[camel-quarkus] branch main updated: Fix failing Slack integration tests with the real Slack service

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git


The following commit(s) were added to refs/heads/main by this push:
     new 284975e96e Fix failing Slack integration tests with the real Slack service
284975e96e is described below

commit 284975e96e06bdc682f03d03e08387945647af02
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue May 10 12:03:11 2022 +0100

    Fix failing Slack integration tests with the real Slack service
    
    Fixes #3781
---
 .../camel/quarkus/component/slack/it/SlackTest.java    | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/integration-tests/slack/src/test/java/org/apache/camel/quarkus/component/slack/it/SlackTest.java b/integration-tests/slack/src/test/java/org/apache/camel/quarkus/component/slack/it/SlackTest.java
index 3d7ef698b1..b521c5f613 100644
--- a/integration-tests/slack/src/test/java/org/apache/camel/quarkus/component/slack/it/SlackTest.java
+++ b/integration-tests/slack/src/test/java/org/apache/camel/quarkus/component/slack/it/SlackTest.java
@@ -18,11 +18,9 @@ package org.apache.camel.quarkus.component.slack.it;
 
 import java.util.UUID;
 
-import com.github.tomakehurst.wiremock.WireMockServer;
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.http.ContentType;
-import org.apache.camel.quarkus.test.wiremock.MockServer;
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.junit.jupiter.api.Test;
 
@@ -42,9 +40,6 @@ import static org.hamcrest.CoreMatchers.equalTo;
 @QuarkusTestResource(SlackTestResource.class)
 class SlackTest {
 
-    @MockServer
-    WireMockServer server;
-
     @Test
     public void testSlackProduceConsumeMessages() {
         // sending a message using Token
@@ -61,11 +56,10 @@ class SlackTest {
                 .get("/slack/messages")
                 .then()
                 .statusCode(200)
-                .body(equalTo(getExpectedResponse(message, 0)));
+                .body("text", equalTo(message));
 
         // sending a message using Webhook URL
         message = "Hello Camel Quarkus Slack using Webhook URL" + (externalSlackEnabled() ? " " + UUID.randomUUID() : "");
-
         given()
                 .contentType(ContentType.TEXT)
                 .body(message)
@@ -78,7 +72,7 @@ class SlackTest {
                 .get("/slack/messages")
                 .then()
                 .statusCode(200)
-                .body(equalTo(getExpectedResponse(message, 0)));
+                .body("text", equalTo(message));
 
         message = "Hello Camel Quarkus Slack using Blocks" + (externalSlackEnabled() ? " " + UUID.randomUUID() : "");
 
@@ -95,14 +89,10 @@ class SlackTest {
                 .get("/slack/messages")
                 .then()
                 .statusCode(200)
-                .body(equalTo(getExpectedResponse(message, 3)));
+                .body("text", equalTo(message), "nbBlocks", equalTo(3));
     }
 
-    boolean externalSlackEnabled() {
+    private boolean externalSlackEnabled() {
         return !ConfigProvider.getConfig().getOptionalValue("wiremock.url", String.class).isPresent();
     }
-
-    String getExpectedResponse(String message, int nbBlocks) {
-        return String.format("{\"text\":\"%s\",\"nbBlocks\":%s}", message, nbBlocks);
-    }
 }