Skip to content

try to fix random failing tests (#1428) #1429

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

Merged
david-driscoll merged 1 commit into from
Dec 27, 2024
Merged

try to fix random failing tests (#1428) #1429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 14 additions & 7 deletions src/DependencyInjection.Analyzers/Configuration/AssemblyProviderConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,28 +40,35 @@ FrozenDictionary<string, SavedSourceLocation> partial
);
#pragma warning restore RS1035

private static string GetCacheFileHash(SourceLocation location, IAssemblySymbol assemblySymbol)
private static string GetCacheFileHash(SourceLocation location)
{
using var hasher = MD5.Create();
hasher.ComputeHash(Encoding.UTF8.GetBytes(location.FileName));
hasher.ComputeHash(Encoding.UTF8.GetBytes(location.ExpressionHash));
hasher.ComputeHash(Encoding.UTF8.GetBytes(location.LineNumber.ToString()));
hasher.ComputeHash(Encoding.UTF8.GetBytes(assemblySymbol.MetadataName));
addStringToHash(hasher, location.FileName);
addStringToHash(hasher, location.ExpressionHash);
addStringToHash(hasher, location.LineNumber.ToString());
var hash = hasher.TransformFinalBlock(Array.Empty<byte>(), 0, 0);
return hasher.Hash.Aggregate("", (s, b) => s + b.ToString("x2"));


static void addStringToHash(ICryptoTransform cryptoTransform, string textToHash)
{
var inputBuffer = Encoding.UTF8.GetBytes(textToHash);
cryptoTransform.TransformBlock(inputBuffer, 0, inputBuffer.Length, inputBuffer, 0);
}
}

#pragma warning disable RS1035
private ResolvedSourceLocation? CacheSourceLocation(SourceLocation location, IAssemblySymbol assemblySymbol, SourceLocationKind kind, Func<ResolvedSourceLocation?> factory)
{
var cacheKey = $"{kind}-{GetCacheFileHash(location, assemblySymbol)}{Constants.PartialExtension}";
var cacheKey = $"{kind}-{assemblySymbol.MetadataName.Replace(".", "_")}-{GetCacheFileHash(location)}{Constants.PartialExtension}";
if (partial.TryGetValue(cacheKey, out var text))
{
return new(location, text.Expression, [..text.PrivateAssemblies]);
}

var source = factory();
if (source is {} && _cacheDirectory.Value is { } && !File.Exists(Path.Combine(_cacheDirectory.Value, cacheKey)))
File.WriteAllText(Path.Combine(_cacheDirectory.Value, cacheKey), JsonSerializer.Serialize(new(kind, source.Expression, [..source.PrivateAssemblies]), JsonSourceGenerationContext.Default.SavedSourceLocation));
File.WriteAllText(Path.Combine(_cacheDirectory.Value, cacheKey), JsonSerializer.Serialize(new(kind, location, source.Expression, [..source.PrivateAssemblies]), JsonSourceGenerationContext.Default.SavedSourceLocation));
return source;
}
#pragma warning restore RS1035
Expand Down
2 changes: 2 additions & 0 deletions src/DependencyInjection.Analyzers/SourceLocation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ public record ResolvedSourceLocation(SourceLocation Location, string Expression,
public record SavedSourceLocation(
[property: JsonPropertyName("k")]
SourceLocationKind Kind,
[property: JsonPropertyName("l")]
SourceLocation Location,
[property: JsonPropertyName("e")]
string Expression,
[property: JsonPropertyName("a")]
Expand Down
9 changes: 8 additions & 1 deletion ...pshots/AssemblyScanningTests.Should_Generate_All_The_Things_018b3342ac37da32.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,15 @@
build_property.ProjectDir: {TempPath}
},
PartialsCached: {
ServiceDescriptor-794233dec4f84d77ce80007b41438587: {
ServiceDescriptor-TestAssembly-de4a0b09f1bfa7f42e56769a3aedcb68: {
Kind: ServiceDescriptor,
Location: {
Kind: ServiceDescriptor,
LineNumber: 16,
ExpressionHash: fhNv/1snT1EgMxIUt2qh7Q==,
FileName: Input0.cs,
FilePath: Input0.cs
},
Expression:
{
services.Add(ServiceDescriptor.Scoped<global::TestAssembly.Service, global::TestAssembly.Service>());
Expand Down
9 changes: 8 additions & 1 deletion ...pshots/AssemblyScanningTests.Should_Generate_All_The_Things_03dbbb1527fed834.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,15 @@
build_property.ProjectDir: {TempPath}
},
PartialsCached: {
ServiceDescriptor-794233dec4f84d77ce80007b41438587: {
ServiceDescriptor-TestAssembly-d9e99c61508c44cfae8c581bbc7c4f99: {
Kind: ServiceDescriptor,
Location: {
Kind: ServiceDescriptor,
LineNumber: 16,
ExpressionHash: nq9T1iBLdNPpqzJrTdNMCQ==,
FileName: Input0.cs,
FilePath: Input0.cs
},
Expression:
{
services.Add(ServiceDescriptor.Scoped<global::TestAssembly.IService, global::TestAssembly.Nested.ServiceA>());
Expand Down
57 changes: 39 additions & 18 deletions ...pshots/AssemblyScanningTests.Should_Generate_All_The_Things_0aba50bb0668a68d.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,15 @@
build_property.ProjectDir: {TempPath}
},
PartialsCached: {
Reflection-38c29bdfac98ce8804acfe22506878cd: {
Reflection-Microsoft_Extensions_DependencyInjection_Abstractions-19374c1ec3e8b09f1c0562a3654a8c8d: {
Kind: Reflection,
Location: {
Kind: Reflection,
LineNumber: 16,
ExpressionHash: 7vjZcTtcu7BiBUxN2YjR2A==,
FileName: Input0.cs,
FilePath: Input0.cs
},
Expression:
{
items.Add(MicrosoftExtensionsDependencyInjectionAbstractions.GetType("FxResources.Microsoft.Extensions.DependencyInjection.Abstractions.SR")!);
Expand All @@ -115,24 +122,15 @@
Microsoft.Extensions.DependencyInjection.Abstractions
]
},
Reflection-794233dec4f84d77ce80007b41438587: {
Kind: Reflection,
Expression:
{
items.Add(TestAssembly.GetType("TestAssembly.GenericService")!);
items.Add(TestAssembly.GetType("TestAssembly.Nested+MyRecord")!);
items.Add(TestAssembly.GetType("TestAssembly.Nested+Validator")!);
items.Add(TestAssembly.GetType("TestAssembly.Request")!);
items.Add(TestAssembly.GetType("TestAssembly.RequestHandler")!);
items.Add(TestAssembly.GetType("TestAssembly.Response")!);
items.Add(TestAssembly.GetType("TestAssembly.ServiceB")!);
},
PrivateAssemblies: [
TestAssembly
]
},
Reflection-f8286df541712f11fc17a6cd53b71e38: {
Reflection-Rocket_Surgery_DependencyInjection_Extensions-19374c1ec3e8b09f1c0562a3654a8c8d: {
Kind: Reflection,
Location: {
Kind: Reflection,
LineNumber: 16,
ExpressionHash: 7vjZcTtcu7BiBUxN2YjR2A==,
FileName: Input0.cs,
FilePath: Input0.cs
},
Expression:
{
items.Add(RocketSurgeryDependencyInjectionExtensions.GetType("Rocket.Surgery.DependencyInjection.ExecuteScoped`1")!);
Expand All @@ -151,6 +149,29 @@
PrivateAssemblies: [
Rocket.Surgery.DependencyInjection.Extensions
]
},
Reflection-TestAssembly-19374c1ec3e8b09f1c0562a3654a8c8d: {
Kind: Reflection,
Location: {
Kind: Reflection,
LineNumber: 16,
ExpressionHash: 7vjZcTtcu7BiBUxN2YjR2A==,
FileName: Input0.cs,
FilePath: Input0.cs
},
Expression:
{
items.Add(TestAssembly.GetType("TestAssembly.GenericService")!);
items.Add(TestAssembly.GetType("TestAssembly.Nested+MyRecord")!);
items.Add(TestAssembly.GetType("TestAssembly.Nested+Validator")!);
items.Add(TestAssembly.GetType("TestAssembly.Request")!);
items.Add(TestAssembly.GetType("TestAssembly.RequestHandler")!);
items.Add(TestAssembly.GetType("TestAssembly.Response")!);
items.Add(TestAssembly.GetType("TestAssembly.ServiceB")!);
},
PrivateAssemblies: [
TestAssembly
]
}
},
References: [
Expand Down
67 changes: 44 additions & 23 deletions ...pshots/AssemblyScanningTests.Should_Generate_All_The_Things_150678ea6ed12575.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,15 @@
build_property.ProjectDir: {TempPath}
},
PartialsCached: {
Reflection-38c29bdfac98ce8804acfe22506878cd: {
Reflection-Microsoft_Extensions_DependencyInjection_Abstractions-8639bfe143bc9ef461f9afa024b585a0: {
Kind: Reflection,
Location: {
Kind: Reflection,
LineNumber: 16,
ExpressionHash: lMxYIBBphBNiTsf1qLYxDg==,
FileName: Input0.cs,
FilePath: Input0.cs
},
Expression:
{
items.Add(MicrosoftExtensionsDependencyInjectionAbstractions.GetType("FxResources.Microsoft.Extensions.DependencyInjection.Abstractions.SR")!);
Expand Down Expand Up @@ -133,8 +140,43 @@
Microsoft.Extensions.DependencyInjection.Abstractions
]
},
Reflection-794233dec4f84d77ce80007b41438587: {
Reflection-Rocket_Surgery_DependencyInjection_Extensions-8639bfe143bc9ef461f9afa024b585a0: {
Kind: Reflection,
Location: {
Kind: Reflection,
LineNumber: 16,
ExpressionHash: lMxYIBBphBNiTsf1qLYxDg==,
FileName: Input0.cs,
FilePath: Input0.cs
},
Expression:
{
items.Add(typeof(global::Microsoft.Extensions.DependencyInjection.CompiledTypeProviderServiceCollectionExtensions));
items.Add(typeof(global::Microsoft.Extensions.DependencyInjection.ScopedServiceDependencyInjectionExtensions));
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.Compiled.CompiledTypeProviderExtensions));
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.Compiled.IReflectionAssemblySelector));
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.Compiled.IReflectionTypeSelector));
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.Compiled.IServiceDescriptorAssemblySelector));
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.Compiled.IServiceDescriptorTypeSelector));
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.Compiled.IServiceLifetimeSelector));
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.Compiled.IServiceTypeSelector));
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.Compiled.ITypeFilter));
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.Compiled.TypeInfoFilter));
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.Compiled.TypeKindFilter));
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.ScopedServiceExtensions));
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.ScopedServiceOptionalExtensions));
},
PrivateAssemblies: null
},
Reflection-TestAssembly-8639bfe143bc9ef461f9afa024b585a0: {
Kind: Reflection,
Location: {
Kind: Reflection,
LineNumber: 16,
ExpressionHash: lMxYIBBphBNiTsf1qLYxDg==,
FileName: Input0.cs,
FilePath: Input0.cs
},
Expression:
{
items.Add(TestAssembly.GetType("TestAssembly.GenericService")!);
Expand All @@ -157,27 +199,6 @@
PrivateAssemblies: [
TestAssembly
]
},
Reflection-f8286df541712f11fc17a6cd53b71e38: {
Kind: Reflection,
Expression:
{
items.Add(typeof(global::Microsoft.Extensions.DependencyInjection.CompiledTypeProviderServiceCollectionExtensions));
items.Add(typeof(global::Microsoft.Extensions.DependencyInjection.ScopedServiceDependencyInjectionExtensions));
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.Compiled.CompiledTypeProviderExtensions));
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.Compiled.IReflectionAssemblySelector));
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.Compiled.IReflectionTypeSelector));
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.Compiled.IServiceDescriptorAssemblySelector));
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.Compiled.IServiceDescriptorTypeSelector));
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.Compiled.IServiceLifetimeSelector));
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.Compiled.IServiceTypeSelector));
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.Compiled.ITypeFilter));
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.Compiled.TypeInfoFilter));
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.Compiled.TypeKindFilter));
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.ScopedServiceExtensions));
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.ScopedServiceOptionalExtensions));
},
PrivateAssemblies: null
}
},
References: [
Expand Down
9 changes: 8 additions & 1 deletion ...pshots/AssemblyScanningTests.Should_Generate_All_The_Things_1cfbf41513313293.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,15 @@
build_property.ProjectDir: {TempPath}
},
PartialsCached: {
ServiceDescriptor-794233dec4f84d77ce80007b41438587: {
ServiceDescriptor-TestAssembly-bbb3dba50c78b7a54e5f59d8c0edb946: {
Kind: ServiceDescriptor,
Location: {
Kind: ServiceDescriptor,
LineNumber: 16,
ExpressionHash: +ZwL1kukDVL/SHup/rQyqQ==,
FileName: Input0.cs,
FilePath: Input0.cs
},
Expression:
{
services.Add(ServiceDescriptor.Scoped(TestAssembly.GetType("TestAssembly.GenericService")!, TestAssembly.GetType("TestAssembly.GenericService")!));
Expand Down
55 changes: 38 additions & 17 deletions ...pshots/AssemblyScanningTests.Should_Generate_All_The_Things_1d9bd21ac809ec94.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,15 @@
build_property.ProjectDir: {TempPath}
},
PartialsCached: {
Reflection-38c29bdfac98ce8804acfe22506878cd: {
Reflection-Microsoft_Extensions_DependencyInjection_Abstractions-aedc82e88b630ade7b85bbd79dc12215: {
Kind: Reflection,
Location: {
Kind: Reflection,
LineNumber: 16,
ExpressionHash: k2UXW1Y4n0CiziE30f9ykg==,
FileName: Input0.cs,
FilePath: Input0.cs
},
Expression:
{
items.Add(typeof(global::Microsoft.Extensions.DependencyInjection.IKeyedServiceProvider));
Expand All @@ -113,23 +120,15 @@
},
PrivateAssemblies: null
},
Reflection-794233dec4f84d77ce80007b41438587: {
Kind: Reflection,
Expression:
{
items.Add(typeof(global::TestAssembly.IGenericService<>));
items.Add(typeof(global::TestAssembly.IOther));
items.Add(typeof(global::TestAssembly.IRequest<>));
items.Add(typeof(global::TestAssembly.IRequestHandler<, >));
items.Add(typeof(global::TestAssembly.IService));
items.Add(typeof(global::TestAssembly.IServiceB));
items.Add(typeof(global::TestAssembly.IValidator));
items.Add(typeof(global::TestAssembly.IValidator<>));
},
PrivateAssemblies: null
},
Reflection-f8286df541712f11fc17a6cd53b71e38: {
Reflection-Rocket_Surgery_DependencyInjection_Extensions-aedc82e88b630ade7b85bbd79dc12215: {
Kind: Reflection,
Location: {
Kind: Reflection,
LineNumber: 16,
ExpressionHash: k2UXW1Y4n0CiziE30f9ykg==,
FileName: Input0.cs,
FilePath: Input0.cs
},
Expression:
{
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.Compiled.IReflectionAssemblySelector));
Expand All @@ -151,6 +150,28 @@
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.IExecuteScopedOptional<,,, >));
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.IExecuteScopedOptional<,, >));
items.Add(typeof(global::Rocket.Surgery.DependencyInjection.IExecuteScopedOptional<, >));
},
PrivateAssemblies: null
},
Reflection-TestAssembly-aedc82e88b630ade7b85bbd79dc12215: {
Kind: Reflection,
Location: {
Kind: Reflection,
LineNumber: 16,
ExpressionHash: k2UXW1Y4n0CiziE30f9ykg==,
FileName: Input0.cs,
FilePath: Input0.cs
},
Expression:
{
items.Add(typeof(global::TestAssembly.IGenericService<>));
items.Add(typeof(global::TestAssembly.IOther));
items.Add(typeof(global::TestAssembly.IRequest<>));
items.Add(typeof(global::TestAssembly.IRequestHandler<, >));
items.Add(typeof(global::TestAssembly.IService));
items.Add(typeof(global::TestAssembly.IServiceB));
items.Add(typeof(global::TestAssembly.IValidator));
items.Add(typeof(global::TestAssembly.IValidator<>));
},
PrivateAssemblies: null
}
Expand Down
9 changes: 8 additions & 1 deletion ...pshots/AssemblyScanningTests.Should_Generate_All_The_Things_246fa42bbd34422c.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,15 @@
build_property.ProjectDir: {TempPath}
},
PartialsCached: {
ServiceDescriptor-794233dec4f84d77ce80007b41438587: {
ServiceDescriptor-TestAssembly-d5512b25c511509c8eb1ecfb3a3e8706: {
Kind: ServiceDescriptor,
Location: {
Kind: ServiceDescriptor,
LineNumber: 16,
ExpressionHash: uKnnfpwHyRGKAgfPehO0Dg==,
FileName: Input0.cs,
FilePath: Input0.cs
},
Expression:
{
services.Add(ServiceDescriptor.Scoped(TestAssembly.GetType("TestAssembly.GenericService")!, TestAssembly.GetType("TestAssembly.GenericService")!));
Expand Down
Loading