Fix: searching Rows and Cells in Table (Winforms.DataGridView) for lo…

…calized versions of Windows and VS (the Name property can be in different language rather than English). Add: controls added to corresponding versions of TestApplications. Tests for these controls added to TestStack.White.UITests project. Fix: Old test for message box fixed for running in localized versions of Windows and VS (the button's Name property is in current locale language).
Orm · Jul 29, 2013 · 434083c · 434083c
1 parent 169953c
commit 434083c
Show file tree

Hide file tree

Showing 16 changed files with 294 additions and 61 deletions.
diff --git a/src/TestApplications/WindowsFormsTestApplication/Form1.Designer.cs b/src/TestApplications/WindowsFormsTestApplication/Form1.Designer.cs
diff --git a/src/TestApplications/WindowsFormsTestApplication/Form1.cs b/src/TestApplications/WindowsFormsTestApplication/Form1.cs
@@ -21,6 +21,19 @@ public Form1()
             TreeView.Nodes.Add(treeViewItem);
             PopulateDataGrid();
             PropertyGrid.SelectedObject = new BasicTypes("str", false, 6, 1.2f);
+            DataGridControl.DataSource = TestItems;
+        }
+
+        public TestItem[] TestItems
+        {
+            get
+            {
+                return new[]{
+                               new TestItem {Id = 1, Contents = "Item1", Description = "Simple item 1"}, 
+                               new TestItem {Id = 2, Contents = "Item2", Description = ""},
+                               new TestItem {Id = 3, Contents = "Item3"}
+                           };
+            }
         }
 
         private void GetMultiple_Click(object sender, System.EventArgs e)

diff --git a/src/TestApplications/WindowsFormsTestApplication/Form1.resx b/src/TestApplications/WindowsFormsTestApplication/Form1.resx
@@ -120,6 +120,9 @@
   <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="Image.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -345,6 +348,21 @@
   <metadata name="details.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="country.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="alive.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="display.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="details.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="ToolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>829, 17</value>
   </metadata>

diff --git a/src/TestApplications/WindowsFormsTestApplication/TestItem.cs b/src/TestApplications/WindowsFormsTestApplication/TestItem.cs
@@ -0,0 +1,9 @@
+namespace WindowsFormsTestApplication
+{
+    public class TestItem
+    {
+        public int Id { get; set; }
+        public string Contents { get; set; }
+        public string Description { get; set; }
+    }
+}
diff --git a/src/TestApplications/WindowsFormsTestApplication/WindowsFormsTestApplication.csproj b/src/TestApplications/WindowsFormsTestApplication/WindowsFormsTestApplication.csproj
@@ -120,6 +120,7 @@
     <Compile Include="Scenarios\WindowWithScrollbars.Designer.cs">
       <DependentUpon>WindowWithScrollbars.cs</DependentUpon>
     </Compile>
+    <Compile Include="TestItem.cs" />
     <EmbeddedResource Include="Scenarios\CustomUIItem\CustomUIItemScenario.resx">
       <DependentUpon>CustomUIItemScenario.cs</DependentUpon>
     </EmbeddedResource>

diff --git a/src/TestApplications/WpfTestApplication/HelpClasses.cs b/src/TestApplications/WpfTestApplication/HelpClasses.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+
+namespace WpfTestApplication
+{
+    public class TestItem
+    {
+        public int Id { get; set; }
+        public string Contents { get; set; }
+        public string Description { get; set; }
+    }
+}
diff --git a/src/TestApplications/WpfTestApplication/MainWindow.xaml b/src/TestApplications/WpfTestApplication/MainWindow.xaml
@@ -80,6 +80,9 @@
                     </StackPanel>
                 </StackPanel>
             </TabItem>
+            <TabItem Header="Data Grid">
+                <DataGrid x:Name="DataGridControl" AutoGenerateColumns="True" ItemsSource="{Binding Path = TestItems}"/>
+            </TabItem>
         </TabControl>
         <GroupBox Header="Scenarios" Grid.Row="3" Grid.Column="1" AutomationProperties.AutomationId="ScenariosPane">
             <StackPanel>

diff --git a/src/TestApplications/WpfTestApplication/MainWindow.xaml.cs b/src/TestApplications/WpfTestApplication/MainWindow.xaml.cs
@@ -158,5 +158,17 @@ private void ClickMe_OnClick(object sender, RoutedEventArgs e)
         {
             AutomationProperties.SetHelpText(this, "Click Me Clicked");
         }
+
+        public TestItem[] TestItems        
+        {
+            get            
+            {
+                return new[]{
+                               new TestItem {Id = 1, Contents = "Item1", Description = "Simple item 1"}, 
+                               new TestItem {Id = 2, Contents = "Item2", Description = ""},
+                               new TestItem {Id = 3, Contents = "Item3"}
+                           };
+            }
+        }
     }
 }
diff --git a/src/TestApplications/WpfTestApplication/WpfTestApplication.csproj b/src/TestApplications/WpfTestApplication/WpfTestApplication.csproj
@@ -123,6 +123,7 @@
     <Compile Include="Scenarios\HorizontalGridSplitter.xaml.cs">
       <DependentUpon>HorizontalGridSplitter.xaml</DependentUpon>
     </Compile>
+    <Compile Include="HelpClasses.cs" />
     <Compile Include="ListControls.xaml.cs">
       <DependentUpon>ListControls.xaml</DependentUpon>
     </Compile>