[camel-quarkus] branch master updated: Send unique messages in Slack itest to avoid false positive tests

[ja...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 6818dd0  Send unique messages in Slack itest to avoid false positive tests
6818dd0 is described below

commit 6818dd060e0b7d10208c59dfc7a07a6e57bc93db
Author: Lukas Lowinger <ll...@redhat.com>
AuthorDate: Tue Aug 25 14:46:26 2020 +0200

    Send unique messages in Slack itest to avoid false positive tests
---
 .../camel/quarkus/component/slack/it/SlackResource.java   |  4 +++-
 .../camel/quarkus/component/slack/it/SlackTest.java       | 15 +++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/integration-tests/slack/src/main/java/org/apache/camel/quarkus/component/slack/it/SlackResource.java b/integration-tests/slack/src/main/java/org/apache/camel/quarkus/component/slack/it/SlackResource.java
index 8097bd5..38ff208 100644
--- a/integration-tests/slack/src/main/java/org/apache/camel/quarkus/component/slack/it/SlackResource.java
+++ b/integration-tests/slack/src/main/java/org/apache/camel/quarkus/component/slack/it/SlackResource.java
@@ -20,6 +20,7 @@ import java.net.URI;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
+import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -54,8 +55,9 @@ public class SlackResource {
 
     @Path("/message")
     @POST
+    @Consumes(MediaType.TEXT_PLAIN)
     public Response createSlackMessage(String message) throws Exception {
-        producerTemplate.requestBody("slack://general?" + SLACK_AUTH_PARAMS, "Hello Camel Quarkus Slack");
+        producerTemplate.requestBody("slack://general?" + SLACK_AUTH_PARAMS, message);
         return Response
                 .created(new URI("https://camel.apache.org/"))
                 .build();
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 9bd4f4f..77877af 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
@@ -16,8 +16,11 @@
  */
 package org.apache.camel.quarkus.component.slack.it;
 
+import java.util.UUID;
+
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -39,13 +42,21 @@ class SlackTest {
 
     @Test
     public void testSlackProduceConsumeMessages() {
-        RestAssured.post("/slack/message")
+        final String message = "Hello Camel Quarkus Slack" + (externalSlackEnabled() ? " " + UUID.randomUUID() : "");
+        RestAssured.given()
+                .contentType(ContentType.TEXT)
+                .body(message)
+                .post("/slack/message")
                 .then()
                 .statusCode(201);
 
         RestAssured.get("/slack/messages")
                 .then()
                 .statusCode(200)
-                .body(equalTo("Hello Camel Quarkus Slack"));
+                .body(equalTo(message));
+    }
+
+    boolean externalSlackEnabled() {
+        return System.getenv("SLACK_WEBHOOK_URL") != null;
     }
 }