Do not cache top level menu, it needs to be rebuilt every time otherw…

…ise an exception is thrown the next time you access the items
Orm · Jul 29, 2013 · bf9144a · bf9144a
1 parent fe2a153
commit bf9144a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/TestStack.White.UITests/Scenarios/Win32Tests.cs b/src/TestStack.White.UITests/Scenarios/Win32Tests.cs
@@ -5,6 +5,7 @@
 using TestStack.White.UIItems.Finders;
 using TestStack.White.UIItems.ListBoxItems;
 using TestStack.White.UIItems.MenuItems;
+using TestStack.White.UIItems.WindowStripControls;
 using TestStack.White.WindowsAPI;
 using Xunit;
 
@@ -64,6 +65,11 @@ public void CalculatorTests()
             using (var application = Application.AttachOrLaunch(psi))
             using (var mainWindow = application.GetWindow(SearchCriteria.ByText("Calculator"), InitializeOption.NoCache))
             {
+                // Verify can click on menu twice
+                var menuBar = mainWindow.Get<MenuBar>(SearchCriteria.ByText("Application"));
+                menuBar.MenuItem("Edit", "Copy").Click();
+                menuBar.MenuItem("Edit", "Copy").Click();
+
                 mainWindow.Keyboard.HoldKey(KeyboardInput.SpecialKeys.CONTROL);
                 mainWindow.Keyboard.Enter("E");
                 mainWindow.Keyboard.LeaveKey(KeyboardInput.SpecialKeys.CONTROL);

diff --git a/src/TestStack.White/UIItems/MenuItems/Menus.cs b/src/TestStack.White/UIItems/MenuItems/Menus.cs
@@ -4,11 +4,9 @@
 using System.Threading;
 using System.Windows.Automation;
 using TestStack.White.AutomationElementSearch;
-using TestStack.White.Configuration;
 using TestStack.White.Factory;
 using TestStack.White.UIItems.Actions;
 using TestStack.White.UIItems.Finders;
-using TestStack.White.Utility;
 
 namespace TestStack.White.UIItems.MenuItems
 {

diff --git a/src/TestStack.White/UIItems/WindowStripControls/MenuBar.cs b/src/TestStack.White/UIItems/WindowStripControls/MenuBar.cs
@@ -7,27 +7,25 @@ namespace TestStack.White.UIItems.WindowStripControls
 {
     public class MenuBar : UIItem, MenuContainer
     {
-        private readonly Menus topLevelMenu;
         protected MenuBar() {}
 
         public MenuBar(AutomationElement automationElement, ActionListener actionListener) : base(automationElement, actionListener)
         {
-            topLevelMenu = new Menus(automationElement, actionListener);
         }
 
         public virtual Menu MenuItem(params string[] path)
         {
-            return topLevelMenu.Find(path);
+            return TopLevelMenu.Find(path);
         }
 
         public virtual Menu MenuItemBy(params SearchCriteria[] path)
         {
-            return topLevelMenu.Find(path);
+            return TopLevelMenu.Find(path);
         }
 
         public virtual Menus TopLevelMenu
         {
-            get { return topLevelMenu; }
+            get { return new Menus(automationElement, actionListener); }
         }
     }
 }