Junit5 bump - ebean-core

ebean-core/src/test/java/io/ebean/BaseTestCase.java

@@ -17,10 +17,10 @@ import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandlerFactory;
 import io.ebeaninternal.server.transaction.TransactionScopeManager;
 import org.assertj.core.api.AbstractCharSequenceAssert;
-import org.junit.After;
-import org.junit.Rule;
-import org.junit.rules.TestName;
-import org.junit.runner.RunWith;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.tests.model.basic.Country;
@@ -30,23 +30,20 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.fail;
 
-@RunWith(ConditionalTestRunner.class)
+@ExtendWith(PlatformCondition.class)
 public abstract class BaseTestCase {
 
   protected static Logger logger = LoggerFactory.getLogger(BaseTestCase.class);
 
-  @Rule public TestName name = new TestName();
-
-  @After
-  public void checkForLeak() {
+  @AfterEach
+  public void checkForLeak(TestInfo testInfo) {
     TransactionScopeManager scope = spiEbeanServer().getTransactionManager().scope();
     SpiTransaction trans = scope.getInScope();
     if (trans != null) {
-      String msg = getClass().getSimpleName() + "." + name.getMethodName() + " did not clear threadScope:" + trans;
+      String msg = getClass().getSimpleName() + "." + testInfo.getDisplayName() + " did not clear threadScope:" + trans;
       scope.clearExternal(); // clear for next test
-      fail(msg);
+      Assertions.fail(msg);
     }
   }
 

ebean-core/src/test/java/io/ebean/ColumnTest.java

@@ -2,7 +2,7 @@ package io.ebean;
 
 
 import io.ebeaninternal.server.rawsql.SpiRawSql;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

ebean-core/src/test/java/io/ebean/ConditionalTestRunner.java

@@ -1,48 +0,0 @@
-package io.ebean;
-
-import io.ebean.annotation.ForPlatform;
-import io.ebean.annotation.IgnorePlatform;
-import io.ebean.annotation.Platform;
-import org.junit.runner.notification.RunNotifier;
-import org.junit.runners.BlockJUnit4ClassRunner;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.InitializationError;
-
-/**
- * This testrunner checks for an {@link IgnorePlatform} annotation and ignores the test.
- *
- * @author Roland Praml, FOCONIS AG
- */
-public class ConditionalTestRunner extends BlockJUnit4ClassRunner {
-  public ConditionalTestRunner(Class<?> klass) throws InitializationError {
-    super(klass);
-  }
-  @Override
-  public void runChild(FrameworkMethod method, RunNotifier notifier) {
-    ForPlatform forPlatform = method.getAnnotation(ForPlatform.class);
-    if (forPlatform != null) {
-      if (!platformMath(forPlatform.value())) {
-        notifier.fireTestIgnored(describeChild(method));
-        return;
-      }
-    }
-
-    IgnorePlatform ignore = method.getAnnotation(IgnorePlatform.class);
-
-    if (ignore == null || !platformMath(ignore.value())) {
-      super.runChild(method, notifier);
-    } else {
-      notifier.fireTestIgnored(describeChild(method));
-    }
-
-  }
-  private boolean platformMath(Platform[] platforms) {
-    Platform basePlatform = DB.getDefault().platform().base();
-    for (Platform platform : platforms) {
-      if (platform.equals(basePlatform)) {
-        return true;
-      }
-    }
-    return false;
-  }
-}

ebean-core/src/test/java/io/ebean/DbPrimaryTest.java

@@ -2,17 +2,16 @@ package io.ebean;
 
 import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.Platform;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Properties;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+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 DbPrimaryTest extends BaseTestCase {
 
-
   @Test
   public void testIsSkipPrimaryServer() {
     DbPrimary.setSkip(true);
@@ -24,14 +23,12 @@ public class DbPrimaryTest extends BaseTestCase {
   @Test
   @ForPlatform(Platform.H2)
   public void testGetPrimaryServerName() {
-
     String primaryServerName = DbPrimary.getDefaultServerName();
     assertEquals("h2", primaryServerName);
   }
 
   @Test
   public void testLoadProperties() {
-
     Properties properties = DbPrimary.getProperties();
     assertTrue(!properties.isEmpty());
   }

ebean-core/src/test/java/io/ebean/DtoQuery2Test.java

@@ -3,7 +3,7 @@ package io.ebean;
 import io.ebean.meta.BasicMetricVisitor;
 import io.ebean.meta.MetaQueryMetric;
 import org.ebeantest.LoggedSqlCollector;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.tests.model.basic.Customer;

ebean-core/src/test/java/io/ebean/DtoQueryFromOrmTest.java

@@ -6,9 +6,9 @@ import io.ebean.meta.MetaQueryMetric;
 import io.ebean.meta.MetaTimedMetric;
 import io.ebean.meta.ServerMetrics;
 import org.ebeantest.LoggedSqlCollector;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.ResetBasicData;
 
@@ -19,12 +19,12 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class DtoQueryFromOrmTest extends BaseTestCase {
 
-  @BeforeClass
+  @BeforeAll
   public static void resetStats() {
     DB.getDefault().metaInfo().resetAllMetrics();
   }
 
-  @AfterClass
+  @AfterAll
   public static void reportStats() {
     ServerMetrics metrics = DB.getDefault().metaInfo().collectMetrics();
     for (MetaQueryMetric metric : metrics.queryMetrics()) {

ebean-core/src/test/java/io/ebean/DtoQueryTest.java

@@ -6,7 +6,7 @@ import io.ebean.meta.BasicMetricVisitor;
 import io.ebean.meta.MetaQueryMetric;
 import io.ebean.meta.ServerMetrics;
 import org.ebeantest.LoggedSqlCollector;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.tests.model.basic.Customer;

ebean-core/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java

@@ -8,7 +8,7 @@ import io.ebean.config.TenantMode;
 import io.ebean.config.TenantSchemaProvider;
 import io.ebean.config.dbplatform.mysql.MySqlPlatform;
 import io.ebean.config.dbplatform.postgres.PostgresPlatform;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import javax.sql.DataSource;

ebean-core/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java

@@ -2,7 +2,7 @@ package io.ebean;
 
 import io.ebean.config.DatabaseConfig;
 import io.ebean.event.ServerConfigStartup;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.UTDetail;
 
 import static org.assertj.core.api.Assertions.assertThat;

ebean-core/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java

@@ -1,14 +1,14 @@
 package io.ebean;
 
 import org.ebeantest.LoggedSqlCollector;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.EBasicVer;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 
 public class EbeanServer_deleteAllByIdTest extends BaseTestCase {

ebean-core/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java

@@ -2,7 +2,7 @@ package io.ebean;
 
 import org.tests.model.basic.EBasicVer;
 import org.ebeantest.LoggedSqlCollector;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 

ebean-core/src/test/java/io/ebean/EbeanServer_deleteTest.java

@@ -2,7 +2,7 @@ package io.ebean;
 
 import org.tests.model.basic.EBasicVer;
 import org.ebeantest.LoggedSqlCollector;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 

ebean-core/src/test/java/io/ebean/EbeanServer_eqlTest.java

@@ -1,7 +1,7 @@
 package io.ebean;
 
 import org.ebeantest.LoggedSqlCollector;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
 
@@ -9,6 +9,7 @@ import javax.persistence.PersistenceException;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class EbeanServer_eqlTest extends BaseTestCase {
 
@@ -187,16 +188,14 @@ public class EbeanServer_eqlTest extends BaseTestCase {
     assertSql(query).contains("where t0.name like ");
   }
 
-  @Test(expected = PersistenceException.class)
+  @Test
   public void unboundNamedParams_expect_PersistenceException() {
-
     Query<Customer> query = server().createQuery(Customer.class, "where name = :name");
-    query.findOne();
+    assertThrows(PersistenceException.class, () ->query.findOne());
   }
 
   @Test
   public void namedQuery() {
-
     ResetBasicData.reset();
 
     Query<Customer> name = server().createNamedQuery(Customer.class, "name");

ebean-core/src/test/java/io/ebean/EbeanServer_refresh.java

@@ -1,6 +1,6 @@
 package io.ebean;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.EBasic;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.OrderDetail;
@@ -11,7 +11,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class EbeanServer_refresh {
 

ebean-core/src/test/java/io/ebean/EbeanServer_saveAllTest.java

@@ -1,7 +1,7 @@
 package io.ebean;
 
 import org.ebeantest.LoggedSqlCollector;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.EBasicVer;
 
 import java.util.ArrayList;

ebean-core/src/test/java/io/ebean/ExtendedServerTest.java

@@ -1,7 +1,8 @@
 package io.ebean;
 
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
 
@@ -14,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class ExtendedServerTest extends BaseTestCase {
 
-  @After
+  @AfterEach
   public void cleanup() {
     Ebean.getDefaultServer()
       .extended()

ebean-core/src/test/java/io/ebean/FetchConfigTest.java

@@ -1,6 +1,6 @@
 package io.ebean;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

ebean-core/src/test/java/io/ebean/FetchGroupTest.java

@@ -2,7 +2,7 @@ package io.ebean;
 
 import io.ebean.service.SpiFetchGroupQuery;
 import org.ebeantest.LoggedSqlCollector;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Address;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;

ebean-core/src/test/java/io/ebean/PlatformCondition.java

@@ -0,0 +1,43 @@
+package io.ebean;
+
+import io.ebean.annotation.ForPlatform;
+import io.ebean.annotation.IgnorePlatform;
+import io.ebean.annotation.Platform;
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
+import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+import java.lang.reflect.AnnotatedElement;
+import java.util.Optional;
+
+public class PlatformCondition implements ExecutionCondition {
+
+  private static final ConditionEvaluationResult ENABLED = ConditionEvaluationResult.enabled("ForPlatform is not present");
+
+  @Override
+  public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
+    Optional<AnnotatedElement> element = context.getElement();
+    if (element.isPresent()) {
+      final AnnotatedElement annotatedElement = element.get();
+      final ForPlatform annotation = annotatedElement.getAnnotation(ForPlatform.class);
+      if (annotation != null && !platformMath(annotation.value())) {
+        return ConditionEvaluationResult.disabled("@ForPlatform");
+      }
+      IgnorePlatform ignore = annotatedElement.getAnnotation(IgnorePlatform.class);
+      if (ignore != null && platformMath(ignore.value())) {
+        return ConditionEvaluationResult.disabled("@ForPlatform");
+      }
+    }
+    return ENABLED;
+  }
+
+  private boolean platformMath(Platform[] platforms) {
+    Platform basePlatform = DB.getDefault().platform().base();
+    for (Platform platform : platforms) {
+      if (platform.equals(basePlatform)) {
+        return true;
+      }
+    }
+    return false;
+  }
+}

ebean-core/src/test/java/io/ebean/PropertyTest.java

@@ -1,10 +1,10 @@
 package io.ebean;
 
 import io.ebean.OrderBy;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 public class PropertyTest {
 

ebean-core/src/test/java/io/ebean/SqlRowBooleanTest.java

@@ -1,6 +1,6 @@
 package io.ebean;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

ebean-core/src/test/java/io/ebean/StringHelperTest.java

@@ -1,15 +1,15 @@
 package io.ebean;
 
 import io.ebean.util.StringHelper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class StringHelperTest {
 

ebean-core/src/test/java/io/ebean/TestDirtyProperties.java

@@ -5,12 +5,14 @@ import io.ebean.bean.EntityBeanIntercept;
 import io.ebeaninternal.server.core.DefaultBeanState;
 import org.tests.model.embedded.EMain;
 import org.tests.model.embedded.Eembeddable;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.Set;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.*;
+
 public class TestDirtyProperties extends BaseTestCase {
 
   @Test
@@ -34,34 +36,32 @@ public class TestDirtyProperties extends BaseTestCase {
     DefaultBeanState beanState = new DefaultBeanState(eb);
 
     Set<String> changedProps = beanState.getChangedProps();
-    Assert.assertEquals(1, changedProps.size());
-    Assert.assertTrue(changedProps.contains("name"));
+    assertEquals(1, changedProps.size());
+    assertThat(changedProps).contains("name");
 
     Map<String, ValuePair> dirtyValues = beanState.getDirtyValues();
-    Assert.assertEquals(1, dirtyValues.size());
-    Assert.assertTrue(dirtyValues.keySet().contains("name"));
+    assertEquals(1, dirtyValues.size());
+    assertThat(dirtyValues.keySet()).contains("name");
 
     ValuePair valuePair = dirtyValues.get("name");
-    Assert.assertNotNull(valuePair);
-    Assert.assertEquals("changedFoo", valuePair.getNewValue());
-    Assert.assertEquals("foo", valuePair.getOldValue());
+    assertNotNull(valuePair);
+    assertEquals("changedFoo", valuePair.getNewValue());
+    assertEquals("foo", valuePair.getOldValue());
 
     Eembeddable embeddableRead = emain.getEmbeddable();
     embeddableRead.setDescription("embChanged");
 
     Set<String> changedProps2 = beanState.getChangedProps();
-    Assert.assertEquals(2, changedProps2.size());
-    Assert.assertTrue(changedProps2.contains("name"));
-    Assert.assertTrue(changedProps2.contains("embeddable.description"));
+    assertEquals(2, changedProps2.size());
+    assertThat(changedProps2).contains("name", "embeddable.description");
 
     Map<String, ValuePair> dirtyValues2 = beanState.getDirtyValues();
-    Assert.assertEquals(2, dirtyValues2.size());
-    Assert.assertTrue(dirtyValues2.keySet().contains("name"));
-    Assert.assertTrue(dirtyValues2.keySet().contains("embeddable.description"));
+    assertEquals(2, dirtyValues2.size());
+    assertThat(dirtyValues2.keySet()).contains("name", "embeddable.description");
 
     ValuePair valuePair2 = dirtyValues2.get("embeddable.description");
-    Assert.assertEquals("embChanged", valuePair2.getNewValue());
-    Assert.assertEquals("bar", valuePair2.getOldValue());
+    assertEquals("embChanged", valuePair2.getNewValue());
+    assertEquals("bar", valuePair2.getOldValue());
   }
 
 
@@ -83,31 +83,29 @@ public class TestDirtyProperties extends BaseTestCase {
 
     emain.setName("changedFoo");
 
-    Assert.assertSame(embeddable, emain.getEmbeddable());
+    assertSame(embeddable, emain.getEmbeddable());
 
     Eembeddable embeddable2 = setEmbeddedBean(emain, "changeEmbeddedInstance");
-    Assert.assertSame(embeddable2, emain.getEmbeddable());
-    Assert.assertNotSame(embeddable, emain.getEmbeddable());
+    assertSame(embeddable2, emain.getEmbeddable());
+    assertNotSame(embeddable, emain.getEmbeddable());
 
 
     DefaultBeanState beanState = new DefaultBeanState(eb);
 
     Set<String> changedProps2 = beanState.getChangedProps();
-    Assert.assertEquals(2, changedProps2.size());
-    Assert.assertTrue(changedProps2.contains("name"));
+    assertEquals(2, changedProps2.size());
+    assertThat(changedProps2).contains("name");
 
-    Assert.assertTrue("The whole bean instance has changed", changedProps2.contains("embeddable"));
+    assertThat(changedProps2).contains("embeddable");
 
     Map<String, ValuePair> dirtyValues2 = beanState.getDirtyValues();
-    Assert.assertEquals(2, dirtyValues2.size());
-    Assert.assertTrue(dirtyValues2.keySet().contains("name"));
-    Assert.assertTrue(dirtyValues2.keySet().contains("embeddable"));
+    assertEquals(2, dirtyValues2.size());
+    assertThat(dirtyValues2.keySet()).contains("name", "embeddable");
 
 
     ValuePair valuePair2 = dirtyValues2.get("embeddable");
-    Assert.assertSame(embeddable2, valuePair2.getNewValue());
-    Assert.assertSame(embeddable, valuePair2.getOldValue());
-
+    assertSame(embeddable2, valuePair2.getNewValue());
+    assertSame(embeddable, valuePair2.getOldValue());
   }
 
 
@@ -128,7 +126,7 @@ public class TestDirtyProperties extends BaseTestCase {
 
     // hooks the embeddable bean back to the owner
     int embeddablePropertyIndex = ebi.findProperty("embeddable");
-    Assert.assertTrue(embeddablePropertyIndex > -1);
+    assertThat(embeddablePropertyIndex).isGreaterThan(-1);
     ((EntityBean) embeddable)._ebean_getIntercept().setEmbeddedOwner(owner, embeddablePropertyIndex);
     return embeddable;
   }

ebean-core/src/test/java/io/ebean/TestFilterWithEnum.java

@@ -1,12 +1,13 @@
 package io.ebean;
 
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Assert;
-import org.junit.Test;
 
 import java.util.List;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 public class TestFilterWithEnum extends BaseTestCase {
 
   @Test
@@ -19,8 +20,7 @@ public class TestFilterWithEnum extends BaseTestCase {
     Filter<Order> filter = Ebean.filter(Order.class);
     List<Order> newOrders = filter.eq("status", Order.Status.NEW).filter(allOrders);
 
-    Assert.assertNotNull(newOrders);
-
+    assertNotNull(newOrders);
   }
 
 }

ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java

@@ -4,7 +4,7 @@ import io.ebean.annotation.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.bean.EntityBean;
 import org.ebeantest.LoggedSqlCollector;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.model.converstation.User;
 
 import java.util.List;

ebean-core/src/test/java/io/ebean/TextExpressionListTest.java

@@ -5,7 +5,7 @@ import io.ebean.Ebean;
 import io.ebean.search.Match;
 import io.ebean.search.MultiMatch;
 import org.tests.model.basic.Order;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TextExpressionListTest {
 

ebean-core/src/test/java/io/ebean/TransactionalTestCase.java

@@ -1,7 +1,7 @@
 package io.ebean;
 
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.tests.model.basic.ResetBasicData;
 
 /**
@@ -16,15 +16,15 @@ import org.tests.model.basic.ResetBasicData;
  */
 public abstract class TransactionalTestCase extends BaseTestCase {
 
-  @Before
+  @BeforeEach
   public void startTransaction() {
     ResetBasicData.reset();
-    Ebean.beginTransaction();
+    DB.beginTransaction();
   }
 
-  @After
+  @AfterEach
   public void endTransaction() {
-    Ebean.rollbackTransaction();
-    Ebean.endTransaction();
+    DB.rollbackTransaction();
+    DB.endTransaction();
   }
 }

ebean-core/src/test/java/io/ebean/TxScopeTest.java

@@ -1,10 +1,10 @@
 package io.ebean;
 
 import io.ebean.annotation.PersistBatch;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class TxScopeTest {
 

ebean-core/src/test/java/io/ebean/UpdateQueryTest.java

@@ -6,7 +6,7 @@ import io.ebean.annotation.Platform;
 import io.ebean.meta.MetaQueryMetric;
 import io.ebean.meta.ServerMetrics;
 import org.ebeantest.LoggedSqlCollector;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Country;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.EBasicWithUniqueCon;
@@ -16,6 +16,7 @@ import java.sql.Timestamp;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class UpdateQueryTest extends BaseTestCase {
 
@@ -411,17 +412,18 @@ public class UpdateQueryTest extends BaseTestCase {
     assertThat(rows).isEqualTo(0);
   }
 
-  @Test(expected = DuplicateKeyException.class)
+  @Test
   public void exceptionTranslation() {
-
     newEbasicWithUnique("o1","other1_a");
     Integer id = newEbasicWithUnique("o2", "other1_b");
 
-    Ebean.update(EBasicWithUniqueCon.class)
-      .set("other", "other1_a")
-      .set("otherOne", "other1_a")
-      .where().idEq(id)
-      .update();
+    assertThrows(DuplicateKeyException.class, () -> {
+      Ebean.update(EBasicWithUniqueCon.class)
+        .set("other", "other1_a")
+        .set("otherOne", "other1_a")
+        .where().idEq(id)
+        .update();
+    });
   }
 
   private Integer newEbasicWithUnique(String name, String other) {

ebean-core/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java

@@ -6,7 +6,7 @@ import org.tests.compositekeys.db.AuditInfo;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.EBasic;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.sql.Date;
 import java.util.HashSet;
@@ -14,8 +14,8 @@ import java.util.List;
 import java.util.Set;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class EntityBeanInterceptTest extends BaseTestCase {
 

ebean-core/src/test/java/io/ebean/cache/CacheKeyTest.java

@@ -1,6 +1,6 @@
 package io.ebean.cache;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java

@@ -1,11 +1,11 @@
 package io.ebean.cache;
 
 import io.ebean.DB;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ServerCacheManagerTest {
 

ebean-core/src/test/java/io/ebean/cache/ServerCacheOptionsTest.java

@@ -1,6 +1,6 @@
 package io.ebean.cache;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

ebean-core/src/test/java/io/ebean/common/BeanListTest.java

@@ -1,7 +1,7 @@
 package io.ebean.common;
 
 import io.ebean.bean.BeanCollection;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Comparator;

ebean-core/src/test/java/io/ebean/common/BeanMapTest.java

@@ -1,13 +1,14 @@
 package io.ebean.common;
 
 import io.ebean.bean.BeanCollection;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.EBasic;
 
 import java.util.*;
 
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 
 public class BeanMapTest {
@@ -189,33 +190,32 @@ public class BeanMapTest {
     assertThat(map.getModifyAdditions()).isEmpty();
   }
 
-  @Test(expected = UnsupportedOperationException.class)
+  @Test
   public void keySet_add_whenModifyListening() {
     BeanMap<String, EBasic> map = newModifyListeningMap();
-    map.keySet().add("3");
+    assertThrows(UnsupportedOperationException.class, () -> map.keySet().add("3"));
   }
 
-  @Test(expected = UnsupportedOperationException.class)
+  @Test
   public void keySet_add() {
     BeanMap<String, Object> map = new BeanMap<>();
-    map.keySet().add("3");
+    assertThrows(UnsupportedOperationException.class, () ->map.keySet().add("3"));
   }
 
-  @Test(expected = UnsupportedOperationException.class)
+  @Test
   public void keySet_addAll_whenModifyListening() {
     BeanMap<String, EBasic> map = newModifyListeningMap();
-    map.keySet().addAll(asList("3", "4"));
+    assertThrows(UnsupportedOperationException.class, () -> map.keySet().addAll(asList("3", "4")));
   }
 
-  @Test(expected = UnsupportedOperationException.class)
+  @Test
   public void keySet_addAll() {
     BeanMap<String, Object> map = new BeanMap<>();
-    map.keySet().addAll(asList("3", "4"));
+    assertThrows(UnsupportedOperationException.class, () -> map.keySet().addAll(asList("3", "4")));
   }
 
   @Test
   public void keySet_remove() {
-
     BeanMap<String, Object> map = new BeanMap<>();
     map.put("1", object1);
     map.put("2", object2);
@@ -233,7 +233,6 @@ public class BeanMapTest {
 
   @Test
   public void keySet_clear() {
-
     BeanMap<String, Object> map = new BeanMap<>();
     map.put("1", object1);
     map.put("2", object2);
@@ -315,23 +314,24 @@ public class BeanMapTest {
     assertThat(map.getModifyRemovals()).containsOnly(object1, object4);
   }
 
-  @Test(expected = UnsupportedOperationException.class)
+  @Test
   public void values_add() {
     BeanMap<String, EBasic> map = new BeanMap<>();
-    map.values().add(object3);
+    assertThrows(UnsupportedOperationException.class, () -> map.values().add(object3));
   }
 
-  @Test(expected = UnsupportedOperationException.class)
+  @Test
   public void values_addAll() {
     BeanMap<String, EBasic> map = new BeanMap<>();
-    map.values().addAll(asList(object3, object5));
+    assertThrows(UnsupportedOperationException.class, () -> map.values().addAll(asList(object3, object5)));
   }
 
-  @Test(expected = UnsupportedOperationException.class)
+  @Test
   public void entrySet_add() {
-    newModifyListeningMap()
+    assertThrows(UnsupportedOperationException.class, () ->
+      newModifyListeningMap()
       .entrySet()
-      .add(new AbstractMap.SimpleEntry<>("3", object3));
+      .add(new AbstractMap.SimpleEntry<>("3", object3)));
   }
 
   @Test

ebean-core/src/test/java/io/ebean/common/BeanSetTest.java

@@ -1,7 +1,7 @@
 package io.ebean.common;
 
 import io.ebean.bean.BeanCollection;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.LinkedHashSet;
 import java.util.Set;

ebean-core/src/test/java/io/ebean/config/ContainerConfigTest.java

@@ -1,10 +1,10 @@
 package io.ebean.config;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Properties;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ContainerConfigTest {
 

ebean-core/src/test/java/io/ebean/config/DatabaseConfigTest.java

@@ -5,15 +5,15 @@ import io.ebean.annotation.MutationDetection;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.datasource.DataSourceConfig;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Properties;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+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.assertTrue;
 
 public class DatabaseConfigTest {
 

ebean-core/src/test/java/io/ebean/config/DbConstraintNamingTest.java

@@ -1,6 +1,6 @@
 package io.ebean.config;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

ebean-core/src/test/java/io/ebean/config/DbMigrationConfigTest.java

@@ -1,11 +1,11 @@
 package io.ebean.config;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Properties;
 import io.ebean.migration.MigrationConfig;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 
 public class DbMigrationConfigTest {

ebean-core/src/test/java/io/ebean/config/DocStoreConfigTest.java

@@ -1,13 +1,13 @@
 package io.ebean.config;
 
 import io.ebean.annotation.DocStoreMode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Properties;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+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 DocStoreConfigTest {
 

ebean-core/src/test/java/io/ebean/config/MatchingNamingConventionTest.java

@@ -2,12 +2,12 @@ package io.ebean.config;
 
 import io.ebean.config.dbplatform.h2.H2Platform;
 import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class MatchingNamingConventionTest {
 

ebean-core/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java

@@ -7,8 +7,8 @@ import io.ebean.annotation.Platform;
 import io.ebean.config.dbplatform.DbIdentity;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.dbplatform.h2.H2Platform;
-import org.junit.AfterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.EBasicVer;
 import org.tests.model.draftable.BasicDraftableBean;
 
@@ -18,7 +18,7 @@ public class PlatformNoGeneratedKeysTest {
 
   static Database server = testH2Server();
 
-  @AfterClass
+  @AfterAll
   public static void shutdown() {
     server.shutdown();
   }

ebean-core/src/test/java/io/ebean/config/PropertiesWrapperTest.java

@@ -2,12 +2,12 @@ package io.ebean.config;
 
 import io.avaje.config.Config;
 import io.ebean.annotation.Platform;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Properties;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class PropertiesWrapperTest {
 
@@ -66,14 +66,14 @@ public class PropertiesWrapperTest {
     assertEquals(42, pw.getInt("someInt", 99));
     assertEquals(Double.valueOf(5.5D), (Double.valueOf(pw.getDouble("someDouble", 99.9D))));
     assertEquals(home + "/hello", pw.get("somePath", null));
-    assertEquals(tmpDir, "/aaa/" + tmpDir + "/bbb", pw.get("someSystemProp"));
+    assertEquals("/aaa/" + tmpDir + "/bbb", pw.get("someSystemProp"));
 
     pw = new PropertiesWrapper(evalCopy, null);
 
     assertEquals(42, pw.getInt("someInt", 99));
     assertEquals(Double.valueOf(5.5D), (Double.valueOf(pw.getDouble("someDouble", 99.9D))));
     assertEquals(home + "/hello", pw.get("somePath", null));
-    assertEquals(tmpDir, "/aaa/" + tmpDir + "/bbb", pw.get("someSystemProp"));
+    assertEquals("/aaa/" + tmpDir + "/bbb", pw.get("someSystemProp"));
   }
 
 }

ebean-core/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java

@@ -5,20 +5,19 @@ import io.ebean.Database;
 import io.ebean.DatabaseFactory;
 import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.Platform;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.EBasicVer;
 
-import javax.persistence.PersistenceException;
 import java.util.Properties;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class ServerConfigSqlServerTest {
 
-  @Ignore
+  @Disabled
   @ForPlatform({Platform.SQLSERVER})
-  @Test(expected = PersistenceException.class)
+  @Test //expected = PersistenceException.class
   public void need_explicitPlatform() {
 
     Properties props = props("some_sqlserver");
@@ -55,7 +54,7 @@ public class ServerConfigSqlServerTest {
 
   }
 
-  @Ignore
+  @Disabled
   @ForPlatform({Platform.SQLSERVER})
   @Test
   public void explicit_17() {
@@ -86,7 +85,7 @@ public class ServerConfigSqlServerTest {
     sqlServer.shutdown();
   }
 
-  @Ignore
+  @Disabled
   @ForPlatform({Platform.SQLSERVER})
   @Test
   public void explicit_16() {

ebean-core/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java

@@ -1,6 +1,6 @@
 package io.ebean.config;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

ebean-core/src/test/java/io/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java

@@ -1,6 +1,6 @@
 package io.ebean.config.dbplatform;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

ebean-core/src/test/java/io/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java

@@ -1,6 +1,6 @@
 package io.ebean.config.dbplatform;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java

@@ -10,10 +10,10 @@ import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.h2.H2Platform;
 import io.ebean.config.dbplatform.postgres.PostgresPlatform;
 import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class DatabasePlatformTest extends BaseTestCase {
 

ebean-core/src/test/java/io/ebean/config/dbplatform/DbIdentityTest.java

@@ -1,9 +1,9 @@
 package io.ebean.config.dbplatform;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class DbIdentityTest {
 

ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java

@@ -1,10 +1,10 @@
 package io.ebean.config.dbplatform;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.sql.Types;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class DbPlatformTypeLookupTest {
 

ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeMappingTest.java

@@ -1,6 +1,6 @@
 package io.ebean.config.dbplatform;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.sql.Types;
 

ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java

@@ -1,8 +1,8 @@
 package io.ebean.config.dbplatform;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class DbPlatformTypeParserTest {
 

ebean-core/src/test/java/io/ebean/config/dbplatform/DbTypeMapTest.java

@@ -1,7 +1,7 @@
 package io.ebean.config.dbplatform;
 
 import io.ebean.config.dbplatform.postgres.PostgresPlatform;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

ebean-core/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java

@@ -1,10 +1,10 @@
 package io.ebean.config.dbplatform;
 
 import io.ebean.config.dbplatform.hana.HanaHistorySupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class HanaHistorySupportTest {
 

ebean-core/src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java

@@ -2,7 +2,7 @@ package io.ebean.config.dbplatform;
 
 import io.ebean.config.PlatformConfig;
 import io.ebean.config.dbplatform.hana.HanaPlatform;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlHistorySupportTest.java

@@ -2,9 +2,9 @@ package io.ebean.config.dbplatform;
 
 
 import io.ebean.config.dbplatform.mysql.MySqlHistorySupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class MySqlHistorySupportTest {
 

ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java

@@ -2,7 +2,7 @@ package io.ebean.config.dbplatform;
 
 import io.ebean.config.PlatformConfig;
 import io.ebean.config.dbplatform.mysql.MySqlPlatform;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java

@@ -3,7 +3,7 @@ package io.ebean.config.dbplatform;
 import io.ebean.config.PlatformConfig;
 import io.ebean.config.dbplatform.oracle.Oracle11Platform;
 import io.ebean.config.dbplatform.oracle.OraclePlatform;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresHistorySupportTest.java

@@ -1,9 +1,9 @@
 package io.ebean.config.dbplatform;
 
 import io.ebean.config.dbplatform.postgres.PostgresHistorySupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class PostgresHistorySupportTest {
 

ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java

@@ -3,7 +3,7 @@ package io.ebean.config.dbplatform;
 import io.ebean.Query;
 import io.ebean.config.PlatformConfig;
 import io.ebean.config.dbplatform.postgres.PostgresPlatform;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

ebean-core/src/test/java/io/ebean/config/dbplatform/SequenceBatchIdGeneratorTest.java

@@ -1,6 +1,6 @@
 package io.ebean.config.dbplatform;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.sql.ResultSet;
 import java.util.List;

ebean-core/src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java

@@ -2,7 +2,7 @@ package io.ebean.config.dbplatform;
 
 import io.ebean.config.PlatformConfig;
 import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java

@@ -1,8 +1,8 @@
 package io.ebean.config.dbplatform.sqlserver;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author Vilmos Nagy  <vilmos.nagy@outlook.com>

ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java

@@ -4,8 +4,8 @@ import io.ebean.BackgroundExecutor;
 import io.ebean.BaseTestCase;
 import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.Platform;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -17,7 +17,7 @@ public class SqlServerStepSequenceTest extends BaseTestCase {
 
   private static final Logger log = LoggerFactory.getLogger(SqlServerStepSequenceTest.class);
 
-  @Ignore
+  @Disabled
   @ForPlatform(Platform.SQLSERVER)
   @Test
   public void seq() {

ebean-core/src/test/java/io/ebean/event/BeanFindControllerTest.java

@@ -6,17 +6,17 @@ import io.ebean.DatabaseFactory;
 import io.ebean.bean.BeanCollection;
 import io.ebean.common.BeanList;
 import io.ebean.config.DatabaseConfig;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.example.ModUuidGenerator;
 import org.tests.model.basic.EBasic;
 import org.tests.model.basic.ECustomId;
 
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+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.assertTrue;
 
 public class BeanFindControllerTest extends BaseTestCase {
 

ebean-core/src/test/java/io/ebean/event/BeanPersistControllerTest.java

@@ -5,7 +5,7 @@ import io.ebean.Database;
 import io.ebean.DatabaseFactory;
 import io.ebean.Transaction;
 import io.ebean.config.DatabaseConfig;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.EBasicVer;
 import org.tests.model.basic.UTDetail;
 import org.tests.model.basic.UTMaster;

ebean-core/src/test/java/io/ebean/event/BeanPostLoadTest.java

@@ -7,7 +7,7 @@ import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.DatabaseFactory;
 import io.ebean.config.DatabaseConfig;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.EBasicVer;
 
 import java.util.ArrayList;

ebean-core/src/test/java/io/ebean/event/readaudit/ReadAuditQueryPlanTest.java

@@ -1,10 +1,10 @@
 package io.ebean.event.readaudit;
 
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 public class ReadAuditQueryPlanTest {
 

ebean-core/src/test/java/io/ebean/json/EJsonTests.java

@@ -5,7 +5,7 @@ import io.ebeaninternal.json.ModifyAwareMap;
 import io.ebean.ModifyAwareType;
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -21,7 +21,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class EJsonTests {
 

ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java

@@ -7,7 +7,7 @@ import io.ebean.Query;
 import io.ebean.text.PathProperties;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.querydefn.OrmQueryDetail;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.inheritance.Stockforecast;
 import org.tests.model.basic.Car;
 import org.tests.model.basic.Customer;
@@ -18,9 +18,7 @@ import org.tests.model.basic.Product;
 import org.tests.model.basic.Vehicle;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 
 public class BeanTypeTest {
@@ -57,15 +55,13 @@ public class BeanTypeTest {
     assertThat(productType.getBeanType()).isEqualTo(Product.class);
   }
 
-  @Test(expected = RuntimeException.class)
+  @Test
   public void getTypeAtPath_when_simpleType() {
-
-    beanType(Order.class).getBeanTypeAtPath("status");
+    assertThrows(RuntimeException.class, () -> beanType(Order.class).getBeanTypeAtPath("status"));
   }
 
   @Test
   public void createBean() {
-
     assertThat(beanType(Order.class).createBean()).isNotNull();
   }
 
@@ -177,19 +173,19 @@ public class BeanTypeTest {
     assertThat(detail.getChunk("customer", false).getIncluded()).containsExactly("id", "name");
   }
 
-  @Test(expected = IllegalStateException.class)
-  public void docStoreIndex() throws Exception {
-    beanType(Order.class).docStore().index(1, new Order(), null);
+  @Test
+  public void docStoreIndex() {
+    assertThrows(IllegalStateException.class, () -> beanType(Order.class).docStore().index(1, new Order(), null));
   }
 
-  @Test(expected = IllegalStateException.class)
-  public void docStoreDeleteById() throws Exception {
-    beanType(Order.class).docStore().deleteById(1, null);
+  @Test
+  public void docStoreDeleteById() {
+    assertThrows(IllegalStateException.class, () -> beanType(Order.class).docStore().deleteById(1, null));
   }
 
-  @Test(expected = IllegalStateException.class)
-  public void docStoreUpdateEmbedded() throws Exception {
-    beanType(Order.class).docStore().updateEmbedded(1, "customer", "someJson", null);
+  @Test
+  public void docStoreUpdateEmbedded() {
+    assertThrows(IllegalStateException.class, () -> beanType(Order.class).docStore().updateEmbedded(1, "customer", "someJson", null));
   }
 
   @Test

ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java

@@ -2,7 +2,7 @@ package io.ebean.plugin;
 
 import io.ebean.Ebean;
 import io.ebean.EbeanServer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;

ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java

@@ -4,7 +4,7 @@ import io.ebean.Ebean;
 import io.ebean.EbeanServer;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java

@@ -4,17 +4,17 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.EbeanServer;
 import org.tests.model.basic.Customer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.VwCustomer;
 
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+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 SpiServerTest extends BaseTestCase {

ebean-core/src/test/java/io/ebean/text/PathPropertiesTests.java

@@ -3,7 +3,7 @@ package io.ebean.text;
 import io.ebean.DB;
 import io.ebean.FetchPath;
 import io.ebean.Query;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.tests.model.basic.Customer;
@@ -12,9 +12,9 @@ import org.tests.model.basic.ResetBasicData;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+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 PathPropertiesTests {
 

ebean-core/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java

@@ -5,7 +5,7 @@ import io.ebean.Ebean;
 import io.ebean.bean.PersistenceContext;
 import org.tests.model.basic.Customer;
 import com.fasterxml.jackson.core.JsonParser;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.StringReader;
 

ebean-core/src/test/java/io/ebean/text/json/JsonContextTest.java

@@ -3,7 +3,7 @@ package io.ebean.text.json;
 import com.fasterxml.jackson.core.JsonGenerator;
 import io.ebean.DB;
 import io.ebean.text.PathProperties;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
@@ -15,11 +15,7 @@ import java.util.List;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class JsonContextTest {
 
@@ -201,9 +197,9 @@ public class JsonContextTest {
     generator.close();
 
     String jsonString = writer.toString();
-    assertTrue(jsonString, jsonString.startsWith("["));
-    assertTrue(jsonString, jsonString.endsWith("]"));
-    assertTrue(jsonString, jsonString.contains("{\"id\":1,\"name\":\"Jim\"}"));
+    assertThat(jsonString).startsWith("[");
+    assertThat(jsonString).endsWith("]");
+    assertThat(jsonString).contains("{\"id\":1,\"name\":\"Jim\"}");
   }
 
   @Test

ebean-core/src/test/java/io/ebean/text/json/JsonWriteOptionsTests.java

@@ -1,12 +1,12 @@
 package io.ebean.text.json;
 
 import io.ebean.FetchPath;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Set;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class JsonWriteOptionsTests {
 

ebean-core/src/test/java/io/ebean/util/CamelCaseHelperTest.java

@@ -1,8 +1,8 @@
 package io.ebean.util;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class CamelCaseHelperTest {
 

ebean-core/src/test/java/io/ebeaninternal/api/BindParamsTest.java

@@ -1,11 +1,11 @@
 package io.ebeaninternal.api;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class BindParamsTest {
 

ebean-core/src/test/java/io/ebeaninternal/api/HelpScopeTransTest.java

@@ -1,14 +1,15 @@
 package io.ebeaninternal.api;
 
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.TxScope;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
 import org.tests.model.basic.UUOne;
 
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 public class HelpScopeTransTest {
 
   @Test
@@ -19,16 +20,16 @@ public class HelpScopeTransTest {
     HelpScopeTrans.enter(TxScope.required());
     HelpScopeTrans.enter(TxScope.required());
 
-    Ebean.find(Customer.class).findList();
+    DB.find(Customer.class).findList();
 
     HelpScopeTrans.enter(TxScope.required());
-    Ebean.find(Contact.class).findList();
+    DB.find(Contact.class).findList();
 
     HelpScopeTrans.exit(null, 1);
 
     UUOne one = new UUOne();
     one.setName("junk");
-    Ebean.save(one);
+    DB.save(one);
 
     HelpScopeTrans.exit(null, 1);
     HelpScopeTrans.exit(null, 1);
@@ -40,7 +41,7 @@ public class HelpScopeTransTest {
 
     try {
       HelpScopeTrans.enter(TxScope.required());
-      Assert.assertNull(Ebean.getDefaultServer().currentTransaction());
+      assertNull(DB.getDefault().currentTransaction());
       HelpScopeTrans.exit(null, 1);
     } finally {
       HelpScopeTrans.setEnabled(true);

ebean-core/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java

@@ -1,9 +1,9 @@
 package io.ebeaninternal.api;
 
 import io.ebean.annotation.Platform;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class PlatformMatchTest {
 

ebean-core/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java

@@ -1,12 +1,12 @@
 package io.ebeaninternal.extraddl.model;
 
 import io.ebean.annotation.Platform;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ExtraDdlXmlReaderTest {
 

ebean-core/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java

@@ -1,8 +1,7 @@
 package io.ebeaninternal.json;
 
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -16,8 +15,7 @@ import java.util.Map;
 import java.util.Set;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class ModifyAwareMapTest {
 
@@ -50,7 +48,7 @@ public class ModifyAwareMapTest {
     assertFalse(map.isMarkedDirty());
 
     map.put("A", "change");
-    Assert.assertTrue(map.isMarkedDirty());
+    assertTrue(map.isMarkedDirty());
   }
 
   @Test
@@ -60,7 +58,7 @@ public class ModifyAwareMapTest {
     assertFalse(map.isMarkedDirty());
 
     map.setMarkedDirty(true);
-    Assert.assertTrue(map.isMarkedDirty());
+    assertTrue(map.isMarkedDirty());
   }
 
   @Test
@@ -74,21 +72,21 @@ public class ModifyAwareMapTest {
   public void testIsEmpty() {
 
     assertFalse(createMap().isEmpty());
-    Assert.assertTrue(createEmptyMap().isEmpty());
+    assertTrue(createEmptyMap().isEmpty());
   }
 
   @Test
   public void testContainsKey() {
 
     ModifyAwareMap<String, String> map = createMap();
-    Assert.assertTrue(map.containsKey("A"));
+    assertTrue(map.containsKey("A"));
     assertFalse(map.containsKey("Z"));
   }
 
   @Test
   public void testContainsValue() {
     ModifyAwareMap<String, String> map = createMap();
-    Assert.assertTrue(map.containsValue("one"));
+    assertTrue(map.containsValue("one"));
     assertFalse(map.containsValue("junk"));
   }
 
@@ -98,7 +96,7 @@ public class ModifyAwareMapTest {
     ModifyAwareMap<String, String> map = createMap();
 
     assertEquals("two", map.get("B"));
-    Assert.assertNull(map.get("Z"));
+    assertNull(map.get("Z"));
     assertFalse(map.isMarkedDirty());
   }
 
@@ -109,7 +107,7 @@ public class ModifyAwareMapTest {
     assertFalse(map.isMarkedDirty());
 
     map.put("A", "mod");
-    Assert.assertTrue(map.isMarkedDirty());
+    assertTrue(map.isMarkedDirty());
   }
 
   @Test
@@ -119,7 +117,7 @@ public class ModifyAwareMapTest {
     assertFalse(map.isMarkedDirty());
 
     map.remove("A");
-    Assert.assertTrue(map.isMarkedDirty());
+    assertTrue(map.isMarkedDirty());
   }
 
   @Test
@@ -130,7 +128,7 @@ public class ModifyAwareMapTest {
 
     Map<String, String> other = new HashMap<>();
     map.putAll(other);
-    Assert.assertTrue(map.isMarkedDirty());
+    assertTrue(map.isMarkedDirty());
   }
 
   @Test
@@ -142,7 +140,7 @@ public class ModifyAwareMapTest {
     Map<String, String> other = new HashMap<>();
     other.put("A", "one");
     map.putAll(other);
-    Assert.assertTrue(map.isMarkedDirty());
+    assertTrue(map.isMarkedDirty());
   }
 
   @Test
@@ -152,7 +150,7 @@ public class ModifyAwareMapTest {
     assertFalse(map.isMarkedDirty());
 
     map.clear();
-    Assert.assertTrue(map.isMarkedDirty());
+    assertTrue(map.isMarkedDirty());
   }
 
   @Test
@@ -163,7 +161,7 @@ public class ModifyAwareMapTest {
 
     Set<String> keys = map.keySet();
     assertEquals(map.size(), keys.size());
-    Assert.assertTrue(keys.contains("A"));
+    assertTrue(keys.contains("A"));
     assertFalse(map.isMarkedDirty());
   }
 
@@ -175,7 +173,7 @@ public class ModifyAwareMapTest {
 
     Collection<String> values = map.values();
     assertEquals(map.size(), values.size());
-    Assert.assertTrue(values.contains("one"));
+    assertTrue(values.contains("one"));
     assertFalse(map.isMarkedDirty());
   }
 

ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java

@@ -13,12 +13,12 @@ import org.tests.model.basic.Customer;
 import org.tests.model.basic.Customer.Status;
 import org.tests.model.embedded.EAddress;
 import org.tests.model.embedded.EPerson;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.sql.Timestamp;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class CacheBeanDataTest extends BaseTestCase {
 

ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java

@@ -5,7 +5,7 @@ import io.ebean.bean.EntityBean;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.transaction.DefaultPersistenceContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Address;
 import org.tests.model.basic.Car;
 import org.tests.model.basic.Contact;
@@ -15,7 +15,7 @@ import java.sql.Date;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class CachedBeanDataFromBeanTest extends BaseTestCase {
 

ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java

@@ -8,7 +8,7 @@ import io.ebeaninternal.server.transaction.DefaultPersistenceContext;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
 import org.tests.model.basic.TBytesOnly;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -20,8 +20,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 
 public class CachedBeanDataSerializeTest extends BaseTestCase {

ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java

@@ -5,7 +5,7 @@ import io.ebean.cache.ServerCacheOptions;
 import io.ebean.cache.ServerCacheType;
 import io.ebean.config.ServerConfig;
 import io.ebeaninternal.server.transaction.TableModState;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
 

ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java

@@ -6,9 +6,9 @@ import io.ebean.config.ServerConfig;
 import org.tests.model.basic.Article;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.Product;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class DefaultCacheHolder_getCacheOptions_Test {
 

ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java

@@ -2,9 +2,9 @@ package io.ebeaninternal.server.cache;
 
 import io.ebean.cache.ServerCacheConfig;
 import io.ebean.cache.ServerCacheOptions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class DefaultServerCacheConfigTest {
 

ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java

@@ -4,12 +4,12 @@ import io.ebean.config.ContainerConfig;
 import io.ebean.config.CurrentTenantProvider;
 import io.ebean.config.ServerConfig;
 import io.ebeaninternal.server.cluster.ClusterManager;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class DefaultServerCacheManagerTest {
 

ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java

@@ -3,9 +3,9 @@ package io.ebeaninternal.server.cache;
 import io.ebean.cache.ServerCacheConfig;
 import io.ebean.cache.ServerCacheOptions;
 import io.ebean.cache.ServerCacheType;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class DefaultServerCacheTest {
 

ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java

@@ -4,8 +4,8 @@ import io.ebean.cache.ServerCacheConfig;
 import io.ebean.cache.ServerCacheOptions;
 import io.ebean.cache.ServerCacheStatistics;
 import io.ebean.cache.ServerCacheType;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.Random;
 
@@ -33,7 +33,7 @@ public class DefaultServerCache_RunEvictionTest {
     this.cache = createCache();
   }
 
-  @Ignore("test takes long time")
+  @Disabled("test takes long time")
   @Test
   public void runEvict() throws InterruptedException {
 

ebean-core/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java

@@ -5,7 +5,7 @@ import io.ebean.Ebean;
 import io.ebean.event.changelog.BeanChange;
 import io.ebean.event.changelog.ChangeSet;
 import io.ebean.text.json.JsonContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.StringWriter;
 import java.util.List;

ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java

@@ -4,7 +4,7 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.EbeanServer;
 import io.ebean.event.changelog.ChangeSet;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class DefaultChangeLogListenerTest extends BaseTestCase {
 

ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java

@@ -7,10 +7,10 @@ import org.tests.model.basic.Address;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Country;
 import org.tests.model.basic.Customer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class DefaultChangeLogRegisterTest extends BaseTestCase {
 

ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java

@@ -12,7 +12,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.transaction.BeanPersistIds;
 import io.ebeaninternal.server.transaction.RemoteTableMod;
 import io.ebeaninternal.server.transaction.RemoteTransactionEvent;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;
 
 import java.io.IOException;

ebean-core/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java

@@ -1,9 +1,9 @@
 package io.ebeaninternal.server.core;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class BasicTypeConverterTest {
 

ebean-core/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java

@@ -1,12 +1,12 @@
 package io.ebeaninternal.server.core;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class BindPaddingTest {
 

ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java

@@ -7,7 +7,7 @@ import io.ebean.FetchConfig;
 import io.ebean.Query;
 import io.ebeaninternal.server.querydefn.DefaultOrmQuery;
 import io.ebeaninternal.server.querydefn.OrmQueryDetail;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Order;
 
 import static org.assertj.core.api.Assertions.assertThat;