Skip to content

Commit 048d735

Browse files
Switch files not loaded on Visual Studio to file-scoped namespaces
1 parent 2bab199 commit 048d735

24 files changed

+1886
-1912
lines changed

UITests/AxeHelper.cs

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -20,43 +20,42 @@
2020
using System.Diagnostics;
2121
using System.Linq;
2222

23-
namespace UITests
23+
namespace UITests;
24+
25+
public class AxeHelper
2426
{
25-
public class AxeHelper
27+
public static IScanner AccessibilityScanner;
28+
29+
internal static void InitializeAxe()
2630
{
27-
public static IScanner AccessibilityScanner;
31+
var processes = Process.GetProcessesByName("WinUIGallery");
32+
Assert.IsTrue(processes.Length > 0);
2833

29-
internal static void InitializeAxe()
30-
{
31-
var processes = Process.GetProcessesByName("WinUIGallery");
32-
Assert.IsTrue(processes.Length > 0);
34+
var config = Config.Builder.ForProcessId(processes[0].Id).Build();
3335

34-
var config = Config.Builder.ForProcessId(processes[0].Id).Build();
36+
AccessibilityScanner = ScannerFactory.CreateScanner(config);
37+
}
3538

36-
AccessibilityScanner = ScannerFactory.CreateScanner(config);
37-
}
39+
public static void AssertNoAccessibilityErrors()
40+
{
41+
// Bug 1474: Disabling Rules NameReasonableLength and BoundingRectangleNotNull temporarily
42+
var testResult = AccessibilityScanner.Scan(null).WindowScanOutputs.SelectMany(output => output.Errors)
43+
.Where(rule => rule.Rule.ID != RuleId.NameIsInformative)
44+
.Where(rule => rule.Rule.ID != RuleId.NameExcludesControlType)
45+
.Where(rule => rule.Rule.ID != RuleId.NameExcludesLocalizedControlType)
46+
.Where(rule => rule.Rule.ID != RuleId.SiblingUniqueAndFocusable)
47+
.Where(rule => rule.Rule.ID != RuleId.NameReasonableLength)
48+
.Where(rule => rule.Rule.ID != RuleId.BoundingRectangleNotNull)
49+
.Where(rule => rule.Rule.ID != RuleId.BoundingRectangleNotNullListViewXAML)
50+
.Where(rule => rule.Rule.ID != RuleId.BoundingRectangleNotNullTextBlockXAML)
51+
.Where(rule => rule.Rule.ID != RuleId.NameNotNull)
52+
.Where(rule => rule.Rule.ID != RuleId.ChromiumComponentsShouldUseWebScanner);
3853

39-
public static void AssertNoAccessibilityErrors()
54+
if (testResult.Any())
4055
{
41-
// Bug 1474: Disabling Rules NameReasonableLength and BoundingRectangleNotNull temporarily
42-
var testResult = AccessibilityScanner.Scan(null).WindowScanOutputs.SelectMany(output => output.Errors)
43-
.Where(rule => rule.Rule.ID != RuleId.NameIsInformative)
44-
.Where(rule => rule.Rule.ID != RuleId.NameExcludesControlType)
45-
.Where(rule => rule.Rule.ID != RuleId.NameExcludesLocalizedControlType)
46-
.Where(rule => rule.Rule.ID != RuleId.SiblingUniqueAndFocusable)
47-
.Where(rule => rule.Rule.ID != RuleId.NameReasonableLength)
48-
.Where(rule => rule.Rule.ID != RuleId.BoundingRectangleNotNull)
49-
.Where(rule => rule.Rule.ID != RuleId.BoundingRectangleNotNullListViewXAML)
50-
.Where(rule => rule.Rule.ID != RuleId.BoundingRectangleNotNullTextBlockXAML)
51-
.Where(rule => rule.Rule.ID != RuleId.NameNotNull)
52-
.Where(rule => rule.Rule.ID != RuleId.ChromiumComponentsShouldUseWebScanner);
53-
54-
if (testResult.Any())
55-
{
56-
var mappedResult = testResult.Select(result =>
57-
"Element " + result.Element.Properties["ControlType"] + " violated rule '" + result.Rule.Description + "'.");
58-
Assert.Fail("Failed with the following accessibility errors \r\n" + string.Join("\r\n", mappedResult));
59-
}
56+
var mappedResult = testResult.Select(result =>
57+
"Element " + result.Element.Properties["ControlType"] + " violated rule '" + result.Rule.Description + "'.");
58+
Assert.Fail("Failed with the following accessibility errors \r\n" + string.Join("\r\n", mappedResult));
6059
}
6160
}
62-
}
61+
}

UITests/SampleTestTemplate.cs

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,22 @@
1818
using Microsoft.VisualStudio.TestTools.UnitTesting;
1919
using OpenQA.Selenium.Appium.Windows;
2020

21-
namespace UITests
21+
namespace UITests;
22+
23+
[TestClass]
24+
public class SampleTestTemplate : TestBase
2225
{
23-
[TestClass]
24-
public class SampleTestTemplate : TestBase
25-
{
2626

27-
private static WindowsElement element1 = null;
28-
private static WindowsElement element2 = null;
27+
private static WindowsElement element1 = null;
28+
private static WindowsElement element2 = null;
2929

30-
public static void ClassInitialize(TestContext context)
31-
{
32-
OpenControlPage("MyControlPage");
33-
Thread.Sleep(1000);
34-
element1 = Session.FindElementByAccessibilityId("Element Locator");
35-
Assert.IsNotNull(element1);
36-
element2 = Session.FindElementByAccessibilityId("Element Locator");
37-
Assert.IsNotNull(element2);
38-
}
30+
public static void ClassInitialize(TestContext context)
31+
{
32+
OpenControlPage("MyControlPage");
33+
Thread.Sleep(1000);
34+
element1 = Session.FindElementByAccessibilityId("Element Locator");
35+
Assert.IsNotNull(element1);
36+
element2 = Session.FindElementByAccessibilityId("Element Locator");
37+
Assert.IsNotNull(element2);
3938
}
4039
}
41-

0 commit comments

Comments
 (0)