Skip to content

Preserve containing generic types in TUnit0001 diagnostics #7563

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
thomhurst merged 1 commit into from
Nov 4, 2026
Merged

Preserve containing generic types in TUnit0001 diagnostics #7563

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
24 changes: 16 additions & 8 deletions src/TUnit.Analyzers/TestDataAnalyzer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@ namespace TUnit.Analyzers;
[DiagnosticAnalyzer(LanguageNames.CSharp)]
public class TestDataAnalyzer : ConcurrentDiagnosticAnalyzer
{
private static readonly SymbolDisplayFormat TestDataTypeDisplayFormat =
new(
typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameAndContainingTypes,
genericsOptions: SymbolDisplayFormat.MinimallyQualifiedFormat.GenericsOptions,
memberOptions: SymbolDisplayFormat.MinimallyQualifiedFormat.MemberOptions,
parameterOptions: SymbolDisplayFormat.MinimallyQualifiedFormat.ParameterOptions,
miscellaneousOptions: SymbolDisplayFormat.MinimallyQualifiedFormat.MiscellaneousOptions);

public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics { get; } =
ImmutableArray.Create(
Rules.WrongArgumentTypeTestData,
Expand Down Expand Up @@ -622,8 +630,8 @@ private void CheckMethodDataSource(SymbolAnalysisContext context,
context.ReportDiagnostic(Diagnostic.Create(
Rules.WrongArgumentTypeTestData,
attribute.GetLocation(),
string.Join(", ", unwrappedTypes.Select(t => t?.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat) ?? "null")),
string.Join(", ", testParameterTypes.Select(t => t?.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat) ?? "null")))
string.Join(", ", unwrappedTypes.Select(t => t?.ToDisplayString(TestDataTypeDisplayFormat) ?? "null")),
string.Join(", ", testParameterTypes.Select(t => t?.ToDisplayString(TestDataTypeDisplayFormat) ?? "null")))
);
return;
}
Expand Down Expand Up @@ -666,8 +674,8 @@ private void CheckMethodDataSource(SymbolAnalysisContext context,
Diagnostic.Create(
Rules.WrongArgumentTypeTestData,
attribute.GetLocation(),
string.Join(", ", unwrappedTypes.Select(t => t?.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat) ?? "null")),
string.Join(", ", testParameterTypes.Select(t => t?.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat) ?? "null")))
string.Join(", ", unwrappedTypes.Select(t => t?.ToDisplayString(TestDataTypeDisplayFormat) ?? "null")),
string.Join(", ", testParameterTypes.Select(t => t?.ToDisplayString(TestDataTypeDisplayFormat) ?? "null")))
);
return;
}
Expand Down Expand Up @@ -708,8 +716,8 @@ private void CheckMethodDataSource(SymbolAnalysisContext context,
context.ReportDiagnostic(Diagnostic.Create(
Rules.WrongArgumentTypeTestData,
attribute.GetLocation(),
string.Join(", ", unwrappedTypes.Select(t => t?.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat) ?? "null")),
string.Join(", ", testParameterTypes.Select(t => t?.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat) ?? "null")))
string.Join(", ", unwrappedTypes.Select(t => t?.ToDisplayString(TestDataTypeDisplayFormat) ?? "null")),
string.Join(", ", testParameterTypes.Select(t => t?.ToDisplayString(TestDataTypeDisplayFormat) ?? "null")))
);
return;
}
Expand Down Expand Up @@ -744,8 +752,8 @@ private void CheckMethodDataSource(SymbolAnalysisContext context,
Diagnostic.Create(
Rules.WrongArgumentTypeTestData,
attribute.GetLocation(),
string.Join(", ", unwrappedTypes.Select(t => t?.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat) ?? "null")),
string.Join(", ", testParameterTypes.Select(t => t?.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat) ?? "null")))
string.Join(", ", unwrappedTypes.Select(t => t?.ToDisplayString(TestDataTypeDisplayFormat) ?? "null")),
string.Join(", ", testParameterTypes.Select(t => t?.ToDisplayString(TestDataTypeDisplayFormat) ?? "null")))
);
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/TUnit.Analyzers.Tests/GenericTupleArrayMethodDataSourceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public struct Fixture : IAsyncInitializer
{
await Verifier.VerifyAnalyzerAsync(source,
Verifier.Diagnostic(Rules.WrongArgumentTypeTestData).WithLocation(0)
.WithArguments($"Fixture, CancellationToken, {sourceElement}", $"(Fixture, CancellationToken, {targetElement})"));
.WithArguments($"C.Fixture, CancellationToken, {sourceElement}", $"(C.Fixture, CancellationToken, {targetElement})"));
}
else
{
Expand Down
43 changes: 43 additions & 0 deletions tests/TUnit.Analyzers.Tests/NestedTypeDiagnosticDisplayTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
using Verifier = TUnit.Analyzers.Tests.Verifiers.CSharpAnalyzerVerifier<TUnit.Analyzers.TestDataAnalyzer>;

namespace TUnit.Analyzers.Tests;

public class NestedTypeDiagnosticDisplayTests : BaseAnalyzerTests
{
[Test]
[Arguments("Outer<string>.D", "Outer<object>.D")]
[Arguments("Outer<string>.Nested", "Outer<object>.Nested")]
[Arguments("Outer<string>.Middle<int>.D", "Outer<object>.Middle<long>.D")]
[Arguments("Outer<string>.Middle<int>.Nested", "Outer<object>.Middle<long>.Nested")]
[Arguments("IConsumer<Outer<string>.D, Outer<object>.D>[]", "IConsumer<Outer<string>.D, Outer<string>.D>[]")]
[Arguments("IConsumer<Outer<string>.Nested, Outer<object>.Nested>[]", "IConsumer<Outer<string>.Nested, Outer<string>.Nested>[]")]
[Arguments("Outer<string>.Middle<int>.D[]", "Outer<object>.Middle<long>.D[]")]
public async Task MethodDataSourcePreservesContainingTypes(string sourceType, string targetType)
{
var source = $$"""
#pragma warning disable TUnit0046
using TUnit.Core;
public class Outer<A>
{
public delegate void D();
public class Nested { }
public class Middle<B>
{
public delegate void D();
public class Nested { }
}
}
public interface IConsumer<in A, in B> { }
public class Tests
{
public static (int, {{sourceType}}) Row() => default;
[Test, {|#0:MethodDataSource(nameof(Row))|}]
public void Test<T>((int, {{targetType}}) row) { }
}
""";

await Verifier.VerifyAnalyzerAsync(source,
Verifier.Diagnostic(Rules.WrongArgumentTypeTestData).WithLocation(0)
.WithArguments($"int, {sourceType}", $"(int, {targetType})"));
}
}
Loading