chore: Fix merge

Signed-off-by: Javier Aliaga <[email protected]>

Author: javier-aliaga

client/src/test/java/io/dapr/durabletask/ErrorHandlingIntegrationTests.java

@@ -3,19 +3,18 @@
 
 package io.dapr.durabletask;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import java.time.Duration;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.params.provider.ValueSource;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * These integration tests are designed to exercise the core, high-level error-handling features of the Durable Task
@@ -26,11 +25,6 @@
  */
 @Tag("integration")
 public class ErrorHandlingIntegrationTests extends IntegrationTestBase {
-
-    @BeforeEach
-    private void startUp() {
-    }
-
     @Test
     void orchestratorException() throws TimeoutException {
         final String orchestratorName = "OrchestratorWithException";
@@ -315,4 +309,4 @@ private FailureDetails retryOnFailuresCoreTest(
             return details;
         }
     }
-}
+}

client/src/test/java/io/dapr/durabletask/IntegrationTests.java

@@ -54,12 +54,6 @@ public class IntegrationTests extends IntegrationTestBase {
     // All tests that create a server should save it to this variable for proper shutdown
     private DurableTaskGrpcWorker server;
 
-    // Before whole test suite, delete the task hub
-    @BeforeEach
-    private void startUp() {
-      
-    }
-
     @AfterEach
     private void shutdown() throws InterruptedException {
         if (this.server != null) {