Skip to content

Commit 9675d2d

Browse files
committed
Preserve explicit instance sources in reflection collisions (#7628)
1 parent abc9c89 commit 9675d2d

4 files changed

Lines changed: 209 additions & 0 deletions

File tree

‎src/TUnit.Engine/Discovery/ReflectionTestDataCollector.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2354,6 +2354,11 @@ private static (List<(MethodInfo Method, Type[] TypeArguments, IDataSourceAttrib
23542354
case GenericMethodInferencePolicy.Source.TypedDataSource when dataSource is not ArgumentsAttribute:
23552355
AddInstantiation(InferTypesFromTypedDataSource(dataSource, method, genericParameterCount, classGenericParameterCount), dataSource, source: rule.Source);
23562356
break;
2357+
// Instance sources use the explicit method types, even when a static source
2358+
// already inferred that instantiation. Join them below in declaration order.
2359+
case GenericMethodInferencePolicy.Source.MethodDataSource when dataSource is InstanceMethodDataSourceAttribute:
2360+
(skippedSources ??= []).Add(dataSource);
2361+
break;
23572362
case GenericMethodInferencePolicy.Source.MethodDataSource when dataSource is MethodDataSourceAttribute methodDataSource:
23582363
dataParameters ??= Array.FindAll(parameters, static parameter => parameter.ParameterType != typeof(CancellationToken));
23592364
AddInstantiation(InferTypesFromMethodDataSource(testClass, methodDataSource, dataParameters, genericParameterCount), methodDataSource, source: rule.Source);

‎tests/TUnit.Core.SourceGenerator.Tests/InstanceMethodTypeInferenceTests.Test.verified.txt‎

Lines changed: 176 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -974,6 +974,182 @@ internal static partial class TUnit_TestRegistration
974974
}
975975

976976

977+
// ===== FILE SEPARATOR =====
978+
979+
// <auto-generated/>
980+
#pragma warning disable
981+
982+
#nullable enable
983+
namespace TUnit.Generated;
984+
[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute]
985+
[global::System.CodeDom.Compiler.GeneratedCode("TUnit", "VERSION_SCRUBBED")]
986+
internal static class TUnit_TestProject_Bugs__7222_ExplicitFactoryTupleInstanceCollisionTests_StaticFirst__T_string_TestSource
987+
{
988+
private static readonly global::TUnit.Core.ClassMetadata __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests", new global::TUnit.Core.ClassMetadata
989+
{
990+
Type = typeof(global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests),
991+
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests)),
992+
Name = "ExplicitFactoryTupleInstanceCollisionTests",
993+
Namespace = "TUnit.TestProject.Bugs._7222",
994+
Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
995+
Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
996+
Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
997+
Parent = null
998+
});
999+
private static readonly global::System.Type __classType = typeof(global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests);
1000+
private static readonly global::TUnit.Core.MethodMetadata __mm_0 = global::TUnit.Core.MethodMetadataFactory.Create("StaticFirst", __classType, typeof(void), __classMetadata, genericTypeCount: 1, parameters: global::TUnit.Core.ParameterMetadataFactory.ForGenericMethod(typeof(global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests), "StaticFirst", false, 1, new global::TUnit.Core.ParameterMetadata[]
1001+
{
1002+
global::TUnit.Core.ParameterMetadataFactory.Create(typeof(object), "item", new global::TUnit.Core.GenericParameter(0, true, "T"), false),
1003+
global::TUnit.Core.ParameterMetadataFactory.Create(typeof(string), "label", new global::TUnit.Core.ConcreteType(typeof(string)), false)
1004+
}));
1005+
private static global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests __CreateInstance_0(global::System.Type[] typeArgs, object?[] args)
1006+
{
1007+
return new global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests();
1008+
}
1009+
private static global::System.Threading.Tasks.ValueTask __Invoke_0(global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests instance, int methodIndex, object?[] args, global::System.Threading.CancellationToken cancellationToken)
1010+
{
1011+
try
1012+
{
1013+
instance.StaticFirst<int>(global::TUnit.Core.Helpers.CastHelper.Cast<int>(args[0]), global::TUnit.Core.Helpers.CastHelper.Cast<string>(args[1]));
1014+
return default(global::System.Threading.Tasks.ValueTask);
1015+
}
1016+
catch (global::System.Exception ex)
1017+
{
1018+
return new global::System.Threading.Tasks.ValueTask(global::System.Threading.Tasks.Task.FromException(ex));
1019+
}
1020+
}
1021+
private static global::System.Attribute[] __Attributes_0(int groupIndex)
1022+
{
1023+
return new global::System.Attribute[]
1024+
{
1025+
new global::TUnit.Core.TestAttribute(),
1026+
new global::TUnit.Core.GenerateGenericTestAttribute(typeof(int)),
1027+
new global::TUnit.Core.MethodDataSourceAttribute("StaticRows"),
1028+
new global::TUnit.Core.InstanceMethodDataSourceAttribute("InstanceRows")
1029+
};
1030+
}
1031+
public static readonly global::TUnit.Core.TestEntry<global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests>[] Entries_0 = new global::TUnit.Core.TestEntry<global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests>[]
1032+
{
1033+
global::TUnit.Core.TestEntryFactory.Create<global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests>(
1034+
methodName: "StaticFirst<int>",
1035+
fullyQualifiedName: "TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests.StaticFirst<int>",
1036+
methodTypeArgumentsIdentity: "<int>",
1037+
filePath: "",
1038+
lineNumber: 156,
1039+
hasDataSource: true,
1040+
testDataSources: new global::TUnit.Core.IDataSourceAttribute[]
1041+
{
1042+
new global::TUnit.Core.MethodDataSourceAttribute("StaticRows")
1043+
{
1044+
Factory = static dataGeneratorMetadata => global::TUnit.Core.Helpers.DataSourceFactories.FromEnumerable(dataGeneratorMetadata, static () => global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests.StaticRows()),
1045+
},
1046+
new global::TUnit.Core.InstanceMethodDataSourceAttribute("InstanceRows")
1047+
{
1048+
Factory = static dataGeneratorMetadata => global::TUnit.Core.Helpers.DataSourceFactories.FromInstanceEnumerable(dataGeneratorMetadata, static instance => (object?)((global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests)instance).InstanceRows() ?? global::System.Array.Empty<object>()),
1049+
},
1050+
},
1051+
methodMetadata: __mm_0,
1052+
createInstance: __CreateInstance_0,
1053+
invokeBody: __Invoke_0,
1054+
methodIndex: 0,
1055+
createAttributes: __Attributes_0,
1056+
attributeGroupIndex: 0),
1057+
};
1058+
}
1059+
internal static partial class TUnit_TestRegistration
1060+
{
1061+
static readonly int _r_TUnit_TestProject_Bugs__7222_ExplicitFactoryTupleInstanceCollisionTests_StaticFirst__T_string_TestSource_0 = global::TUnit.Core.SourceRegistrar.RegisterEntries<global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests>(static () => TUnit_TestProject_Bugs__7222_ExplicitFactoryTupleInstanceCollisionTests_StaticFirst__T_string_TestSource.Entries_0);
1062+
}
1063+
1064+
1065+
// ===== FILE SEPARATOR =====
1066+
1067+
// <auto-generated/>
1068+
#pragma warning disable
1069+
1070+
#nullable enable
1071+
namespace TUnit.Generated;
1072+
[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute]
1073+
[global::System.CodeDom.Compiler.GeneratedCode("TUnit", "VERSION_SCRUBBED")]
1074+
internal static class TUnit_TestProject_Bugs__7222_ExplicitFactoryTupleInstanceCollisionTests_InstanceFirst__T_string_TestSource
1075+
{
1076+
private static readonly global::TUnit.Core.ClassMetadata __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests", new global::TUnit.Core.ClassMetadata
1077+
{
1078+
Type = typeof(global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests),
1079+
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests)),
1080+
Name = "ExplicitFactoryTupleInstanceCollisionTests",
1081+
Namespace = "TUnit.TestProject.Bugs._7222",
1082+
Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
1083+
Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
1084+
Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
1085+
Parent = null
1086+
});
1087+
private static readonly global::System.Type __classType = typeof(global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests);
1088+
private static readonly global::TUnit.Core.MethodMetadata __mm_0 = global::TUnit.Core.MethodMetadataFactory.Create("InstanceFirst", __classType, typeof(void), __classMetadata, genericTypeCount: 1, parameters: global::TUnit.Core.ParameterMetadataFactory.ForGenericMethod(typeof(global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests), "InstanceFirst", false, 1, new global::TUnit.Core.ParameterMetadata[]
1089+
{
1090+
global::TUnit.Core.ParameterMetadataFactory.Create(typeof(object), "item", new global::TUnit.Core.GenericParameter(0, true, "T"), false),
1091+
global::TUnit.Core.ParameterMetadataFactory.Create(typeof(string), "label", new global::TUnit.Core.ConcreteType(typeof(string)), false)
1092+
}));
1093+
private static global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests __CreateInstance_0(global::System.Type[] typeArgs, object?[] args)
1094+
{
1095+
return new global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests();
1096+
}
1097+
private static global::System.Threading.Tasks.ValueTask __Invoke_0(global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests instance, int methodIndex, object?[] args, global::System.Threading.CancellationToken cancellationToken)
1098+
{
1099+
try
1100+
{
1101+
instance.InstanceFirst<int>(global::TUnit.Core.Helpers.CastHelper.Cast<int>(args[0]), global::TUnit.Core.Helpers.CastHelper.Cast<string>(args[1]));
1102+
return default(global::System.Threading.Tasks.ValueTask);
1103+
}
1104+
catch (global::System.Exception ex)
1105+
{
1106+
return new global::System.Threading.Tasks.ValueTask(global::System.Threading.Tasks.Task.FromException(ex));
1107+
}
1108+
}
1109+
private static global::System.Attribute[] __Attributes_0(int groupIndex)
1110+
{
1111+
return new global::System.Attribute[]
1112+
{
1113+
new global::TUnit.Core.TestAttribute(),
1114+
new global::TUnit.Core.GenerateGenericTestAttribute(typeof(int)),
1115+
new global::TUnit.Core.InstanceMethodDataSourceAttribute("InstanceRows"),
1116+
new global::TUnit.Core.MethodDataSourceAttribute("StaticRows")
1117+
};
1118+
}
1119+
public static readonly global::TUnit.Core.TestEntry<global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests>[] Entries_0 = new global::TUnit.Core.TestEntry<global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests>[]
1120+
{
1121+
global::TUnit.Core.TestEntryFactory.Create<global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests>(
1122+
methodName: "InstanceFirst<int>",
1123+
fullyQualifiedName: "TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests.InstanceFirst<int>",
1124+
methodTypeArgumentsIdentity: "<int>",
1125+
filePath: "",
1126+
lineNumber: 166,
1127+
hasDataSource: true,
1128+
testDataSources: new global::TUnit.Core.IDataSourceAttribute[]
1129+
{
1130+
new global::TUnit.Core.InstanceMethodDataSourceAttribute("InstanceRows")
1131+
{
1132+
Factory = static dataGeneratorMetadata => global::TUnit.Core.Helpers.DataSourceFactories.FromInstanceEnumerable(dataGeneratorMetadata, static instance => (object?)((global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests)instance).InstanceRows() ?? global::System.Array.Empty<object>()),
1133+
},
1134+
new global::TUnit.Core.MethodDataSourceAttribute("StaticRows")
1135+
{
1136+
Factory = static dataGeneratorMetadata => global::TUnit.Core.Helpers.DataSourceFactories.FromEnumerable(dataGeneratorMetadata, static () => global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests.StaticRows()),
1137+
},
1138+
},
1139+
methodMetadata: __mm_0,
1140+
createInstance: __CreateInstance_0,
1141+
invokeBody: __Invoke_0,
1142+
methodIndex: 0,
1143+
createAttributes: __Attributes_0,
1144+
attributeGroupIndex: 0),
1145+
};
1146+
}
1147+
internal static partial class TUnit_TestRegistration
1148+
{
1149+
static readonly int _r_TUnit_TestProject_Bugs__7222_ExplicitFactoryTupleInstanceCollisionTests_InstanceFirst__T_string_TestSource_0 = global::TUnit.Core.SourceRegistrar.RegisterEntries<global::TUnit.TestProject.Bugs._7222.ExplicitFactoryTupleInstanceCollisionTests>(static () => TUnit_TestProject_Bugs__7222_ExplicitFactoryTupleInstanceCollisionTests_InstanceFirst__T_string_TestSource.Entries_0);
1150+
}
1151+
1152+
9771153
// ===== FILE SEPARATOR =====
9781154

9791155
// <auto-generated/>

‎tests/TUnit.Engine.Tests/Issue7222Tests.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ await RunTestsWithFilter(
156156
[Arguments("ExplicitClassMethodSourceCollisionTests*", 2)]
157157
[Arguments("ClassRowMethodSourceCollisionTests*", 2)]
158158
[Arguments("ExplicitMethodInstanceSourceTests", 1)]
159+
[Arguments("ExplicitFactoryTupleInstanceCollisionTests", 4)]
159160
[Arguments("ClosedClassParameterInferredSourceTests*", 1)]
160161
[Arguments("ExplicitClassParameterInferredSourceTests*", 1)]
161162
public async Task Explicit_And_Parameter_Inference_Preserve_Instance_Sources(string className, int count)

‎tests/TUnit.TestProject/Bugs/_7222/GenericInstanceSourceTests.cs‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,3 +146,30 @@ public void BothSources<T>(T? item) where T : struct
146146
}
147147

148148
#pragma warning restore TUnit0001
149+
150+
// Factory tuples exercise the static inference path in reflection discovery too.
151+
public class ExplicitFactoryTupleInstanceCollisionTests
152+
{
153+
public static IEnumerable<Func<(int, string)>> StaticRows() => [() => (1, "static")];
154+
public IEnumerable<Func<(int, string)>> InstanceRows() => [() => (2, "instance")];
155+
156+
[Test]
157+
[GenerateGenericTest(typeof(int))]
158+
[MethodDataSource(nameof(StaticRows))]
159+
[InstanceMethodDataSource(nameof(InstanceRows))]
160+
public void StaticFirst<T>(T item, string label)
161+
{
162+
if (typeof(T) != typeof(int)) throw new InvalidOperationException("Expected explicit int");
163+
if (label != (Equals(item, 1) ? "static" : "instance")) throw new InvalidOperationException("Unexpected row");
164+
}
165+
166+
[Test]
167+
[GenerateGenericTest(typeof(int))]
168+
[InstanceMethodDataSource(nameof(InstanceRows))]
169+
[MethodDataSource(nameof(StaticRows))]
170+
public void InstanceFirst<T>(T item, string label)
171+
{
172+
if (typeof(T) != typeof(int)) throw new InvalidOperationException("Expected explicit int");
173+
if (label != (Equals(item, 1) ? "static" : "instance")) throw new InvalidOperationException("Unexpected row");
174+
}
175+
}

0 commit comments

Comments
 (0)