Merge pull request santanusinha#83 from r0goyal/junit5

JUnit 5 Integration

Author: santanusinha

src/test/java/io/appform/dropwizard/sharding/ShardInfoProviderTest.java

@@ -1,10 +1,10 @@
 package io.appform.dropwizard.sharding;
 
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class ShardInfoProviderTest {
 
@@ -34,10 +34,10 @@ public void testGetNamespace() {
         assertEquals("default", namespace);
 
         namespace = shardInfoProvider.namespace("connectionpool");
-        Assertions.assertNull(namespace);
+        assertNull(namespace);
 
         namespace = shardInfoProvider.namespace("connectionpool-default");
-        Assertions.assertNull(namespace);
+        assertNull(namespace);
 
         namespace = shardInfoProvider.namespace("connectionpool-test-1");
         assertEquals("test", namespace);

src/test/java/io/appform/dropwizard/sharding/dao/LookupDaoTest.java

@@ -41,7 +41,6 @@
 import org.hibernate.criterion.DetachedCriteria;
 import org.hibernate.criterion.Restrictions;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -52,6 +51,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class LookupDaoTest {
@@ -360,8 +360,8 @@ public void deleteTest() throws Exception {
         assertNotNull(lookupDao.get("testId")
                 .orElse(null));
         assertTrue(lookupDao.delete("testId"));
-        Assertions.assertNull(lookupDao.get("testId")
-                .orElse(null));
+        assertNull(lookupDao.get("testId")
+                                  .orElse(null));
     }
 
     @Test

src/test/java/io/appform/dropwizard/sharding/dao/locktest/LockTest.java

@@ -41,7 +41,6 @@
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.hibernate.exception.ConstraintViolationException;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -53,9 +52,12 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Test locking behavior
@@ -122,7 +124,7 @@ public void testLockingFail() throws Exception {
                 .myId("0")
                 .build();
         lookupDao.save(p1);
-        Assertions.assertThrows(IllegalArgumentException.class,
+        assertThrows(IllegalArgumentException.class,
                 () -> lookupDao.lockAndGetExecutor("0")
                         .filter(parent -> !Strings.isNullOrEmpty(parent.getName()))
                         .save(relationDao, parent -> {
@@ -226,7 +228,7 @@ public void testPersist_alreadyExistingDifferent() throws Exception {
                 .name("Changed")
                 .build();
 
-        Assertions.assertThrows(ConstraintViolationException.class, () -> lookupDao.saveAndGetExecutor(p2)
+        assertThrows(ConstraintViolationException.class, () -> lookupDao.saveAndGetExecutor(p2)
                 .filter(parent -> !Strings.isNullOrEmpty(parent.getName()))
                 .save(relationDao, parent -> SomeOtherObject.builder()
                         .myId(parent.getMyId())
@@ -283,7 +285,7 @@ public void testCreateOrUpdate() throws Exception {
                     childObj.setValue(childModifiedValue);
                     return childObj;
                 }, () -> {
-                    Assertions.fail("New Entity is getting created. It should have been updated.");
+                    fail("New Entity is getting created. It should have been updated.");
                     return SomeOtherObject.builder()
                             .myId(parentId)
                             .value("test")
@@ -303,8 +305,8 @@ public void testCreateOrUpdate() throws Exception {
 
         lookupDao.lockAndGetExecutor(parent.getMyId())
                 .createOrUpdate(relationDao, creationCriteria, childObj -> {
-                    Assertions.assertNotEquals(null, childObj);
-                    Assertions.fail("New Entity is getting updated. It should have been created.");
+                    assertNotEquals(null, childObj);
+                    fail("New Entity is getting updated. It should have been created.");
 
                     childObj.setValue("abcd");
                     return childObj;
@@ -321,7 +323,7 @@ public void testCreateOrUpdate() throws Exception {
                 .findFirst()
                 .get();
         assertEquals(newChildValue, savedChild.getValue());
-        Assertions.assertNotEquals(child.getId(), savedChild.getId());
+        assertNotEquals(child.getId(), savedChild.getId());
         assertEquals(newParentValue, lookupDao.get(parentId).get().getName());
     }
 

src/test/java/io/appform/dropwizard/sharding/metrics/TransactionMetricManagerTest.java

@@ -5,37 +5,38 @@
 import io.appform.dropwizard.sharding.config.MetricConfig;
 import io.appform.dropwizard.sharding.execution.TransactionExecutionContext;
 import lombok.val;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TransactionMetricManagerTest {
 
     @Test
     public void testIsMetricApplicable() {
         TransactionMetricManager metricManager = new TransactionMetricManager(null, null);
-        Assertions.assertFalse(metricManager.isMetricApplicable(this.getClass()));
+        assertFalse(metricManager.isMetricApplicable(this.getClass()));
 
         metricManager = new TransactionMetricManager(() -> null, null);
-        Assertions.assertFalse(metricManager.isMetricApplicable(this.getClass()));
+        assertFalse(metricManager.isMetricApplicable(this.getClass()));
 
         metricManager = new TransactionMetricManager(() -> MetricConfig.builder().enabledForAll(true).build(), null);
-        Assertions.assertTrue(metricManager.isMetricApplicable(this.getClass()));
+        assertTrue(metricManager.isMetricApplicable(this.getClass()));
 
         metricManager = new TransactionMetricManager(() -> MetricConfig.builder().enabledForAll(false)
                 .enabledForEntities(ImmutableSet.of(this.getClass().getCanonicalName()))
                 .build(), null);
-        Assertions.assertTrue(metricManager.isMetricApplicable(this.getClass()));
+        assertTrue(metricManager.isMetricApplicable(this.getClass()));
 
         metricManager = new TransactionMetricManager(() -> MetricConfig.builder().enabledForAll(false)
                 .enabledForEntities(ImmutableSet.of(this.getClass().getSimpleName()))
                 .build(), null);
-        Assertions.assertFalse(metricManager.isMetricApplicable(this.getClass()));
+        assertFalse(metricManager.isMetricApplicable(this.getClass()));
 
         metricManager = new TransactionMetricManager(() -> MetricConfig.builder().enabledForAll(false)
                 .build(), null);
-        Assertions.assertFalse(metricManager.isMetricApplicable(this.getClass()));
+        assertFalse(metricManager.isMetricApplicable(this.getClass()));
     }
 
     @Test

src/test/java/io/appform/dropwizard/sharding/metrics/TransactionMetricObserverTest.java

@@ -6,12 +6,12 @@
 import io.appform.dropwizard.sharding.dao.testdata.entities.RelationalEntity;
 import io.appform.dropwizard.sharding.execution.TransactionExecutionContext;
 import lombok.val;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class TransactionMetricObserverTest {
 
@@ -104,7 +104,7 @@ public void testExecuteWithException() {
 
         Mockito.doReturn(true).when(metricManager).isMetricApplicable(context.getEntityClass());
 
-        Assertions.assertThrows(RuntimeException.class, () -> transactionMetricObserver.execute(context, this::terminateWithException));
+        assertThrows(RuntimeException.class, () -> transactionMetricObserver.execute(context, this::terminateWithException));
         validateCache(entityMetricData, shardMetricData, daoMetricData, "test", context);
         validateMetrics(entityMetricData, shardMetricData, daoMetricData, 0, 1);
     }

src/test/java/io/appform/dropwizard/sharding/observers/ErrorListenerTest.java

@@ -11,14 +11,14 @@
 import lombok.val;
 import org.hibernate.criterion.DetachedCriteria;
 import org.hibernate.criterion.Property;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 
 /**
@@ -119,7 +119,7 @@ public void testFilterErrorCounter() {
                         .setValue("CV1"))
                 .execute();
         assertNotNull(parent);
-        Assertions.assertThrows(Exception.class,
+        assertThrows(Exception.class,
                 () -> parentDao.lockAndGetExecutor(parent.getName())
                         .update(childDao,
                                 DetachedCriteria.forClass(SimpleChild.class)

src/test/java/io/appform/dropwizard/sharding/sharding/BalancedShardManagerTest.java

@@ -18,26 +18,26 @@
 package io.appform.dropwizard.sharding.sharding;
 
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class BalancedShardManagerTest {
 
     @Test
     public void testShardForBucket() throws Exception {
-        Assertions.assertThrows(IllegalArgumentException.class, () -> new BalancedShardManager(5));
+        assertThrows(IllegalArgumentException.class, () -> new BalancedShardManager(5));
     }
 
     @Test
     public void testShardForOddBucket() throws Exception {
-        Assertions.assertThrows(IllegalArgumentException.class, () -> new BalancedShardManager(9));
+        assertThrows(IllegalArgumentException.class, () -> new BalancedShardManager(9));
     }
 
     @Test
     public void testShardForEvenNon2PowerBucket() throws Exception {
-        Assertions.assertThrows(IllegalArgumentException.class, () -> new BalancedShardManager(40));
+        assertThrows(IllegalArgumentException.class, () -> new BalancedShardManager(40));
     }
 
     @Test

src/test/java/io/appform/dropwizard/sharding/sharding/LegacyShardManagerTest.java

@@ -18,22 +18,22 @@
 package io.appform.dropwizard.sharding.sharding;
 
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class LegacyShardManagerTest {
 
     @Test
     public void testShardForOddBucket() {
-        Assertions.assertThrows(IllegalArgumentException.class,
+        assertThrows(IllegalArgumentException.class,
                 () -> new LegacyShardManager(9));
     }
 
     @Test
     public void testShardForEvenNon2PowerBucket() throws Exception {
-        Assertions.assertThrows(IllegalArgumentException.class,
+        assertThrows(IllegalArgumentException.class,
                 () -> new LegacyShardManager(40));
     }
 

src/test/java/io/appform/dropwizard/sharding/sharding/ShardManagerTest.java

@@ -18,10 +18,10 @@
 package io.appform.dropwizard.sharding.sharding;
 
 import io.appform.dropwizard.sharding.exceptions.ShardBlacklistedException;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class ShardManagerTest {
 
@@ -39,7 +39,7 @@ public void testBlacklisting() throws Exception {
         Thread.sleep(5000); //Sleeping for 5 seconds
         try {
             shardManager.shardForBucket(100);
-            Assertions.fail("Should have errored out");
+            fail("Should have errored out");
         } catch (ShardBlacklistedException e) {
 
         }