Fix more tests

Author: andystaples

test/e2e/Apps/BasicJava/src/main/java/com/function/JsonHelpers/DurableMetadataGsonProvider.java

@@ -0,0 +1,14 @@
+package com.function.JsonHelpers;
+
+import java.time.Instant;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+public class DurableMetadataGsonProvider {
+    public static Gson createGson() {
+        return new GsonBuilder()
+            .registerTypeAdapter(Instant.class, new InstantAdapter())
+            .create();
+    }
+}

test/e2e/Apps/BasicJava/src/main/java/com/function/LargeOutputOrchestrator.java

@@ -1,6 +1,7 @@
 package com.function;
 
 import com.microsoft.azure.functions.annotation.*;
+import com.function.JsonHelpers.DurableMetadataGsonProvider;
 import com.google.gson.Gson;
 import com.microsoft.azure.functions.*;
 
@@ -48,7 +49,7 @@ public HttpResponseMessage httpStart(
             @DurableClientInput(name = "durableContext") DurableClientContext durableContext,
             final ExecutionContext context) {
         int sizeInKB = 0;
-        Gson gson = new Gson();
+        Gson gson = DurableMetadataGsonProvider.createGson();
         try {
             String body = request.getBody().orElse("0");
             sizeInKB = gson.fromJson(body, int.class);
@@ -80,10 +81,12 @@ public HttpResponseMessage queryOutput(
             return response;
         }
 
-        Object output = metadata.readOutputAs(Object.class);
+        Gson gson = DurableMetadataGsonProvider.createGson();
+        String outputJson = gson.toJson(metadata);
+
         HttpResponseMessage response = request.createResponseBuilder(HttpStatus.OK)
             .header("Content-Type", "application/json")
-            .body(output != null ? output.toString() : "[]")
+            .body(outputJson)
             .build();
         return response;
     }

test/e2e/Apps/BasicJava/src/main/java/com/function/OrchestrationQuery.java

@@ -1,12 +1,9 @@
 package com.function;
 
 import com.microsoft.azure.functions.annotation.*;
-import com.function.JsonHelpers.InstantAdapter;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
+import com.function.JsonHelpers.DurableMetadataGsonProvider;
 import com.microsoft.azure.functions.*;
 
-import java.time.Instant;
 import java.util.*;
 
 import com.microsoft.durabletask.*;
@@ -15,12 +12,6 @@
 
 
 public class OrchestrationQuery {
-    public Gson newInstancesConverter() {
-        GsonBuilder gsonBuilder = new GsonBuilder();
-        gsonBuilder.registerTypeAdapter(Instant.class, new InstantAdapter());
-        return gsonBuilder.create();
-    }
-
     /**
      * This HTTP-triggered function returns all orchestration instances.
      */
@@ -33,7 +24,7 @@ public HttpResponseMessage getAllInstances(
         try {
             // Java SDK: getAllInstancesAsync returns a CompletableFuture<List<OrchestrationInstanceStatus>>
             OrchestrationStatusQueryResult instances = client.queryInstances(new OrchestrationStatusQuery());
-            String instanceString = newInstancesConverter().toJson(instances);
+            String instanceString = DurableMetadataGsonProvider.createGson().toJson(instances.getOrchestrationState());
             return request.createResponseBuilder(HttpStatus.OK)
                     .header("Content-Type", "application/json")
                     .body(instanceString)
@@ -65,7 +56,7 @@ public HttpResponseMessage getRunningInstances(
             OrchestrationStatusQuery query = new OrchestrationStatusQuery();
             query.setRuntimeStatusList(statuses);
             OrchestrationStatusQueryResult instances = client.queryInstances(query);
-            String instanceString = newInstancesConverter().toJson(instances);
+            String instanceString = DurableMetadataGsonProvider.createGson().toJson(instances.getOrchestrationState());
             return request.createResponseBuilder(HttpStatus.OK)
                     .header("Content-Type", "application/json")
                     .body(instanceString)

test/e2e/Tests/Localizers/JavaTestLanguageLocalizer.cs

@@ -7,9 +7,9 @@ internal class JavaTestLanguageLocalizer : ITestLanguageLocalizer
     private readonly Dictionary<string, string> isolatedLocalizedStrings = new Dictionary<string, string>
     {
         { "CaughtActivityException.ErrorMessage", "Task 'RaiseException' (#0) failed with an unhandled exception:" },
-        { "RethrownActivityException.ErrorMessage", "Microsoft.DurableTask.TaskFailedException" },
-        { "CaughtEntityException.ErrorMessage", "Operation 'ThrowFirstTimeOnly' of entity '@counter@MyExceptionEntity' failed:" },
-        { "RethrownEntityException.ErrorMessage", "Microsoft.DurableTask.Entities.EntityOperationFailedException" },
+        { "RethrownActivityException.ErrorMessage", "com.microsoft.durabletask.TaskFailedException: Task " },
+        { "CaughtEntityException.ErrorMessage", "N/A (Test not implemented)" },
+        { "RethrownEntityException.ErrorMessage", "N/A (Test not implemented)" },
         { "ExternalEvent.CompletedInstance.ErrorName", "gRPC error: StatusRuntimeException - FAIL" },
         { "ExternalEvent.CompletedInstance.ErrorMessage", "The orchestration instance with the provided instance id is not running." },
         { "ExternalEvent.InvalidInstance.ErrorName", "gRPC error: StatusRuntimeException - NOT_FOUND" },

test/e2e/Tests/Tests/ErrorHandlingTests.cs

@@ -219,7 +219,8 @@ public async Task OrchestratorWithCustomRetriedActivityException_ShouldSucceed()
         // We want to ensure that multiline exception messages and inner exceptions are preserved
         Assert.Contains(this.fixture.TestLogs.CoreToolsLogs, x => x.Contains(nameof(InvalidOperationException)) &&
                                                               x.Contains("This activity failed"));
+        Assert.Contains(this.fixture.TestLogs.CoreToolsLogs, x => x.Contains("More information about the failure"));
         Assert.Contains(this.fixture.TestLogs.CoreToolsLogs, x => x.Contains(nameof(OverflowException)) &&
-                                                              x.Contains("More information about the failure"));
+                                                              x.Contains("Inner exception message"));
     }
 }

test/e2e/Tests/Tests/HelloCitiesTest.cs

@@ -67,7 +67,8 @@ public async Task ScheduledStartTests(string functionName, int startDelaySeconds
 
         if (scheduledStartTime > DateTime.UtcNow + TimeSpan.FromSeconds(1))
         {
-            if (this.fixture.functionLanguageLocalizer.GetLanguageType() == LanguageType.DotnetIsolated)
+            if (this.fixture.functionLanguageLocalizer.GetLanguageType() == LanguageType.DotnetIsolated || 
+                this.fixture.functionLanguageLocalizer.GetLanguageType() == LanguageType.Java)
             {
                 await DurableHelpers.WaitForOrchestrationStateAsync(statusQueryGetUri, "Pending", 30);
             }

test/e2e/Tests/Tests/LargeOutputOrchestratorTests.cs

@@ -41,7 +41,8 @@ public async Task LargeOutputStatusQueryTests(int sizeInKB)
 
     [Theory]
     [InlineData(4608)]// This value exceeds the default 4 MB, as the test sets the threshold to 6 MB.
-    [Trait("DTS", "Skip")] 
+    [Trait("DTS", "Skip")]
+    [Trait("Java", "Skip")] // Bug: Needs investigation, Exception: StatusRuntimeException: RESOURCE_EXHAUSTED: gRPC message exceeds maximum size 4194304: 4718735
     public async Task DurableTaskClientWriteOutputTests(int sizeInKB)
     {
         using HttpResponseMessage response = await HttpHelpers.InvokeHttpTriggerWithBody("LargeOutputOrchestrator_HttpStart", sizeInKB.ToString(), "application/json");

test/e2e/Tests/Tests/VersioningTests.cs

@@ -31,7 +31,7 @@ public VersioningTests(FunctionAppFixture fixture, ITestOutputHelper testOutputH
                                   // mid-test.
     [Trait("Python", "Skip")] // The above applies to Python as well
     [Trait("Node", "Skip")] // The above applies to Node as well
-    [Trait("Node", "Skip")] // The above applies to Java as well
+    [Trait("Java", "Skip")] // The above applies to Java as well
     public async Task TestVersionedOrchestration_OKWithMatchingVersion(string? version)
     {
         string queryString = version == null ? string.Empty : $"?version={version}";