Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions TUnit.Core.SourceGenerator/CodeGenerationHelpers.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Collections.Immutable;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using TUnit.Core.SourceGenerator.CodeGenerators.Helpers;
Expand Down Expand Up @@ -55,7 +56,7 @@ public static string GenerateParameterMetadataArray(IMethodSymbol method)
/// <summary>
/// Generates direct instantiation code for attributes.
/// </summary>
public static string GenerateAttributeInstantiation(AttributeData attr, IMethodSymbol? targetMethod = null)
public static string GenerateAttributeInstantiation(AttributeData attr, ImmutableArray<IParameterSymbol> targetParameters = default)
{
var typeName = attr.AttributeClass!.GloballyQualified();
using var writer = new CodeWriter("", includeHeader: false);
Expand All @@ -75,9 +76,9 @@ public static string GenerateAttributeInstantiation(AttributeData attr, IMethodS

// Determine if this is an Arguments attribute and get parameter types
ITypeSymbol[]? parameterTypes = null;
if (attr.AttributeClass?.Name == "ArgumentsAttribute" && targetMethod != null)
if (attr.AttributeClass?.Name == "ArgumentsAttribute" && !targetParameters.IsDefault)
{
parameterTypes = targetMethod.Parameters.Select(p => p.Type).ToArray();
parameterTypes = targetParameters.Select(p => p.Type).ToArray();
}

var syntaxIndex = 0;
Expand Down
43 changes: 33 additions & 10 deletions TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@

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

writer.Unindent();
Expand All @@ -673,7 +673,7 @@

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

writer.Unindent();
Expand All @@ -684,7 +684,7 @@
GeneratePropertyDataSources(writer, compilation, testMethod);
}

private static void GenerateDataSourceAttribute(CodeWriter writer, AttributeData attr, IMethodSymbol methodSymbol, INamedTypeSymbol typeSymbol)
private static void GenerateDataSourceAttribute(CodeWriter writer, AttributeData attr, IMethodSymbol methodSymbol, INamedTypeSymbol typeSymbol, bool isClassDataSource = false)
{
var attrClass = attr.AttributeClass;
if (attrClass == null)
Expand All @@ -702,8 +702,31 @@
{
// Use the generic attribute instantiation method for all other attributes
// This properly handles generics on the attribute type
// Pass methodSymbol for ArgumentsAttribute to preserve decimal precision
var generatedCode = CodeGenerationHelpers.GenerateAttributeInstantiation(attr, methodSymbol);
// For class-level ArgumentsAttribute, pass constructor parameters
// For method-level ArgumentsAttribute, pass method parameters
ImmutableArray<IParameterSymbol> parameters = default;
if (attr.AttributeClass?.Name == "ArgumentsAttribute")
{
if (isClassDataSource)
{
// Get the constructor parameters for class-level Arguments
var constructor = typeSymbol.Constructors
.Where(c => !c.IsStatic && c.DeclaredAccessibility == Accessibility.Public)
.OrderByDescending(c => c.Parameters.Length)
.FirstOrDefault();
if (constructor != null)
{
parameters = constructor.Parameters;
}
}
else
{
// Use method parameters for method-level Arguments
parameters = methodSymbol.Parameters;
}
}

var generatedCode = CodeGenerationHelpers.GenerateAttributeInstantiation(attr, parameters);
writer.AppendLine($"{generatedCode},");
}
}
Expand Down Expand Up @@ -743,7 +766,7 @@
}

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

Check warning on line 769 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 769 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 769 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 769 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 769 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 769 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 @@ -1278,7 +1301,7 @@
writer.AppendLine($"PropertyName = \"{property.Name}\",");
writer.AppendLine($"PropertyType = typeof({property.Type.GloballyQualified()}),");
writer.Append("DataSource = ");
GenerateDataSourceAttribute(writer, dataSourceAttr, testMethod.MethodSymbol, typeSymbol);
GenerateDataSourceAttribute(writer, dataSourceAttr, testMethod.MethodSymbol, typeSymbol, isClassDataSource: false);
writer.Unindent();
writer.AppendLine("},");
}
Expand Down Expand Up @@ -4262,7 +4285,7 @@

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

writer.Unindent();
Expand All @@ -4282,7 +4305,7 @@

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

writer.Unindent();
Expand Down Expand Up @@ -4546,7 +4569,7 @@
writer.AppendLine("DataSources = new global::TUnit.Core.IDataSourceAttribute[]");
writer.AppendLine("{");
writer.Indent();
GenerateDataSourceAttribute(writer, methodDataSourceAttribute, testMethod.MethodSymbol, testMethod.TypeSymbol);
GenerateDataSourceAttribute(writer, methodDataSourceAttribute, testMethod.MethodSymbol, testMethod.TypeSymbol, isClassDataSource: false);
writer.Unindent();
writer.AppendLine("},");
}
Expand All @@ -4561,7 +4584,7 @@
writer.AppendLine("ClassDataSources = new global::TUnit.Core.IDataSourceAttribute[]");
writer.AppendLine("{");
writer.Indent();
GenerateDataSourceAttribute(writer, classDataSourceAttribute, testMethod.MethodSymbol, testMethod.TypeSymbol);
GenerateDataSourceAttribute(writer, classDataSourceAttribute, testMethod.MethodSymbol, testMethod.TypeSymbol, isClassDataSource: true);
writer.Unindent();
writer.AppendLine("},");
}
Expand Down
16 changes: 16 additions & 0 deletions TUnit.TestProject/ClassWithStringConstructorArgumentsTest.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
using TUnit.TestProject.Attributes;

namespace TUnit.TestProject;

[EngineTest(ExpectedResult.Pass)]
[Arguments("Hello")]
[Arguments("World")]
public class ClassWithStringConstructorArgumentsTest(string title)
{
[Test]
public async Task TestWithStringConstructorArgument()
{
await Assert.That(title).IsNotNull();
await Assert.That(title).IsIn("Hello", "World");
}
}
Loading