Merge pull request #50 from FOCONIS/improve-test-speed

Refactor tests - Remove Thread.Sleep to improve test speed

Author: rbygrave

ebean-datasource/src/test/java/io/ebean/datasource/pool/ConnectionPoolOfflineTest.java

@@ -11,7 +11,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class ConnectionPoolOfflineTest {
+public class ConnectionPoolOfflineTest implements WaitFor {
 
   private static final Logger log = LoggerFactory.getLogger(ConnectionPoolOfflineTest.class);
 
@@ -39,44 +39,47 @@ public void testOffline() throws InterruptedException, SQLException {
     assertThat(pool.isOnline()).isFalse();
     assertThat(pool.size()).isEqualTo(0);
     log.info("pool created ");
-    Thread.sleep(3000);
-
-    assertEquals(0, pool.getStatus(false).getFree());
-    assertEquals(0, pool.getStatus(false).getBusy());
-    assertThat(pool.size()).isEqualTo(0);
 
+    waitFor(() -> {
+      assertEquals(0, pool.getStatus(false).getFree());
+      assertEquals(0, pool.getStatus(false).getBusy());
+      assertThat(pool.size()).isEqualTo(0);
+    });
+    
     pool.online();
     log.info("pool online");
     assertThat(pool.isOnline()).isTrue();
     assertEquals(2, pool.getStatus(false).getFree());
     assertEquals(0, pool.getStatus(false).getBusy());
     assertThat(pool.size()).isEqualTo(2);
 
-    Thread.sleep(3000);
-
     pool.offline();
     log.info("pool offline");
-    assertThat(pool.isOnline()).isFalse();
-    assertEquals(0, pool.getStatus(false).getFree());
-    assertEquals(0, pool.getStatus(false).getBusy());
-    assertThat(pool.size()).isEqualTo(0);
-
-    Thread.sleep(3000);
+    waitFor(() -> {
+      assertThat(pool.isOnline()).isFalse();
+      assertEquals(0, pool.getStatus(false).getFree());
+      assertEquals(0, pool.getStatus(false).getBusy());
+      assertThat(pool.size()).isEqualTo(0);
+    });
 
     pool.online();
     log.info("pool online");
-    assertThat(pool.isOnline()).isTrue();
-    assertEquals(2, pool.getStatus(false).getFree());
-    assertEquals(0, pool.getStatus(false).getBusy());
-    assertThat(pool.size()).isEqualTo(2);
-    Thread.sleep(3000);
-
+    
+    waitFor(() -> {
+      assertThat(pool.isOnline()).isTrue();
+      assertEquals(2, pool.getStatus(false).getFree());
+      assertEquals(0, pool.getStatus(false).getBusy());
+      assertThat(pool.size()).isEqualTo(2);
+    });
+    
     pool.shutdown();
 
-    assertThat(pool.isOnline()).isFalse();
-    assertEquals(0, pool.getStatus(false).getFree());
-    assertEquals(0, pool.getStatus(false).getBusy());
-    assertThat(pool.size()).isEqualTo(0);
+    waitFor(() -> {
+      assertThat(pool.isOnline()).isFalse();
+      assertEquals(0, pool.getStatus(false).getFree());
+      assertEquals(0, pool.getStatus(false).getBusy());
+      assertThat(pool.size()).isEqualTo(0);
+    });
   }
 
   @Test
@@ -131,13 +134,13 @@ public void offline_whenBusy_allowed() throws SQLException, InterruptedException
     assertEquals(1, pool.getStatus(false).getBusy()); // still 1 busy connection
     assertThat(pool.size()).isEqualTo(1);
 
-    // a bit of time to let busy connection finish and close
-    Thread.sleep(4000);
-
-    // all done now
-    assertEquals(0, pool.getStatus(false).getFree());
-    assertEquals(0, pool.getStatus(false).getBusy());
-    assertThat(pool.size()).isEqualTo(0);
+    // wait to let busy connection finish and close
+    waitFor(() -> {
+      // all done now
+      assertEquals(0, pool.getStatus(false).getFree());
+      assertEquals(0, pool.getStatus(false).getBusy());
+      assertThat(pool.size()).isEqualTo(0);
+    });
   }
 
   @Test

ebean-datasource/src/test/java/io/ebean/datasource/pool/ConnectionPoolTrimIdleTest.java

@@ -10,7 +10,7 @@
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
-public class ConnectionPoolTrimIdleTest {
+public class ConnectionPoolTrimIdleTest implements WaitFor {
 
   private ConnectionPool createPool() {
 
@@ -47,11 +47,10 @@ public void test() throws SQLException, InterruptedException {
       assertThat(pool.size()).isEqualTo(4);
       assertThat(pool.getStatus(false).getFree()).isEqualTo(4);
 
-      Thread.sleep(6000);
-
-      assertThat(pool.getStatus(false).getFree()).isEqualTo(1);
-      assertThat(pool.size()).isEqualTo(1);
-
+      waitFor(() -> {
+        assertThat(pool.getStatus(false).getFree()).isEqualTo(1);
+        assertThat(pool.size()).isEqualTo(1);
+      });
     } finally {
       pool.shutdown();
     }
@@ -77,23 +76,25 @@ public void test_withDecreasingActivity_expect_trimToActivityLevel() throws SQLE
 
       // keep 4 connections busy
       Timer timer0 = createTimer(pool, 4);
-      Thread.sleep(9000);
 
-      assertThat(pool.getStatus(false).getFree()).isEqualTo(4);
+      waitFor(() -> {
+        assertThat(pool.getStatus(false).getFree()).isEqualTo(4);
+      });
       timer0.cancel();
 
       // keep 2 connections busy
       Timer timer1 = createTimer(pool, 2);
-      Thread.sleep(6000);
 
-      assertThat(pool.getStatus(false).getFree()).isEqualTo(2);
+      waitFor(() -> {
+        assertThat(pool.getStatus(false).getFree()).isEqualTo(2);
+      });
       timer1.cancel();
 
       // Go Idle
-      Thread.sleep(5000);
-      assertThat(pool.getStatus(false).getFree()).isEqualTo(1);
-      assertThat(pool.size()).isEqualTo(1);
-
+      waitFor(() -> {
+        assertThat(pool.getStatus(false).getFree()).isEqualTo(1);
+        assertThat(pool.size()).isEqualTo(1);
+      });
     } finally {
       pool.shutdown();
     }