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: 5 additions & 2 deletions src/TUnit.Analyzers/TestDataAnalyzer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -995,8 +995,11 @@ private static bool CanBindWholeTupleWithOmissions(SymbolAnalysisContext context

// testParameterTypes and this parameter list both exclude engine-injected tokens.
var cancellationToken = context.Compilation.GetTypeByMetadataName("System.Threading.CancellationToken");
return method.Parameters.Where(parameter => !SymbolEqualityComparer.Default.Equals(parameter.Type, cancellationToken))
.Skip(1).All(parameter => parameter.IsOptional || parameter.IsParams);
var dataParameters = method.Parameters
.Where(parameter => !SymbolEqualityComparer.Default.Equals(parameter.Type, cancellationToken)).ToArray();
return dataParameters.Skip(1).All(parameter => parameter.IsOptional || parameter.IsParams
|| SymbolEqualityComparer.Default.Equals(parameter, dataParameters[^1])
&& parameter.Type is IArrayTypeSymbol { IsSZArray: true });
}

private ImmutableArray<ITypeSymbol> UnwrapTypes(SymbolAnalysisContext context,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
private const string InstanceMethodDataSourceAttributeName = "global::TUnit.Core.InstanceMethodDataSourceAttribute";

private static readonly DiagnosticDescriptor GenerationErrorDescriptor = new(
GeneratorDiagnosticIds.TestMetadataGenerationFailed,

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

View workflow job for this annotation

GitHub Actions / doc-snippets

Enable analyzer release tracking for the analyzer project containing rule 'TUNIT0999' (https://github.com/dotnet/roslyn-analyzers/blob/main/src/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md)

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

View workflow job for this annotation

GitHub Actions / modularpipeline (tr-TR)

'TUNIT0999' kuralını içeren çözümleyici projesi için çözümleyici yayını izlemeyi etkinleştir (https://github.com/dotnet/roslyn-analyzers/blob/main/src/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md)

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

View workflow job for this annotation

GitHub Actions / modularpipeline (fr-FR)

Activer le suivi de version d'analyseur pour le projet d'analyseur contenant la règle 'TUNIT0999' (https://github.com/dotnet/roslyn-analyzers/blob/main/src/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md)

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

View workflow job for this annotation

GitHub Actions / modularpipeline (windows-latest)

Enable analyzer release tracking for the analyzer project containing rule 'TUNIT0999' (https://github.com/dotnet/roslyn-analyzers/blob/main/src/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md)

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

View workflow job for this annotation

GitHub Actions / AOT (ubuntu-latest)

Enable analyzer release tracking for the analyzer project containing rule 'TUNIT0999' (https://github.com/dotnet/roslyn-analyzers/blob/main/src/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md)

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

View workflow job for this annotation

GitHub Actions / modularpipeline (ubuntu-latest)

Enable analyzer release tracking for the analyzer project containing rule 'TUNIT0999' (https://github.com/dotnet/roslyn-analyzers/blob/main/src/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md)

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

View workflow job for this annotation

GitHub Actions / modularpipeline (macos-latest)

Enable analyzer release tracking for the analyzer project containing rule 'TUNIT0999' (https://github.com/dotnet/roslyn-analyzers/blob/main/src/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md)
"Source Generation Error",
"Failed to generate test metadata for {0}.{1}: {2}",
"TUnit",
Expand Down Expand Up @@ -4302,7 +4302,8 @@
// Mutable elements retain their boxes inside one tuple argument until initialization finishes.
// Reconstruct only at invocation, before the ordinary optional/params binder consumes the row.
if (parametersFromArgs.Length > 1
&& parametersFromArgs.Skip(1).All(parameter => parameter.IsOptional || parameter.IsParams)
&& parametersFromArgs.Skip(1).All(parameter => parameter.IsOptional || parameter.IsParams
|| SymbolEqualityComparer.Default.Equals(parameter, parametersFromArgs[^1]) && parameter.CollectsTrailingArguments())
&& parametersFromArgs[0].Type is INamedTypeSymbol firstTuple
&& (firstTuple.IsTupleType || IsReferenceTuple(firstTuple)))
{
Expand Down
47 changes: 28 additions & 19 deletions src/TUnit.Engine/Helpers/DataUnwrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,35 +66,26 @@ public static (object?[] Data, TestDataRowMetadata? Metadata) UnwrapWithTypesAnd

private static Type? GetTupleDataParameterType(ParameterMetadata[]? parameters)
{
Type? dataType = null;
if (parameters is null)
{
return null;
}

foreach (var parameter in parameters)
for (var i = 0; i < parameters.Length; i++)
{
if (parameter.Type == typeof(CancellationToken))
var dataType = parameters[i].Type;
if (dataType == typeof(CancellationToken))
{
continue;
}

// Keep scanning after the tuple: only a required later data parameter prevents
// the wrapped row from binding whole (injected tokens do not consume row values).
if (dataType is not null)
{
if (!parameter.IsOptional && !parameter.IsParams)
{
return null;
}
}
else
{
dataType = parameter.Type;
}
// Wrapped and unwrapped rows must use the same whole-tuple binding rule.
return TupleHelper.IsTupleType(dataType) && RemainingDataParametersAreOmittable(parameters, i)
? dataType
: null;
}

return TupleHelper.IsTupleType(dataType) ? dataType : null;
return null;
}

private static object?[] UnwrapWithTypesInternal(object?[] values, ParameterMetadata[]? expectedParameters)
Expand Down Expand Up @@ -176,7 +167,7 @@ public static (object?[] Data, TestDataRowMetadata? Metadata) UnwrapWithTypesAnd
}

// A tuple that is already an instance of the first data parameter's tuple type binds to it
// whole when every later data parameter can be omitted (optional or params).
// whole when every later data parameter can be omitted (optional, params, or a trailing collecting array).
var firstDataParameterType = expectedParameters[firstDataParameterIndex].Type;
if (dataParameterCount > 1
&& TupleHelper.IsTupleType(firstDataParameterType)
Expand Down Expand Up @@ -205,15 +196,33 @@ public static (object?[] Data, TestDataRowMetadata? Metadata) UnwrapWithTypesAnd

private static bool RemainingDataParametersAreOmittable(ParameterMetadata[] parameters, int firstDataParameterIndex)
{
var lastDataParameterIndex = parameters.Length - 1;
while (lastDataParameterIndex > firstDataParameterIndex
&& parameters[lastDataParameterIndex].Type == typeof(CancellationToken))
{
lastDataParameterIndex--;
}

for (var i = firstDataParameterIndex + 1; i < parameters.Length; i++)
{
var parameter = parameters[i];
if (parameter.Type != typeof(CancellationToken) && !parameter.IsOptional && !parameter.IsParams)
if (parameter.Type != typeof(CancellationToken) && !parameter.IsOptional && !parameter.IsParams
&& !(i == lastDataParameterIndex
&& IsSingleDimensionalZeroBasedArray(parameter.Type)))
{
return false;
}
}

return true;
}

private static bool IsSingleDimensionalZeroBasedArray(Type type)
{
#if NET
return type.IsSZArray;
#else
return type.IsArray && type.Name.EndsWith("[]", StringComparison.Ordinal);
#endif
}
}
16 changes: 16 additions & 0 deletions tests/TUnit.Analyzers.Tests/ReferenceTupleMethodDataSourceTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,22 @@ public class ReferenceTupleMethodDataSourceTests : BaseAnalyzerTests
{
// Runtime binding coverage: StaticTupleDataSourceTests in TUnit.TestProject,
// executed in both generated and reflection modes.
[Test]
public async Task WholeTupleBeforePlainArray()
{
await Verifier.VerifyAnalyzerAsync(
"""
using System;
using System.Collections.Generic;
using TUnit.Core;
public class C {
[Test, MethodDataSource(nameof(Rows))]
public void Test(Tuple<int, string> row, int[] extra) {}
public static IEnumerable<Tuple<int, string>> Rows() => [Tuple.Create(5, "b")];
}
""");
}

[Test]
public async Task Method()
{
Expand Down
Loading
Loading