From 57e4404c9d09ebcac78799ff5a853545eb8f4a3c Mon Sep 17 00:00:00 2001 From: "huiyu.eun" Date: Wed, 23 Oct 2019 16:38:29 +0900 Subject: [PATCH] [NUI][Non-ACR]Fix Tizen.NUI.Wearable.Manual.Tests crash issue Change-Id: I7a9e54303fddfafc63e8834ddd94d2d9fd35c7e3 Signed-off-by: huiyu.eun --- .../WearableManualTestPage.cs | 24 +++++++--- .../testcase/TSNUIWatchApplication.cs | 52 +++++++++++++++++++--- 2 files changed, 64 insertions(+), 12 deletions(-) diff --git a/tct-suite-vs/Tizen.NUI.Wearable.Manual.Tests/WearableManualTestPage.cs b/tct-suite-vs/Tizen.NUI.Wearable.Manual.Tests/WearableManualTestPage.cs index 8d80664..6fc37d6 100755 --- a/tct-suite-vs/Tizen.NUI.Wearable.Manual.Tests/WearableManualTestPage.cs +++ b/tct-suite-vs/Tizen.NUI.Wearable.Manual.Tests/WearableManualTestPage.cs @@ -29,6 +29,7 @@ namespace Tizen.NUI.Wearable.Tests { class WearableManualTestNUI { + private bool _isSelectRunButton; private List _tcIDList; private List _listItem; private TSettings _tsettings; @@ -89,8 +90,15 @@ namespace Tizen.NUI.Wearable.Tests { Initialize(); } + + public void SetSelectButtn(bool isSelect) + { + _isSelectRunButton = isSelect; + } + public void Initialize() { + _isSelectRunButton = false; Window.Instance.BackgroundColor = new Color(0.1f, 0.1f, 0.1f, 1.0f); Tizen.Log.Fatal("NUI", "Initialize========================================="); PointSize = (1.0f / Window.Instance.Dpi.Length()) * 2000.0f; @@ -361,12 +369,16 @@ namespace Tizen.NUI.Wearable.Tests runButton.Add(run); runButton.Clicked += (obj, ee) => { - Clear(); - //should update the _caseView by the test case - _pressButton = NavigationButton.NA; - _tsettings.Testcase_ID = _tcIDList[CurrentTCNum]; - _tsettings.TCResult = ""; - _tRunner.Execute(); + if(_isSelectRunButton == false) + { + _isSelectRunButton = true; + Clear(); + //should update the _caseView by the test case + _pressButton = NavigationButton.NA; + _tsettings.Testcase_ID = _tcIDList[CurrentTCNum]; + _tsettings.TCResult = ""; + _tRunner.Execute(); + } return true; }; diff --git a/tct-suite-vs/Tizen.NUI.Wearable.Manual.Tests/testcase/TSNUIWatchApplication.cs b/tct-suite-vs/Tizen.NUI.Wearable.Manual.Tests/testcase/TSNUIWatchApplication.cs index db7f9a8..563dba3 100755 --- a/tct-suite-vs/Tizen.NUI.Wearable.Manual.Tests/testcase/TSNUIWatchApplication.cs +++ b/tct-suite-vs/Tizen.NUI.Wearable.Manual.Tests/testcase/TSNUIWatchApplication.cs @@ -32,6 +32,7 @@ namespace Tizen.NUI.Wearable.Tests private bool _isWearable = false; private bool _isEmulator = false; private WearableManualTestNUI _testPage; + private PushButton _infoButton; [SetUp] public void Init() @@ -41,12 +42,36 @@ namespace Tizen.NUI.Wearable.Tests _isEmulator = ManualTest.IsEmulator(); _testPage = WearableManualTestNUI.GetInstance(); + _testPage.SetSelectButtn(false); } [TearDown] public void Destroy() { Log.Info("TCT", "Postconditions for each TEST"); + } + + private PropertyMap CreateTextMap(float pointSize, string text) + { + PropertyMap map = new PropertyMap(); + map.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Text)); + map.Add(TextVisualProperty.Text, new PropertyValue(text)); + map.Add(TextVisualProperty.PointSize, new PropertyValue(pointSize)); + if (ManualTest.IsWearable()) + { + map.Add(TextVisualProperty.TextColor, new PropertyValue(Color.White)); + map.Add(TextVisualProperty.HorizontalAlignment, new PropertyValue("CENTER")); + map.Add(TextVisualProperty.VerticalAlignment, new PropertyValue("BOTTOM")); + } + return map; + } + + private void CreateButton() + { + _infoButton = new PushButton(); + _infoButton.Label = CreateTextMap(5.0f, "Clicked run, Please refer test step"); + _infoButton.Size2D = new Size2D(300, 50); + _testPage.ExecuteTC(_infoButton); } [Test] @@ -67,6 +92,7 @@ namespace Tizen.NUI.Wearable.Tests public async Task Run_MANUAL_TEST() { /* TEST CODE */ + CreateButton(); await ManualTest.WaitForConfirm(); } @@ -151,6 +177,7 @@ namespace Tizen.NUI.Wearable.Tests public async Task OnCreate_MANUAL_TEST() { /* TEST CODE */ + CreateButton(); await ManualTest.WaitForConfirm(); } @@ -171,6 +198,7 @@ namespace Tizen.NUI.Wearable.Tests public async Task OnPreCreate_MANUAL_TEST() { /* TEST CODE */ + CreateButton(); await ManualTest.WaitForConfirm(); } @@ -191,6 +219,7 @@ namespace Tizen.NUI.Wearable.Tests public async Task OnAppControlReceived_MANUAL_TEST() { /* TEST CODE */ + CreateButton(); await ManualTest.WaitForConfirm(); } @@ -213,6 +242,7 @@ namespace Tizen.NUI.Wearable.Tests public async Task OnLocaleChanged_MANUAL_TEST() { /* TEST CODE */ + CreateButton(); await ManualTest.WaitForConfirm(); } @@ -237,6 +267,7 @@ namespace Tizen.NUI.Wearable.Tests public async Task OnRegionFormatChanged_MANUAL_TEST() { /* TEST CODE */ + CreateButton(); await ManualTest.WaitForConfirm(); } @@ -258,6 +289,7 @@ namespace Tizen.NUI.Wearable.Tests public async Task Exit_MANUAL_TEST() { /* TEST CODE */ + CreateButton(); await ManualTest.WaitForConfirm(); } @@ -279,6 +311,7 @@ namespace Tizen.NUI.Wearable.Tests public async Task OnTerminate_MANUAL_TEST() { /* TEST CODE */ + CreateButton(); await ManualTest.WaitForConfirm(); } @@ -300,6 +333,7 @@ namespace Tizen.NUI.Wearable.Tests public async Task Resumed_EVENT_TEST() { /* TEST CODE */ + CreateButton(); await ManualTest.WaitForConfirm(); } @@ -320,9 +354,9 @@ namespace Tizen.NUI.Wearable.Tests [Step(4, "Check if log show \"[TestCase][Paused_Event_Test][NUIWatchApplication] Pass\".")] [Postcondition(1, "Close the terminal")] public async Task Paused_EVENT_TEST() - { + { /* TEST CODE */ - + CreateButton(); await ManualTest.WaitForConfirm(); } @@ -342,9 +376,9 @@ namespace Tizen.NUI.Wearable.Tests [Step(3, "Check if log show \"[TestCase][OnResume][NUIWatchApplication] Pass\".")] [Postcondition(1, "Close the terminal")] public async Task OnResume_Manual_Test() - { + { /* TEST CODE */ - + CreateButton(); await ManualTest.WaitForConfirm(); } @@ -365,9 +399,9 @@ namespace Tizen.NUI.Wearable.Tests [Step(4, "Check if log show \"[TestCase][OnPause][NUIWatchApplication] Pass\".")] [Postcondition(1, "Close the terminal")] public async Task OnPause_Manual_Test() - { + { /* TEST CODE */ - + CreateButton(); await ManualTest.WaitForConfirm(); } @@ -393,6 +427,7 @@ namespace Tizen.NUI.Wearable.Tests public async Task AmbientChanged_EVENT_TEST() { /* TEST CODE */ + CreateButton(); await ManualTest.WaitForConfirm(); } @@ -418,6 +453,7 @@ namespace Tizen.NUI.Wearable.Tests public async Task OnAmbientChanged_Manual_Test() { /* TEST CODE */ + CreateButton(); await ManualTest.WaitForConfirm(); } @@ -443,6 +479,7 @@ namespace Tizen.NUI.Wearable.Tests public async Task OnAmbientTick_Manual_Test() { /* TEST CODE */ + CreateButton(); await ManualTest.WaitForConfirm(); } @@ -468,6 +505,7 @@ namespace Tizen.NUI.Wearable.Tests public async Task AmbientTick_EVENT_TEST() { /* TEST CODE */ + CreateButton(); await ManualTest.WaitForConfirm(); } @@ -489,6 +527,7 @@ namespace Tizen.NUI.Wearable.Tests public async Task TimeTick_EVENT_TEST() { /* TEST CODE */ + CreateButton(); await ManualTest.WaitForConfirm(); } @@ -510,6 +549,7 @@ namespace Tizen.NUI.Wearable.Tests public async Task OnTimeTick_Manual_Test() { /* TEST CODE */ + CreateButton(); await ManualTest.WaitForConfirm(); } -- 2.7.4