Revert #221 as it is causing more problems

TestStack · Jun 10, 2014 · d7cf2bf · d7cf2bf
1 parent 4bc6145
commit d7cf2bf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/src/TestStack.White/AutomationElementSearch/AutomationElementFinder.cs b/src/TestStack.White/AutomationElementSearch/AutomationElementFinder.cs
@@ -26,7 +26,8 @@ public virtual AutomationElement AutomationElement
 
         public virtual List<AutomationElement> Children(params AutomationSearchCondition[] automationSearchConditions)
         {
-            return new MultiLevelAutomationElementFinder(automationSearchConditions).FindAll(automationElement).Cast<AutomationElement>().ToList();
+            return new MultiLevelAutomationElementFinder(automationSearchConditions)
+                .FindAll(automationElement);
         }
 
         public virtual AutomationElement Child(params AutomationSearchCondition[] automationSearchConditions)

diff --git a/src/TestStack.White/UIItems/WindowItems/Win32Window.cs b/src/TestStack.White/UIItems/WindowItems/Win32Window.cs
@@ -39,15 +39,20 @@ public override Window ModalWindow(string title, InitializeOption option)
                                                          WindowSession.ModalWindowSession(option));
         }
 
-        public override List<Window> ModalWindows()
-        {
-            var descendants = new AutomationElementFinder(automationElement)
-                .Children(new AutomationSearchConditionFactory().GetWindowSearchConditions(automationElement.Current.ProcessId).ToArray());
-
-            return descendants
-                .Select(descendant => ChildWindowFactory.Create(descendant, InitializeOption.NoCache, WindowSession.ModalWindowSession(InitializeOption.NoCache)))
-                .ToList();
-        }
+        //TODO Try and get this working
+        //public override List<Window> ModalWindows()
+        //{
+        //    var automationSearchConditions = new AutomationSearchConditionFactory()
+        //        .GetWindowSearchConditions(automationElement.Current.ProcessId)
+        //        .ToArray();
+
+        //    var descendants = new AutomationElementFinder(automationElement)
+        //        .Children(automationSearchConditions);
+
+        //    return descendants
+        //        .Select(descendant => ChildWindowFactory.Create(descendant, InitializeOption.NoCache, WindowSession.ModalWindowSession(InitializeOption.NoCache)))
+        //        .ToList();
+        //}
 
         public override Window ModalWindow(SearchCriteria searchCriteria, InitializeOption option)
         {