From a802ee5878a026c7e1d30df09cef828ccef78592 Mon Sep 17 00:00:00 2001 From: Bowon Ryu Date: Wed, 29 Dec 2021 20:37:23 +0900 Subject: [PATCH] [NUI] update testcase for Text * remove duplicate code from function extraction * reduce loc & make better readability Signed-off-by: Bowon Ryu --- .../testcase/public/BaseComponents/TSTextField.cs | 72 ++++++++++++---------- .../public/BaseComponents/TSTextMapHelper.cs | 58 ++++++----------- .../testcase/public/BaseComponents/TSTextUtils.cs | 29 +++++---- 3 files changed, 75 insertions(+), 84 deletions(-) diff --git a/test/Tizen.NUI.Tests/Tizen.NUI.Devel.Tests/testcase/public/BaseComponents/TSTextField.cs b/test/Tizen.NUI.Tests/Tizen.NUI.Devel.Tests/testcase/public/BaseComponents/TSTextField.cs index 05fa76c..eb6fcd6 100755 --- a/test/Tizen.NUI.Tests/Tizen.NUI.Devel.Tests/testcase/public/BaseComponents/TSTextField.cs +++ b/test/Tizen.NUI.Tests/Tizen.NUI.Devel.Tests/testcase/public/BaseComponents/TSTextField.cs @@ -34,6 +34,22 @@ namespace Tizen.NUI.Devel.Tests } } + public bool CheckColor(Color colorSrc, Color colorDst) + { + if (colorSrc.R == colorDst.R && colorSrc.G == colorDst.G && colorSrc.B == colorDst.B && colorSrc.A == colorDst.A) + return true; + + return false; + } + + public bool CheckColor(Vector4 colorSrc, Vector4 colorDst) + { + if (colorSrc.X == colorDst.X && colorSrc.Y == colorDst.Y && colorSrc.Z == colorDst.Z && colorSrc.W == colorDst.W) + return true; + + return false; + } + [SetUp] public void Init() { @@ -527,11 +543,10 @@ namespace Tizen.NUI.Devel.Tests Assert.IsInstanceOf(testingTarget, "Should be an instance of TextField type."); testingTarget.TextColor = new Color(1.0f, 1.0f, 0.8f, 0.0f); - Assert.AreEqual(1.0f, testingTarget.TextColor.R, "Should be equal!"); - Assert.AreEqual(1.0f, testingTarget.TextColor.G, "Should be equal!"); - Assert.AreEqual(0.8f, testingTarget.TextColor.B, "Should be equal!"); - Assert.AreEqual(0.0f, testingTarget.TextColor.A, "Should be equal!"); + var color = new Color(1.0f, 1.0f, 0.8f, 0.0f); + Assert.AreEqual(true, CheckColor(color, testingTarget.TextColor), "Should be true!"); + color.Dispose(); testingTarget.Dispose(); tlog.Debug(tag, $"TextFieldTextColor END (OK)"); } @@ -552,11 +567,10 @@ namespace Tizen.NUI.Devel.Tests Assert.IsInstanceOf(testingTarget, "Should be an instance of TextField type."); testingTarget.PlaceholderTextColor = new Vector4(1.0f, 1.0f, 0.8f, 0.0f); - Assert.AreEqual(1.0f, testingTarget.PlaceholderTextColor.X, "Should be equal!"); - Assert.AreEqual(1.0f, testingTarget.PlaceholderTextColor.Y, "Should be equal!"); - Assert.AreEqual(0.8f, testingTarget.PlaceholderTextColor.Z, "Should be equal!"); - Assert.AreEqual(0.0f, testingTarget.PlaceholderTextColor.W, "Should be equal!"); + var color = new Vector4(1.0f, 1.0f, 0.8f, 0.0f); + Assert.AreEqual(true, CheckColor(color, testingTarget.PlaceholderTextColor), "Should be true!"); + color.Dispose(); testingTarget.Dispose(); tlog.Debug(tag, $"TextFieldPlaceholderTextColor END (OK)"); } @@ -602,11 +616,10 @@ namespace Tizen.NUI.Devel.Tests Assert.IsInstanceOf(testingTarget, "Should be an instance of TextField type."); testingTarget.ShadowColor = new Vector4(1.0f, 1.0f, 0.8f, 0.0f); - Assert.AreEqual(1.0f, testingTarget.ShadowColor.X, "Should be equal!"); - Assert.AreEqual(1.0f, testingTarget.ShadowColor.Y, "Should be equal!"); - Assert.AreEqual(0.8f, testingTarget.ShadowColor.Z, "Should be equal!"); - Assert.AreEqual(0.0f, testingTarget.ShadowColor.W, "Should be equal!"); + var color = new Vector4(1.0f, 1.0f, 0.8f, 0.0f); + Assert.AreEqual(true, CheckColor(color, testingTarget.ShadowColor), "Should be true!"); + color.Dispose(); testingTarget.Dispose(); tlog.Debug(tag, $"TextFieldShadowColor END (OK)"); } @@ -628,11 +641,10 @@ namespace Tizen.NUI.Devel.Tests Assert.IsInstanceOf(testingTarget, "Should be an instance of TextField type."); testingTarget.PrimaryCursorColor = new Vector4(1.0f, 1.0f, 0.8f, 0.0f); - Assert.AreEqual(1.0f, testingTarget.PrimaryCursorColor.X, "Should be equal!"); - Assert.AreEqual(1.0f, testingTarget.PrimaryCursorColor.Y, "Should be equal!"); - Assert.AreEqual(0.8f, testingTarget.PrimaryCursorColor.Z, "Should be equal!"); - Assert.AreEqual(0.0f, testingTarget.PrimaryCursorColor.W, "Should be equal!"); + var color = new Vector4(1.0f, 1.0f, 0.8f, 0.0f); + Assert.AreEqual(true, CheckColor(color, testingTarget.PrimaryCursorColor), "Should be true!"); + color.Dispose(); testingTarget.Dispose(); tlog.Debug(tag, $"TextFieldPrimaryCursorColor END (OK)"); } @@ -654,11 +666,10 @@ namespace Tizen.NUI.Devel.Tests Assert.IsInstanceOf(testingTarget, "Should be an instance of TextField type."); testingTarget.SecondaryCursorColor = new Vector4(1.0f, 0.5f, 0.0f, 0.8f); - Assert.AreEqual(1.0f, testingTarget.SecondaryCursorColor.X, "Should be equal!"); - Assert.AreEqual(0.5f, testingTarget.SecondaryCursorColor.Y, "Should be equal!"); - Assert.AreEqual(0.0f, testingTarget.SecondaryCursorColor.Z, "Should be equal!"); - Assert.AreEqual(0.8f, testingTarget.SecondaryCursorColor.W, "Should be equal!"); + var color = new Vector4(1.0f, 0.5f, 0.0f, 0.8f); + Assert.AreEqual(true, CheckColor(color, testingTarget.SecondaryCursorColor), "Should be true!"); + color.Dispose(); testingTarget.Dispose(); tlog.Debug(tag, $"TextFieldSecondaryCursorColor END (OK)"); } @@ -1053,11 +1064,10 @@ namespace Tizen.NUI.Devel.Tests Assert.IsInstanceOf(testingTarget, "Should be an instance of TextField type."); testingTarget.SelectionHighlightColor = new Vector4(0.3f, 0.5f, 0.8f, 0.0f); - Assert.AreEqual(0.3f, testingTarget.SelectionHighlightColor.X, "Should be equal!"); - Assert.AreEqual(0.5f, testingTarget.SelectionHighlightColor.Y, "Should be equal!"); - Assert.AreEqual(0.8f, testingTarget.SelectionHighlightColor.Z, "Should be equal!"); - Assert.AreEqual(0.0f, testingTarget.SelectionHighlightColor.W, "Should be equal!"); + var color = new Vector4(0.3f, 0.5f, 0.8f, 0.0f); + Assert.AreEqual(true, CheckColor(color, testingTarget.SelectionHighlightColor), "Should be true!"); + color.Dispose(); testingTarget.Dispose(); tlog.Debug(tag, $"TextFieldSelectionHighlightColor END (OK)"); } @@ -1136,11 +1146,10 @@ namespace Tizen.NUI.Devel.Tests Assert.IsInstanceOf(testingTarget, "Should be an instance of TextField type."); testingTarget.InputColor = new Vector4(0.3f, 0.5f, 0.8f, 0.0f); - Assert.AreEqual(0.3f, testingTarget.InputColor.X, "Should be equal!"); - Assert.AreEqual(0.5f, testingTarget.InputColor.Y, "Should be equal!"); - Assert.AreEqual(0.8f, testingTarget.InputColor.Z, "Should be equal!"); - Assert.AreEqual(0.0f, testingTarget.InputColor.W, "Should be equal!"); + var color = new Vector4(0.3f, 0.5f, 0.8f, 0.0f); + Assert.AreEqual(true, CheckColor(color, testingTarget.InputColor), "Should be true!"); + color.Dispose(); testingTarget.Dispose(); tlog.Debug(tag, $"TextFieldInputColor END (OK)"); } @@ -1586,11 +1595,10 @@ namespace Tizen.NUI.Devel.Tests Assert.IsInstanceOf(testingTarget, "Should be an instance of TextField type."); testingTarget.GrabHandleColor = new Color(1.0f, 1.0f, 0.8f, 0.0f); - Assert.AreEqual(1.0f, testingTarget.GrabHandleColor.R, "Should be equal!"); - Assert.AreEqual(1.0f, testingTarget.GrabHandleColor.G, "Should be equal!"); - Assert.AreEqual(0.8f, testingTarget.GrabHandleColor.B, "Should be equal!"); - Assert.AreEqual(0.0f, testingTarget.GrabHandleColor.A, "Should be equal!"); + var color = new Color(1.0f, 1.0f, 0.8f, 0.0f); + Assert.AreEqual(true, CheckColor(color, testingTarget.GrabHandleColor), "Should be true!"); + color.Dispose(); testingTarget.Dispose(); tlog.Debug(tag, $"TextFieldGrabHandleColor END (OK)"); } diff --git a/test/Tizen.NUI.Tests/Tizen.NUI.Devel.Tests/testcase/public/BaseComponents/TSTextMapHelper.cs b/test/Tizen.NUI.Tests/Tizen.NUI.Devel.Tests/testcase/public/BaseComponents/TSTextMapHelper.cs index 3e910b8..7e6871d 100644 --- a/test/Tizen.NUI.Tests/Tizen.NUI.Devel.Tests/testcase/public/BaseComponents/TSTextMapHelper.cs +++ b/test/Tizen.NUI.Tests/Tizen.NUI.Devel.Tests/testcase/public/BaseComponents/TSTextMapHelper.cs @@ -16,6 +16,14 @@ namespace Tizen.NUI.Devel.Tests { private const string tag = "NUITEST"; + public bool CheckColor(Color colorSrc, Color colorDst) + { + if (colorSrc.R == colorDst.R && colorSrc.G == colorDst.G && colorSrc.B == colorDst.B && colorSrc.A == colorDst.A) + return true; + + return false; + } + [SetUp] public void Init() { @@ -280,10 +288,7 @@ namespace Tizen.NUI.Devel.Tests Assert.AreEqual(enable, underline.Enable, "Should be equal!"); Assert.AreEqual(height, underline.Height, "Should be equal!"); - Assert.AreEqual(color.R, underline.Color.R, "Should be equal!"); - Assert.AreEqual(color.G, underline.Color.G, "Should be equal!"); - Assert.AreEqual(color.B, underline.Color.B, "Should be equal!"); - Assert.AreEqual(color.A, underline.Color.A, "Should be equal!"); + Assert.AreEqual(true, CheckColor(color, underline.Color), "Should be true!"); tlog.Debug(tag, $"TextMapHelperGetUnderlineMap END (OK)"); } @@ -309,10 +314,7 @@ namespace Tizen.NUI.Devel.Tests Assert.AreEqual(true, underline.Enable, "Should be equal!"); Assert.AreEqual(2.0f, underline.Height, "Should be equal!"); - Assert.AreEqual(color.R, underline.Color.R, "Should be equal!"); - Assert.AreEqual(color.G, underline.Color.G, "Should be equal!"); - Assert.AreEqual(color.B, underline.Color.B, "Should be equal!"); - Assert.AreEqual(color.A, underline.Color.A, "Should be equal!"); + Assert.AreEqual(true, CheckColor(color, underline.Color), "Should be true!"); tlog.Debug(tag, $"TextMapHelperGetUnderlineStruct END (OK)"); } @@ -345,10 +347,7 @@ namespace Tizen.NUI.Devel.Tests Assert.AreEqual(blurRadius, shadow.BlurRadius, "Should be equal!"); Assert.AreEqual(offset.X, shadow.Offset.X, "Should be equal!"); Assert.AreEqual(offset.Y, shadow.Offset.Y, "Should be equal!"); - Assert.AreEqual(color.R, shadow.Color.R, "Should be equal!"); - Assert.AreEqual(color.G, shadow.Color.G, "Should be equal!"); - Assert.AreEqual(color.B, shadow.Color.B, "Should be equal!"); - Assert.AreEqual(color.A, shadow.Color.A, "Should be equal!"); + Assert.AreEqual(true, CheckColor(color, shadow.Color), "Should be true!"); tlog.Debug(tag, $"TextMapHelperGetShadowMap END (OK)"); } @@ -378,10 +377,7 @@ namespace Tizen.NUI.Devel.Tests Assert.AreEqual(blurRadius, shadow.BlurRadius, "Should be equal!"); Assert.AreEqual(offset.X, shadow.Offset.X, "Should be equal!"); Assert.AreEqual(offset.Y, shadow.Offset.Y, "Should be equal!"); - Assert.AreEqual(color.R, shadow.Color.R, "Should be equal!"); - Assert.AreEqual(color.G, shadow.Color.G, "Should be equal!"); - Assert.AreEqual(color.B, shadow.Color.B, "Should be equal!"); - Assert.AreEqual(color.A, shadow.Color.A, "Should be equal!"); + Assert.AreEqual(true, CheckColor(color, shadow.Color), "Should be true!"); tlog.Debug(tag, $"TextMapHelperGetShadowStruct END (OK)"); } @@ -409,10 +405,7 @@ namespace Tizen.NUI.Devel.Tests map.Find(0, "width").Get(out float width); Assert.AreEqual(width, outline.Width, "Should be equal!"); - Assert.AreEqual(color.R, outline.Color.R, "Should be equal!"); - Assert.AreEqual(color.G, outline.Color.G, "Should be equal!"); - Assert.AreEqual(color.B, outline.Color.B, "Should be equal!"); - Assert.AreEqual(color.A, outline.Color.A, "Should be equal!"); + Assert.AreEqual(true, CheckColor(color, outline.Color), "Should be true!"); tlog.Debug(tag, $"TextMapHelperGetOutlineMap END (OK)"); } @@ -437,10 +430,7 @@ namespace Tizen.NUI.Devel.Tests var outline = TextMapHelper.GetOutlineStruct(map); Assert.AreEqual(width, outline.Width, "Should be equal!"); - Assert.AreEqual(color.R, outline.Color.R, "Should be equal!"); - Assert.AreEqual(color.G, outline.Color.G, "Should be equal!"); - Assert.AreEqual(color.B, outline.Color.B, "Should be equal!"); - Assert.AreEqual(color.A, outline.Color.A, "Should be equal!"); + Assert.AreEqual(true, CheckColor(color, outline.Color), "Should be true!"); tlog.Debug(tag, $"TextMapHelperGetOutlineStruct END (OK)"); } @@ -610,10 +600,7 @@ namespace Tizen.NUI.Devel.Tests Assert.AreEqual(text, placeholder.Text, "Should be equal!"); Assert.AreEqual(textFocused, placeholder.TextFocused, "Should be equal!"); - Assert.AreEqual(color.R, placeholder.Color.R, "Should be equal!"); - Assert.AreEqual(color.G, placeholder.Color.G, "Should be equal!"); - Assert.AreEqual(color.B, placeholder.Color.B, "Should be equal!"); - Assert.AreEqual(color.A, placeholder.Color.A, "Should be equal!"); + Assert.AreEqual(true, CheckColor(color, placeholder.Color), "Should be true!"); Assert.AreEqual(fontFamily, placeholder.FontFamily, "Should be equal!"); Assert.AreEqual(width, "expanded", "Should be equal!"); Assert.AreEqual(weight, "bold", "Should be equal!"); @@ -659,10 +646,7 @@ namespace Tizen.NUI.Devel.Tests Assert.AreEqual(text, placeholder.Text, "Should be equal!"); Assert.AreEqual(textFocused, placeholder.TextFocused, "Should be equal!"); - Assert.AreEqual(color.R, placeholder.Color.R, "Should be equal!"); - Assert.AreEqual(color.G, placeholder.Color.G, "Should be equal!"); - Assert.AreEqual(color.B, placeholder.Color.B, "Should be equal!"); - Assert.AreEqual(color.A, placeholder.Color.A, "Should be equal!"); + Assert.AreEqual(true, CheckColor(color, placeholder.Color), "Should be true!"); Assert.AreEqual(fontFamily, placeholder.FontFamily, "Should be equal!"); Assert.AreEqual(FontWidthType.Expanded, placeholder.FontStyle?.Width, "Should be equal!"); Assert.AreEqual(FontWeightType.Bold, placeholder.FontStyle?.Weight, "Should be equal!"); @@ -961,16 +945,10 @@ namespace Tizen.NUI.Devel.Tests map.Add(intKey, new PropertyValue(value)); var result = TextMapHelper.GetColorFromMap(map, stringKey); - Assert.AreEqual(value.R, result.R, "Should be equal!"); - Assert.AreEqual(value.G, result.G, "Should be equal!"); - Assert.AreEqual(value.B, result.B, "Should be equal!"); - Assert.AreEqual(value.A, result.A, "Should be equal!"); + Assert.AreEqual(true, CheckColor(value, result), "Should be true!"); result = TextMapHelper.GetColorFromMap(map, intKey); - Assert.AreEqual(value.R, result.R, "Should be equal!"); - Assert.AreEqual(value.G, result.G, "Should be equal!"); - Assert.AreEqual(value.B, result.B, "Should be equal!"); - Assert.AreEqual(value.A, result.A, "Should be equal!"); + Assert.AreEqual(true, CheckColor(value, result), "Should be true!"); tlog.Debug(tag, $"TextMapHelperGetColorFromMap END (OK)"); } diff --git a/test/Tizen.NUI.Tests/Tizen.NUI.Devel.Tests/testcase/public/BaseComponents/TSTextUtils.cs b/test/Tizen.NUI.Tests/Tizen.NUI.Devel.Tests/testcase/public/BaseComponents/TSTextUtils.cs index 35fb835..5e0ca58 100755 --- a/test/Tizen.NUI.Tests/Tizen.NUI.Devel.Tests/testcase/public/BaseComponents/TSTextUtils.cs +++ b/test/Tizen.NUI.Tests/Tizen.NUI.Devel.Tests/testcase/public/BaseComponents/TSTextUtils.cs @@ -16,6 +16,14 @@ namespace Tizen.NUI.Devel.Tests private const string tag = "NUITEST"; private string imageurl = Tizen.Applications.Application.Current.DirectoryInfo.Resource + "picture.png"; + public bool CheckColor(Vector4 colorSrc, Vector4 colorDst) + { + if (colorSrc.X == colorDst.X && colorSrc.Y == colorDst.Y && colorSrc.Z == colorDst.Z && colorSrc.W == colorDst.W) + return true; + + return false; + } + [SetUp] public void Init() { @@ -285,11 +293,10 @@ namespace Tizen.NUI.Devel.Tests Assert.IsInstanceOf(testingTarget, "Should be an instance of RendererParameters type."); testingTarget.TextColor = new Vector4(0.3f, 0.8f, 1.0f, 0.0f); - Assert.AreEqual(0.3f, testingTarget.TextColor.R, "Should be equal!"); - Assert.AreEqual(0.8f, testingTarget.TextColor.G, "Should be equal!"); - Assert.AreEqual(1.0f, testingTarget.TextColor.B, "Should be equal!"); - Assert.AreEqual(0.0f, testingTarget.TextColor.A, "Should be equal!"); + var color = new Vector4(0.3f, 0.8f, 1.0f, 0.0f); + Assert.AreEqual(true, CheckColor(color, testingTarget.TextColor), "Should be true!"); + color.Dispose(); testingTarget.Dispose(); tlog.Debug(tag, $"TextUtilsRendererParametersTextColor END (OK)"); } @@ -784,11 +791,10 @@ namespace Tizen.NUI.Devel.Tests Assert.IsInstanceOf(testingTarget, "Should be an instance of ShadowParameters type."); testingTarget.TextColor = new Vector4(0.3f, 0.8f, 1.0f, 0.0f); - Assert.AreEqual(0.3f, testingTarget.TextColor.R, "Should be equal!"); - Assert.AreEqual(0.8f, testingTarget.TextColor.G, "Should be equal!"); - Assert.AreEqual(1.0f, testingTarget.TextColor.B, "Should be equal!"); - Assert.AreEqual(0.0f, testingTarget.TextColor.A, "Should be equal!"); + var color = new Vector4(0.3f, 0.8f, 1.0f, 0.0f); + Assert.AreEqual(true, CheckColor(color, testingTarget.TextColor), "Should be true!"); + color.Dispose(); testingTarget.Dispose(); tlog.Debug(tag, $"TextUtilsShadowParametersTextColor END (OK)"); } @@ -811,11 +817,10 @@ namespace Tizen.NUI.Devel.Tests testingTarget.Input = new PixelBuffer(30, 50, PixelFormat.A8); testingTarget.Color = new Vector4(0.3f, 0.8f, 1.0f, 0.0f); - Assert.AreEqual(0.3f, testingTarget.Color.R, "Should be equal!"); - Assert.AreEqual(0.8f, testingTarget.Color.G, "Should be equal!"); - Assert.AreEqual(1.0f, testingTarget.Color.B, "Should be equal!"); - Assert.AreEqual(0.0f, testingTarget.Color.A, "Should be equal!"); + var color = new Vector4(0.3f, 0.8f, 1.0f, 0.0f); + Assert.AreEqual(true, CheckColor(color, testingTarget.Color), "Should be true!"); + color.Dispose(); testingTarget.Dispose(); tlog.Debug(tag, $"TextUtilsShadowParametersColor END (OK)"); } -- 2.7.4