Skip to content

Commit 1f88f93

Browse files
authored
Improved source quality in the test projects (#1848)
## Description As the title. Please enable this option to hide space to tab changes. ![image](https://github.com/user-attachments/assets/e5f248fa-4c96-4d41-a170-45adbb7d1ce7) ## Motivation and Context The code quality in the test projects was not as good and so, improved it to be consistent. - #1806 ## How Has This Been Tested? - Build the test projects ## Screenshots (if appropriate): ## Types of changes - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change)
1 parent f5a933c commit 1f88f93

29 files changed

+184
-417
lines changed

tests/WinUIGallery.UITests/AxeHelper.cs

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
1-
//******************************************************************************
2-
//
3-
// Copyright (c) 2024 Microsoft Corporation. All rights reserved.
4-
//
5-
// This code is licensed under the MIT License (MIT).
6-
//
7-
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
8-
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
9-
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
10-
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
11-
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
12-
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
13-
// THE SOFTWARE.
14-
//
15-
//******************************************************************************
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
163

174
using Axe.Windows.Automation;
185
using Axe.Windows.Core.Enums;
@@ -40,16 +27,16 @@ public static void AssertNoAccessibilityErrors()
4027
{
4128
// Bug 1474: Disabling Rules NameReasonableLength and BoundingRectangleNotNull temporarily
4229
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);
30+
.Where(rule => rule.Rule.ID != RuleId.NameIsInformative)
31+
.Where(rule => rule.Rule.ID != RuleId.NameExcludesControlType)
32+
.Where(rule => rule.Rule.ID != RuleId.NameExcludesLocalizedControlType)
33+
.Where(rule => rule.Rule.ID != RuleId.SiblingUniqueAndFocusable)
34+
.Where(rule => rule.Rule.ID != RuleId.NameReasonableLength)
35+
.Where(rule => rule.Rule.ID != RuleId.BoundingRectangleNotNull)
36+
.Where(rule => rule.Rule.ID != RuleId.BoundingRectangleNotNullListViewXAML)
37+
.Where(rule => rule.Rule.ID != RuleId.BoundingRectangleNotNullTextBlockXAML)
38+
.Where(rule => rule.Rule.ID != RuleId.NameNotNull)
39+
.Where(rule => rule.Rule.ID != RuleId.ChromiumComponentsShouldUseWebScanner);
5340

5441
if (testResult.Any())
5542
{

tests/WinUIGallery.UITests/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,3 @@ Please follow the guidelines below to maintain test reliability and reduce test
8080

8181
1. Provide a complete set of interactions (if applicable) for each new control
8282
1. Aim for simple and reliable scenario using the least amount of test steps
83-

tests/WinUIGallery.UITests/SampleTestTemplate.cs

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
1-
//******************************************************************************
2-
//
3-
// Copyright (c) 2024 Microsoft Corporation. All rights reserved.
4-
//
5-
// This code is licensed under the MIT License (MIT).
6-
//
7-
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
8-
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
9-
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
10-
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
11-
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
12-
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
13-
// THE SOFTWARE.
14-
//
15-
//******************************************************************************
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
163

174
using System.Threading;
185
using Microsoft.VisualStudio.TestTools.UnitTesting;

tests/WinUIGallery.UITests/SessionManager.cs

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
1-
//******************************************************************************
2-
//
3-
// Copyright (c) 2024 Microsoft Corporation. All rights reserved.
4-
//
5-
// This code is licensed under the MIT License (MIT).
6-
//
7-
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
8-
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
9-
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
10-
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
11-
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
12-
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
13-
// THE SOFTWARE.
14-
//
15-
//******************************************************************************
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
163

174
using Microsoft.VisualStudio.TestTools.UnitTesting;
185
using Microsoft.VisualStudio.TestTools.UnitTesting.Logging;
@@ -230,4 +217,3 @@ private static void TryInitializeSession()
230217
}
231218
}
232219
}
233-

tests/WinUIGallery.UITests/TestBase.cs

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
1-
//******************************************************************************
2-
//
3-
// Copyright (c) 2024 Microsoft Corporation. All rights reserved.
4-
//
5-
// This code is licensed under the MIT License (MIT).
6-
//
7-
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
8-
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
9-
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
10-
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
11-
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
12-
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
13-
// THE SOFTWARE.
14-
//
15-
//******************************************************************************
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
163

174
using Microsoft.VisualStudio.TestTools.UnitTesting;
185
using OpenQA.Selenium.Appium.Windows;
@@ -49,6 +36,7 @@ public static WindowsElement GetElementByName(string name)
4936
}
5037
return null;
5138
}
39+
5240
private static WindowsElement WaitForPageHeader(string name)
5341
{
5442
for (int i = 0; i < 100; i++)

tests/WinUIGallery.UITests/Tests/AxeScanAllTests.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
using Microsoft.VisualStudio.TestTools.UnitTesting;
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
3+
4+
using Microsoft.VisualStudio.TestTools.UnitTesting;
25
using OpenQA.Selenium.Appium.Windows;
36
using System;
47
using System.Linq;

tests/WinUIGallery.UITests/Tests/Button.cs

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
1-
//******************************************************************************
2-
//
3-
// Copyright (c) 2024 Microsoft Corporation. All rights reserved.
4-
//
5-
// This code is licensed under the MIT License (MIT).
6-
//
7-
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
8-
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
9-
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
10-
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
11-
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
12-
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
13-
// THE SOFTWARE.
14-
//
15-
//******************************************************************************
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
163

174
using Microsoft.VisualStudio.TestTools.UnitTesting;
185
using OpenQA.Selenium.Appium.Windows;

tests/WinUIGallery.UITests/Tests/CheckBox.cs

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
1-
//******************************************************************************
2-
//
3-
// Copyright (c) 2024 Microsoft Corporation. All rights reserved.
4-
//
5-
// This code is licensed under the MIT License (MIT).
6-
//
7-
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
8-
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
9-
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
10-
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
11-
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
12-
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
13-
// THE SOFTWARE.
14-
//
15-
//******************************************************************************
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
163

174
using Microsoft.VisualStudio.TestTools.UnitTesting;
185
using OpenQA.Selenium.Appium.Windows;

tests/WinUIGallery.UITests/Tests/ComboBox.cs

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
1-
//******************************************************************************
2-
//
3-
// Copyright (c) 2024 Microsoft Corporation. All rights reserved.
4-
//
5-
// This code is licensed under the MIT License (MIT).
6-
//
7-
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
8-
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
9-
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
10-
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
11-
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
12-
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
13-
// THE SOFTWARE.
14-
//
15-
//******************************************************************************
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
163

174
using Microsoft.VisualStudio.TestTools.UnitTesting;
185
using OpenQA.Selenium;

tests/WinUIGallery.UITests/Tests/DatePicker.cs

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
1-
//******************************************************************************
2-
//
3-
// Copyright (c) 2024 Microsoft Corporation. All rights reserved.
4-
//
5-
// This code is licensed under the MIT License (MIT).
6-
//
7-
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
8-
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
9-
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
10-
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
11-
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
12-
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
13-
// THE SOFTWARE.
14-
//
15-
//******************************************************************************
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
163

174
using Microsoft.VisualStudio.TestTools.UnitTesting;
185
using OpenQA.Selenium.Appium.Windows;

0 commit comments

Comments
 (0)