Merge branch 'release/v11.1.2'

dhq-boiler · Feb 27, 2023 · 65891f2 · 65891f2
2 parents 3eb9dc4 + 56a247c
commit 65891f2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/ReleaseNote.md b/ReleaseNote.md
@@ -1,6 +1,12 @@
 
 # リリースノート
 
+## v11.1.2
+
+### バグフィックス
+
+* ユニットテストを修正しました。
+
 ## v11.1.1
 
 ### バグフィックス

diff --git a/boilersGraphics.Test/UITests/LayersWindowTest.cs b/boilersGraphics.Test/UITests/LayersWindowTest.cs
@@ -33,7 +33,7 @@ public void レイヤー１のアピアランスが正しく映っている()
 
             foreach (var layerItem in layerswindowPO.LayerItems)
             {
-                layerItem.ToggleButton(1);
+                //レイヤーアイテムはデフォルトで展開されるので、トグル不要
 
                 //レイヤー１
                 try
@@ -73,7 +73,7 @@ public void アイテム１のアピアランスが正しく映っている()
 
             foreach (var layerItem in layerswindowPO.LayerItems)
             {
-                layerItem.ToggleButton(1);
+                //レイヤーアイテムはデフォルトで展開されるので、トグル不要
 
                 var layerItems = layerItem.LayerItems;
                 try

diff --git a/boilersGraphics.Test/UITests/PageObjects/LayersWindowPO.cs b/boilersGraphics.Test/UITests/PageObjects/LayersWindowPO.cs
@@ -27,7 +27,7 @@ public void ToggleButton(int count)
             {
                 for (int i = 0;i < count; i++)
                 {
-                    x.GetElementBy(By.XPath("//Button[@AutomationId=\"LayerItem_ToggleButton\"]")).Click();
+                    x.GetElementBy(By.XPath("//Button[@AutomationId=\"LayerItem_ToggleButton\"]"), 60 * 5).Click();
                 }
             }
 
@@ -54,9 +54,9 @@ public Screenshot AppearanceImage
                 }
             }
 
-            public IEnumerable<LayerItemPO> LayerItems => GetElementsBy(By.XPath("//Custom[@AutomationId=\"DiagramControl\"]/Custom[@AutomationId=\"layers\"]/Group[@ClassName=\"Expander\"]/Tree[@AutomationId=\"LayersTreeView\"]/TreeItem")).Select(x => new LayerItemPO(Session, x));
+            public IEnumerable<LayerItemPO> LayerItems => GetElementsBy(By.XPath("//Custom[@AutomationId=\"DiagramControl\"]/Custom[@AutomationId=\"layers\"]/Group[@ClassName=\"Expander\"]/Tree[@AutomationId=\"LayersTreeView\"]/TreeItem"), 60 * 5).Select(x => new LayerItemPO(Session, x));
         }
 
-        public IEnumerable<LayerItemPO> LayerItems => GetElementsBy(By.XPath("//Custom[@AutomationId=\"DiagramControl\"]/Custom[@AutomationId=\"layers\"]/Group[@ClassName=\"Expander\"]/Tree[@AutomationId=\"LayersTreeView\"]/TreeItem")).Select(x => new LayerItemPO(Session, x));
+        public IEnumerable<LayerItemPO> LayerItems => GetElementsBy(By.XPath("//Custom[@AutomationId=\"DiagramControl\"]/Custom[@AutomationId=\"layers\"]/Group[@ClassName=\"Expander\"]/Tree[@AutomationId=\"LayersTreeView\"]/TreeItem"), 60 * 5).Select(x => new LayerItemPO(Session, x));
     }
 }