Skip to content

Move Throws assertions to TUnit.Assertions.Extensions namespace for consistent implicit usings #2724

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 8 commits into from
Aug 4, 2025
Merged

Move Throws assertions to TUnit.Assertions.Extensions namespace for consistent implicit usings #2724

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eb49684
Initial plan
Copilot Aug 3, 2025
a925c43
Move ThrowsExtensions and ThrowsException to TUnit.Assertions.Extensi…
Copilot Aug 3, 2025
01d02a6
Remove unnecessary Throws namespace imports from test and example files
Copilot Aug 3, 2025
377367a
refactor: update ThrowsAsync method signatures for consistency across…
thomhurst Aug 3, 2025
320fdf8
refactor: update namespace imports in Extensions.fs for clarity
thomhurst Aug 4, 2025
cbadc13
chore: add Playwright dependencies installation step to CI workflow a…
thomhurst Aug 4, 2025
7ec8243
refactor: remove unused methods and clean up code in EventReceiverOrc…
thomhurst Aug 4, 2025
af1a216
test: add InitializableTestClassTests with various test cases for asy…
thomhurst Aug 4, 2025
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
Prev Previous commit
Next Next commit
refactor: remove unused methods and clean up code in EventReceiverOrc… 
…hestrator and MetadataGenerationHelper
  • Loading branch information
@thomhurst
thomhurst committed Aug 4, 2025
commit 7ec824316918981c058c448d69b05cdf61cda0c4
165 changes: 26 additions & 139 deletions TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@
if (hasTypedDataSource || hasGenerateGenericTest || testMethod.IsGenericMethod || hasClassArguments || hasTypedDataSourceForGenericType || hasMethodArgumentsForGenericType || hasMethodDataSourceForGenericType)
{
// Use concrete types approach for AOT compatibility
// For generic methods and classes with Arguments attributes, we always use this approach
// For generic methods and classes with Arguments attributes, we always use this approach
GenerateGenericTestWithConcreteTypes(writer, compilation, testMethod, className, combinationGuid);
}
else
Expand Down Expand Up @@ -497,119 +497,6 @@
writer.AppendLine("tests.Add(metadata);");
}

private static void GenerateAttributeFactoryWithFilteredClassAttributes(CodeWriter writer, Compilation compilation, TestMethodMetadata testMethod, List<AttributeData> filteredClassAttributes)
{
writer.AppendLine("AttributeFactory = () =>");
writer.AppendLine("[");
writer.Indent();

var attributes = testMethod.MethodSymbol.GetAttributes()
.Concat(filteredClassAttributes)
.Concat(testMethod.TypeSymbol.ContainingAssembly.GetAttributes())
.ToImmutableArray();

AttributeWriter.WriteAttributes(writer, compilation, attributes);

writer.Unindent();
writer.AppendLine("],");
}

private static void GenerateMetadataWithFilteredClassAttributes(CodeWriter writer, Compilation compilation, TestMethodMetadata testMethod, List<AttributeData> filteredClassAttributes)
{
var methodSymbol = testMethod.MethodSymbol;
var typeSymbol = testMethod.TypeSymbol;

writer.AppendLine("TimeoutMs = null,");
writer.AppendLine("RetryCount = 0,");
writer.AppendLine("RepeatCount = 0,");
writer.AppendLine("CanRunInParallel = true,");

// Generate dependencies
GenerateDependencies(writer, compilation, methodSymbol);

// Generate attribute factory with filtered class attributes
GenerateAttributeFactoryWithFilteredClassAttributes(writer, compilation, testMethod, filteredClassAttributes);

// Collect data sources from method
var methodDataSources = methodSymbol.GetAttributes()
.Where(a => DataSourceAttributeHelper.IsDataSourceAttribute(a.AttributeClass) &&
a.AttributeClass?.Name != "ArgumentsAttribute")
.ToList();

// Filter class data sources to only include the specific Arguments attribute
var classDataSources = filteredClassAttributes
.Where(a => DataSourceAttributeHelper.IsDataSourceAttribute(a.AttributeClass))
.ToList();

// Generate method data sources
writer.AppendLine("DataSources = new global::TUnit.Core.IDataSourceAttribute[]");
writer.AppendLine("{");
writer.Indent();

foreach (var attr in methodDataSources)
{
GenerateDataSourceAttribute(writer, attr, methodSymbol, typeSymbol);
}

writer.Unindent();
writer.AppendLine("},");

// Generate class data sources
writer.AppendLine("ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]");
writer.AppendLine("{");
writer.Indent();

foreach (var attr in classDataSources)
{
GenerateDataSourceAttribute(writer, attr, methodSymbol, typeSymbol);
}

writer.Unindent();
writer.AppendLine("},");

// Generate property data sources
GeneratePropertyDataSources(writer, compilation, testMethod);

// Generate property injections
GeneratePropertyInjections(writer, typeSymbol, typeSymbol.GloballyQualified());

// Parameter types
writer.AppendLine("ParameterTypes = new global::System.Type[]");
writer.AppendLine("{");
writer.Indent();
foreach (var param in methodSymbol.Parameters)
{
var paramType = param.Type;
if (IsGenericTypeParameter(paramType) || ContainsGenericTypeParameter(paramType))
{
// Use object as placeholder for generic type parameters
writer.AppendLine("typeof(global::System.Object),");
}
else
{
writer.AppendLine($"typeof({paramType.GloballyQualified()}),");
}
}
writer.Unindent();
writer.AppendLine("},");

// String parameter types
writer.AppendLine("TestMethodParameterTypes = new string[]");
writer.AppendLine("{");
writer.Indent();
foreach (var param in methodSymbol.Parameters)
{
var paramType = param.Type.GloballyQualified();
writer.AppendLine($"\"{paramType}\",");
}
writer.Unindent();
writer.AppendLine("},");

// Method metadata
writer.Append("MethodMetadata = ");
SourceInformationWriter.GenerateMethodInformation(writer, compilation, testMethod.TypeSymbol, testMethod.MethodSymbol, null, ',');
}

private static void GenerateMetadata(CodeWriter writer, Compilation compilation, TestMethodMetadata testMethod)
{
var methodSymbol = testMethod.MethodSymbol;
Expand Down Expand Up @@ -893,7 +780,7 @@
writer.AppendLine("// Error: No method name in MethodDataSourceAttribute");
return;
}

if (targetType == null)
{
writer.AppendLine("// Error: No target type for MethodDataSourceAttribute");
Expand All @@ -901,7 +788,7 @@
}

// Find the data source method
var dataSourceMethod = targetType.GetMembers(methodName)

Check warning on line 791 in TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs

View workflow job for this annotation

GitHub Actions / modularpipeline (ubuntu-latest) 

Possible null reference argument for parameter 'name' in 'ImmutableArray<ISymbol> INamespaceOrTypeSymbol.GetMembers(string name)'.

Check warning on line 791 in TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs

View workflow job for this annotation

GitHub Actions / modularpipeline (ubuntu-latest) 

Possible null reference argument for parameter 'name' in 'ImmutableArray<ISymbol> INamespaceOrTypeSymbol.GetMembers(string name)'.

Check warning on line 791 in TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs

View workflow job for this annotation

GitHub Actions / modularpipeline (windows-latest) 

Possible null reference argument for parameter 'name' in 'ImmutableArray<ISymbol> INamespaceOrTypeSymbol.GetMembers(string name)'.

Check warning on line 791 in TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs

View workflow job for this annotation

GitHub Actions / modularpipeline (windows-latest) 

Possible null reference argument for parameter 'name' in 'ImmutableArray<ISymbol> INamespaceOrTypeSymbol.GetMembers(string name)'.

Check warning on line 791 in TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs

View workflow job for this annotation

GitHub Actions / modularpipeline (macos-latest) 

Possible null reference argument for parameter 'name' in 'ImmutableArray<ISymbol> INamespaceOrTypeSymbol.GetMembers(string name)'.

Check warning on line 791 in TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs

View workflow job for this annotation

GitHub Actions / modularpipeline (macos-latest) 

Possible null reference argument for parameter 'name' in 'ImmutableArray<ISymbol> INamespaceOrTypeSymbol.GetMembers(string name)'.
.OfType<IMethodSymbol>()
.FirstOrDefault();

Expand Down Expand Up @@ -2472,7 +2359,7 @@
{
// Handle class-only or method-only Arguments attributes
var allArgumentsAttributes = new List<AttributeData>();

// For generic classes with non-generic methods, don't include method Arguments here
// They will be processed separately with InferClassTypesFromMethodArguments
if (!(testMethod.IsGenericType && !testMethod.IsGenericMethod))
Expand Down Expand Up @@ -2550,10 +2437,10 @@

// Validate class type constraints
bool constraintsValid = ValidateClassTypeConstraints(testMethod.TypeSymbol, inferredTypes);

// TODO: Fix ValidateClassTypeConstraints method - temporarily skip validation
constraintsValid = true;

if (!constraintsValid)
continue;

Expand Down Expand Up @@ -2808,7 +2695,7 @@

// Also get class-level data source generators for non-generic classes
var nonGenericClassDataSourceGenerators = testMethod.TypeSymbol.GetAttributes()
.Where(a => DataSourceAttributeHelper.IsDataSourceAttribute(a.AttributeClass) &&
.Where(a => DataSourceAttributeHelper.IsDataSourceAttribute(a.AttributeClass) &&
a.AttributeClass?.Name != "ArgumentsAttribute")
.ToList();

Expand Down Expand Up @@ -2864,7 +2751,7 @@
var generateGenericTestAttributes = testMethod.MethodAttributes
.Where(a => a.AttributeClass?.Name == "GenerateGenericTestAttribute")
.ToList();

// For generic classes, also check class-level GenerateGenericTest attributes
if (testMethod.IsGenericType)
{
Expand Down Expand Up @@ -3020,7 +2907,7 @@
{
// This is a class type parameter
var paramName = typeParam.Name;

// The argument value's type tells us what the generic type should be
ITypeSymbol? argType = null;

Expand Down Expand Up @@ -3371,7 +3258,7 @@
else if (!method.IsGenericMethod && method.ContainingType.IsGenericType)
{
var classTypeParams = method.ContainingType.TypeParameters;

// Single type parameter class
if (classTypeParams.Length == 1 && typeArgs.Length >= 1)
{
Expand All @@ -3397,7 +3284,7 @@
else if (method.IsGenericMethod && method.ContainingType.IsGenericType)
{
var totalGenericParams = method.TypeParameters.Length + method.ContainingType.TypeParameters.Length;

// Check if the data source provides types for all parameters
if (typeArgs.Length == 1 && typeArgs[0] is INamedTypeSymbol { IsTupleType: true } tupleType)
{
Expand All @@ -3406,7 +3293,7 @@
return tupleType.TupleElements.Select(e => e.Type).ToArray();
}
}

// Direct match for multiple type args
if (typeArgs.Length == totalGenericParams)
{
Expand Down Expand Up @@ -3624,7 +3511,7 @@
private static bool ValidateTypeParameterConstraints(IEnumerable<ITypeParameterSymbol> typeParams, ITypeSymbol[] typeArguments)
{
var typeParamsList = typeParams.ToList();

for (int i = 0; i < typeParamsList.Count; i++)
{
var typeParam = typeParamsList[i];
Expand Down Expand Up @@ -3781,7 +3668,7 @@
else
return arg.Value.ToString();
}));

writer.AppendLine($"return ({concreteClassName})global::System.Activator.CreateInstance(typeof({concreteClassName}), new object[] {{ {constructorArgs} }})!;");
}
else
Expand Down Expand Up @@ -3915,7 +3802,7 @@

// Generate attribute factory with filtered attributes
var filteredAttributes = new List<AttributeData>();

// Filter method attributes - only filter Arguments attributes when we have a specific one to match
foreach (var attr in methodSymbol.GetAttributes())
{
Expand All @@ -3934,7 +3821,7 @@
filteredAttributes.Add(attr);
}
}

// Add all class and assembly attributes (they don't have Arguments attributes)
filteredAttributes.AddRange(testMethod.TypeSymbol.GetAttributesIncludingBaseTypes());
filteredAttributes.AddRange(testMethod.TypeSymbol.ContainingAssembly.GetAttributes());
Expand Down Expand Up @@ -4093,15 +3980,15 @@
{
// Look for IInfersType<T> in the attribute's interfaces
var infersTypeInterface = attr.AttributeClass.AllInterfaces
.FirstOrDefault(i => ((ISymbol)i).GloballyQualifiedNonGeneric() == "global::TUnit.Core.Interfaces.IInfersType" &&
i.IsGenericType &&
.FirstOrDefault(i => ((ISymbol)i).GloballyQualifiedNonGeneric() == "global::TUnit.Core.Interfaces.IInfersType" &&
i.IsGenericType &&
i.TypeArguments.Length == 1);

if (infersTypeInterface != null)
{
// Get the type argument from IInfersType<T>
var inferredType = infersTypeInterface.TypeArguments[0];

// Map this to the method's type parameter
inferredTypes[typeParam.Name] = inferredType;
break;
Expand Down Expand Up @@ -4148,18 +4035,18 @@
{
// Look for IInfersType<T> in the attribute's interfaces
var infersTypeInterface = attr.AttributeClass.AllInterfaces
.FirstOrDefault(i => ((ISymbol)i).GloballyQualifiedNonGeneric() == "global::TUnit.Core.Interfaces.IInfersType" &&
i.IsGenericType &&
.FirstOrDefault(i => ((ISymbol)i).GloballyQualifiedNonGeneric() == "global::TUnit.Core.Interfaces.IInfersType" &&
i.IsGenericType &&
i.TypeArguments.Length == 1);

if (infersTypeInterface != null)
{
// Get the type argument from IInfersType<T>
var inferredType = infersTypeInterface.TypeArguments[0];
inferredTypes[typeParam.Name] = inferredType;
break;
}

// Fall back to checking if it's a data source attribute with type info
if (attr.AttributeClass.IsOrInherits("global::TUnit.Core.AsyncDataSourceGeneratorAttribute"))
{
Expand Down Expand Up @@ -4203,7 +4090,7 @@
{
var name = current.Name;
var namespaceName = current.ContainingNamespace?.ToDisplayString();

// Check for exact match of the typed base classes
if ((name == "DataSourceGeneratorAttribute" || name == "AsyncDataSourceGeneratorAttribute") &&
namespaceName?.Contains("TUnit.Core") == true)
Expand Down Expand Up @@ -4362,8 +4249,8 @@
{
// For classes with constructor parameters, check if we have Arguments attribute
var isArgumentsAttribute = classDataSourceAttribute?.AttributeClass?.Name == "ArgumentsAttribute";
if (isArgumentsAttribute && classDataSourceAttribute != null &&

if (isArgumentsAttribute && classDataSourceAttribute != null &&
classDataSourceAttribute.ConstructorArguments.Length > 0 &&
classDataSourceAttribute.ConstructorArguments[0].Kind == TypedConstantKind.Array)
{
Expand Down
Loading
Loading