Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
99 changes: 44 additions & 55 deletions TUnit.Engine/Services/MetadataFilterMatcher.cs
Original file line number Diff line number Diff line change
Expand Up @@ -309,80 +309,69 @@ private static string BuildClassNameForMatching(Type type)
return type.Name;
}

// Build the full nested type hierarchy with '+' separators
// This matches TestIdentifierService.WriteTypeNameWithGenerics
var typeHierarchy = new ValueListBuilder<string>([null, null, null, null]);
var typeVsb = new ValueStringBuilder(stackalloc char[128]);
// Collect the nested-type chain (inner -> outer) without allocating per-segment strings,
// then emit it directly into the result builder. Matches TestIdentifierService.WriteTypeNameWithGenerics.
var typeHierarchy = new ValueListBuilder<Type>([null!, null!, null!, null!]);
var resultVsb = new ValueStringBuilder(stackalloc char[256]);
try
{
var currentType = type;

while (currentType != null)
{
if (currentType.IsGenericType)
{
var name = currentType.Name;

var backtickIndex = name.IndexOf('`');
if (backtickIndex > 0)
{
typeVsb.Append(name.AsSpan(0, backtickIndex));
}
else
{
typeVsb.Append(name);
}

// Add the generic type arguments (same format as TestIdentifierService)
var genericArgs = currentType.GetGenericArguments();
typeVsb.Append('<');
for (var i = 0; i < genericArgs.Length; i++)
{
if (i > 0)
{
typeVsb.Append(", ");
}
typeVsb.Append(genericArgs[i].FullName ?? genericArgs[i].Name);
}
typeVsb.Append('>');

typeHierarchy.Append(typeVsb.AsSpan().ToString());
typeVsb.Length = 0;
}
else
{
typeHierarchy.Append(currentType.Name);
}

typeHierarchy.Append(currentType);
currentType = currentType.DeclaringType;
}

// Build result: reverse to get outer-to-inner order and join with '+'
var resultVsb = new ValueStringBuilder(stackalloc char[256]);
try
// Reverse to get outer-to-inner order and join with '+'.
for (var i = typeHierarchy.Length - 1; i >= 0; i--)
{
for (var i = typeHierarchy.Length - 1; i >= 0; i--)
if (i < typeHierarchy.Length - 1)
{
if (i < typeHierarchy.Length - 1)
{
resultVsb.Append('+');
}
resultVsb.Append(typeHierarchy[i]);
resultVsb.Append('+');
}
return resultVsb.ToString();
}
finally
{
resultVsb.Dispose();
AppendTypeNameWithGenericArgs(ref resultVsb, typeHierarchy[i]);
}
return resultVsb.ToString();
}
finally
{
resultVsb.Dispose();
typeHierarchy.Dispose();
typeVsb.Dispose();
}
}

private static void AppendTypeNameWithGenericArgs(ref ValueStringBuilder vsb, Type type)
{
if (!type.IsGenericType)
{
vsb.Append(type.Name);
return;
}

var name = type.Name;
var backtickIndex = name.IndexOf('`');
if (backtickIndex > 0)
{
vsb.Append(name.AsSpan(0, backtickIndex));
}
else
{
vsb.Append(name);
}

var genericArgs = type.GetGenericArguments();
vsb.Append('<');
for (var i = 0; i < genericArgs.Length; i++)
{
if (i > 0)
{
vsb.Append(", ");
}
vsb.Append(genericArgs[i].FullName ?? genericArgs[i].Name);
}
vsb.Append('>');
}

private static bool HasMethodNameMatch(string uidValue, string methodName)
{
// Method name patterns with proper boundaries:
Expand Down
82 changes: 38 additions & 44 deletions TUnit.Engine/Services/TestIdentifierService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -117,72 +117,66 @@ public static string GenerateFailedTestId(TestMetadata metadata, TestDataCombina

private static void WriteTypeNameWithGenerics(ref ValueStringBuilder vsb, Type type)
{
// Build the full type hierarchy including all containing types
var typeHierarchy = new ValueListBuilder<string>([null, null, null, null]);
var typeVsb = new ValueStringBuilder(stackalloc char[128]);
// Collect the nested-type chain (inner -> outer) without allocating per-segment strings.
var typeHierarchy = new ValueListBuilder<Type>([null!, null!, null!, null!]);
try
{
var currentType = type;

while (currentType != null)
{
if (currentType.IsGenericType)
{
var name = currentType.Name;

var backtickIndex = name.IndexOf('`');
if (backtickIndex > 0)
{
typeVsb.Append(name.AsSpan(0, backtickIndex));
}
else
{
typeVsb.Append(name);
}

// Add the generic type arguments
var genericArgs = currentType.GetGenericArguments();
typeVsb.Append('<');
for (var i = 0; i < genericArgs.Length; i++)
{
if (i > 0)
{
typeVsb.Append(", ");
}
// Use the full name for generic arguments to ensure uniqueness
typeVsb.Append(genericArgs[i].FullName ?? genericArgs[i].Name);
}
typeVsb.Append('>');

typeHierarchy.Append(typeVsb.AsSpan().ToString());
typeVsb.Length = 0;
}
else
{
typeHierarchy.Append(currentType.Name);
}

typeHierarchy.Append(currentType);
currentType = currentType.DeclaringType;
}

// Reverse to get outer-to-inner order
// Append all types with + separator (matching .NET Type.FullName convention for nested types)
// Reverse to get outer-to-inner order (matches .NET Type.FullName convention for nested types).
for (var i = typeHierarchy.Length - 1; i >= 0; i--)
{
if (i < typeHierarchy.Length - 1)
{
vsb.Append('+');
}
vsb.Append(typeHierarchy[i]);
AppendTypeNameWithGenericArgs(ref vsb, typeHierarchy[i]);
}
}
finally
{
typeHierarchy.Dispose();
typeVsb.Dispose();
}
}

private static void AppendTypeNameWithGenericArgs(ref ValueStringBuilder vsb, Type type)
{
if (!type.IsGenericType)
{
vsb.Append(type.Name);
return;
}

var name = type.Name;
var backtickIndex = name.IndexOf('`');
if (backtickIndex > 0)
{
vsb.Append(name.AsSpan(0, backtickIndex));
}
else
{
vsb.Append(name);
}

// Use the full name for generic arguments to ensure uniqueness.
var genericArgs = type.GetGenericArguments();
vsb.Append('<');
for (var i = 0; i < genericArgs.Length; i++)
{
if (i > 0)
{
vsb.Append(", ");
}
vsb.Append(genericArgs[i].FullName ?? genericArgs[i].Name);
}
vsb.Append('>');
}

private static void WriteTypeWithParameters(ref ValueStringBuilder vsb, ReadOnlySpan<ParameterMetadata> parameterTypes)
{
if (parameterTypes.Length == 0)
Expand Down
Loading