unskip and fix func source gen tests

Author: YunchuWang

Directory.Packages.props

@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />

test/Generators.Tests/AzureFunctionsTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-//using Microsoft.Azure.Functions.Worker;
+using Microsoft.Azure.Functions.Worker;
 using Microsoft.DurableTask.Generators.Tests.Utils;
 
 namespace Microsoft.DurableTask.Generators.Tests;
@@ -11,7 +11,7 @@ public class AzureFunctionsTests
     const string GeneratedClassName = "GeneratedDurableTaskExtensions";
     const string GeneratedFileName = $"{GeneratedClassName}.cs";
 
-    [Fact(Skip = "Durable Functions Extension out of date")]
+    [Fact]
     public async Task Activities_SimpleFunctionTrigger()
     {
         string code = @"
@@ -40,7 +40,7 @@ await TestHelpers.RunTestAsync<DurableTaskSourceGenerator>(
             isDurableFunctions: true);
     }
 
-    [Fact(Skip = "Durable Functions Extension out of date")]
+    [Fact]
     public async Task Activities_SimpleFunctionTrigger_TaskReturning()
     {
         string code = @"
@@ -70,7 +70,7 @@ await TestHelpers.RunTestAsync<DurableTaskSourceGenerator>(
             isDurableFunctions: true);
     }
 
-    [Fact(Skip = "Durable Functions Extension out of date")]
+    [Fact]
     public async Task Activities_SimpleFunctionTrigger_CustomType()
     {
         string code = @"
@@ -111,7 +111,7 @@ await TestHelpers.RunTestAsync<DurableTaskSourceGenerator>(
     /// </summary>
     /// <param name="inputType">The activity input type.</param>
     /// <param name="outputType">The activity output type.</param>
-    [Theory(Skip = "Durable Functions Extension out of date")]
+    [Theory]
     [InlineData("int", "string")]
     [InlineData("string", "int")]
     [InlineData("Guid", "TimeSpan")]
@@ -126,11 +126,18 @@ public async Task Activities_ClassBasedSyntax(string inputType, string outputTyp
 using Microsoft.DurableTask;
 
 [DurableTask(nameof(MyActivity))]
-public class MyActivity : TaskActivityBase<{inputType}, {outputType}>
+public class MyActivity : TaskActivity<{inputType}, {outputType}>
 {{
-    protected override {outputType} OnRun(TaskActivityContext context, {inputType} input) => default!;
+    public override Task<{outputType}> RunAsync(TaskActivityContext context, {inputType} input) => Task.FromResult<{outputType}>(default!);
 }}";
 
+        // Build the expected InputParameter format (matches generator logic)
+        string expectedInputParameter = inputType + " input";
+        if (inputType.EndsWith('?'))
+        {
+            expectedInputParameter += " = default";
+        }
+
         string expectedOutput = TestHelpers.WrapAndFormat(
             GeneratedClassName,
             methodList: $@"
@@ -140,9 +147,9 @@ public class MyActivity : TaskActivityBase<{inputType}, {outputType}>
 }}
 
 [Function(nameof(MyActivity))]
-public static async Task<{outputType}> MyActivity([ActivityTrigger] {defaultInputType} input, string instanceId, FunctionContext executionContext)
+public static async Task<{outputType}> MyActivity([ActivityTrigger] {expectedInputParameter}, string instanceId, FunctionContext executionContext)
 {{
-    ITaskActivity activity = ActivatorUtilities.CreateInstance<MyActivity>(executionContext.InstanceServices);
+    ITaskActivity activity = ActivatorUtilities.GetServiceOrCreateInstance<MyActivity>(executionContext.InstanceServices);
     TaskActivityContext context = new GeneratedActivityContext(""MyActivity"", instanceId);
     object? result = await activity.RunAsync(context, input);
     return ({outputType})result!;
@@ -164,7 +171,7 @@ await TestHelpers.RunTestAsync<DurableTaskSourceGenerator>(
     /// </summary>
     /// <param name="inputType">The activity input type.</param>
     /// <param name="outputType">The activity output type.</param>
-    [Theory(Skip = "Durable Functions Extension out of date")]
+    [Theory]
     [InlineData("int", "string?")]
     [InlineData("string", "int")]
     [InlineData("(int, int)", "(double, double)")]
@@ -183,11 +190,18 @@ public async Task Orchestrators_ClassBasedSyntax(string inputType, string output
 namespace MyNS
 {{
     [DurableTask(nameof(MyOrchestrator))]
-    public class MyOrchestrator : TaskOrchestratorBase<{inputType}, {outputType}>
+    public class MyOrchestrator : TaskOrchestrator<{inputType}, {outputType}>
     {{
-        protected override Task<{outputType}> OnRunAsync(TaskOrchestrationContext ctx, {defaultInputType} input) => throw new NotImplementedException();
+        public override Task<{outputType}> RunAsync(TaskOrchestrationContext ctx, {defaultInputType} input) => throw new NotImplementedException();
     }}
 }}";
+        // Build the expected InputParameter format (matches generator logic)
+        string expectedInputParameter = inputType + " input";
+        if (inputType.EndsWith('?'))
+        {
+            expectedInputParameter += " = default";
+        }
+
         string expectedOutput = TestHelpers.WrapAndFormat(
             GeneratedClassName,
             methodList: $@"
@@ -200,32 +214,18 @@ public class MyOrchestrator : TaskOrchestratorBase<{inputType}, {outputType}>
         .ContinueWith(t => ({outputType})(t.Result ?? default({outputType})!), TaskContinuationOptions.ExecuteSynchronously);
 }}
 
-/// <inheritdoc cref=""DurableTaskClient.ScheduleNewOrchestrationInstanceAsync""/>
+/// <inheritdoc cref=""IOrchestrationSubmitter.ScheduleNewOrchestrationInstanceAsync""/>
 public static Task<string> ScheduleNewMyOrchestratorInstanceAsync(
-    this DurableTaskClient client,
-    string? instanceId = null,
-    {defaultInputType} input = default,
-    DateTimeOffset? startTime = null)
+    this IOrchestrationSubmitter client, {expectedInputParameter}, StartOrchestrationOptions? options = null)
 {{
-    return client.ScheduleNewOrchestrationInstanceAsync(
-        ""MyOrchestrator"",
-        instanceId,
-        input,
-        startTime);
+    return client.ScheduleNewOrchestrationInstanceAsync(""MyOrchestrator"", input, options);
 }}
 
-/// <inheritdoc cref=""TaskOrchestrationContext.CallSubOrchestratorAsync""/>
+/// <inheritdoc cref=""TaskOrchestrationContext.CallSubOrchestratorAsync(TaskName, object?, TaskOptions?)""/>
 public static Task<{outputType}> CallMyOrchestratorAsync(
-    this TaskOrchestrationContext context,
-    string? instanceId = null,
-    {defaultInputType} input = default,
-    TaskOptions? options = null)
+    this TaskOrchestrationContext context, {expectedInputParameter}, TaskOptions? options = null)
 {{
-    return context.CallSubOrchestratorAsync<{outputType}>(
-        ""MyOrchestrator"",
-        instanceId,
-        input,
-        options);
+    return context.CallSubOrchestratorAsync<{outputType}>(""MyOrchestrator"", input, options);
 }}",
             isDurableFunctions: true);
 
@@ -243,7 +243,7 @@ await TestHelpers.RunTestAsync<DurableTaskSourceGenerator>(
     /// </summary>
     /// <param name="inputType">The activity input type.</param>
     /// <param name="outputType">The activity output type.</param>
-    [Theory(Skip = "Durable Functions Extension out of date")]
+    [Theory]
     [InlineData("int", "string?")]
     [InlineData("string", "int")]
     [InlineData("(int, int)", "(double, double)")]
@@ -264,14 +264,21 @@ namespace MyNS
     [DurableTask]
     public class MyOrchestrator : MyOrchestratorBase
     {{
-        protected override Task<{outputType}> OnRunAsync(TaskOrchestrationContext ctx, {defaultInputType} input) => throw new NotImplementedException();
+        public override Task<{outputType}> RunAsync(TaskOrchestrationContext ctx, {defaultInputType} input) => throw new NotImplementedException();
     }}
 
-    public abstract class MyOrchestratorBase : TaskOrchestratorBase<{inputType}, {outputType}>
+    public abstract class MyOrchestratorBase : TaskOrchestrator<{inputType}, {outputType}>
     {{
     }}
 }}";
         // Same output as Orchestrators_ClassBasedSyntax
+        // Build the expected InputParameter format (matches generator logic)
+        string expectedInputParameter = inputType + " input";
+        if (inputType.EndsWith('?'))
+        {
+            expectedInputParameter += " = default";
+        }
+
         string expectedOutput = TestHelpers.WrapAndFormat(
             GeneratedClassName,
             methodList: $@"
@@ -284,32 +291,18 @@ public abstract class MyOrchestratorBase : TaskOrchestratorBase<{inputType}, {ou
         .ContinueWith(t => ({outputType})(t.Result ?? default({outputType})!), TaskContinuationOptions.ExecuteSynchronously);
 }}
 
-/// <inheritdoc cref=""DurableTaskClient.ScheduleNewOrchestrationInstanceAsync""/>
+/// <inheritdoc cref=""IOrchestrationSubmitter.ScheduleNewOrchestrationInstanceAsync""/>
 public static Task<string> ScheduleNewMyOrchestratorInstanceAsync(
-    this DurableTaskClient client,
-    string? instanceId = null,
-    {defaultInputType} input = default,
-    DateTimeOffset? startTime = null)
+    this IOrchestrationSubmitter client, {expectedInputParameter}, StartOrchestrationOptions? options = null)
 {{
-    return client.ScheduleNewOrchestrationInstanceAsync(
-        ""MyOrchestrator"",
-        instanceId,
-        input,
-        startTime);
+    return client.ScheduleNewOrchestrationInstanceAsync(""MyOrchestrator"", input, options);
 }}
 
-/// <inheritdoc cref=""TaskOrchestrationContext.CallSubOrchestratorAsync""/>
+/// <inheritdoc cref=""TaskOrchestrationContext.CallSubOrchestratorAsync(TaskName, object?, TaskOptions?)""/>
 public static Task<{outputType}> CallMyOrchestratorAsync(
-    this TaskOrchestrationContext context,
-    string? instanceId = null,
-    {defaultInputType} input = default,
-    TaskOptions? options = null)
+    this TaskOrchestrationContext context, {expectedInputParameter}, TaskOptions? options = null)
 {{
-    return context.CallSubOrchestratorAsync<{outputType}>(
-        ""MyOrchestrator"",
-        instanceId,
-        input,
-        options);
+    return context.CallSubOrchestratorAsync<{outputType}>(""MyOrchestrator"", input, options);
 }}",
             isDurableFunctions: true);
 

test/Generators.Tests/Generators.Tests.csproj

@@ -6,6 +6,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.DurableTask" />
   </ItemGroup>
 
   <ItemGroup>

test/Generators.Tests/Utils/TestHelpers.cs

@@ -3,6 +3,7 @@
 
 using System.Reflection;
 using System.Text;
+using Microsoft.Azure.Functions.Worker;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.Extensions.DependencyInjection;
@@ -38,14 +39,15 @@ public static Task RunTestAsync<TSourceGenerator>(
         {
             // Durable Functions code generation is triggered by the presence of the
             // Durable Functions worker extension for .NET Isolated.
-            // Assembly functionsWorkerAbstractions = typeof(TriggerBindingAttribute).Assembly;
-            // test.TestState.AdditionalReferences.Add(functionsWorkerAbstractions);
+            Assembly functionsWorkerAbstractions = typeof(FunctionAttribute).Assembly;
+            test.TestState.AdditionalReferences.Add(functionsWorkerAbstractions);
 
-            // Assembly functionsWorkerCore = typeof(FunctionContext).Assembly;
-            // test.TestState.AdditionalReferences.Add(functionsWorkerCore);
+            Assembly functionsWorkerCore = typeof(FunctionContext).Assembly;
+            test.TestState.AdditionalReferences.Add(functionsWorkerCore);
 
-            // Assembly durableExtension = typeof(OrchestrationTriggerAttribute).Assembly;
-            // test.TestState.AdditionalReferences.Add(durableExtension);
+            // OrchestrationTriggerAttribute and ActivityTriggerAttribute are in the DurableTask extension
+            Assembly durableExtension = typeof(OrchestrationTriggerAttribute).Assembly;
+            test.TestState.AdditionalReferences.Add(durableExtension);
 
             Assembly dependencyInjection = typeof(ActivatorUtilities).Assembly;
             test.TestState.AdditionalReferences.Add(dependencyInjection);