Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Rocket Surgery Testing to v8.0.15 #1045

Merged
merged 3 commits into from
Mar 23, 2024
Merged

Update Rocket Surgery Testing to v8.0.15 #1045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
011bb19
Update Rocket Surgery Testing to v8.0.15
renovate[bot] Mar 23, 2024
f311dfc
Updated to latest tests fixing up issue with new C# versions
david-driscoll Mar 23, 2024
e06341f
Automatically linting code
david-driscoll Mar 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="FluentAssertions.Analyzers" Version="0.31.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageVersion Include="Rocket.Surgery.Extensions.Testing.FakeItEasy" Version="8.0.13" />
<PackageVersion Include="Rocket.Surgery.Extensions.Testing.XUnit" Version="8.0.13" />
<PackageVersion Include="Rocket.Surgery.Extensions.Testing.SourceGenerators" Version="8.0.13" />
<PackageVersion Include="Rocket.Surgery.Extensions.Testing.FakeItEasy" Version="8.0.15" />
<PackageVersion Include="Rocket.Surgery.Extensions.Testing.XUnit" Version="8.0.15" />
<PackageVersion Include="Rocket.Surgery.Extensions.Testing.SourceGenerators" Version="8.0.15" />
<PackageVersion Include="Verify.Xunit" Version="23.5.2" />
<PackageVersion Include="Verify.SourceGenerators" Version="2.2.0" />
<PackageVersion Include="xunit" Version="2.7.0" />
Expand Down
3 changes: 2 additions & 1 deletion src/DependencyInjection.Analyzers/CompiledServiceScanningGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,8 @@ List<ITypeFilterDescriptor> typeFilters

var allAssemblyReferences = assemblyReferences
.Concat(assemblies.OfType<CompiledAssemblyDescriptor>().Select(z => z.TypeFromAssembly.ContainingAssembly))
.Distinct(SymbolEqualityComparer.Default);
.Distinct(SymbolEqualityComparer.Default)
.OfType<IAssemblySymbol>();

types = TypeSymbolVisitor.GetTypes(compilation, allAssemblyReferences);
}
Expand Down
19 changes: 12 additions & 7 deletions src/DependencyInjection.Analyzers/TypeSymbolVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,33 @@

namespace Rocket.Surgery.DependencyInjection.Analyzers;

internal class TypeSymbolVisitor : SymbolVisitor
internal class TypeSymbolVisitor(Compilation compilation) : SymbolVisitor
{
public static ImmutableArray<INamedTypeSymbol> GetTypes(Compilation compilation)
{
var visitor = new TypeSymbolVisitor();
var visitor = new TypeSymbolVisitor(compilation);
visitor.VisitNamespace(compilation.GlobalNamespace);
foreach (var symbol in compilation.References.Select(compilation.GetAssemblyOrModuleSymbol).Where(z => z != null))
symbol?.Accept(visitor);
return visitor.GetTypes();
}

public static ImmutableArray<INamedTypeSymbol> GetTypes(Compilation compilation, IEnumerable<ISymbol?> symbols)
public static ImmutableArray<INamedTypeSymbol> GetTypes(Compilation compilation, IEnumerable<IAssemblySymbol> symbols)
{
var visitor = new TypeSymbolVisitor();
var visitor = new TypeSymbolVisitor(compilation);
visitor.Accept(symbols);
return visitor.GetTypes();
}

private readonly List<INamedTypeSymbol> _types = new List<INamedTypeSymbol>();
private readonly List<INamedTypeSymbol> _types = new();

private void Accept<T>(IEnumerable<T> members)
where T : ISymbol?
{
foreach (var member in members)
{
member?.Accept(this);
}
}

public override void VisitNamespace(INamespaceSymbol symbol)
Expand All @@ -42,9 +44,12 @@ public override void VisitAssembly(IAssemblySymbol symbol)

public override void VisitNamedType(INamedTypeSymbol symbol)
{
if (symbol.TypeKind == TypeKind.Class || symbol.TypeKind == TypeKind.Delegate || symbol.TypeKind == TypeKind.Struct)
if (symbol.TypeKind is TypeKind.Class or TypeKind.Delegate or TypeKind.Struct)
{
if (symbol.IsAbstract || !symbol.CanBeReferencedByName) return;
if (Helpers
.GetBaseTypes(compilation, symbol)
.Contains(compilation.GetTypeByMetadataName("System.Attribute"), SymbolEqualityComparer.Default)) return;
_types.Add(symbol);
}

Expand All @@ -55,4 +60,4 @@ public ImmutableArray<INamedTypeSymbol> GetTypes()
{
return _types.Distinct(SymbolEqualityComparer.Default).OfType<INamedTypeSymbol>().ToImmutableArray();
}
}
}
11 changes: 1 addition & 10 deletions test/DependencyInjection.Analyzers.Tests/ModuleInitializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public static class ModuleInitializer
[ModuleInitializer]
public static void Init()
{
VerifyGeneratorTextContext.Initialize(false, true, DiagnosticSeverity.Error);
VerifyGeneratorTextContext.Initialize(DiagnosticSeverity.Error, Customizers.Default, Customizers.ExcludeParseOptions);

VerifierSettings.AddExtraSettings(
settings => { settings.Converters.Add(new ServiceDescriptorConverter()); }
Expand Down Expand Up @@ -57,15 +57,6 @@ private static ConversionResult Convert(GeneratorTestResultsWithServices result,
}

var data = new Dictionary<string, object>();
// start here
data["ParseOptions"] = new
{
target.ParseOptions.LanguageVersion,
target.ParseOptions.DocumentationMode,
target.ParseOptions.Kind,
target.ParseOptions.Features,
target.ParseOptions.PreprocessorSymbolNames,
};

data["GlobalOptions"] = target.GlobalOptions;
data["FileOptions"] = target.FileOptions;
Expand Down
4 changes: 0 additions & 4 deletions ...ion.Analyzers.Tests/snapshots/StaticScanningTests.Should_Filter_AssignableTo.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
GlobalOptions: {
compiled_scan_assembly_load: false
},
ParseOptions: {
LanguageVersion: CSharp10,
DocumentationMode: Parse
},
References: [
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Expand Down
4 changes: 0 additions & 4 deletions ....Analyzers.Tests/snapshots/StaticScanningTests.Should_Filter_AssignableToAny.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
GlobalOptions: {
compiled_scan_assembly_load: false
},
ParseOptions: {
LanguageVersion: CSharp10,
DocumentationMode: Parse
},
References: [
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Expand Down
4 changes: 0 additions & 4 deletions ...shots/StaticScanningTests.Should_Filter_Multiple_Namespaces_212c4bac188f905d.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
GlobalOptions: {
compiled_scan_assembly_load: false
},
ParseOptions: {
LanguageVersion: CSharp10,
DocumentationMode: Parse
},
References: [
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Expand Down
4 changes: 0 additions & 4 deletions ...shots/StaticScanningTests.Should_Filter_Multiple_Namespaces_2865ea4c4d31737f.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
GlobalOptions: {
compiled_scan_assembly_load: false
},
ParseOptions: {
LanguageVersion: CSharp10,
DocumentationMode: Parse
},
References: [
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Expand Down
4 changes: 0 additions & 4 deletions ...shots/StaticScanningTests.Should_Filter_Multiple_Namespaces_4dbddab62e1ee5c1.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
GlobalOptions: {
compiled_scan_assembly_load: false
},
ParseOptions: {
LanguageVersion: CSharp10,
DocumentationMode: Parse
},
References: [
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Expand Down
4 changes: 0 additions & 4 deletions ...shots/StaticScanningTests.Should_Filter_Multiple_Namespaces_547fe24fca4f8f73.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
GlobalOptions: {
compiled_scan_assembly_load: false
},
ParseOptions: {
LanguageVersion: CSharp10,
DocumentationMode: Parse
},
References: [
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Expand Down
4 changes: 0 additions & 4 deletions ...shots/StaticScanningTests.Should_Filter_Multiple_Namespaces_91f630359ca70f59.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
GlobalOptions: {
compiled_scan_assembly_load: false
},
ParseOptions: {
LanguageVersion: CSharp10,
DocumentationMode: Parse
},
References: [
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Expand Down
4 changes: 0 additions & 4 deletions ...shots/StaticScanningTests.Should_Filter_Multiple_Namespaces_993604c325445db4.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
GlobalOptions: {
compiled_scan_assembly_load: false
},
ParseOptions: {
LanguageVersion: CSharp10,
DocumentationMode: Parse
},
References: [
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Expand Down
4 changes: 0 additions & 4 deletions ...ests/snapshots/StaticScanningTests.Should_Filter_Namespaces_0358b0c4594edbb8.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
GlobalOptions: {
compiled_scan_assembly_load: false
},
ParseOptions: {
LanguageVersion: CSharp10,
DocumentationMode: Parse
},
References: [
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Expand Down
4 changes: 0 additions & 4 deletions ...ests/snapshots/StaticScanningTests.Should_Filter_Namespaces_0bb08a92557b9770.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
GlobalOptions: {
compiled_scan_assembly_load: false
},
ParseOptions: {
LanguageVersion: CSharp10,
DocumentationMode: Parse
},
References: [
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Expand Down
4 changes: 0 additions & 4 deletions ...ests/snapshots/StaticScanningTests.Should_Filter_Namespaces_0bd082c78e7293fa.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
GlobalOptions: {
compiled_scan_assembly_load: false
},
ParseOptions: {
LanguageVersion: CSharp10,
DocumentationMode: Parse
},
References: [
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Expand Down
4 changes: 0 additions & 4 deletions ...ests/snapshots/StaticScanningTests.Should_Filter_Namespaces_3851bf1ad799965b.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
GlobalOptions: {
compiled_scan_assembly_load: false
},
ParseOptions: {
LanguageVersion: CSharp10,
DocumentationMode: Parse
},
References: [
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Expand Down
4 changes: 0 additions & 4 deletions ...ests/snapshots/StaticScanningTests.Should_Filter_Namespaces_42704de9e2e76eb9.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
GlobalOptions: {
compiled_scan_assembly_load: false
},
ParseOptions: {
LanguageVersion: CSharp10,
DocumentationMode: Parse
},
References: [
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Expand Down
4 changes: 0 additions & 4 deletions ...ests/snapshots/StaticScanningTests.Should_Filter_Namespaces_5de0bdedee26237c.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
GlobalOptions: {
compiled_scan_assembly_load: false
},
ParseOptions: {
LanguageVersion: CSharp10,
DocumentationMode: Parse
},
References: [
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Expand Down
4 changes: 0 additions & 4 deletions ...ests/snapshots/StaticScanningTests.Should_Filter_Namespaces_a58b277eac9396cf.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
GlobalOptions: {
compiled_scan_assembly_load: false
},
ParseOptions: {
LanguageVersion: CSharp10,
DocumentationMode: Parse
},
References: [
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Expand Down
4 changes: 0 additions & 4 deletions ...ests/snapshots/StaticScanningTests.Should_Filter_Namespaces_bffdeadd6d48b2ce.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
GlobalOptions: {
compiled_scan_assembly_load: false
},
ParseOptions: {
LanguageVersion: CSharp10,
DocumentationMode: Parse
},
References: [
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Expand Down
4 changes: 0 additions & 4 deletions ...ests/snapshots/StaticScanningTests.Should_Filter_Namespaces_fe82acf1349b3b6e.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
GlobalOptions: {
compiled_scan_assembly_load: false
},
ParseOptions: {
LanguageVersion: CSharp10,
DocumentationMode: Parse
},
References: [
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Expand Down
4 changes: 0 additions & 4 deletions ...ts/snapshots/StaticScanningTests.Should_Filter_WithAttribute_useTypeof=False.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
GlobalOptions: {
compiled_scan_assembly_load: false
},
ParseOptions: {
LanguageVersion: CSharp10,
DocumentationMode: Parse
},
References: [
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Expand Down
4 changes: 0 additions & 4 deletions ...sts/snapshots/StaticScanningTests.Should_Filter_WithAttribute_useTypeof=True.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
GlobalOptions: {
compiled_scan_assembly_load: false
},
ParseOptions: {
LanguageVersion: CSharp10,
DocumentationMode: Parse
},
References: [
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Expand Down
4 changes: 0 additions & 4 deletions ...s/StaticScanningTests.Should_Filter_With_Contains_NameOf_methodName=Contains.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
GlobalOptions: {
compiled_scan_assembly_load: false
},
ParseOptions: {
LanguageVersion: CSharp10,
DocumentationMode: Parse
},
References: [
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Expand Down
4 changes: 0 additions & 4 deletions ...s/StaticScanningTests.Should_Filter_With_Contains_NameOf_methodName=Includes.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
GlobalOptions: {
compiled_scan_assembly_load: false
},
ParseOptions: {
LanguageVersion: CSharp10,
DocumentationMode: Parse
},
References: [
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Expand Down
4 changes: 0 additions & 4 deletions ...napshots/StaticScanningTests.Should_Filter_With_Contains_methodName=Contains.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
GlobalOptions: {
compiled_scan_assembly_load: false
},
ParseOptions: {
LanguageVersion: CSharp10,
DocumentationMode: Parse
},
References: [
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Expand Down
4 changes: 0 additions & 4 deletions ...napshots/StaticScanningTests.Should_Filter_With_Contains_methodName=Includes.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
GlobalOptions: {
compiled_scan_assembly_load: false
},
ParseOptions: {
LanguageVersion: CSharp10,
DocumentationMode: Parse
},
References: [
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Expand Down
4 changes: 0 additions & 4 deletions ...s/StaticScanningTests.Should_Filter_With_EndsWith_NameOf_methodName=EndsWith.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
GlobalOptions: {
compiled_scan_assembly_load: false
},
ParseOptions: {
LanguageVersion: CSharp10,
DocumentationMode: Parse
},
References: [
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Expand Down
4 changes: 0 additions & 4 deletions ...ts/StaticScanningTests.Should_Filter_With_EndsWith_NameOf_methodName=Postfix.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
GlobalOptions: {
compiled_scan_assembly_load: false
},
ParseOptions: {
LanguageVersion: CSharp10,
DocumentationMode: Parse
},
References: [
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Expand Down
4 changes: 0 additions & 4 deletions ...ots/StaticScanningTests.Should_Filter_With_EndsWith_NameOf_methodName=Suffix.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
GlobalOptions: {
compiled_scan_assembly_load: false
},
ParseOptions: {
LanguageVersion: CSharp10,
DocumentationMode: Parse
},
References: [
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Microsoft.Extensions.DependencyInjection.Abstractions.dll,
Expand Down
Loading
Loading