Skip to content

Commit 1d43b01

Browse files
author
MPCoreDeveloper
committed
tests upgraded because of deprecated packages
1 parent fc927f1 commit 1d43b01

14 files changed

Lines changed: 46 additions & 86 deletions

‎Posseth.NamedArguments.AnalyzerAndFixer.Test/NestedInvocationTests.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
using Microsoft.CodeAnalysis.CSharp.Testing;
22
using Microsoft.CodeAnalysis.Testing;
3-
using Microsoft.VisualStudio.TestTools.UnitTesting;
3+
using Xunit;
44
using System.Threading.Tasks;
55
using VerifyCS = Posseth.NamedArguments.AnalyzerAndFixer.Test.CSharpCodeFixVerifier<
66
Posseth.NamedArguments.AnalyzerAndFixer.NamedArgumentsAnalyzer,
77
Posseth.NamedArguments.AnalyzerAndFixer.NamedArgumentsCodeFixProvider>;
88

99
namespace Posseth.NamedArguments.AnalyzerAndFixer.Test
1010
{
11-
[TestClass]
1211
public class NestedInvocationTests
1312
{
14-
[TestMethod]
13+
[Fact]
1514
public async Task NestedInvocations_AreFixed()
1615
{
1716
// Configuratie om Info-diagnostieken te negeren

‎Posseth.NamedArguments.AnalyzerAndFixer.Test/Posseth.NamedArguments.AnalyzerAndFixer.Test.csproj‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
77
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
8+
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
89
</PropertyGroup>
910

1011
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
12-
<PackageReference Include="MSTest.TestAdapter" Version="3.10.4" />
13-
<PackageReference Include="MSTest.TestFramework" Version="3.10.4" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
13+
<PackageReference Include="xunit" Version="2.9.3" />
14+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
1415
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.14.0" />
15-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.MSTest" Version="1.1.2" />
16-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.MSTest" Version="1.1.2" />
17-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.MSTest" Version="1.1.2" />
18-
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.MSTest" Version="1.1.2" />
19-
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.MSTest" Version="1.1.2" />
20-
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.MSTest" Version="1.1.2" />
21-
<PackageReference Include="System.Formats.Asn1" Version="9.0.9" />
16+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />
17+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2" />
18+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing" Version="1.1.2" />
19+
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing" Version="1.1.2" />
20+
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing" Version="1.1.2" />
21+
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing" Version="1.1.2" />
22+
<PackageReference Include="Microsoft.CodeAnalysis.Testing.Verifiers.XUnit" Version="1.1.2" />
23+
<PackageReference Include="System.Formats.Asn1" Version="9.0.10" />
2224
</ItemGroup>
2325

2426
<ItemGroup>

‎Posseth.NamedArguments.AnalyzerAndFixer.Test/PossethNamedArgumentsAnalyzerAndFixerUnitTests.cs‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Microsoft.CodeAnalysis.Testing;
2-
using Microsoft.VisualStudio.TestTools.UnitTesting;
2+
using Xunit;
33
using System.Collections.Generic;
44
using System.Threading.Tasks;
55
using VerifyCS = Posseth.NamedArguments.AnalyzerAndFixer.Test.CSharpCodeFixVerifier<
@@ -8,10 +8,9 @@
88

99
namespace Posseth.NamedArguments.AnalyzerAndFixer.Test
1010
{
11-
[TestClass]
1211
public class PossethNamedArgumentsAnalyzeAndFixUnitTest
1312
{
14-
[TestMethod]
13+
[Fact]
1514
public async Task Test_MethodWithoutNamedArguments_ShouldTriggerDiagnostic()
1615
{
1716
var testCode = @"
@@ -38,7 +37,7 @@ void TestMethod(int x, int y)
3837
await VerifyCS.VerifyAnalyzerAsync(testCode, expectedDiagnostics);
3938
}
4039

41-
[TestMethod]
40+
[Fact]
4241
public async Task Test_MethodWithoutNamedArguments_ShouldFixToUseNamedArguments()
4342
{
4443
var testCode = @"
@@ -76,7 +75,7 @@ void TestMethod(int x, int y)
7675
await VerifyCS.VerifyCodeFixAsync(testCode, expectedDiagnostics, fixedCode);
7776
}
7877

79-
[TestMethod]
78+
[Fact]
8079
public async Task Test_MethodWithSingleParameter_ShouldNotTriggerDiagnostic()
8180
{
8281
var testCode = @"
@@ -100,7 +99,7 @@ void TestMethodSingle(int x)
10099
await VerifyCS.VerifyAnalyzerAsync(testCode, expectedDiagnostics);
101100
}
102101

103-
[TestMethod]
102+
[Fact]
104103
public async Task Test_MethodWithThreeParameters_ShouldTriggerDiagnostic()
105104
{
106105
var testCode = @"
@@ -130,7 +129,7 @@ void TestMethod(int x, int y, int z)
130129
await VerifyCS.VerifyAnalyzerAsync(testCode, expectedDiagnostics);
131130
}
132131

133-
[TestMethod]
132+
[Fact]
134133
public async Task Test_MethodWithThreeParameters_ShouldFixToUseNamedArguments()
135134
{
136135
var testCode = @"
@@ -171,7 +170,7 @@ void TestMethod(int x, int y, int z)
171170
await VerifyCS.VerifyCodeFixAsync(testCode, expectedDiagnostics, fixedCode);
172171
}
173172

174-
[TestMethod]
173+
[Fact]
175174
public async Task Test_MethodWithMixedNamedArguments_ShouldOnlyFixUnnamed()
176175
{
177176
var testCode = @"
@@ -209,7 +208,7 @@ void TestMethod(int x, int y, int z)
209208
await VerifyCS.VerifyCodeFixAsync(testCode, expectedDiagnostics, fixedCode);
210209
}
211210

212-
[TestMethod]
211+
[Fact]
213212
public async Task Test_MethodWithAllNamedArguments_ShouldNotTriggerDiagnostic()
214213
{
215214
var testCode = @"
@@ -226,7 +225,7 @@ void TestMethod(int x, int y, int z)
226225
await VerifyCS.VerifyAnalyzerAsync(testCode);
227226
}
228227

229-
[TestMethod]
228+
[Fact]
230229
public async Task Test_MethodWithConfiguredMinimumParameters_ShouldRespectThreshold()
231230
{
232231
var testCode = @"
@@ -263,7 +262,7 @@ void TestMethodSingle(int x)
263262
await VerifyCS.VerifyAnalyzerAsync(testCode, expectedDiagnostics);
264263
}
265264

266-
[TestMethod]
265+
[Fact]
267266
public async Task Test_MethodWithConfiguredMinimumParameters_ShouldFixBorderlineCases()
268267
{
269268
var testCode = @"
@@ -301,7 +300,7 @@ void TestMethod(int a, int b)
301300
await VerifyCS.VerifyCodeFixAsync(testCode, expectedDiagnostics, fixedCode);
302301
}
303302

304-
[TestMethod]
303+
[Fact]
305304
public async Task Analyzer_Excludes_FullyQualifiedMethodName_ButNotCustom()
306305
{
307306
var test = @"

‎Posseth.NamedArguments.AnalyzerAndFixer.Test/RecordAnalyzerTests.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
using Microsoft.CodeAnalysis.Testing;
2-
using Microsoft.VisualStudio.TestTools.UnitTesting;
2+
using Xunit;
33
using System.Collections.Generic;
44
using System.Threading.Tasks;
55
using VerifyCS = Posseth.NamedArguments.AnalyzerAndFixer.Test.CSharpCodeFixVerifier<
66
Posseth.NamedArguments.AnalyzerAndFixer.NamedArgumentsAnalyzer,
77
Posseth.NamedArguments.AnalyzerAndFixer.NamedArgumentsCodeFixProvider>;
88
namespace Posseth.NamedArguments.AnalyzerAndFixer.Test
99
{
10-
[TestClass]
1110
public class RecordAnalyzerTests
1211
{
1312

1413

15-
[TestMethod]
14+
[Fact]
1615
public async Task Test_RecordUsage_ShouldRequireNamedArguments()
1716
{
1817
var testCode = @"

‎Posseth.NamedArguments.AnalyzerAndFixer.Test/Verifiers/CSharpAnalyzerVerifier`1+Test.cs‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,8 @@ namespace Posseth.NamedArguments.AnalyzerAndFixer.Test
88
public static partial class CSharpAnalyzerVerifier<TAnalyzer>
99
where TAnalyzer : DiagnosticAnalyzer, new()
1010
{
11-
public class Test : CSharpAnalyzerTest<TAnalyzer, MSTestVerifier>
11+
public class Test : CSharpAnalyzerTest<TAnalyzer, XUnitVerifier>
1212
{
13-
public Test()
14-
{
15-
SolutionTransforms.Add((solution, projectId) =>
16-
{
17-
var compilationOptions = solution.GetProject(projectId).CompilationOptions;
18-
compilationOptions = compilationOptions.WithSpecificDiagnosticOptions(
19-
compilationOptions.SpecificDiagnosticOptions.SetItems(CSharpVerifierHelper.NullableWarnings));
20-
solution = solution.WithProjectCompilationOptions(projectId, compilationOptions);
21-
22-
return solution;
23-
});
24-
}
2513
}
2614
}
2715
}

‎Posseth.NamedArguments.AnalyzerAndFixer.Test/Verifiers/CSharpAnalyzerVerifier`1.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ public static partial class CSharpAnalyzerVerifier<TAnalyzer>
1313
{
1414
/// <inheritdoc cref="AnalyzerVerifier{TAnalyzer, TTest, TVerifier}.Diagnostic()"/>
1515
public static DiagnosticResult Diagnostic()
16-
=> CSharpAnalyzerVerifier<TAnalyzer, MSTestVerifier>.Diagnostic();
16+
=> CSharpAnalyzerVerifier<TAnalyzer, XUnitVerifier>.Diagnostic();
1717

1818
/// <inheritdoc cref="AnalyzerVerifier{TAnalyzer, TTest, TVerifier}.Diagnostic(string)"/>
1919
public static DiagnosticResult Diagnostic(string diagnosticId)
20-
=> CSharpAnalyzerVerifier<TAnalyzer, MSTestVerifier>.Diagnostic(diagnosticId);
20+
=> CSharpAnalyzerVerifier<TAnalyzer, XUnitVerifier>.Diagnostic(diagnosticId);
2121

2222
/// <inheritdoc cref="AnalyzerVerifier{TAnalyzer, TTest, TVerifier}.Diagnostic(DiagnosticDescriptor)"/>
2323
public static DiagnosticResult Diagnostic(DiagnosticDescriptor descriptor)
24-
=> CSharpAnalyzerVerifier<TAnalyzer, MSTestVerifier>.Diagnostic(descriptor);
24+
=> CSharpAnalyzerVerifier<TAnalyzer, XUnitVerifier>.Diagnostic(descriptor);
2525

2626
/// <inheritdoc cref="AnalyzerVerifier{TAnalyzer, TTest, TVerifier}.VerifyAnalyzerAsync(string, DiagnosticResult[])"/>
2727
public static async Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected)

‎Posseth.NamedArguments.AnalyzerAndFixer.Test/Verifiers/CSharpCodeFixVerifier`2+Test.cs‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,8 @@ public static partial class CSharpCodeFixVerifier<TAnalyzer, TCodeFix>
1010
where TAnalyzer : DiagnosticAnalyzer, new()
1111
where TCodeFix : CodeFixProvider, new()
1212
{
13-
public class Test : CSharpCodeFixTest<TAnalyzer, TCodeFix, MSTestVerifier>
13+
public class Test : CSharpCodeFixTest<TAnalyzer, TCodeFix, XUnitVerifier>
1414
{
15-
public Test()
16-
{
17-
SolutionTransforms.Add((solution, projectId) =>
18-
{
19-
var compilationOptions = solution.GetProject(projectId).CompilationOptions;
20-
compilationOptions = compilationOptions.WithSpecificDiagnosticOptions(
21-
compilationOptions.SpecificDiagnosticOptions.SetItems(CSharpVerifierHelper.NullableWarnings));
22-
solution = solution.WithProjectCompilationOptions(projectId, compilationOptions);
23-
24-
return solution;
25-
});
26-
}
2715
}
2816
}
2917
}

‎Posseth.NamedArguments.AnalyzerAndFixer.Test/Verifiers/CSharpCodeFixVerifier`2.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ public static partial class CSharpCodeFixVerifier<TAnalyzer, TCodeFix>
1515
{
1616
/// <inheritdoc cref="CodeFixVerifier{TAnalyzer, TCodeFix, TTest, TVerifier}.Diagnostic()"/>
1717
public static DiagnosticResult Diagnostic()
18-
=> CSharpCodeFixVerifier<TAnalyzer, TCodeFix, MSTestVerifier>.Diagnostic();
18+
=> CSharpCodeFixVerifier<TAnalyzer, TCodeFix, XUnitVerifier>.Diagnostic();
1919

2020
/// <inheritdoc cref="CodeFixVerifier{TAnalyzer, TCodeFix, TTest, TVerifier}.Diagnostic(string)"/>
2121
public static DiagnosticResult Diagnostic(string diagnosticId)
22-
=> CSharpCodeFixVerifier<TAnalyzer, TCodeFix, MSTestVerifier>.Diagnostic(diagnosticId);
22+
=> CSharpCodeFixVerifier<TAnalyzer, TCodeFix, XUnitVerifier>.Diagnostic(diagnosticId);
2323

2424
/// <inheritdoc cref="CodeFixVerifier{TAnalyzer, TCodeFix, TTest, TVerifier}.Diagnostic(DiagnosticDescriptor)"/>
2525
public static DiagnosticResult Diagnostic(DiagnosticDescriptor descriptor)
26-
=> CSharpCodeFixVerifier<TAnalyzer, TCodeFix, MSTestVerifier>.Diagnostic(descriptor);
26+
=> CSharpCodeFixVerifier<TAnalyzer, TCodeFix, XUnitVerifier>.Diagnostic(descriptor);
2727

2828
/// <inheritdoc cref="CodeFixVerifier{TAnalyzer, TCodeFix, TTest, TVerifier}.VerifyAnalyzerAsync(string, DiagnosticResult[])"/>
2929
public static async Task VerifyAnalyzerAsync(string source, params DiagnosticResult[] expected)

‎Posseth.NamedArguments.AnalyzerAndFixer.Test/Verifiers/CSharpCodeRefactoringVerifier`1+Test.cs‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,8 @@ namespace Posseth.NamedArguments.AnalyzerAndFixer.Test
88
public static partial class CSharpCodeRefactoringVerifier<TCodeRefactoring>
99
where TCodeRefactoring : CodeRefactoringProvider, new()
1010
{
11-
public class Test : CSharpCodeRefactoringTest<TCodeRefactoring, MSTestVerifier>
11+
public class Test : CSharpCodeRefactoringTest<TCodeRefactoring, XUnitVerifier>
1212
{
13-
public Test()
14-
{
15-
SolutionTransforms.Add((solution, projectId) =>
16-
{
17-
var compilationOptions = solution.GetProject(projectId).CompilationOptions;
18-
compilationOptions = compilationOptions.WithSpecificDiagnosticOptions(
19-
compilationOptions.SpecificDiagnosticOptions.SetItems(CSharpVerifierHelper.NullableWarnings));
20-
solution = solution.WithProjectCompilationOptions(projectId, compilationOptions);
21-
22-
return solution;
23-
});
24-
}
2513
}
2614
}
2715
}

‎Posseth.NamedArguments.AnalyzerAndFixer.Test/Verifiers/VisualBasicAnalyzerVerifier`1+Test.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,8 @@ namespace Posseth.NamedArguments.AnalyzerAndFixer.Test
77
public static partial class VisualBasicAnalyzerVerifier<TAnalyzer>
88
where TAnalyzer : DiagnosticAnalyzer, new()
99
{
10-
public class Test : VisualBasicAnalyzerTest<TAnalyzer, MSTestVerifier>
10+
public class Test : VisualBasicAnalyzerTest<TAnalyzer, XUnitVerifier>
1111
{
12-
public Test()
13-
{
14-
}
1512
}
1613
}
1714
}

0 commit comments

Comments
 (0)