You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2020/09/11 07:44:56 UTC

[camel-quarkus] branch master updated: Fix intermittent failures of SmallRyeReactiveMessagingIT

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 b908017  Fix intermittent failures of SmallRyeReactiveMessagingIT
b908017 is described below

commit b908017e9b04a8f1ed3b63aa47ac863e87f2477d
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Sep 11 07:31:06 2020 +0100

    Fix intermittent failures of SmallRyeReactiveMessagingIT
    
    Fixes #1632
---
 .../component/smallrye/reactive/messaging/it/PublisherRoute.java    | 6 ------
 .../reactive/messaging/it/SmallRyeReactiveMessagingResource.java    | 6 +++++-
 .../reactive/messaging/it/SmallRyeReactiveMessagingTest.java        | 4 ----
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/integration-tests/smallrye-reactive-messaging/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/PublisherRoute.java b/integration-tests/smallrye-reactive-messaging/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/PublisherRoute.java
index becbf9b..b32edae 100644
--- a/integration-tests/smallrye-reactive-messaging/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/PublisherRoute.java
+++ b/integration-tests/smallrye-reactive-messaging/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/PublisherRoute.java
@@ -26,13 +26,10 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.reactive.streams.api.CamelReactiveStreamsService;
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.eclipse.microprofile.reactive.messaging.Outgoing;
-import org.jboss.logging.Logger;
 import org.reactivestreams.Publisher;
 
 public class PublisherRoute extends RouteBuilder {
 
-    private static final Logger LOG = Logger.getLogger(PublisherRoute.class);
-
     @Inject
     CamelReactiveStreamsService camel;
 
@@ -41,10 +38,7 @@ public class PublisherRoute extends RouteBuilder {
 
     @Incoming("sink")
     public CompletionStage<Void> sink(String value) {
-        LOG.infof("Results before add: %s", String.join(",", results.getResults()));
-        LOG.infof("Adding result value: %s", value);
         results.addResult(value);
-        LOG.infof("Results after add: %s", String.join(",", results.getResults()));
         return CompletableFuture.completedFuture(null);
     }
 
diff --git a/integration-tests/smallrye-reactive-messaging/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/SmallRyeReactiveMessagingResource.java b/integration-tests/smallrye-reactive-messaging/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/SmallRyeReactiveMessagingResource.java
index 4a03fec..3e90518 100644
--- a/integration-tests/smallrye-reactive-messaging/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/SmallRyeReactiveMessagingResource.java
+++ b/integration-tests/smallrye-reactive-messaging/src/main/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/SmallRyeReactiveMessagingResource.java
@@ -17,6 +17,8 @@
 package org.apache.camel.quarkus.component.smallrye.reactive.messaging.it;
 
 import java.net.URI;
+import java.util.Collections;
+import java.util.List;
 
 import javax.inject.Inject;
 import javax.ws.rs.Consumes;
@@ -52,6 +54,8 @@ public class SmallRyeReactiveMessagingResource {
     @Produces(MediaType.TEXT_PLAIN)
     @GET
     public String getValues() {
-        return String.join(",", results.getResults());
+        List<String> values = results.getResults();
+        Collections.sort(values);
+        return String.join(",", values);
     }
 }
diff --git a/integration-tests/smallrye-reactive-messaging/src/test/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/SmallRyeReactiveMessagingTest.java b/integration-tests/smallrye-reactive-messaging/src/test/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/SmallRyeReactiveMessagingTest.java
index d75d79a..005910e 100644
--- a/integration-tests/smallrye-reactive-messaging/src/test/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/SmallRyeReactiveMessagingTest.java
+++ b/integration-tests/smallrye-reactive-messaging/src/test/java/org/apache/camel/quarkus/component/smallrye/reactive/messaging/it/SmallRyeReactiveMessagingTest.java
@@ -25,7 +25,6 @@ import java.util.stream.Stream;
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
-import org.jboss.logging.Logger;
 import org.junit.jupiter.api.Test;
 
 import static org.awaitility.Awaitility.await;
@@ -33,8 +32,6 @@ import static org.awaitility.Awaitility.await;
 @QuarkusTest
 class SmallRyeReactiveMessagingTest {
 
-    private static final Logger LOG = Logger.getLogger(SmallRyeReactiveMessagingTest.class);
-
     @Test
     public void testSmallRyeReactiveMessagingCamelRouteSubscriber() {
         Path path = Paths.get("target/values.txt");
@@ -69,7 +66,6 @@ class SmallRyeReactiveMessagingTest {
                     .extract()
                     .body()
                     .asString();
-            LOG.infof("Values: %s", response);
             return response.equals("A,B,C,D");
         });
     }