Skip to content

Commit 9932560

Browse files
authored
Enable CA1050: Declare types in namespaces (#13872)
1 parent ab378f6 commit 9932560

File tree

4 files changed

+23
-18
lines changed

4 files changed

+23
-18
lines changed

.globalconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ dotnet_diagnostic.CA1046.severity = none
9191
dotnet_diagnostic.CA1047.severity = suggestion
9292

9393
# CA1050: Declare types in namespaces
94-
dotnet_diagnostic.CA1050.severity = suggestion
94+
dotnet_diagnostic.CA1050.severity = warning
9595

9696
# CA1051: Do not declare visible instance fields
9797
dotnet_diagnostic.CA1051.severity = silent

test/xUnit/Asserts/PriorityAttribute.cs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@
33

44
using System;
55

6-
[AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
7-
public class TestPriorityAttribute : Attribute
6+
namespace PSTests.Internal
87
{
9-
public TestPriorityAttribute(int priority)
8+
[AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
9+
public class PriorityAttribute : Attribute
1010
{
11-
Priority = priority;
12-
}
11+
public PriorityAttribute(int priority)
12+
{
13+
Priority = priority;
14+
}
1315

14-
public int Priority { get; }
16+
public int Priority { get; }
17+
}
1518
}

test/xUnit/Asserts/PriorityOrderer.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System;
55
using System.Collections.Generic;
66
using System.Linq;
7+
using PSTests.Internal;
78
using Xunit.Abstractions;
89
using Xunit.Sdk;
910

@@ -19,7 +20,7 @@ public IEnumerable<TTestCase> OrderTestCases<TTestCase>(IEnumerable<TTestCase> t
1920
{
2021
int priority = 0;
2122

22-
foreach (IAttributeInfo attr in testCase.TestMethod.Method.GetCustomAttributes(typeof(TestPriorityAttribute).AssemblyQualifiedName))
23+
foreach (IAttributeInfo attr in testCase.TestMethod.Method.GetCustomAttributes(typeof(PriorityAttribute).AssemblyQualifiedName))
2324
{
2425
priority = attr.GetNamedArgument<int>("Priority");
2526
}

test/xUnit/csharp/test_PSConfiguration.cs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using System.Threading;
1111
using Newtonsoft.Json;
1212
using Newtonsoft.Json.Linq;
13+
using PSTests.Internal;
1314
using Xunit;
1415

1516
namespace PSTests.Sequential
@@ -382,7 +383,7 @@ public PowerShellPolicyTests(PowerShellPolicyFixture fixture)
382383
this.fixture = fixture;
383384
}
384385

385-
[Fact, TestPriority(1)]
386+
[Fact, Priority(1)]
386387
public void PowerShellConfig_GetPowerShellPolicies_BothConfigFilesNotEmpty()
387388
{
388389
fixture.SetupConfigFile1();
@@ -398,7 +399,7 @@ public void PowerShellConfig_GetPowerShellPolicies_BothConfigFilesNotEmpty()
398399
fixture.CompareTwoPolicies(userPolicies, fixture.CurrentUserPolicies);
399400
}
400401

401-
[Fact, TestPriority(2)]
402+
[Fact, Priority(2)]
402403
public void PowerShellConfig_GetPowerShellPolicies_EmptyUserConfig()
403404
{
404405
fixture.SetupConfigFile2();
@@ -413,7 +414,7 @@ public void PowerShellConfig_GetPowerShellPolicies_EmptyUserConfig()
413414
fixture.CompareTwoPolicies(sysPolicies, fixture.SystemWidePolicies);
414415
}
415416

416-
[Fact, TestPriority(3)]
417+
[Fact, Priority(3)]
417418
public void PowerShellConfig_GetPowerShellPolicies_EmptySystemConfig()
418419
{
419420
fixture.SetupConfigFile3();
@@ -428,7 +429,7 @@ public void PowerShellConfig_GetPowerShellPolicies_EmptySystemConfig()
428429
fixture.CompareTwoPolicies(userPolicies, fixture.CurrentUserPolicies);
429430
}
430431

431-
[Fact, TestPriority(4)]
432+
[Fact, Priority(4)]
432433
public void PowerShellConfig_GetPowerShellPolicies_BothConfigFilesEmpty()
433434
{
434435
fixture.SetupConfigFile4();
@@ -441,7 +442,7 @@ public void PowerShellConfig_GetPowerShellPolicies_BothConfigFilesEmpty()
441442
Assert.Null(userPolicies);
442443
}
443444

444-
[Fact, TestPriority(5)]
445+
[Fact, Priority(5)]
445446
public void PowerShellConfig_GetPowerShellPolicies_BothConfigFilesNotExist()
446447
{
447448
fixture.CleanupConfigFiles();
@@ -454,7 +455,7 @@ public void PowerShellConfig_GetPowerShellPolicies_BothConfigFilesNotExist()
454455
Assert.Null(userPolicies);
455456
}
456457

457-
[Fact, TestPriority(6)]
458+
[Fact, Priority(6)]
458459
public void Utils_GetPolicySetting_BothConfigFilesNotEmpty()
459460
{
460461
fixture.SetupConfigFile1();
@@ -553,7 +554,7 @@ public void Utils_GetPolicySetting_BothConfigFilesNotEmpty()
553554
fixture.CompareConsoleSessionConfiguration(consoleSessionConfiguration, fixture.SystemWidePolicies.ConsoleSessionConfiguration);
554555
}
555556

556-
[Fact, TestPriority(7)]
557+
[Fact, Priority(7)]
557558
public void Utils_GetPolicySetting_EmptyUserConfig()
558559
{
559560
fixture.SetupConfigFile2();
@@ -652,7 +653,7 @@ public void Utils_GetPolicySetting_EmptyUserConfig()
652653
fixture.CompareConsoleSessionConfiguration(consoleSessionConfiguration, fixture.SystemWidePolicies.ConsoleSessionConfiguration);
653654
}
654655

655-
[Fact, TestPriority(8)]
656+
[Fact, Priority(8)]
656657
public void Utils_GetPolicySetting_EmptySystemConfig()
657658
{
658659
fixture.SetupConfigFile3();
@@ -752,7 +753,7 @@ public void Utils_GetPolicySetting_EmptySystemConfig()
752753
fixture.CompareConsoleSessionConfiguration(consoleSessionConfiguration, null);
753754
}
754755

755-
[Fact, TestPriority(9)]
756+
[Fact, Priority(9)]
756757
public void Utils_GetPolicySetting_BothConfigFilesEmpty()
757758
{
758759
fixture.SetupConfigFile4();
@@ -852,7 +853,7 @@ public void Utils_GetPolicySetting_BothConfigFilesEmpty()
852853
fixture.CompareConsoleSessionConfiguration(consoleSessionConfiguration, null);
853854
}
854855

855-
[Fact, TestPriority(10)]
856+
[Fact, Priority(10)]
856857
public void Utils_GetPolicySetting_BothConfigFilesNotExist()
857858
{
858859
fixture.CleanupConfigFiles();

0 commit comments

Comments
 (0)