Merge pull request #126 from JakeGinnivan/FixIssue111

Fixing finding Win32 modal window

Author: Jake Ginnivan

…UITests/Scenarios/Win32CalculatorTest.cs …ck.White.UITests/Scenarios/Win32Tests.cssrc/TestStack.White.UITests/Scenarios/Win32CalculatorTest.cs renamed to src/TestStack.White.UITests/Scenarios/Win32Tests.cs src/TestStack.White.UITests/Scenarios/Win32CalculatorTest.cs renamed to src/TestStack.White.UITests/Scenarios/Win32Tests.cs

@@ -9,9 +9,27 @@
 
 namespace TestStack.White.UITests.Scenarios
 {
-    public class Win32CalculatorTest
+    public class Win32Tests
     {
         private const string ExeSourceFile = @"C:\Windows\system32\calc.exe";
+        private const string Notepad = @"C:\Windows\system32\notepad.exe";
+
+        [Fact]
+        public void NotepadTests()
+        {
+            using (var app = Application.Launch(Notepad))
+            using (var window = app.GetWindow("Untitled - Notepad"))
+            {
+                window.Keyboard.PressSpecialKey(KeyboardInput.SpecialKeys.ALT);
+                window.Keyboard.Enter("o");
+                window.Keyboard.Enter("f");
+
+                using (var modalWindow = window.ModalWindow("Font"))
+                {
+                    Assert.NotNull(modalWindow);
+                }
+            }
+        }
 
         [Fact]
         public void CalculatorTests()

src/TestStack.White.UITests/TestStack.White.UITests.csproj

@@ -125,7 +125,7 @@
     <Compile Include="Infrastructure\TestConfiguration.cs" />
     <Compile Include="Infrastructure\TestConfigurationFactory.cs" />
     <Compile Include="Scenarios\GetMultipleTest.cs" />
-    <Compile Include="Scenarios\Win32CalculatorTest.cs" />
+    <Compile Include="Scenarios\Win32Tests.cs" />
     <Compile Include="TestFailedException.cs" />
     <Compile Include="UIA\AutomationElementXTest.cs" />
     <Compile Include="WhiteTestBase.cs" />

src/TestStack.White/UIItems/WindowItems/Win32Window.cs

@@ -1,3 +1,4 @@
+using System.Diagnostics;
 using System.Windows.Automation;
 using TestStack.White.Factory;
 using TestStack.White.Sessions;
@@ -31,7 +32,8 @@ public override PopUpMenu Popup
 
         public override Window ModalWindow(string title, InitializeOption option)
         {
-            return windowFactory.ModalWindow(title, option, WindowSession.ModalWindowSession(option));
+            return windowFactory.FindModalWindow(title, Process.GetProcessById(automationElement.Current.ProcessId), option, automationElement,
+                                                         WindowSession.ModalWindowSession(option));
         }
 
         public override Window ModalWindow(SearchCriteria searchCriteria, InitializeOption option)