From 399e455bcd005adaa72863198982627fb2803c29 Mon Sep 17 00:00:00 2001 From: Bowon Ryu Date: Wed, 29 Dec 2021 21:31:04 +0900 Subject: [PATCH] [NUI] update testcase for text vector2 Signed-off-by: Bowon Ryu --- .../testcase/public/BaseComponents/TSTextMapHelper.cs | 17 +++++++++++------ .../testcase/public/BaseComponents/TSTextUtils.cs | 18 ++++++++++++++---- 2 files changed, 25 insertions(+), 10 deletions(-) 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 7e6871d..6babee3 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 @@ -24,6 +24,14 @@ namespace Tizen.NUI.Devel.Tests return false; } + public bool CheckVector2(Vector2 vectorSrc, Vector2 vectorDst) + { + if (vectorSrc.X == vectorDst.X && vectorSrc.Y == vectorDst.Y) + return true; + + return false; + } + [SetUp] public void Init() { @@ -345,8 +353,7 @@ namespace Tizen.NUI.Devel.Tests map.Find(0, "blurRadius").Get(out float blurRadius); 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(true, CheckVector2(offset, shadow.Offset), "Should be true!"); Assert.AreEqual(true, CheckColor(color, shadow.Color), "Should be true!"); tlog.Debug(tag, $"TextMapHelperGetShadowMap END (OK)"); @@ -375,8 +382,7 @@ namespace Tizen.NUI.Devel.Tests var shadow = TextMapHelper.GetShadowStruct(map); 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(true, CheckVector2(offset, shadow.Offset), "Should be true!"); Assert.AreEqual(true, CheckColor(color, shadow.Color), "Should be true!"); tlog.Debug(tag, $"TextMapHelperGetShadowStruct END (OK)"); @@ -972,8 +978,7 @@ namespace Tizen.NUI.Devel.Tests map.Add(stringKey, new PropertyValue(value)); var result = TextMapHelper.GetVector2FromMap(map, stringKey); - Assert.AreEqual(value.X, result.X, "Should be equal!"); - Assert.AreEqual(value.Y, result.Y, "Should be equal!"); + Assert.AreEqual(true, CheckVector2(value, result), "Should be true!"); tlog.Debug(tag, $"TextMapHelperGetVector2FromMap 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 5e0ca58..f207012 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 @@ -24,6 +24,14 @@ namespace Tizen.NUI.Devel.Tests return false; } + public bool CheckVector2(Vector2 vectorSrc, Vector2 vectorDst) + { + if (vectorSrc.X == vectorDst.X && vectorSrc.Y == vectorDst.Y) + return true; + + return false; + } + [SetUp] public void Init() { @@ -632,9 +640,10 @@ namespace Tizen.NUI.Devel.Tests Assert.IsInstanceOf(testingTarget, "Should be an instance of EmbeddedItemInfo type."); testingTarget.Position = new Vector2(100.0f, 200.0f); - Assert.AreEqual(100.0f, testingTarget.Position.X, "Should be equal!"); - Assert.AreEqual(200.0f, testingTarget.Position.Y, "Should be equal!"); + var position = new Vector2(100.0f, 200.0f); + Assert.AreEqual(true, CheckVector2(position, testingTarget.Position), "Should be true!"); + position.Dispose(); testingTarget.Dispose(); tlog.Debug(tag, $"TextUtilsEmbeddedItemInfoPosition END (OK)"); } @@ -841,9 +850,10 @@ namespace Tizen.NUI.Devel.Tests Assert.IsInstanceOf(testingTarget, "Should be an instance of ShadowParameters type."); testingTarget.Offset = new Vector2(0.3f, 0.8f); - Assert.AreEqual(0.3f, testingTarget.Offset.X, "Should be equal!"); - Assert.AreEqual(0.8f, testingTarget.Offset.Y, "Should be equal!"); + var offset = new Vector2(0.3f, 0.8f); + Assert.AreEqual(true, CheckVector2(offset, testingTarget.Offset), "Should be true!"); + offset.Dispose(); testingTarget.Dispose(); tlog.Debug(tag, $"TextUtilsShadowParametersOffset END (OK)"); } -- 2.7.4