You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2020/04/17 15:30:35 UTC

[james-project] 01/16: JAMES-3117 PeriodicalHealthChecksTest should use reactive health check

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

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit d9ce8b7c2c830d3d22e9f6acf5e50582dc88471d
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Apr 17 11:25:34 2020 +0700

    JAMES-3117 PeriodicalHealthChecksTest should use reactive health check
    
    Before that unit tests were failing
---
 .../java/org/apache/james/PeriodicalHealthChecksTest.java | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/PeriodicalHealthChecksTest.java b/server/container/guice/guice-common/src/test/java/org/apache/james/PeriodicalHealthChecksTest.java
index 315540b..6819ebe 100644
--- a/server/container/guice/guice-common/src/test/java/org/apache/james/PeriodicalHealthChecksTest.java
+++ b/server/container/guice/guice-common/src/test/java/org/apache/james/PeriodicalHealthChecksTest.java
@@ -38,6 +38,7 @@ import org.mockito.Mockito;
 
 import com.google.common.collect.ImmutableSet;
 
+import reactor.core.publisher.Mono;
 import reactor.test.scheduler.VirtualTimeScheduler;
 
 public class PeriodicalHealthChecksTest {
@@ -53,8 +54,8 @@ public class PeriodicalHealthChecksTest {
     void setUp() {
         mockHealthCheck1 = Mockito.mock(EventDeadLettersHealthCheck.class);
         mockHealthCheck2 = Mockito.mock(GuiceLifecycleHealthCheck.class);
-        when(mockHealthCheck1.check()).thenReturn(Result.healthy(new ComponentName("mockHealthCheck1")));
-        when(mockHealthCheck2.check()).thenReturn(Result.healthy(new ComponentName("mockHealthCheck2")));
+        when(mockHealthCheck1.checkReactive()).thenReturn(Mono.just(Result.healthy(new ComponentName("mockHealthCheck1"))));
+        when(mockHealthCheck2.checkReactive()).thenReturn(Mono.just(Result.healthy(new ComponentName("mockHealthCheck2"))));
 
         scheduler = VirtualTimeScheduler.getOrSet();
         testee = new PeriodicalHealthChecks(ImmutableSet.of(mockHealthCheck1, mockHealthCheck2),
@@ -72,7 +73,7 @@ public class PeriodicalHealthChecksTest {
         testee.start();
 
         scheduler.advanceTimeBy(Duration.ofSeconds(PERIOD));
-        verify(mockHealthCheck1, atLeast(1)).check();
+        verify(mockHealthCheck1, atLeast(1)).checkReactive();
     }
 
     @Test
@@ -80,7 +81,7 @@ public class PeriodicalHealthChecksTest {
         testee.start();
 
         scheduler.advanceTimeBy(Duration.ofSeconds(PERIOD * EXPECTED_INVOKED_TIME));
-        verify(mockHealthCheck1, times(EXPECTED_INVOKED_TIME)).check();
+        verify(mockHealthCheck1, times(EXPECTED_INVOKED_TIME)).checkReactive();
     }
 
     @Test
@@ -88,8 +89,8 @@ public class PeriodicalHealthChecksTest {
         testee.start();
 
         scheduler.advanceTimeBy(Duration.ofSeconds(PERIOD * EXPECTED_INVOKED_TIME));
-        verify(mockHealthCheck1, times(EXPECTED_INVOKED_TIME)).check();
-        verify(mockHealthCheck2, times(EXPECTED_INVOKED_TIME)).check();
+        verify(mockHealthCheck1, times(EXPECTED_INVOKED_TIME)).checkReactive();
+        verify(mockHealthCheck2, times(EXPECTED_INVOKED_TIME)).checkReactive();
     }
 
     @Test
@@ -99,6 +100,6 @@ public class PeriodicalHealthChecksTest {
         testee.start();
 
         scheduler.advanceTimeBy(Duration.ofSeconds(PERIOD * EXPECTED_INVOKED_TIME));
-        verify(mockHealthCheck2, times(EXPECTED_INVOKED_TIME)).check();
+        verify(mockHealthCheck2, times(EXPECTED_INVOKED_TIME)).checkReactive();
     }
 }
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org