Fixing blinking tests (ReactiveX#173)

* Fixing blinking test in AsyncRetryEventPublisherTest * Removing race condition from 'RateLimiterChainSpec.test events' test
jihoonson · Nov 2, 2017 · 003ab53 · 003ab53
1 parent 077e1e2
commit 003ab53
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/...st/groovy/io/github/resilience4j/ratpack/ratelimiter/endpoint/RateLimiterChainSpec.groovy b/...st/groovy/io/github/resilience4j/ratpack/ratelimiter/endpoint/RateLimiterChainSpec.groovy
@@ -121,10 +121,6 @@ class RateLimiterChainSpec extends Specification {
         }
 
         and:
-        ['test1', 'test2'].each {
-            def r = rateLimiterRegistry.rateLimiter(it)
-            assert r.metrics.availablePermissions == 0
-        }
         await().atMost(2, TimeUnit.SECONDS).until {
             ['test1', 'test2'].each {
                 def r = rateLimiterRegistry.rateLimiter(it)

diff --git a/...ence4j-retry/src/test/java/io/github/resilience4j/retry/AsyncRetryEventPublisherTest.java b/...ence4j-retry/src/test/java/io/github/resilience4j/retry/AsyncRetryEventPublisherTest.java
@@ -26,11 +26,15 @@
 
 import javax.xml.ws.WebServiceException;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 import static io.github.resilience4j.retry.utils.AsyncUtils.awaitResult;
-import static io.vavr.API.*;
+import static io.vavr.API.$;
+import static io.vavr.API.Case;
+import static io.vavr.API.Match;
 import static io.vavr.Predicates.instanceOf;
 import static java.util.concurrent.CompletableFuture.completedFuture;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -62,22 +66,27 @@ public void shouldReturnTheSameConsumer() {
     }
 
     @Test
-    public void shouldConsumeOnSuccessEvent() {
+    public void shouldConsumeOnSuccessEvent() throws Exception {
         CompletableFuture<String> failedFuture = new CompletableFuture<>();
         failedFuture.completeExceptionally(new WebServiceException("BAM!"));
 
+        CountDownLatch latch = new CountDownLatch(1);
+
         // Given the HelloWorldService returns Hello world
         given(helloWorldService.returnHelloWorld())
                 .willReturn(failedFuture)
                 .willReturn(completedFuture("Hello world"));
 
         retry.getEventPublisher()
-            .onSuccess(event ->
-                    logger.info(event.getEventType().toString()));
+            .onSuccess(event -> {
+                logger.info(event.getEventType().toString());
+                latch.countDown();
+            });
 
         String result = awaitResult(retry.executeCompletionStage(scheduler,
                 () -> helloWorldService.returnHelloWorld()));
 
+        assertThat(latch.await(10, TimeUnit.SECONDS)).isTrue();
         assertThat(result).isEqualTo("Hello world");
         then(helloWorldService).should(times(2)).returnHelloWorld();
         then(logger).should(times(1)).info("SUCCESS");