[NUI][Non-ACR][Fix Fhub TC fail] 33/211633/1
authordongsug.song <dongsug.song@samsung.com>
Wed, 7 Aug 2019 10:12:59 +0000 (19:12 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Wed, 7 Aug 2019 10:12:59 +0000 (19:12 +0900)
Change-Id: I6461ed632f22c58079b75e77d4005e0165668170

tct-suite-vs/Tizen.NUI.Tests/testcase/TSWindow.cs

index 810173f..ca091e0 100755 (executable)
@@ -398,10 +398,28 @@ namespace Tizen.NUI.Tests
             /* TEST CODE */
             Window stage = Window.Instance;
             Layer layer = stage.GetDefaultLayer();
-            Assert.IsTrue((stage.GetLayer(0) == layer), "Should be equal!");
+            uint cnt = stage.LayerCount;\r
+            Tizen.Log.Debug("NUITEST", $"num of layers={cnt}");\r
+\r
+            // default layer's depth can be changed by sibling order or rendering order\r
+            uint defaultLayerdepth = 0;\r
+            for (uint i = 0; i < cnt; i++)\r
+            {\r
+                var iterLayer = stage.GetLayer(i);\r
+                if (iterLayer == null)\r
+                {\r
+                    Tizen.Log.Debug("NUITEST", $"iterLayer[{i}] is NULL!");\r
+                }\r
+                else if (iterLayer == layer)\r
+                {\r
+                    Tizen.Log.Debug("NUITEST", $"iterLayer[{i}] is same as default layer!");\r
+                    defaultLayerdepth = i;\r
+                    break;\r
+                }\r
+            }
+            Assert.IsTrue((stage.GetLayer(defaultLayerdepth) == layer), "Should be equal!");
         }
 
-
         [Test]
         [Category("P1")]
         [Description("Test SetKeyboardRepeatInfo.")]
@@ -826,8 +844,29 @@ namespace Tizen.NUI.Tests
         public void GetLayer_CHECK_RETURN_VALUE()
         {
             /* TEST CODE */
-            Layer layer = Window.Instance.GetDefaultLayer();
-            Assert.IsTrue((Window.Instance.GetLayer(0) == layer), "Should be equal!");
+            Layer layer = Window.Instance.GetDefaultLayer();\r
+\r
+            uint cnt = Window.Instance.LayerCount;\r
+            Tizen.Log.Debug("NUITEST", $"num of layers={cnt}");\r
+\r
+            // default layer's depth can be changed by sibling order or rendering order\r
+            uint defaultLayerdepth = 0;\r
+            for (uint i = 0; i < cnt; i++)\r
+            {\r
+                var iterLayer = Window.Instance.GetLayer(i);\r
+                if (iterLayer == null)\r
+                {\r
+                    Tizen.Log.Debug("NUITEST", $"iterLayer[{i}] is NULL!");\r
+                }\r
+                else if (iterLayer == layer)\r
+                {\r
+                    Tizen.Log.Debug("NUITEST", $"iterLayer[{i}] is same as default layer!");\r
+                    defaultLayerdepth = i;\r
+                    break;\r
+                }\r
+            }
+
+            Assert.IsTrue((Window.Instance.GetLayer(defaultLayerdepth) == layer), "Should be equal!");
         }
 
         [Test]