refactoring of patterns

apetrovskiy · Dec 8, 2013 · ea6f284 · ea6f284
1 parent 811f817
commit ea6f284
Show file tree

Hide file tree

Showing 68 changed files with 2,984 additions and 670 deletions.
diff --git a/ImprovementsHistory/20131208-2.ps1 b/ImprovementsHistory/20131208-2.ps1
@@ -0,0 +1,6 @@
+ipmo C:\Projects\PS\STUPS\UIA\UIAutomation\bin\Release35\UIAutomation.dll;
+#Start-Process calc -PassThru | Get-UiaWindow | Get-UiaButton 1;
+Get-UiaWindow -n *calc* | Get-UiaEdit -Value 22* -Sec 1;
+
+
+
diff --git a/ImprovementsHistory/20131208.txt b/ImprovementsHistory/20131208.txt
@@ -0,0 +1,34 @@
+20131208 day:
+GetUiaControlCommandTestFixture:
+GetControlByValue_WildCard_TimeoutDefault
+GetControlGetControlByValueAndAutomationId_WildCard_TimeoutDefault
+ByValue_Win32_WildCard_TimeoutDefault
+GetControlByValueX2_WildCard_TimeoutDefault
+
+traditional:
+GetUiaControlRelativesTestFixture:
+GetControlAncestors_MoreThanOne
+
+WaitUiaWindowCommandTestFixture:
+WaitWindow_ByProcessId_Timeout2000
+
+InvokeUiaScrollItemPatternCommandTestFixture:
+InvokeScrollItem_ListBox
+
+
+
+
+ipmo C:\Projects\PS\STUPS\UIA\UIAutomation\bin\Release35\UIAutomation.dll
+Start-Process calc -PassThru | Get-UiaWindow | Get-UiaButton 1
+Get-UiaEdit -Value 22*
+
+
+20131208 evening:
+GetUiaWindowCommandTestFixture:
+GetWindowByAutomationId_TimeoutDefault
+
+ParameterlessSearchTestFixture:
+GetControl_Win32_X2_SearchInAutomationIdClassName_Timeout2000
+GetControl_Win32_X2_SearchInClassName_Timeout2000
+GetControl_Win32_X2_SearchInNameClassName_Timeout2000
+GetControl_Win32_X2_SearchInValue_Timeout2000
diff --git a/UIA/UIAutomation/Commands/Common/ShowUIADesktopCommand.cs b/UIA/UIAutomation/Commands/Common/ShowUIADesktopCommand.cs
@@ -33,9 +33,14 @@ protected override void BeginProcessing()
                         new PropertyCondition(
                             AutomationElement.NameProperty,
                             "Show desktop"));
-                InvokePattern invPtrn = 
-                    showDesktopButton.GetCurrentPattern(InvokePattern.Pattern) as InvokePattern;
-                invPtrn.Invoke();
+                // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+                // 20131208
+                // InvokePattern invPtrn =
+                    // 20131208
+                    // showDesktopButton.GetCurrentPattern(InvokePattern.Pattern) as InvokePattern;
+                //    showDesktopButton.GetCurrentPattern<IMySuperInvokePattern, InvokePattern>(InvokePattern.Pattern) as InvokePattern;
+                // invPtrn.Invoke();
+                // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
                 /*
                 InvokePattern invPtrn = 
                     showDesktopButton.GetCurrentPattern(InvokePattern.Pattern) as InvokePattern;

diff --git a/UIA/UIAutomation/Commands/Convert/ConvertFromUIADataGridCommand.cs b/UIA/UIAutomation/Commands/Convert/ConvertFromUIADataGridCommand.cs
@@ -49,12 +49,17 @@ protected override void ProcessRecord()
                 string strData = String.Empty;
                 IUiElement currentControl = 
                     inputObject;
-                GridPattern gridPattern = null;
+                // 20131208
+                // GridPattern gridPattern = null;
+                IMySuperGridPattern gridPattern = null;
 
                 try {
-                    gridPattern = 
-                        inputObject.GetCurrentPattern(GridPattern.Pattern)
-                        as GridPattern;
+                    gridPattern =
+                        // 20131208
+                        // inputObject.GetCurrentPattern(GridPattern.Pattern)
+                        // inputObject.GetCurrentPattern<IMySuperGridPattern, GridPattern>(GridPattern.Pattern)
+                        inputObject.GetCurrentPattern<IMySuperGridPattern>(GridPattern.Pattern);
+                        // as GridPattern;
 
 
                     bool res1 = 
@@ -73,9 +78,12 @@ protected override void ProcessRecord()
                         // if there's a selection, get items in the selection
                         try
                         {
-                            SelectionPattern selPattern = inputObject.GetCurrentPattern(
-                                SelectionPattern.Pattern)
-                                as SelectionPattern;
+                            // 20131208
+                            // SelectionPattern selPattern = inputObject.GetCurrentPattern(
+                            // SelectionPattern selPattern = inputObject.GetCurrentPattern<IMySuperSelectionPattern, SelectionPattern>(
+                            IMySuperSelectionPattern selPattern = inputObject.GetCurrentPattern<IMySuperSelectionPattern>(SelectionPattern.Pattern);
+                                // SelectionPattern.Pattern)
+                                // as SelectionPattern;
                             /*
                             System.Windows.Automation.SelectionPattern selPattern;
                             selPattern = 
@@ -117,8 +125,10 @@ protected override void ProcessRecord()
 
                             } else {
                                 // without a selection
-                                string outString = 
-                                    UiaHelper.GetOutputStringUsingTableGridPattern<GridPattern>(
+                                string outString =
+                                    // 20131208
+                                    // UiaHelper.GetOutputStringUsingTableGridPattern<GridPattern>(
+                                    UiaHelper.GetOutputStringUsingTableGridPattern<IMySuperGridPattern>(
                                         gridPattern,
                                         gridPattern.Current.ColumnCount,
                                         rowsCounter,

diff --git a/UIA/UIAutomation/Commands/Convert/ConvertFromUIATableCommand.cs b/UIA/UIAutomation/Commands/Convert/ConvertFromUIATableCommand.cs
@@ -46,14 +46,19 @@ protected override void ProcessRecord()
                     // 20120823
                     //this.InputObject;
                     inputObject;
-                TablePattern tblPattern = null;
+                // 20131208
+                // TablePattern tblPattern = null;
+                IMySuperTablePattern tblPattern = null;
 
                 try {
                     tblPattern =
                         // 20120823
                         //this.InputObject.GetCurrentPattern(TablePattern.Pattern)
-                        inputObject.GetCurrentPattern(TablePattern.Pattern)
-                        as TablePattern;
+                        // 20131208
+                        // inputObject.GetCurrentPattern(TablePattern.Pattern)
+                        // inputObject.GetCurrentPattern<IMySuperTablePattern, TablePattern>(TablePattern.Pattern)
+                        // as TablePattern;
+                        inputObject.GetCurrentPattern<IMySuperTablePattern>(TablePattern.Pattern);
 
                     bool res1 = 
                         UiaHelper.GetHeaderItems(ref currentControl, out strData, Delimiter);
@@ -74,10 +79,13 @@ protected override void ProcessRecord()
                         // if there's a selection, get items in the selection
                         try
                         {
-
-                            SelectionPattern selPattern = inputObject.GetCurrentPattern(
-                                SelectionPattern.Pattern)
-                                as SelectionPattern;
+                            // 20131208
+                            // SelectionPattern selPattern = inputObject.GetCurrentPattern(
+                            // SelectionPattern selPattern = inputObject.GetCurrentPattern<IMySuperSelectionPattern, SelectionPattern>(
+                                // SelectionPattern.Pattern)
+                                // as SelectionPattern;
+                            // SelectionPattern selPattern = inputObject.GetCurrentPattern<IMySuperSelectionPattern>(SelectionPattern.Pattern);
+                            IMySuperSelectionPattern selPattern = inputObject.GetCurrentPattern<IMySuperSelectionPattern>(SelectionPattern.Pattern);
 
                             /*
                             System.Windows.Automation.SelectionPattern selPattern;
@@ -121,8 +129,10 @@ protected override void ProcessRecord()
                             } else {
 
                                 // without a selection
-                                string outString = 
-                                    UiaHelper.GetOutputStringUsingTableGridPattern<TablePattern>(
+                                string outString =
+                                    // 20131208
+                                    // UiaHelper.GetOutputStringUsingTableGridPattern<TablePattern>(
+                                    UiaHelper.GetOutputStringUsingTableGridPattern<IMySuperTablePattern>(
                                         tblPattern,
                                         tblPattern.Current.ColumnCount,
                                         rowsCounter,

diff --git a/UIA/UIAutomation/Helpers/Inheritance/HasTimeoutCmdletBase.cs b/UIA/UIAutomation/Helpers/Inheritance/HasTimeoutCmdletBase.cs
@@ -1048,7 +1048,10 @@ private List<IUiElement> GetWindowCollectionByName(string[] windowNames, string
             string realValue = string.Empty;
             try {
                 realValue =
-                    (item.GetCurrentPattern(ValuePattern.Pattern) as IMySuperValuePattern).Current.Value;
+                    // 20131208
+                    // (item.GetCurrentPattern(ValuePattern.Pattern) as IMySuperValuePattern).Current.Value;
+                    // (item.GetCurrentPattern<IMySuperValuePattern, ValuePattern>(ValuePattern.Pattern) as IMySuperValuePattern).Current.Value;
+                    (item.GetCurrentPattern<IMySuperValuePattern>(ValuePattern.Pattern)).Current.Value;
             }
             catch { //(Exception eGetCurrentPattern) {
                 // nothing to do