Update app id, fix test failures

marcelwgn · Aug 24, 2023 · 23933a2 · 23933a2
1 parent 345dccb
commit 23933a2
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 35 deletions.
diff --git a/UITests/Button.cs b/UITests/Button.cs
@@ -89,7 +89,7 @@ public void Size()
         [TestMethod]
         public void Text()
         {
-            Assert.AreEqual("Button", buttonElement.Text);
+            Assert.AreEqual("Standard XAML button", buttonElement.Text);
         }
     }
-}
+}
diff --git a/UITests/RadioButton.cs b/UITests/RadioButton.cs
@@ -54,10 +54,10 @@ public void Click()
             var radioButtonEventOutput = session.FindElementByAccessibilityId("Control1Output");
 
             radioButtonElement1.Click();
-            Assert.AreEqual("You selected option 1.", radioButtonEventOutput.Text);
+            Assert.AreEqual("You selected Option 1", radioButtonEventOutput.Text);
 
             radioButtonElement2.Click();
-            Assert.AreEqual("You selected option 2.", radioButtonEventOutput.Text);
+            Assert.AreEqual("You selected Option 2", radioButtonEventOutput.Text);
         }
 
         [TestMethod]
@@ -123,4 +123,4 @@ public void Text()
             Assert.AreEqual("Option 2", radioButtonElement2.Text);
         }
     }
-}
+}
diff --git a/UITests/TextBox.cs b/UITests/TextBox.cs
@@ -55,8 +55,8 @@ public void Clear()
         {
             textBoxElement1.Clear();
             Assert.AreEqual(string.Empty, textBoxElement1.Text);
-            textBoxElement1.SendKeys("fghij67890^&*()");
-            Assert.AreEqual("fghij67890^&*()", textBoxElement1.Text);
+            textBoxElement1.SendKeys("fghij");
+            Assert.AreEqual("fghij", textBoxElement1.Text);
             textBoxElement1.Clear();
             Assert.AreEqual(string.Empty, textBoxElement1.Text);
         }
@@ -65,7 +65,7 @@ public void Clear()
         public void Click()
         {
             // Click textBoxElement1 to set focus and arbitrarily type
-           //textBoxElement1.Clear();
+            textBoxElement1.Clear();
             Assert.AreEqual(string.Empty, textBoxElement1.Text);
             textBoxElement1.Click();
             session.Keyboard.SendKeys("1234567890");
@@ -141,4 +141,4 @@ public void Text()
             Assert.AreEqual("abcde12345!@#$%", textBoxElement1.Text);
         }
     }
-}
+}
diff --git a/UITests/UITestSettings.runsettings b/UITests/UITestSettings.runsettings
diff --git a/UITests/base.cs b/UITests/base.cs
@@ -26,9 +26,9 @@ public class Test_Base
     {
         private const string WindowsApplicationDriverUrl = "http://127.0.0.1:4723";
 #if DEBUG
-        private const string AppUIBasicAppId = "Microsoft.XAMLControlsGallery.Debug_8wekyb3d8bbwe!App";
+        private const string AppUIBasicAppId = "Microsoft.WinUI3ControlsGallery.Debug_s9y1p3hwd5qda!App";
 #else
-        private const string AppUIBasicAppId = "Microsoft.XAMLControlsGallery_8wekyb3d8bbwe!App";
+        private const string AppUIBasicAppId = "Microsoft.WinUI3ControlsGallery_s9y1p3hwd5qda!App";
 #endif
         protected static WindowsDriver<WindowsElement> session = null;
 
@@ -48,7 +48,7 @@ public static void Setup(TestContext context)
                 catch
                 {  }
                 Thread.Sleep(125000);
-               if (session == null)
+                if (session == null)
                 {
                     session = new WindowsDriver<WindowsElement>(new Uri(WindowsApplicationDriverUrl), appiumOptions);
                 }

diff --git a/UITests/packages.config b/UITests/packages.config
diff --git a/WinUIGallery/ControlPages/RadioButtonPage.xaml b/WinUIGallery/ControlPages/RadioButtonPage.xaml
@@ -18,10 +18,9 @@
         <local:ControlExample HeaderText="A group of RadioButton controls in a RadioButtons group.">
             <StackPanel>
                 <RadioButtons Header="Options:">
-                    <RadioButton Content="Option 1" Checked="RadioButton_Checked" />
-                    <RadioButton Content="Option 2" Checked="RadioButton_Checked" />
-                    <RadioButton Content="Option 3" Checked="RadioButton_Checked" />
-                </RadioButtons>
+                    <RadioButton Content="Option 1" Checked="RadioButton_Checked" AutomationProperties.AutomationId="Option1RadioButton"/>
+                    <RadioButton Content="Option 2" Checked="RadioButton_Checked" AutomationProperties.AutomationId="Option2RadioButton"/>
+                    <RadioButton Content="Option 3" Checked="RadioButton_Checked" AutomationProperties.AutomationId="Option3RadioButton"/>                </RadioButtons>
             </StackPanel>
             <local:ControlExample.Output>
                 <TextBlock x:Name="Control1Output" Text="Select an option." />