Skip to content

Commit eb54287

Browse files
mavasanimavasani
authored
Merge pull request #4633 from sharwell/test-update
Update to Microsoft.CodeAnalysis.Testing 1.0.1-beta1.20623.3
2 parents b8d5ea3 + 851ed2f commit eb54287

File tree

7 files changed

+142
-198
lines changed

7 files changed

+142
-198
lines changed

‎eng/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<RoslynDiagnosticsAnalyzersVersion>$(DogfoodAnalyzersVersion)</RoslynDiagnosticsAnalyzersVersion>
4040
<MicrosoftCodeAnalysisTestResourcesProprietaryVersion>2.0.0-pre-20160714</MicrosoftCodeAnalysisTestResourcesProprietaryVersion>
4141
<!-- Roslyn Testing -->
42-
<MicrosoftCodeAnalysisTestingVersion>1.0.1-beta1.20521.1</MicrosoftCodeAnalysisTestingVersion>
42+
<MicrosoftCodeAnalysisTestingVersion>1.0.1-beta1.20623.3</MicrosoftCodeAnalysisTestingVersion>
4343
<!-- Libs -->
4444
<SystemCollectionsImmutableVersion>1.3.1</SystemCollectionsImmutableVersion>
4545
<SystemComponentModelCompositionVersion>4.7.0</SystemComponentModelCompositionVersion>

‎src/Microsoft.CodeAnalysis.Analyzers/UnitTests/InternalImplementationOnlyTests.cs

+32-46
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,14 @@ class SomeOtherClass : IMyOtherInterface { }";
5959
TestState =
6060
{
6161
Sources = { source2 },
62+
AdditionalProjects =
63+
{
64+
["DependencyProject"] =
65+
{
66+
Sources = { source1 },
67+
},
68+
},
69+
AdditionalProjectReferences = { "DependencyProject" },
6270
ExpectedDiagnostics =
6371
{
6472
// Test0.cs(2,7): error RS1009: Type SomeClass cannot implement interface IMyInterface because IMyInterface is not available for public implementation.
@@ -67,19 +75,6 @@ class SomeOtherClass : IMyOtherInterface { }";
6775
VerifyCS.Diagnostic().WithSpan(4, 7, 4, 21).WithArguments("SomeOtherClass", "IMyInterface"),
6876
},
6977
},
70-
SolutionTransforms =
71-
{
72-
(solution, projectId) =>
73-
{
74-
var dependencyProject = solution.AddProject("DependencyProject", "DependencyProject", LanguageNames.CSharp)
75-
.WithCompilationOptions(solution.GetProject(projectId).CompilationOptions)
76-
.WithParseOptions(solution.GetProject(projectId).ParseOptions)
77-
.WithMetadataReferences(solution.GetProject(projectId).MetadataReferences)
78-
.AddDocument("Test0.cs", source1, filePath: "Test0.cs").Project;
79-
80-
return dependencyProject.Solution.AddProjectReference(projectId, new ProjectReference(dependencyProject.Id));
81-
},
82-
},
8378
}.RunAsync();
8479
}
8580

@@ -105,19 +100,17 @@ class SomeOtherClass : IMyOtherInterface { }";
105100
await new VerifyCS.Test
106101
{
107102
ReferenceAssemblies = AdditionalMetadataReferences.DefaultWithoutRoslynSymbols,
108-
TestState = { Sources = { source2 } },
109-
SolutionTransforms =
103+
TestState =
110104
{
111-
(solution, projectId) =>
105+
Sources = { source2 },
106+
AdditionalProjects =
112107
{
113-
var dependencyProject = solution.AddProject("DependencyProject", "DependencyProject", LanguageNames.CSharp)
114-
.WithCompilationOptions(solution.GetProject(projectId).CompilationOptions)
115-
.WithParseOptions(solution.GetProject(projectId).ParseOptions)
116-
.WithMetadataReferences(solution.GetProject(projectId).MetadataReferences)
117-
.AddDocument("Test0.cs", source1, filePath: "Test0.cs").Project;
118-
119-
return dependencyProject.Solution.AddProjectReference(projectId, new ProjectReference(dependencyProject.Id));
108+
["DependencyProject"] =
109+
{
110+
Sources = { source1 },
111+
},
120112
},
113+
AdditionalProjectReferences = { "DependencyProject" },
121114
},
122115
}.RunAsync();
123116
}
@@ -441,6 +434,14 @@ End Class
441434
TestState =
442435
{
443436
Sources = { source2 },
437+
AdditionalProjects =
438+
{
439+
["DependencyProject"] =
440+
{
441+
Sources = { source1 },
442+
},
443+
},
444+
AdditionalProjectReferences = { "DependencyProject" },
444445
ExpectedDiagnostics =
445446
{
446447
// Test0.vb(2,7): error RS1009: Type SomeClass cannot implement interface IMyInterface because IMyInterface is not available for public implementation.
@@ -449,19 +450,6 @@ End Class
449450
VerifyVB.Diagnostic().WithSpan(6, 7, 6, 21).WithArguments("SomeOtherClass", "IMyInterface"),
450451
},
451452
},
452-
SolutionTransforms =
453-
{
454-
(solution, projectId) =>
455-
{
456-
var dependencyProject = solution.AddProject("DependencyProject", "DependencyProject", LanguageNames.VisualBasic)
457-
.WithCompilationOptions(solution.GetProject(projectId).CompilationOptions)
458-
.WithParseOptions(solution.GetProject(projectId).ParseOptions)
459-
.WithMetadataReferences(solution.GetProject(projectId).MetadataReferences)
460-
.AddDocument("Test0.vb", source1, filePath: "Test0.vb").Project;
461-
462-
return dependencyProject.Solution.AddProjectReference(projectId, new ProjectReference(dependencyProject.Id));
463-
},
464-
},
465453
}.RunAsync();
466454
}
467455

@@ -495,19 +483,17 @@ End Class
495483
await new VerifyVB.Test
496484
{
497485
ReferenceAssemblies = AdditionalMetadataReferences.DefaultWithoutRoslynSymbols,
498-
TestState = { Sources = { source2 } },
499-
SolutionTransforms =
486+
TestState =
500487
{
501-
(solution, projectId) =>
488+
Sources = { source2 },
489+
AdditionalProjects =
502490
{
503-
var dependencyProject = solution.AddProject("DependencyProject", "DependencyProject", LanguageNames.VisualBasic)
504-
.WithCompilationOptions(solution.GetProject(projectId).CompilationOptions)
505-
.WithParseOptions(solution.GetProject(projectId).ParseOptions)
506-
.WithMetadataReferences(solution.GetProject(projectId).MetadataReferences)
507-
.AddDocument("Test0.vb", source1, filePath: "Test0.vb").Project;
508-
509-
return dependencyProject.Solution.AddProjectReference(projectId, new ProjectReference(dependencyProject.Id));
491+
["DependencyProject"] =
492+
{
493+
Sources = { source1 },
494+
},
510495
},
496+
AdditionalProjectReferences = { "DependencyProject" },
511497
},
512498
}.RunAsync();
513499
}

‎src/Microsoft.CodeAnalysis.BannedApiAnalyzers/UnitTests/RestrictedInternalsVisibleToAnalyzerTests.cs

+27-33
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
22

3-
using System.Linq;
43
using System.Threading.Tasks;
5-
using Microsoft.CodeAnalysis.CSharp;
64
using Microsoft.CodeAnalysis.Testing;
7-
using Microsoft.CodeAnalysis.VisualBasic;
85
using Test.Utilities;
96
using Xunit;
107

@@ -41,9 +38,6 @@ private static DiagnosticResult GetBasicResultAt(int startLine, int startColumn,
4138
private const string CSharpApiProviderFileName = "ApiProviderFileName.cs";
4239
private const string VisualBasicApiProviderFileName = "ApiProviderFileName.vb";
4340

44-
private static readonly CompilationOptions s_csharpCompilationOptions = new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary);
45-
private static readonly CompilationOptions s_visualBasicCompilationOptions = new VisualBasicCompilationOptions(OutputKind.DynamicallyLinkedLibrary);
46-
4741
private const string CSharpRestrictedInternalsVisibleToAttribute = @"
4842
namespace System.Runtime.CompilerServices
4943
{
@@ -73,10 +67,21 @@ private async Task VerifyCSharpAsync(string apiProviderSource, string apiConsume
7367
TestState =
7468
{
7569
Sources = { apiConsumerSource },
70+
AdditionalProjects =
71+
{
72+
[ApiProviderProjectName] =
73+
{
74+
Sources =
75+
{
76+
(CSharpApiProviderFileName, apiProviderSource + CSharpRestrictedInternalsVisibleToAttribute),
77+
},
78+
},
79+
},
80+
AdditionalProjectReferences = { ApiProviderProjectName },
7681
},
7782
SolutionTransforms =
7883
{
79-
(solution, projectId) => ApplySolutionTransforms(solution, projectId, apiProviderSource, LanguageNames.CSharp),
84+
(solution, projectId) => ApplySolutionTransforms(solution, projectId),
8085
},
8186
};
8287

@@ -91,42 +96,31 @@ private async Task VerifyBasicAsync(string apiProviderSource, string apiConsumer
9196
TestState =
9297
{
9398
Sources = { apiConsumerSource },
99+
AdditionalProjects =
100+
{
101+
[ApiProviderProjectName] =
102+
{
103+
Sources =
104+
{
105+
(VisualBasicApiProviderFileName, apiProviderSource + VisualBasicRestrictedInternalsVisibleToAttribute),
106+
},
107+
},
108+
},
109+
AdditionalProjectReferences = { ApiProviderProjectName },
94110
},
95111
SolutionTransforms =
96112
{
97-
(solution, projectId) => ApplySolutionTransforms(solution, projectId, apiProviderSource, LanguageNames.VisualBasic),
113+
(solution, projectId) => ApplySolutionTransforms(solution, projectId),
98114
},
99115
};
100116

101117
test.ExpectedDiagnostics.AddRange(expected);
102118
await test.RunAsync();
103119
}
104120

105-
private static Solution ApplySolutionTransforms(
106-
Solution solution,
107-
ProjectId apiConsumerProjectId,
108-
string apiProviderSource,
109-
string language)
110-
{
111-
var restrictedInternalsVisibleToAttribute = language == LanguageNames.CSharp
112-
? CSharpRestrictedInternalsVisibleToAttribute
113-
: VisualBasicRestrictedInternalsVisibleToAttribute;
114-
var compilationOptions = language == LanguageNames.CSharp
115-
? s_csharpCompilationOptions
116-
: s_visualBasicCompilationOptions;
117-
var fileName = language == LanguageNames.CSharp
118-
? CSharpApiProviderFileName
119-
: VisualBasicApiProviderFileName;
120-
121-
var metadataReferences = solution.Projects.Single().MetadataReferences;
122-
solution = solution.WithProjectAssemblyName(apiConsumerProjectId, ApiConsumerProjectName);
123-
var apiProducerProject = solution
124-
.AddProject(ApiProviderProjectName, ApiProviderProjectName, language)
125-
.WithCompilationOptions(compilationOptions)
126-
.WithMetadataReferences(metadataReferences)
127-
.AddDocument(fileName, apiProviderSource + restrictedInternalsVisibleToAttribute)
128-
.Project;
129-
return apiProducerProject.Solution.AddProjectReference(apiConsumerProjectId, new ProjectReference(apiProducerProject.Id));
121+
private static Solution ApplySolutionTransforms(Solution solution, ProjectId apiConsumerProjectId)
122+
{
123+
return solution.WithProjectAssemblyName(apiConsumerProjectId, ApiConsumerProjectName);
130124
}
131125

132126
[Fact]

‎src/NetAnalyzers/UnitTests/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/IdentifiersShouldNotContainTypeNamesTests.cs

+6-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
22

33
using System.Threading.Tasks;
4+
using Microsoft.CodeAnalysis;
45
using Microsoft.CodeAnalysis.Testing;
56
using Test.Utilities;
67
using Xunit;
@@ -464,17 +465,12 @@ public async Task CA1720_TopLevelStatements_NoDiagnostic()
464465
{
465466
await new VerifyCS.Test()
466467
{
467-
TestCode = @"int x = 0;",
468-
LanguageVersion = CodeAnalysis.CSharp.LanguageVersion.CSharp9,
469-
SolutionTransforms =
468+
TestState =
470469
{
471-
(solution, projectId) =>
472-
{
473-
var project = solution.GetProject(projectId);
474-
project = project.WithCompilationOptions(project.CompilationOptions.WithOutputKind(CodeAnalysis.OutputKind.ConsoleApplication));
475-
return project.Solution;
476-
},
477-
}
470+
Sources = { @"int x = 0;" },
471+
OutputKind = OutputKind.ConsoleApplication,
472+
},
473+
LanguageVersion = CodeAnalysis.CSharp.LanguageVersion.CSharp9,
478474
}.RunAsync();
479475
}
480476

0 commit comments

Comments
 (0)