From 0790af949c5060ac311f5bf45ba79b0b3684eee6 Mon Sep 17 00:00:00 2001
From: Jeonghyun Yun <jh0506.yun@samsung.com>
Date: Mon, 9 Dec 2019 13:33:34 +0900
Subject: [PATCH] [ElmSharp][Non-ACR] Updated naviframe TC for more clarify

Change-Id: If8b773e7cca0dd1cc944a51c7cebb8a5de1c8740
Signed-off-by: Jeonghyun Yun <jh0506.yun@samsung.com>
---
 .../testcase/TSItemObject.cs                       |  8 +++++++-
 .../testcase/TSNaviItem.cs                         |  8 +++++++-
 .../testcase/TSNaviframe.cs                        | 24 +++++++++++++---------
 3 files changed, 28 insertions(+), 12 deletions(-)
 mode change 100755 => 100644 tct-suite-vs/Tizen.ElmSharp.Manual.Tests/testcase/TSItemObject.cs
 mode change 100755 => 100644 tct-suite-vs/Tizen.ElmSharp.Manual.Tests/testcase/TSNaviItem.cs

diff --git a/tct-suite-vs/Tizen.ElmSharp.Manual.Tests/testcase/TSItemObject.cs b/tct-suite-vs/Tizen.ElmSharp.Manual.Tests/testcase/TSItemObject.cs
old mode 100755
new mode 100644
index ec0a318..b47df15
--- a/tct-suite-vs/Tizen.ElmSharp.Manual.Tests/testcase/TSItemObject.cs
+++ b/tct-suite-vs/Tizen.ElmSharp.Manual.Tests/testcase/TSItemObject.cs
@@ -75,7 +75,7 @@ namespace ElmSharp.Tests
         [Property("AUTHOR", "Qian Sui, qian.sui@samsung.com")]
         [Step(1, "Click Run TC")]
         [Step(2, "Click 'Push' button")]
-        [Step(3, "Click navi back button")]
+        [Step(3, "Click navi back button. (You should press hw back button on FHub due to product UX.)")]
         [Step(4, "The test result will show automatically.")]
         [Postcondition(1, "NA")]
         public async Task OnInvalidate_Check()
@@ -108,10 +108,16 @@ namespace ElmSharp.Tests
                     item.Popped += OnConfirm;
                 };
 
+                _navi.BackButtonPressed += (s, e) =>
+                {
+                    _navi.Pop();
+                };
+
                 _navi.Show();
                 _testPage.ExecuteTCByPage(_navi);
 
                 await ManualTest.WaitForConfirm();
+                _navi.BackButtonPressed -= (s, e) => { };
                 var niviframe = _testPage.getNavigationPage();
                 if (niviframe != null)
                     niviframe.Pop();
diff --git a/tct-suite-vs/Tizen.ElmSharp.Manual.Tests/testcase/TSNaviItem.cs b/tct-suite-vs/Tizen.ElmSharp.Manual.Tests/testcase/TSNaviItem.cs
old mode 100755
new mode 100644
index cc1a28a..04d81e9
--- a/tct-suite-vs/Tizen.ElmSharp.Manual.Tests/testcase/TSNaviItem.cs
+++ b/tct-suite-vs/Tizen.ElmSharp.Manual.Tests/testcase/TSNaviItem.cs
@@ -75,7 +75,7 @@ namespace ElmSharp.Tests
         [Property("AUTHOR", "Jeonghyun Yun, jh0506.yun@samsung.com")]
         [Step(1, "Click Run TC")]
         [Step(2, "Click 'Push' button")]
-        [Step(3, "Click navi back button")]
+        [Step(3, "Click navi back button. (You should press hw back button on FHub due to product UX.)")]
         [Step(4, "The test result will show automatically.")]
         [Postcondition(1, "NA")]
         public async Task OnInvalidate_Check()
@@ -108,10 +108,16 @@ namespace ElmSharp.Tests
                     item.Popped += OnConfirm;
                 };
 
+                _navi.BackButtonPressed += (s, e) =>
+                {
+                    _navi.Pop();
+                };
+
                 _navi.Show();
                 _testPage.ExecuteTCByPage(_navi);
 
                 await ManualTest.WaitForConfirm();
+                _navi.BackButtonPressed -= (s, e) => { };
                 var niviframe = _testPage.getNavigationPage();
                 if (niviframe != null)
                     niviframe.Pop();
diff --git a/tct-suite-vs/Tizen.ElmSharp.Manual.Tests/testcase/TSNaviframe.cs b/tct-suite-vs/Tizen.ElmSharp.Manual.Tests/testcase/TSNaviframe.cs
index aa43e81..b941693 100644
--- a/tct-suite-vs/Tizen.ElmSharp.Manual.Tests/testcase/TSNaviframe.cs
+++ b/tct-suite-vs/Tizen.ElmSharp.Manual.Tests/testcase/TSNaviframe.cs
@@ -51,7 +51,7 @@ namespace ElmSharp.Tests
         [Property("AUTHOR", "Li Hongqing, hongqing.li@samsung.com")]
         [Precondition(1, "This test will be automatically passed on TV and Wearable. (Due to limitation on profiles)")]
         [Step(1, "Click run TC")]
-        [Step(2, "Click navi back button")]
+        [Step(2, "Click navi back button. (You should press hw back button on FHub due to product UX.)")]
         [Step(3, "The test result(pass) will show")]
         [Postcondition(1, "NA")]
         public async Task Popped_Check()
@@ -71,20 +71,21 @@ namespace ElmSharp.Tests
                 {
                     Geometry = new Rect(0, 0, 30, 30)
                 };
-                navi.Push(rect1, "First Page");
-                Rectangle rect2 = new Rectangle(_window)
-                {
-                    Geometry = new Rect(0, 0, 30, 30)
-                };
-                navi.Push(rect2, "Second Page");
+                navi.Push(rect1, "First Page");
+
+                navi.BackButtonPressed += (s, e) =>
+                {
+                    navi.Pop();
+                };
+
                 navi.Show();
-                _testPage.ExecuteTC(navi);
+                _testPage.ExecuteTCByPage(navi);
                 await ManualTest.WaitForConfirm();
                 navi.Popped -= (s, e) => { };
+                navi.BackButtonPressed -= (s, e) => { };
                 navi.Hide();
                 navi = null;
                 rect1 = null;
-                rect2 = null;
             }
             else
             {
@@ -137,13 +138,16 @@ namespace ElmSharp.Tests
             };
 
             navi.Show();
-            _testPage.ExecuteTC(navi);
+            _testPage.ExecuteTCByPage(navi);
             await ManualTest.WaitForConfirm();
             navi.AnimationFinished -= (s, e) => { };
             navi.Unrealize();
             navi = null;
             _btn = null;
             rect1 = null;
+            var niviframe = _testPage.getNavigationPage();
+            if (niviframe != null)
+                niviframe.Pop();
         }
     }
 }
\ No newline at end of file
-- 
2.7.4