fix(source-gen): adapt ValueTask<T> test results

src/TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs

@@ -23,7 +23,7 @@
     private const string GeneratedNamespace = "TUnit.Generated";
 
     private static readonly DiagnosticDescriptor GenerationErrorDescriptor = new(
         "TUNIT0999",
         "Source Generation Error",
         "Failed to generate test metadata for {0}.{1}: {2}",
         "TUnit",
@@ -1100,6 +1100,9 @@
                 case TestReturnPattern.ValueTask:
                     writer.AppendLine($"return {methodCall};");
                     break;
+                case TestReturnPattern.ValueTaskOfT:
+                    writer.AppendLine($"return new global::System.Threading.Tasks.ValueTask({methodCall}.AsTask());");
+                    break;
                 case TestReturnPattern.Task:
                     writer.AppendLine($"return new global::System.Threading.Tasks.ValueTask({methodCall});");
                     break;
@@ -3847,7 +3850,8 @@
     private enum TestReturnPattern
     {
         Void,        // void methods
-        ValueTask,   // ValueTask or ValueTask<T>
+        ValueTask,   // ValueTask
+        ValueTaskOfT, // ValueTask<T>
         Task,        // Task or Task<T>
         Unknown      // F# Async, custom awaitables, etc.
     }
@@ -3861,11 +3865,16 @@
 
         var returnTypeName = method.ReturnType.ToDisplayString();
 
-        if (returnTypeName.StartsWith("System.Threading.Tasks.ValueTask"))
+        if (returnTypeName == "System.Threading.Tasks.ValueTask")
         {
             return TestReturnPattern.ValueTask;
         }
 
+        if (returnTypeName.StartsWith("System.Threading.Tasks.ValueTask<"))
+        {
+            return TestReturnPattern.ValueTaskOfT;
+        }
+
         if (returnTypeName.StartsWith("System.Threading.Tasks.Task") ||
             returnTypeName.StartsWith("Task<"))
         {
@@ -3891,6 +3900,10 @@
                 writer.AppendLine($"return {methodCall};");
                 break;
 
+            case TestReturnPattern.ValueTaskOfT:
+                writer.AppendLine($"return new global::System.Threading.Tasks.ValueTask({methodCall}.AsTask());");
+                break;
+
             case TestReturnPattern.Task:
                 writer.AppendLine($"return new global::System.Threading.Tasks.ValueTask({methodCall});");
                 break;

tests/TUnit.Core.SourceGenerator.Tests/ValueTaskResultTests.Test.DotNet10_0.verified.txt

@@ -0,0 +1,150 @@
+// <auto-generated/>
+#pragma warning disable
+
+#nullable enable
+namespace TUnit.Generated;
+[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute]
+[global::System.CodeDom.Compiler.GeneratedCode("TUnit", "VERSION_SCRUBBED")]
+internal static class TUnit_TestProject_ValueTaskResultTests_GenericMethodValueTaskResult_TestSource
+{
+    private static readonly global::TUnit.Core.ClassMetadata __classMetadata =     global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ValueTaskResultTests", new global::TUnit.Core.ClassMetadata
+    {
+        Type = typeof(global::TUnit.TestProject.ValueTaskResultTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ValueTaskResultTests)),
+        Name = "ValueTaskResultTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+    });
+    private static readonly global::System.Type __classType = typeof(global::TUnit.TestProject.ValueTaskResultTests);
+    private static readonly global::TUnit.Core.MethodMetadata __mm_0 = global::TUnit.Core.MethodMetadataFactory.Create("GenericMethodValueTaskResult", __classType, typeof(global::System.Threading.Tasks.ValueTask<int>), __classMetadata, genericTypeCount: 1);
+    private static global::TUnit.TestProject.ValueTaskResultTests __CreateInstance_0(global::System.Type[] typeArgs, object?[] args)
+    {
+        return new global::TUnit.TestProject.ValueTaskResultTests();
+    }
+    private static global::System.Threading.Tasks.ValueTask __Invoke_0(global::TUnit.TestProject.ValueTaskResultTests instance, int methodIndex, object?[] args, global::System.Threading.CancellationToken cancellationToken)
+    {
+        try
+        {
+            return new global::System.Threading.Tasks.ValueTask(instance.GenericMethodValueTaskResult<int>().AsTask());
+        }
+        catch (global::System.Exception ex)
+        {
+            return new global::System.Threading.Tasks.ValueTask(global::System.Threading.Tasks.Task.FromException(ex));
+        }
+    }
+    private static global::System.Attribute[] __Attributes_0(int groupIndex)
+    {
+        return new global::System.Attribute[]
+        {
+            new global::TUnit.Core.TestAttribute(),
+            new global::TUnit.Core.GenerateGenericTestAttribute(typeof(int))
+        };
+    }
+    public static readonly global::TUnit.Core.TestEntry<global::TUnit.TestProject.ValueTaskResultTests>[] Entries_0 = new global::TUnit.Core.TestEntry<global::TUnit.TestProject.ValueTaskResultTests>[]
+    {
+        global::TUnit.Core.TestEntryFactory.Create<global::TUnit.TestProject.ValueTaskResultTests>(
+            methodName: "GenericMethodValueTaskResult<int>",
+            fullyQualifiedName: "TUnit.TestProject.ValueTaskResultTests.GenericMethodValueTaskResult<int>",
+            filePath: "",
+            lineNumber: 8,
+            methodMetadata: __mm_0,
+            createInstance: __CreateInstance_0,
+            invokeBody: __Invoke_0,
+            methodIndex: 0,
+            createAttributes: __Attributes_0,
+            attributeGroupIndex: 0),
+    };
+}
+internal static partial class TUnit_TestRegistration
+{
+    static readonly int _r_TUnit_TestProject_ValueTaskResultTests_GenericMethodValueTaskResult_TestSource_0 = global::TUnit.Core.SourceRegistrar.RegisterEntries<global::TUnit.TestProject.ValueTaskResultTests>(static () => TUnit_TestProject_ValueTaskResultTests_GenericMethodValueTaskResult_TestSource.Entries_0);
+}
+
+
+// ===== FILE SEPARATOR =====
+
+// <auto-generated/>
+#pragma warning disable
+
+#nullable enable
+namespace TUnit.Generated;
+[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute]
+[global::System.CodeDom.Compiler.GeneratedCode("TUnit", "VERSION_SCRUBBED")]
+internal static class TUnit_TestProject_ValueTaskResultTests__TestSource
+{
+    private static readonly global::TUnit.Core.ClassMetadata __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ValueTaskResultTests", new global::TUnit.Core.ClassMetadata
+    {
+        Type = typeof(global::TUnit.TestProject.ValueTaskResultTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ValueTaskResultTests)),
+        Name = "ValueTaskResultTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+    });
+    private static readonly global::System.Type __classType = typeof(global::TUnit.TestProject.ValueTaskResultTests);
+    private static global::TUnit.TestProject.ValueTaskResultTests __CreateInstance(global::System.Type[] typeArgs, object?[] args)
+    {
+        return new global::TUnit.TestProject.ValueTaskResultTests();
+    }
+    private static global::System.Threading.Tasks.ValueTask __Invoke(global::TUnit.TestProject.ValueTaskResultTests instance, int methodIndex, object?[] args, global::System.Threading.CancellationToken cancellationToken)
+    {
+        try
+        {
+            switch (methodIndex)
+            {
+                case 0:
+                {
+                    return new global::System.Threading.Tasks.ValueTask(instance.GenericValueTaskResult().AsTask());
+                }
+                default:
+                    throw new global::System.ArgumentOutOfRangeException(nameof(methodIndex));
+            }
+        }
+        catch (global::System.Exception ex)
+        {
+            return new global::System.Threading.Tasks.ValueTask(global::System.Threading.Tasks.Task.FromException(ex));
+        }
+    }
+    private static global::System.Attribute[] __Attributes(int groupIndex)
+    {
+        switch (groupIndex)
+        {
+            case 0:
+            {
+                return
+                [
+                    new global::TUnit.Core.TestAttribute()
+                ];
+            }
+            default:
+                throw new global::System.ArgumentOutOfRangeException(nameof(groupIndex));
+        }
+    }
+    private static readonly global::System.Func<global::System.Type[], object?[], global::TUnit.TestProject.ValueTaskResultTests> __createInstance = __CreateInstance;
+    private static readonly global::System.Func<global::TUnit.TestProject.ValueTaskResultTests, int, object?[], global::System.Threading.CancellationToken, global::System.Threading.Tasks.ValueTask> __invoke = __Invoke;
+    private static readonly global::System.Func<int, global::System.Attribute[]> __attributes = __Attributes;
+    public static readonly global::TUnit.Core.TestEntry<global::TUnit.TestProject.ValueTaskResultTests>[] Entries = new global::TUnit.Core.TestEntry<global::TUnit.TestProject.ValueTaskResultTests>[]
+    {
+        global::TUnit.Core.TestEntryFactory.CreateWithClassMetadata<global::TUnit.TestProject.ValueTaskResultTests>(
+            methodName: "GenericValueTaskResult",
+            fullyQualifiedName: "TUnit.TestProject.ValueTaskResultTests.GenericValueTaskResult",
+            filePath: "",
+            lineNumber: 5,
+            returnType: typeof(global::System.Threading.Tasks.ValueTask<int>),
+            classMetadata: __classMetadata,
+            createInstance: __createInstance,
+            invokeBody: __invoke,
+            methodIndex: 0,
+            createAttributes: __attributes,
+            attributeGroupIndex: 0),
+    };
+}
+internal static partial class TUnit_TestRegistration
+{
+    static readonly int _r_TUnit_TestProject_ValueTaskResultTests__TestSource = global::TUnit.Core.SourceRegistrar.RegisterEntries<global::TUnit.TestProject.ValueTaskResultTests>(static () => TUnit_TestProject_ValueTaskResultTests__TestSource.Entries);
+}

tests/TUnit.Core.SourceGenerator.Tests/ValueTaskResultTests.Test.DotNet8_0.verified.txt

@@ -0,0 +1,150 @@
+// <auto-generated/>
+#pragma warning disable
+
+#nullable enable
+namespace TUnit.Generated;
+[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute]
+[global::System.CodeDom.Compiler.GeneratedCode("TUnit", "VERSION_SCRUBBED")]
+internal static class TUnit_TestProject_ValueTaskResultTests_GenericMethodValueTaskResult_TestSource
+{
+    private static readonly global::TUnit.Core.ClassMetadata __classMetadata =     global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ValueTaskResultTests", new global::TUnit.Core.ClassMetadata
+    {
+        Type = typeof(global::TUnit.TestProject.ValueTaskResultTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ValueTaskResultTests)),
+        Name = "ValueTaskResultTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+    });
+    private static readonly global::System.Type __classType = typeof(global::TUnit.TestProject.ValueTaskResultTests);
+    private static readonly global::TUnit.Core.MethodMetadata __mm_0 = global::TUnit.Core.MethodMetadataFactory.Create("GenericMethodValueTaskResult", __classType, typeof(global::System.Threading.Tasks.ValueTask<int>), __classMetadata, genericTypeCount: 1);
+    private static global::TUnit.TestProject.ValueTaskResultTests __CreateInstance_0(global::System.Type[] typeArgs, object?[] args)
+    {
+        return new global::TUnit.TestProject.ValueTaskResultTests();
+    }
+    private static global::System.Threading.Tasks.ValueTask __Invoke_0(global::TUnit.TestProject.ValueTaskResultTests instance, int methodIndex, object?[] args, global::System.Threading.CancellationToken cancellationToken)
+    {
+        try
+        {
+            return new global::System.Threading.Tasks.ValueTask(instance.GenericMethodValueTaskResult<int>().AsTask());
+        }
+        catch (global::System.Exception ex)
+        {
+            return new global::System.Threading.Tasks.ValueTask(global::System.Threading.Tasks.Task.FromException(ex));
+        }
+    }
+    private static global::System.Attribute[] __Attributes_0(int groupIndex)
+    {
+        return new global::System.Attribute[]
+        {
+            new global::TUnit.Core.TestAttribute(),
+            new global::TUnit.Core.GenerateGenericTestAttribute(typeof(int))
+        };
+    }
+    public static readonly global::TUnit.Core.TestEntry<global::TUnit.TestProject.ValueTaskResultTests>[] Entries_0 = new global::TUnit.Core.TestEntry<global::TUnit.TestProject.ValueTaskResultTests>[]
+    {
+        global::TUnit.Core.TestEntryFactory.Create<global::TUnit.TestProject.ValueTaskResultTests>(
+            methodName: "GenericMethodValueTaskResult<int>",
+            fullyQualifiedName: "TUnit.TestProject.ValueTaskResultTests.GenericMethodValueTaskResult<int>",
+            filePath: "",
+            lineNumber: 8,
+            methodMetadata: __mm_0,
+            createInstance: __CreateInstance_0,
+            invokeBody: __Invoke_0,
+            methodIndex: 0,
+            createAttributes: __Attributes_0,
+            attributeGroupIndex: 0),
+    };
+}
+internal static partial class TUnit_TestRegistration
+{
+    static readonly int _r_TUnit_TestProject_ValueTaskResultTests_GenericMethodValueTaskResult_TestSource_0 = global::TUnit.Core.SourceRegistrar.RegisterEntries<global::TUnit.TestProject.ValueTaskResultTests>(static () => TUnit_TestProject_ValueTaskResultTests_GenericMethodValueTaskResult_TestSource.Entries_0);
+}
+
+
+// ===== FILE SEPARATOR =====
+
+// <auto-generated/>
+#pragma warning disable
+
+#nullable enable
+namespace TUnit.Generated;
+[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute]
+[global::System.CodeDom.Compiler.GeneratedCode("TUnit", "VERSION_SCRUBBED")]
+internal static class TUnit_TestProject_ValueTaskResultTests__TestSource
+{
+    private static readonly global::TUnit.Core.ClassMetadata __classMetadata = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.ValueTaskResultTests", new global::TUnit.Core.ClassMetadata
+    {
+        Type = typeof(global::TUnit.TestProject.ValueTaskResultTests),
+        TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.ValueTaskResultTests)),
+        Name = "ValueTaskResultTests",
+        Namespace = "TUnit.TestProject",
+        Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", "TestsBase`1"),
+        Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
+        Properties = global::System.Array.Empty<global::TUnit.Core.PropertyMetadata>(),
+        Parent = null
+    });
+    private static readonly global::System.Type __classType = typeof(global::TUnit.TestProject.ValueTaskResultTests);
+    private static global::TUnit.TestProject.ValueTaskResultTests __CreateInstance(global::System.Type[] typeArgs, object?[] args)
+    {
+        return new global::TUnit.TestProject.ValueTaskResultTests();
+    }
+    private static global::System.Threading.Tasks.ValueTask __Invoke(global::TUnit.TestProject.ValueTaskResultTests instance, int methodIndex, object?[] args, global::System.Threading.CancellationToken cancellationToken)
+    {
+        try
+        {
+            switch (methodIndex)
+            {
+                case 0:
+                {
+                    return new global::System.Threading.Tasks.ValueTask(instance.GenericValueTaskResult().AsTask());
+                }
+                default:
+                    throw new global::System.ArgumentOutOfRangeException(nameof(methodIndex));
+            }
+        }
+        catch (global::System.Exception ex)
+        {
+            return new global::System.Threading.Tasks.ValueTask(global::System.Threading.Tasks.Task.FromException(ex));
+        }
+    }
+    private static global::System.Attribute[] __Attributes(int groupIndex)
+    {
+        switch (groupIndex)
+        {
+            case 0:
+            {
+                return
+                [
+                    new global::TUnit.Core.TestAttribute()
+                ];
+            }
+            default:
+                throw new global::System.ArgumentOutOfRangeException(nameof(groupIndex));
+        }
+    }
+    private static readonly global::System.Func<global::System.Type[], object?[], global::TUnit.TestProject.ValueTaskResultTests> __createInstance = __CreateInstance;
+    private static readonly global::System.Func<global::TUnit.TestProject.ValueTaskResultTests, int, object?[], global::System.Threading.CancellationToken, global::System.Threading.Tasks.ValueTask> __invoke = __Invoke;
+    private static readonly global::System.Func<int, global::System.Attribute[]> __attributes = __Attributes;
+    public static readonly global::TUnit.Core.TestEntry<global::TUnit.TestProject.ValueTaskResultTests>[] Entries = new global::TUnit.Core.TestEntry<global::TUnit.TestProject.ValueTaskResultTests>[]
+    {
+        global::TUnit.Core.TestEntryFactory.CreateWithClassMetadata<global::TUnit.TestProject.ValueTaskResultTests>(
+            methodName: "GenericValueTaskResult",
+            fullyQualifiedName: "TUnit.TestProject.ValueTaskResultTests.GenericValueTaskResult",
+            filePath: "",
+            lineNumber: 5,
+            returnType: typeof(global::System.Threading.Tasks.ValueTask<int>),
+            classMetadata: __classMetadata,
+            createInstance: __createInstance,
+            invokeBody: __invoke,
+            methodIndex: 0,
+            createAttributes: __attributes,
+            attributeGroupIndex: 0),
+    };
+}
+internal static partial class TUnit_TestRegistration
+{
+    static readonly int _r_TUnit_TestProject_ValueTaskResultTests__TestSource = global::TUnit.Core.SourceRegistrar.RegisterEntries<global::TUnit.TestProject.ValueTaskResultTests>(static () => TUnit_TestProject_ValueTaskResultTests__TestSource.Entries);
+}