[camel] branch master updated: [CAMEL-13353] Update to re-enable the camel-lra integration tests

[davsclaus]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 8368882  [CAMEL-13353] Update to re-enable the camel-lra integration 
tests
8368882 is described below

commit 83688826081cf37a8cb19bf6c7ce6a283528caf5
Author: Amos Feng <zf...@redhat.com>
AuthorDate: Thu Mar 21 20:48:00 2019 +0800

    [CAMEL-13353] Update to re-enable the camel-lra integration tests
---
 .../java/org/apache/camel/service/lra/AbstractLRATestSupport.java    | 5 +++++
 .../src/test/java/org/apache/camel/service/lra/LRAFailuresIT.java    | 2 --
 .../src/test/java/org/apache/camel/service/lra/LRAManualIT.java      | 1 -
 .../src/test/java/org/apache/camel/service/lra/LRATimeoutIT.java     | 1 -
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/components/camel-lra/src/test/java/org/apache/camel/service/lra/AbstractLRATestSupport.java
 
b/components/camel-lra/src/test/java/org/apache/camel/service/lra/AbstractLRATestSupport.java
index 6529858..86ced60c 100644
--- 
a/components/camel-lra/src/test/java/org/apache/camel/service/lra/AbstractLRATestSupport.java
+++ 
b/components/camel-lra/src/test/java/org/apache/camel/service/lra/AbstractLRATestSupport.java
@@ -18,6 +18,7 @@ package org.apache.camel.service.lra;
 
 import java.io.IOException;
 import java.io.InputStream;
+import static java.util.concurrent.TimeUnit.SECONDS;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.core.Response;
@@ -32,6 +33,9 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 
+import static org.awaitility.Awaitility.await;
+import static org.hamcrest.Matchers.equalTo;
+
 /**
  * Base class for LRA based tests.
  */
@@ -48,6 +52,7 @@ public abstract class AbstractLRATestSupport extends 
CamelTestSupport {
 
     @After
     public void checkActiveLRAs() throws IOException {
+        await().atMost(2, SECONDS).until(() -> getNumberOfActiveLRAs(), 
equalTo(activeLRAs));
         Assert.assertEquals("Some LRA have been left pending", activeLRAs, 
getNumberOfActiveLRAs());
     }
 
diff --git 
a/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRAFailuresIT.java
 
b/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRAFailuresIT.java
index 135d1dc..704f865 100644
--- 
a/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRAFailuresIT.java
+++ 
b/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRAFailuresIT.java
@@ -28,7 +28,6 @@ public class LRAFailuresIT extends AbstractLRATestSupport {
     private AtomicInteger maxFailures;
 
     @Test
-    @Ignore("https://issues.jboss.org/browse/JBTM-2978";)
     public void testCompensationAfterFailures() throws Exception {
         maxFailures = new AtomicInteger(1);
 
@@ -42,7 +41,6 @@ public class LRAFailuresIT extends AbstractLRATestSupport {
     }
 
     @Test
-    @Ignore("https://issues.jboss.org/browse/JBTM-2977";)
     public void testCompletionAfterFailures() throws Exception {
         maxFailures = new AtomicInteger(1);
 
diff --git 
a/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRAManualIT.java
 
b/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRAManualIT.java
index 4fb1853..b8130d2 100644
--- 
a/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRAManualIT.java
+++ 
b/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRAManualIT.java
@@ -50,7 +50,6 @@ public class LRAManualIT extends AbstractLRATestSupport {
     }
 
     @Test
-    @Ignore("https://issues.jboss.org/browse/JBTM-2979";)
     public void testTimeout() throws InterruptedException {
         MockEndpoint compensateEndpoint = getMockEndpoint("mock:compensate");
         compensateEndpoint.expectedMessageCount(1);
diff --git 
a/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRATimeoutIT.java
 
b/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRATimeoutIT.java
index 5b6764d..e2fb580 100644
--- 
a/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRATimeoutIT.java
+++ 
b/components/camel-lra/src/test/java/org/apache/camel/service/lra/LRATimeoutIT.java
@@ -27,7 +27,6 @@ import org.junit.Test;
 public class LRATimeoutIT extends AbstractLRATestSupport {
 
     @Test
-    @Ignore("https://issues.jboss.org/browse/JBTM-2979";)
     public void testTimeoutCalledCorrectly() throws Exception {
 
         MockEndpoint compensate = getMockEndpoint("mock:compensate");