From f0d48814c97bea586065ebbce47a9f2683b7b18f Mon Sep 17 00:00:00 2001 From: Jeonghyun Yun Date: Wed, 4 Apr 2018 17:20:03 +0900 Subject: [PATCH] [ElmSharp][Non-ACR] Fixed wrong TC Change-Id: Icdcdbf16376c0ead3ded6c7f854a647105a76e1f Signed-off-by: Jeonghyun Yun --- .../Tizen.ElmSharp.Tests/testcase/TSEvasObject.cs | 3 ++- .../Tizen.ElmSharp.Tests/testcase/TSImage.cs | 20 ++++++++++---------- .../Tizen.ElmSharp.Tests/testcase/TSLayout.cs | 6 +++--- .../testcase/TSMultiButtonEntry.cs | 3 +++ .../Tizen.ElmSharp.Tests/testcase/TSPopup.cs | 20 +++++--------------- .../Tizen.ElmSharp.Tests/testcase/TSWipeEffect.cs | 18 +++++++++--------- 6 files changed, 32 insertions(+), 38 deletions(-) diff --git a/tct-suite-vs/Tizen.ElmSharp.Tests/testcase/TSEvasObject.cs b/tct-suite-vs/Tizen.ElmSharp.Tests/testcase/TSEvasObject.cs index 3da8d09..0248b50 100755 --- a/tct-suite-vs/Tizen.ElmSharp.Tests/testcase/TSEvasObject.cs +++ b/tct-suite-vs/Tizen.ElmSharp.Tests/testcase/TSEvasObject.cs @@ -523,7 +523,8 @@ namespace ElmSharp.Tests { try { - _evasObject.SetClip(_window); + var rect = new Rectangle(_window); + _evasObject.SetClip(rect); } catch (Exception) { diff --git a/tct-suite-vs/Tizen.ElmSharp.Tests/testcase/TSImage.cs b/tct-suite-vs/Tizen.ElmSharp.Tests/testcase/TSImage.cs index 8330447..5e23981 100755 --- a/tct-suite-vs/Tizen.ElmSharp.Tests/testcase/TSImage.cs +++ b/tct-suite-vs/Tizen.ElmSharp.Tests/testcase/TSImage.cs @@ -242,31 +242,31 @@ namespace ElmSharp.Tests [Test] [Category("P1")] - [Description("Check LoadAsync(System.IO.Stream) return value")] + [Description("Check LoadAsync(System.Uri) return value")] [Property("SPEC", "ElmSharp.Image.LoadAsync M")] - [Property("COVPARAM", "string, CancellationToken")] + [Property("COVPARAM", "Uri, CancellationToken")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] + [Precondition(1, "make sure the device can access to the internet")] [Property("AUTHOR", "Qian Sui, qian.sui@samsung.com")] - public static async Task LoadAsync_File_CHECK() + public static async Task LoadAsync_Uri_CHECK() { - bool mark = await _image.LoadAsync(Program.Current.DirectoryInfo.Resource + "test.jpg"); + bool mark = await _image.LoadAsync("http://pe.tedcdn.com/images/ted/2e306b9655267cee35e45688ace775590b820510_615x461.jpg"); Assert.IsTrue(mark); } [Test] [Category("P1")] - [Description("Check LoadAsync(System.Uri) return value")] + [Description("Check LoadAsync(System.IO.Stream) return value")] [Property("SPEC", "ElmSharp.Image.LoadAsync M")] - [Property("COVPARAM", "Uri, CancellationToken")] + [Property("COVPARAM", "string, CancellationToken")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] - [Precondition(1, "make sure the device can access to the internet")] [Property("AUTHOR", "Qian Sui, qian.sui@samsung.com")] - public static async Task LoadAsync_Uri_CHECK() + public static async Task LoadAsync_File_CHECK() { - bool mark = await _image.LoadAsync("http://pe.tedcdn.com/images/ted/2e306b9655267cee35e45688ace775590b820510_615x461.jpg"); - Assert.IsTrue(mark); + bool mark = await _image.LoadAsync(Program.Current.DirectoryInfo.Resource + "test.jpg"); + Assert.IsTrue(mark, "LoadAsync method return true"); } [Test] diff --git a/tct-suite-vs/Tizen.ElmSharp.Tests/testcase/TSLayout.cs b/tct-suite-vs/Tizen.ElmSharp.Tests/testcase/TSLayout.cs index dc5d132..703528b 100755 --- a/tct-suite-vs/Tizen.ElmSharp.Tests/testcase/TSLayout.cs +++ b/tct-suite-vs/Tizen.ElmSharp.Tests/testcase/TSLayout.cs @@ -401,7 +401,7 @@ namespace ElmSharp.Tests DefaultBackButtonEnabled = true }; var mark = _layout.BoxRemove("elm.text", naviFrameTemp); - Assert.AreEqual(true, mark); + Assert.AreEqual(false, "BoxRemove method return " + mark); naviFrameTemp = null; } @@ -415,7 +415,7 @@ namespace ElmSharp.Tests public void BoxRemoveAll_CHECK() { var mark = _layout.BoxRemoveAll("elm.text", true); - Assert.AreEqual(true, mark); + Assert.AreEqual(false, "BoxRemoveAll method return " + mark); } [Test] @@ -505,4 +505,4 @@ namespace ElmSharp.Tests naviFrameTemp = null; } } -} \ No newline at end of file +} diff --git a/tct-suite-vs/Tizen.ElmSharp.Tests/testcase/TSMultiButtonEntry.cs b/tct-suite-vs/Tizen.ElmSharp.Tests/testcase/TSMultiButtonEntry.cs index 4448b2e..cb5d915 100755 --- a/tct-suite-vs/Tizen.ElmSharp.Tests/testcase/TSMultiButtonEntry.cs +++ b/tct-suite-vs/Tizen.ElmSharp.Tests/testcase/TSMultiButtonEntry.cs @@ -287,6 +287,9 @@ namespace ElmSharp.Tests { [Property("AUTHOR", "Qian Sui, qian.sui@samsung.com")] public void IsExpanded_SET_GET() { + MultiButtonEntryItem mButtonEntryItem = _mButtonEntry.Append("Append"); + _mButtonEntry.IsExpanded = true; + Assert.IsTrue(_mButtonEntry.IsExpanded, "The IsExpanded should be true."); _mButtonEntry.IsExpanded = false; Assert.IsFalse(_mButtonEntry.IsExpanded, "The IsExpanded should be false."); } diff --git a/tct-suite-vs/Tizen.ElmSharp.Tests/testcase/TSPopup.cs b/tct-suite-vs/Tizen.ElmSharp.Tests/testcase/TSPopup.cs index 74e73ff..c50f5f2 100755 --- a/tct-suite-vs/Tizen.ElmSharp.Tests/testcase/TSPopup.cs +++ b/tct-suite-vs/Tizen.ElmSharp.Tests/testcase/TSPopup.cs @@ -178,7 +178,6 @@ namespace ElmSharp.Tests Assert.AreEqual(PopupOrientation.BottomRight, _popup.Orientation, "PopupOrientation.BottomRight is not equal to set value"); } - [Test] [Category("P1")] [Description("Check whether get value of ContentTextWrapType are identical with the set value or not.")] @@ -188,21 +187,12 @@ namespace ElmSharp.Tests [Property("AUTHOR", "Gu Wenxuan, wenxuan.gu@samsung.com")] public void ContentTextWrapType_PROPERTY_SET_GET() { - _popup.ContentTextWrapType = WrapType.None; - Assert.AreEqual(WrapType.None, _popup.ContentTextWrapType, "ContentTextWrapType is not equal to set value"); - } - - [Test] - [Category("P1")] - [Description("Check whether enum WrapType.Char are gettable and settable.")] - [Property("SPEC", "ElmSharp.Popup.ContentTextWrapType A")] - [Property("SPEC_URL", "-")] - [Property("CRITERIA", "PRE")] - [Property("AUTHOR", "Gu Wenxuan, wenxuan.gu@samsung.com")] - public void ContentTextWrapType_GET_ENUM_CHAR() - { + _popup.ContentTextWrapType = WrapType.Word; + Assert.AreEqual(WrapType.Word, _popup.ContentTextWrapType, "ContentTextWrapType is not equal to set value"); _popup.ContentTextWrapType = WrapType.Char; - Assert.AreEqual(WrapType.Char, _popup.ContentTextWrapType, "WrapType.Char is not equal to set value"); + Assert.AreEqual(WrapType.Char, _popup.ContentTextWrapType, "ContentTextWrapType is not equal to set value"); + _popup.ContentTextWrapType = WrapType.Mixed; + Assert.AreEqual(WrapType.Mixed, _popup.ContentTextWrapType, "ContentTextWrapType is not equal to set value"); } [Test] diff --git a/tct-suite-vs/Tizen.ElmSharp.Tests/testcase/TSWipeEffect.cs b/tct-suite-vs/Tizen.ElmSharp.Tests/testcase/TSWipeEffect.cs index e3f761c..a063e39 100755 --- a/tct-suite-vs/Tizen.ElmSharp.Tests/testcase/TSWipeEffect.cs +++ b/tct-suite-vs/Tizen.ElmSharp.Tests/testcase/TSWipeEffect.cs @@ -65,8 +65,8 @@ namespace ElmSharp.Tests public void Type_PROPERTY_GET() { _wipeEffect = new WipeEffect(WipeType.Hide, WipeDirection.Down); - Assert.AreEqual(WipeType.Hide, _wipeEffect.Type, "Type value is not equal to WipeType.Hide."); - + Assert.AreEqual(WipeType.Hide, _wipeEffect.Type, "Type value is not equal to WipeType.Hide."); + _wipeEffect = new WipeEffect(WipeType.Show, WipeDirection.Down); Assert.AreEqual(WipeType.Show, _wipeEffect.Type, "Type value is not equal to WipeType.Show."); } @@ -79,16 +79,16 @@ namespace ElmSharp.Tests [Property("CRITERIA", "PRE")] [Property("AUTHOR", "Qian Sui, qian.sui@samsung.com")] public void Direction_PROPERTY_GET() - { + { _wipeEffect = new WipeEffect(WipeType.Hide, WipeDirection.Down); - Assert.AreEqual(WipeDirection.Down, _wipeEffect.Direction, "Direction value is not equal to WipeDirection.Down."); - + Assert.AreEqual(WipeDirection.Down, _wipeEffect.Direction, "Direction value is not equal to WipeDirection.Down."); + _wipeEffect = new WipeEffect(WipeType.Hide, WipeDirection.Left); - Assert.AreEqual(WipeDirection.Left, _wipeEffect.Direction, "Direction value is not equal to WipeDirection.Left."); - + Assert.AreEqual(WipeDirection.Left, _wipeEffect.Direction, "Direction value is not equal to WipeDirection.Left."); + _wipeEffect = new WipeEffect(WipeType.Hide, WipeDirection.Right); - Assert.AreEqual(WipeDirection.Right, _wipeEffect.Direction, "Direction value is not equal to WipeDirection.Right."); - + Assert.AreEqual(WipeDirection.Right, _wipeEffect.Direction, "Direction value is not equal to WipeDirection.Right."); + _wipeEffect = new WipeEffect(WipeType.Hide, WipeDirection.Up); Assert.AreEqual(WipeDirection.Up, _wipeEffect.Direction, "Direction value is not equal to WipeDirection.Up."); } -- 2.7.4