fix e2e tests

camunda · Nov 12, 2024 · 7d63de5 · 7d63de5
1 parent 00536b3
commit 7d63de5
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 74 deletions.
diff --git a/...utomation-anywhere/src/test/java/io/camunda/connector/e2e/BaseAutomationAnywhereTest.java b/...utomation-anywhere/src/test/java/io/camunda/connector/e2e/BaseAutomationAnywhereTest.java
@@ -21,7 +21,6 @@
 
 import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
 import io.camunda.connector.runtime.inbound.importer.ProcessDefinitionSearch;
-import io.camunda.operate.CamundaOperateClient;
 import io.camunda.zeebe.client.ZeebeClient;
 import java.io.File;
 import java.util.Collections;
@@ -46,8 +45,6 @@ public abstract class BaseAutomationAnywhereTest {
 
   @MockBean ProcessDefinitionSearch processDefinitionSearch;
 
-  @Autowired CamundaOperateClient camundaOperateClient;
-
   @LocalServerPort int serverPort;
 
   protected static final String ELEMENT_TEMPLATE_PATH =

diff --git a/...-aws/connectors-e2e-test-aws-base/src/test/java/io/camunda/connector/e2e/BaseAwsTest.java b/...-aws/connectors-e2e-test-aws-base/src/test/java/io/camunda/connector/e2e/BaseAwsTest.java
@@ -24,7 +24,6 @@
 
 import io.camunda.connector.e2e.app.TestConnectorRuntimeApplication;
 import io.camunda.connector.runtime.inbound.importer.ProcessDefinitionSearch;
-import io.camunda.operate.CamundaOperateClient;
 import io.camunda.process.test.api.CamundaSpringProcessTest;
 import io.camunda.zeebe.client.ZeebeClient;
 import java.io.File;
@@ -57,7 +56,6 @@ public abstract class BaseAwsTest {
   @TempDir File tempDir;
   @Autowired ZeebeClient zeebeClient;
   @MockBean ProcessDefinitionSearch processDefinitionSearch;
-  @Autowired CamundaOperateClient camundaOperateClient;
 
   static LocalStackContainer localstack;
 

diff --git a/...test-base/src/main/java/io/camunda/connector/e2e/app/TestConnectorRuntimeApplication.java b/...test-base/src/main/java/io/camunda/connector/e2e/app/TestConnectorRuntimeApplication.java
@@ -16,7 +16,7 @@
  */
 package io.camunda.connector.e2e.app;
 
-import io.camunda.operate.CamundaOperateClient;
+import io.camunda.connector.runtime.inbound.operate.OperateClient;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -28,7 +28,7 @@
   io.camunda.connector.runtime.OutboundConnectorsAutoConfiguration.class,
   io.camunda.connector.runtime.WebhookConnectorAutoConfiguration.class
 })
-@MockBean(CamundaOperateClient.class)
+@MockBean(OperateClient.class)
 public class TestConnectorRuntimeApplication {
 
   public static void main(String[] args) {

diff --git a/...onnectors-e2e-test-easy-post/src/test/java/io/camunda/connector/e2e/BaseEasyPostTest.java b/...onnectors-e2e-test-easy-post/src/test/java/io/camunda/connector/e2e/BaseEasyPostTest.java
@@ -21,7 +21,6 @@
 
 import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
 import io.camunda.connector.runtime.inbound.importer.ProcessDefinitionSearch;
-import io.camunda.operate.CamundaOperateClient;
 import io.camunda.zeebe.client.ZeebeClient;
 import io.camunda.zeebe.model.bpmn.Bpmn;
 import io.camunda.zeebe.model.bpmn.BpmnModelInstance;
@@ -71,8 +70,6 @@ public abstract class BaseEasyPostTest {
 
   @MockBean ProcessDefinitionSearch processDefinitionSearch;
 
-  @Autowired CamundaOperateClient camundaOperateClient;
-
   @LocalServerPort int serverPort;
 
   @BeforeEach

diff --git a/...s-e2e-test/connectors-e2e-test-http/src/test/java/io/camunda/connector/e2e/HttpTests.java b/...s-e2e-test/connectors-e2e-test-http/src/test/java/io/camunda/connector/e2e/HttpTests.java
@@ -39,15 +39,14 @@
 import io.camunda.connector.http.base.model.auth.BearerAuthentication;
 import io.camunda.connector.http.base.model.auth.OAuthAuthentication;
 import io.camunda.connector.runtime.inbound.importer.ProcessDefinitionSearch;
+import io.camunda.connector.runtime.inbound.operate.OperateClient;
 import io.camunda.connector.runtime.inbound.state.ProcessImportResult;
 import io.camunda.connector.runtime.inbound.state.ProcessImportResult.ProcessDefinitionIdentifier;
 import io.camunda.connector.runtime.inbound.state.ProcessImportResult.ProcessDefinitionVersion;
 import io.camunda.connector.runtime.inbound.state.ProcessStateStore;
-import io.camunda.operate.CamundaOperateClient;
-import io.camunda.operate.model.ProcessDefinition;
-import io.camunda.process.test.api.CamundaProcessTestContext;
 import io.camunda.process.test.api.CamundaSpringProcessTest;
 import io.camunda.zeebe.client.ZeebeClient;
+import io.camunda.zeebe.client.api.search.response.ProcessDefinition;
 import io.camunda.zeebe.model.bpmn.Bpmn;
 import io.camunda.zeebe.model.bpmn.instance.Process;
 import java.io.File;
@@ -88,9 +87,7 @@ public class HttpTests {
 
   @Autowired ProcessStateStore stateStore;
 
-  @MockBean CamundaOperateClient camundaOperateClient;
-
-  @Autowired CamundaProcessTestContext context;
+  @MockBean OperateClient operateClient;
 
   @LocalServerPort int serverPort;
 
@@ -341,21 +338,21 @@ void successfulWebhookModelRun() throws Exception {
     var model = replace("webhook_connector.bpmn", replace("http://webhook", mockUrl));
 
     // Prepare a mocked process connectorData backed by our test model
-    when(camundaOperateClient.getProcessDefinitionModel(1L)).thenReturn(model);
+    when(operateClient.getProcessModel(1L)).thenReturn(model);
     var processDef = mock(ProcessDefinition.class);
-    when(processDef.getKey()).thenReturn(1L);
+    when(processDef.getProcessDefinitionKey()).thenReturn(1L);
     when(processDef.getTenantId()).thenReturn(zeebeClient.getConfiguration().getDefaultTenantId());
-    when(processDef.getBpmnProcessId())
+    when(processDef.getProcessDefinitionId())
         .thenReturn(model.getModelElementsByType(Process.class).stream().findFirst().get().getId());
 
     // Deploy the webhook
     stateStore.update(
         new ProcessImportResult(
             Map.of(
                 new ProcessDefinitionIdentifier(
-                    processDef.getBpmnProcessId(), processDef.getTenantId()),
+                    processDef.getProcessDefinitionId(), processDef.getTenantId()),
                 new ProcessDefinitionVersion(
-                    processDef.getKey(), processDef.getVersion().intValue()))));
+                    processDef.getProcessDefinitionKey(), processDef.getVersion()))));
 
     var bpmnTest =
         ZeebeTest.with(zeebeClient).deploy(model).createInstance().waitForProcessCompletion();
@@ -370,21 +367,21 @@ void successfulWebhookModelWithQueryParamsRun() throws Exception {
     var model = replace("webhook_connector.bpmn", replace("http://webhook", mockUrl));
 
     // Prepare a mocked process connectorData backed by our test model
-    when(camundaOperateClient.getProcessDefinitionModel(1L)).thenReturn(model);
+    when(operateClient.getProcessModel(1L)).thenReturn(model);
     var processDef = mock(ProcessDefinition.class);
-    when(processDef.getKey()).thenReturn(1L);
+    when(processDef.getProcessDefinitionKey()).thenReturn(1L);
     when(processDef.getTenantId()).thenReturn(zeebeClient.getConfiguration().getDefaultTenantId());
-    when(processDef.getBpmnProcessId())
+    when(processDef.getProcessDefinitionId())
         .thenReturn(model.getModelElementsByType(Process.class).stream().findFirst().get().getId());
 
     // Deploy the webhook
     stateStore.update(
         new ProcessImportResult(
             Map.of(
                 new ProcessDefinitionIdentifier(
-                    processDef.getBpmnProcessId(), processDef.getTenantId()),
+                    processDef.getProcessDefinitionId(), processDef.getTenantId()),
                 new ProcessDefinitionVersion(
-                    processDef.getKey(), processDef.getVersion().intValue()))));
+                    processDef.getProcessDefinitionKey(), processDef.getVersion()))));
 
     var bpmnTest =
         ZeebeTest.with(zeebeClient).deploy(model).createInstance().waitForProcessCompletion();

diff --git a/...-test/connectors-e2e-test-kafka/src/test/java/io/camunda/connector/e2e/BaseKafkaTest.java b/...-test/connectors-e2e-test-kafka/src/test/java/io/camunda/connector/e2e/BaseKafkaTest.java
@@ -20,8 +20,8 @@
 import static org.mockito.Mockito.when;
 
 import io.camunda.connector.runtime.inbound.importer.ProcessDefinitionSearch;
+import io.camunda.connector.runtime.inbound.operate.OperateClient;
 import io.camunda.connector.runtime.inbound.state.ProcessStateStore;
-import io.camunda.operate.CamundaOperateClient;
 import io.camunda.zeebe.client.ZeebeClient;
 import java.io.File;
 import java.util.Arrays;
@@ -63,7 +63,7 @@ public class BaseKafkaTest {
 
   @Autowired ProcessStateStore processStateStore;
 
-  @Autowired CamundaOperateClient camundaOperateClient;
+  @Autowired OperateClient camundaOperateClient;
 
   static KafkaContainer kafkaContainer;
 

diff --git a/...t/connectors-e2e-test-kafka/src/test/java/io/camunda/connector/e2e/InboundKafkaTests.java b/...t/connectors-e2e-test-kafka/src/test/java/io/camunda/connector/e2e/InboundKafkaTests.java
@@ -24,10 +24,9 @@
 import io.camunda.connector.runtime.inbound.state.ProcessImportResult;
 import io.camunda.connector.runtime.inbound.state.ProcessImportResult.ProcessDefinitionIdentifier;
 import io.camunda.connector.runtime.inbound.state.ProcessImportResult.ProcessDefinitionVersion;
-import io.camunda.operate.exception.OperateException;
-import io.camunda.operate.model.ProcessDefinition;
 import io.camunda.process.test.api.CamundaAssert;
 import io.camunda.process.test.api.CamundaSpringProcessTest;
+import io.camunda.zeebe.client.api.search.response.ProcessDefinition;
 import io.camunda.zeebe.model.bpmn.BpmnModelInstance;
 import io.camunda.zeebe.model.bpmn.instance.Process;
 import java.util.Map;
@@ -68,7 +67,7 @@ public void afterEach() {
   }
 
   @Test
-  void testKafkaIntermediateConnectorProcessWithJsonKey() throws OperateException {
+  void testKafkaIntermediateConnectorProcessWithJsonKey() {
     Map<String, Object> expectedJsonResponse =
         Map.of(
             "key", MESSAGE_KEY_JSON_AS_OBJECT,
@@ -87,9 +86,9 @@ void testKafkaIntermediateConnectorProcessWithJsonKey() throws OperateException
         new ProcessImportResult(
             Map.of(
                 new ProcessDefinitionIdentifier(
-                    processDef.getBpmnProcessId(), processDef.getTenantId()),
+                    processDef.getProcessDefinitionId(), processDef.getTenantId()),
                 new ProcessDefinitionVersion(
-                    processDef.getKey(), processDef.getVersion().intValue()))));
+                    processDef.getProcessDefinitionKey(), processDef.getVersion()))));
 
     AtomicBoolean kafkaProducerThreadRun =
         producer.startContinuousMessageSending(
@@ -107,7 +106,7 @@ void testKafkaIntermediateConnectorProcessWithJsonKey() throws OperateException
   }
 
   @Test
-  void testKafkaIntermediateConnectorProcessWithStringKey() throws OperateException {
+  void testKafkaIntermediateConnectorProcessWithStringKey() {
     Map<String, Object> expectedJsonResponse =
         Map.of(
             "key",
@@ -130,9 +129,9 @@ void testKafkaIntermediateConnectorProcessWithStringKey() throws OperateExceptio
         new ProcessImportResult(
             Map.of(
                 new ProcessDefinitionIdentifier(
-                    processDef.getBpmnProcessId(), processDef.getTenantId()),
+                    processDef.getProcessDefinitionId(), processDef.getTenantId()),
                 new ProcessDefinitionVersion(
-                    processDef.getKey(), processDef.getVersion().intValue()))));
+                    processDef.getProcessDefinitionKey(), processDef.getVersion()))));
 
     AtomicBoolean kafkaProducerThreadRun =
         producer.startContinuousMessageSending(
@@ -147,11 +146,11 @@ void testKafkaIntermediateConnectorProcessWithStringKey() throws OperateExceptio
         .hasVariable("allResult", expectedJsonResponse);
   }
 
-  private void mockProcessDefinition(BpmnModelInstance model) throws OperateException {
-    when(camundaOperateClient.getProcessDefinitionModel(1L)).thenReturn(model);
-    when(processDef.getKey()).thenReturn(1L);
+  private void mockProcessDefinition(BpmnModelInstance model) {
+    when(camundaOperateClient.getProcessModel(1)).thenReturn(model);
+    when(processDef.getProcessDefinitionKey()).thenReturn(1L);
     when(processDef.getTenantId()).thenReturn(zeebeClient.getConfiguration().getDefaultTenantId());
-    when(processDef.getBpmnProcessId())
+    when(processDef.getProcessDefinitionId())
         .thenReturn(model.getModelElementsByType(Process.class).stream().findFirst().get().getId());
   }
 }
diff --git a/...est/connectors-e2e-test-mail/src/test/java/io/camunda/connector/e2e/InboundEmailTest.java b/...est/connectors-e2e-test-mail/src/test/java/io/camunda/connector/e2e/InboundEmailTest.java
@@ -22,13 +22,12 @@
 import static org.mockito.Mockito.when;
 
 import io.camunda.connector.e2e.app.TestConnectorRuntimeApplication;
+import io.camunda.connector.runtime.inbound.operate.OperateClient;
 import io.camunda.connector.runtime.inbound.state.ProcessImportResult;
 import io.camunda.connector.runtime.inbound.state.ProcessStateStore;
-import io.camunda.operate.CamundaOperateClient;
-import io.camunda.operate.exception.OperateException;
-import io.camunda.operate.model.ProcessDefinition;
 import io.camunda.process.test.api.CamundaSpringProcessTest;
 import io.camunda.zeebe.client.ZeebeClient;
+import io.camunda.zeebe.client.api.search.response.ProcessDefinition;
 import io.camunda.zeebe.model.bpmn.BpmnModelInstance;
 import io.camunda.zeebe.model.bpmn.instance.Process;
 import jakarta.mail.Flags;
@@ -38,7 +37,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicInteger;
 import org.awaitility.core.ConditionTimeoutException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -61,9 +60,9 @@ public class InboundEmailTest extends BaseEmailTest {
 
   private static final ScheduledExecutorService scheduler =
       Executors.newSingleThreadScheduledExecutor();
-  private static AtomicLong counter = new AtomicLong(1);
+  private static final AtomicInteger counter = new AtomicInteger(1);
   @Autowired ProcessStateStore processStateStore;
-  @Autowired CamundaOperateClient camundaOperateClient;
+  @Autowired OperateClient camundaOperateClient;
   @Mock private ProcessDefinition processDef;
   @Autowired private ZeebeClient zeebeClient;
 
@@ -73,7 +72,7 @@ public void beforeEach() {
   }
 
   @Test
-  public void shouldReceiveEmailAndSetAsSeen() throws OperateException, MessagingException {
+  public void shouldReceiveEmailAndSetAsSeen() throws MessagingException {
     var model =
         replace(
             "email-inbound-connector-intermediate_unseen_read.bpmn",
@@ -92,9 +91,9 @@ public void shouldReceiveEmailAndSetAsSeen() throws OperateException, MessagingE
         new ProcessImportResult(
             Map.of(
                 new ProcessImportResult.ProcessDefinitionIdentifier(
-                    processDef.getBpmnProcessId(), processDef.getTenantId()),
+                    processDef.getProcessDefinitionId(), processDef.getTenantId()),
                 new ProcessImportResult.ProcessDefinitionVersion(
-                    processDef.getKey(), processDef.getVersion().intValue()))));
+                    processDef.getProcessDefinitionKey(), processDef.getVersion()))));
 
     bpmnTest = bpmnTest.waitForProcessCompletion();
 
@@ -109,7 +108,7 @@ public void shouldReceiveEmailAndSetAsSeen() throws OperateException, MessagingE
   }
 
   @Test
-  public void shouldThrowWhenAllMessageAreSeen() throws OperateException, MessagingException {
+  public void shouldThrowWhenAllMessageAreSeen() throws MessagingException {
     var model =
         replace(
             "email-inbound-connector-intermediate_unseen_read.bpmn",
@@ -137,15 +136,15 @@ public void shouldThrowWhenAllMessageAreSeen() throws OperateException, Messagin
         new ProcessImportResult(
             Map.of(
                 new ProcessImportResult.ProcessDefinitionIdentifier(
-                    processDef.getBpmnProcessId(), processDef.getTenantId()),
+                    processDef.getProcessDefinitionId(), processDef.getTenantId()),
                 new ProcessImportResult.ProcessDefinitionVersion(
-                    processDef.getKey(), processDef.getVersion().intValue()))));
+                    processDef.getProcessDefinitionKey(), processDef.getVersion()))));
 
     Assertions.assertThrows(ConditionTimeoutException.class, bpmnTest::waitForProcessCompletion);
   }
 
   @Test
-  public void shouldReceiveEmailAndDelete() throws OperateException, MessagingException {
+  public void shouldReceiveEmailAndDelete() throws MessagingException {
     var model =
         replace(
             "email-inbound-connector-intermediate_unseen_delete.bpmn",
@@ -164,9 +163,9 @@ public void shouldReceiveEmailAndDelete() throws OperateException, MessagingExce
         new ProcessImportResult(
             Map.of(
                 new ProcessImportResult.ProcessDefinitionIdentifier(
-                    processDef.getBpmnProcessId(), processDef.getTenantId()),
+                    processDef.getProcessDefinitionId(), processDef.getTenantId()),
                 new ProcessImportResult.ProcessDefinitionVersion(
-                    processDef.getKey(), processDef.getVersion().intValue()))));
+                    processDef.getProcessDefinitionKey(), processDef.getVersion()))));
 
     bpmnTest = bpmnTest.waitForProcessCompletion();
 
@@ -181,7 +180,7 @@ public void shouldReceiveEmailAndDelete() throws OperateException, MessagingExce
   }
 
   @Test
-  public void shouldReceiveEmailAndMove() throws OperateException, MessagingException {
+  public void shouldReceiveEmailAndMove() throws MessagingException {
     var model =
         replace(
             "email-inbound-connector-intermediate_unseen_move.bpmn",
@@ -200,9 +199,9 @@ public void shouldReceiveEmailAndMove() throws OperateException, MessagingExcept
         new ProcessImportResult(
             Map.of(
                 new ProcessImportResult.ProcessDefinitionIdentifier(
-                    processDef.getBpmnProcessId(), processDef.getTenantId()),
+                    processDef.getProcessDefinitionId(), processDef.getTenantId()),
                 new ProcessImportResult.ProcessDefinitionVersion(
-                    processDef.getKey(), processDef.getVersion().intValue()))));
+                    processDef.getProcessDefinitionKey(), processDef.getVersion()))));
 
     bpmnTest = bpmnTest.waitForProcessCompletion();
 
@@ -217,17 +216,17 @@ public void shouldReceiveEmailAndMove() throws OperateException, MessagingExcept
     assertThat(bpmnTest.getProcessInstanceEvent()).hasVariable("plainTextBody", "hey");
   }
 
-  private void mockProcessDefinition(BpmnModelInstance model) throws OperateException {
-    when(camundaOperateClient.getProcessDefinitionModel(1L)).thenReturn(model);
-    when(processDef.getKey()).thenReturn(1L);
+  private void mockProcessDefinition(BpmnModelInstance model) {
+    when(camundaOperateClient.getProcessModel(1L)).thenReturn(model);
+    when(processDef.getProcessDefinitionKey()).thenReturn(1L);
     when(processDef.getTenantId()).thenReturn(zeebeClient.getConfiguration().getDefaultTenantId());
-    when(processDef.getBpmnProcessId())
+    when(processDef.getProcessDefinitionId())
         .thenReturn(model.getModelElementsByType(Process.class).stream().findFirst().get().getId());
     when(processDef.getVersion()).thenReturn(counter.getAndIncrement());
   }
 
   @Test
-  public void shouldPollEmailAndMove() throws OperateException, MessagingException {
+  public void shouldPollEmailAndMove() throws MessagingException {
     var model =
         replace(
             "email-inbound-connector-intermediate_all_delete.bpmn",
@@ -258,9 +257,9 @@ public void shouldPollEmailAndMove() throws OperateException, MessagingException
         new ProcessImportResult(
             Map.of(
                 new ProcessImportResult.ProcessDefinitionIdentifier(
-                    processDef.getBpmnProcessId(), processDef.getTenantId()),
+                    processDef.getProcessDefinitionId(), processDef.getTenantId()),
                 new ProcessImportResult.ProcessDefinitionVersion(
-                    processDef.getKey(), processDef.getVersion().intValue()))));
+                    processDef.getProcessDefinitionKey(), processDef.getVersion()))));
 
     bpmnTest = bpmnTest.waitForProcessCompletion();