diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index fd7e161b4..719a66ca0 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -63,7 +63,7 @@ io.ebean ebean-ddl-generator - 12.11.0 + 12.11.3 test @@ -257,16 +257,9 @@ - org.mockito - mockito-core - 3.0.0 - test - - - - org.avaje.composite + io.avaje junit - 1.1 + 1.0 test diff --git a/ebean-core/src/test/java/io/ebean/BaseTestCase.java b/ebean-core/src/test/java/io/ebean/BaseTestCase.java index 3e144debc..eb100fc15 100644 --- a/ebean-core/src/test/java/io/ebean/BaseTestCase.java +++ b/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); } } diff --git a/ebean-core/src/test/java/io/ebean/ColumnTest.java b/ebean-core/src/test/java/io/ebean/ColumnTest.java index 9c8c1c50d..041e64efa 100644 --- a/ebean-core/src/test/java/io/ebean/ColumnTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/ConditionalTestRunner.java b/ebean-core/src/test/java/io/ebean/ConditionalTestRunner.java deleted file mode 100644 index d0dea0067..000000000 --- a/ebean-core/src/test/java/io/ebean/ConditionalTestRunner.java +++ /dev/null @@ -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; - } -} diff --git a/ebean-core/src/test/java/io/ebean/DbPrimaryTest.java b/ebean-core/src/test/java/io/ebean/DbPrimaryTest.java index 139f80930..0e716b159 100644 --- a/ebean-core/src/test/java/io/ebean/DbPrimaryTest.java +++ b/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()); } diff --git a/ebean-core/src/test/java/io/ebean/DtoQuery2Test.java b/ebean-core/src/test/java/io/ebean/DtoQuery2Test.java index 4d37aaf57..dd657f296 100644 --- a/ebean-core/src/test/java/io/ebean/DtoQuery2Test.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/DtoQueryFromOrmTest.java b/ebean-core/src/test/java/io/ebean/DtoQueryFromOrmTest.java index db9e85aa9..c0caf65bd 100644 --- a/ebean-core/src/test/java/io/ebean/DtoQueryFromOrmTest.java +++ b/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()) { diff --git a/ebean-core/src/test/java/io/ebean/DtoQueryTest.java b/ebean-core/src/test/java/io/ebean/DtoQueryTest.java index f9e5406e1..4daa80eeb 100644 --- a/ebean-core/src/test/java/io/ebean/DtoQueryTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java b/ebean-core/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java index cbf119fb2..6f3ced974 100644 --- a/ebean-core/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java b/ebean-core/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java index 4c594630e..4e54932fa 100644 --- a/ebean-core/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java b/ebean-core/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java index 6ab6db3e7..7365f430c 100644 --- a/ebean-core/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java b/ebean-core/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java index 43c4d750e..4478219ad 100644 --- a/ebean-core/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_deleteTest.java b/ebean-core/src/test/java/io/ebean/EbeanServer_deleteTest.java index 92232e6f0..747754faa 100644 --- a/ebean-core/src/test/java/io/ebean/EbeanServer_deleteTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_eqlTest.java b/ebean-core/src/test/java/io/ebean/EbeanServer_eqlTest.java index 0e3366311..eafa16bf4 100644 --- a/ebean-core/src/test/java/io/ebean/EbeanServer_eqlTest.java +++ b/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 query = server().createQuery(Customer.class, "where name = :name"); - query.findOne(); + assertThrows(PersistenceException.class, () ->query.findOne()); } @Test public void namedQuery() { - ResetBasicData.reset(); Query name = server().createNamedQuery(Customer.class, "name"); diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_refresh.java b/ebean-core/src/test/java/io/ebean/EbeanServer_refresh.java index 638f110f6..393cb86dc 100644 --- a/ebean-core/src/test/java/io/ebean/EbeanServer_refresh.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebean/EbeanServer_saveAllTest.java b/ebean-core/src/test/java/io/ebean/EbeanServer_saveAllTest.java index 0187adcf1..54415ca4c 100644 --- a/ebean-core/src/test/java/io/ebean/EbeanServer_saveAllTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/ExtendedServerTest.java b/ebean-core/src/test/java/io/ebean/ExtendedServerTest.java index 5f756e9ad..fee0fafa2 100644 --- a/ebean-core/src/test/java/io/ebean/ExtendedServerTest.java +++ b/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() diff --git a/ebean-core/src/test/java/io/ebean/FetchConfigTest.java b/ebean-core/src/test/java/io/ebean/FetchConfigTest.java index f85808f6c..5c644b231 100644 --- a/ebean-core/src/test/java/io/ebean/FetchConfigTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/FetchGroupTest.java b/ebean-core/src/test/java/io/ebean/FetchGroupTest.java index 9e3a88602..83ef87e2c 100644 --- a/ebean-core/src/test/java/io/ebean/FetchGroupTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/PlatformCondition.java b/ebean-core/src/test/java/io/ebean/PlatformCondition.java new file mode 100644 index 000000000..9122bf826 --- /dev/null +++ b/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 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; + } +} diff --git a/ebean-core/src/test/java/io/ebean/PropertyTest.java b/ebean-core/src/test/java/io/ebean/PropertyTest.java index 77d22c439..a4462f9de 100644 --- a/ebean-core/src/test/java/io/ebean/PropertyTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebean/SqlRowBooleanTest.java b/ebean-core/src/test/java/io/ebean/SqlRowBooleanTest.java index 1da2189eb..0c0b51522 100644 --- a/ebean-core/src/test/java/io/ebean/SqlRowBooleanTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/StringHelperTest.java b/ebean-core/src/test/java/io/ebean/StringHelperTest.java index b4a5fabae..eba711bb4 100644 --- a/ebean-core/src/test/java/io/ebean/StringHelperTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebean/TestDirtyProperties.java b/ebean-core/src/test/java/io/ebean/TestDirtyProperties.java index fabd51f38..2e01111cc 100644 --- a/ebean-core/src/test/java/io/ebean/TestDirtyProperties.java +++ b/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 changedProps = beanState.getChangedProps(); - Assert.assertEquals(1, changedProps.size()); - Assert.assertTrue(changedProps.contains("name")); + assertEquals(1, changedProps.size()); + assertThat(changedProps).contains("name"); Map 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 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 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 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 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; } diff --git a/ebean-core/src/test/java/io/ebean/TestFilterWithEnum.java b/ebean-core/src/test/java/io/ebean/TestFilterWithEnum.java index c3805107f..9627a7b2a 100644 --- a/ebean-core/src/test/java/io/ebean/TestFilterWithEnum.java +++ b/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 filter = Ebean.filter(Order.class); List newOrders = filter.eq("status", Order.Status.NEW).filter(allOrders); - Assert.assertNotNull(newOrders); - + assertNotNull(newOrders); } } diff --git a/ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java b/ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java index eb19d02d7..57d959304 100644 --- a/ebean-core/src/test/java/io/ebean/TestUnsetLoadedProperties.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/TextExpressionListTest.java b/ebean-core/src/test/java/io/ebean/TextExpressionListTest.java index 04d7d108c..bc21bffed 100644 --- a/ebean-core/src/test/java/io/ebean/TextExpressionListTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebean/TransactionalTestCase.java b/ebean-core/src/test/java/io/ebean/TransactionalTestCase.java index 3fcbb34bc..4975100fa 100644 --- a/ebean-core/src/test/java/io/ebean/TransactionalTestCase.java +++ b/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(); } } diff --git a/ebean-core/src/test/java/io/ebean/TxScopeTest.java b/ebean-core/src/test/java/io/ebean/TxScopeTest.java index 55524e4f0..6d6cb5ce9 100644 --- a/ebean-core/src/test/java/io/ebean/TxScopeTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebean/UpdateQueryTest.java b/ebean-core/src/test/java/io/ebean/UpdateQueryTest.java index bcbdd103b..355bbca84 100644 --- a/ebean-core/src/test/java/io/ebean/UpdateQueryTest.java +++ b/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) { diff --git a/ebean-core/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java b/ebean-core/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java index 31891de2f..a04180ae1 100644 --- a/ebean-core/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebean/cache/CacheKeyTest.java b/ebean-core/src/test/java/io/ebean/cache/CacheKeyTest.java index 98225a6e6..4e0b987f9 100644 --- a/ebean-core/src/test/java/io/ebean/cache/CacheKeyTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java b/ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java index 977b38b42..9145f46ab 100644 --- a/ebean-core/src/test/java/io/ebean/cache/ServerCacheManagerTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebean/cache/ServerCacheOptionsTest.java b/ebean-core/src/test/java/io/ebean/cache/ServerCacheOptionsTest.java index 47f569c74..4601a321d 100644 --- a/ebean-core/src/test/java/io/ebean/cache/ServerCacheOptionsTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/common/BeanListTest.java b/ebean-core/src/test/java/io/ebean/common/BeanListTest.java index 03c08efad..fc041549e 100644 --- a/ebean-core/src/test/java/io/ebean/common/BeanListTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/common/BeanMapTest.java b/ebean-core/src/test/java/io/ebean/common/BeanMapTest.java index 3101fc0f2..fc9a481cd 100644 --- a/ebean-core/src/test/java/io/ebean/common/BeanMapTest.java +++ b/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 map = newModifyListeningMap(); - map.keySet().add("3"); + assertThrows(UnsupportedOperationException.class, () -> map.keySet().add("3")); } - @Test(expected = UnsupportedOperationException.class) + @Test public void keySet_add() { BeanMap 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 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 map = new BeanMap<>(); - map.keySet().addAll(asList("3", "4")); + assertThrows(UnsupportedOperationException.class, () -> map.keySet().addAll(asList("3", "4"))); } @Test public void keySet_remove() { - BeanMap map = new BeanMap<>(); map.put("1", object1); map.put("2", object2); @@ -233,7 +233,6 @@ public class BeanMapTest { @Test public void keySet_clear() { - BeanMap 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 map = new BeanMap<>(); - map.values().add(object3); + assertThrows(UnsupportedOperationException.class, () -> map.values().add(object3)); } - @Test(expected = UnsupportedOperationException.class) + @Test public void values_addAll() { BeanMap 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 diff --git a/ebean-core/src/test/java/io/ebean/common/BeanSetTest.java b/ebean-core/src/test/java/io/ebean/common/BeanSetTest.java index 40253faef..7bc12bb07 100644 --- a/ebean-core/src/test/java/io/ebean/common/BeanSetTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/config/ContainerConfigTest.java b/ebean-core/src/test/java/io/ebean/config/ContainerConfigTest.java index 23c4d0b6c..183360a07 100644 --- a/ebean-core/src/test/java/io/ebean/config/ContainerConfigTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebean/config/DatabaseConfigTest.java b/ebean-core/src/test/java/io/ebean/config/DatabaseConfigTest.java index 368bc9a8f..e8c2dd208 100644 --- a/ebean-core/src/test/java/io/ebean/config/DatabaseConfigTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebean/config/DbConstraintNamingTest.java b/ebean-core/src/test/java/io/ebean/config/DbConstraintNamingTest.java index ca5dbb13f..9153b2f74 100644 --- a/ebean-core/src/test/java/io/ebean/config/DbConstraintNamingTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/config/DbMigrationConfigTest.java b/ebean-core/src/test/java/io/ebean/config/DbMigrationConfigTest.java index 80f3e7c64..bf0214ae1 100644 --- a/ebean-core/src/test/java/io/ebean/config/DbMigrationConfigTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebean/config/DocStoreConfigTest.java b/ebean-core/src/test/java/io/ebean/config/DocStoreConfigTest.java index 8919fab4a..6a99267b9 100644 --- a/ebean-core/src/test/java/io/ebean/config/DocStoreConfigTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebean/config/MatchingNamingConventionTest.java b/ebean-core/src/test/java/io/ebean/config/MatchingNamingConventionTest.java index 2db6b95ba..d832f1370 100644 --- a/ebean-core/src/test/java/io/ebean/config/MatchingNamingConventionTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java b/ebean-core/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java index c363be10f..9d600fc56 100644 --- a/ebean-core/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java +++ b/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(); } diff --git a/ebean-core/src/test/java/io/ebean/config/PropertiesWrapperTest.java b/ebean-core/src/test/java/io/ebean/config/PropertiesWrapperTest.java index 2954f1f9d..98a64ad0b 100644 --- a/ebean-core/src/test/java/io/ebean/config/PropertiesWrapperTest.java +++ b/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")); } } diff --git a/ebean-core/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java b/ebean-core/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java index 4a4dd820d..0d8644d5d 100644 --- a/ebean-core/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java +++ b/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() { diff --git a/ebean-core/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java b/ebean-core/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java index a1574ebed..b117d47ae 100644 --- a/ebean-core/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java index d4fb59cd9..f10469d52 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java index 25f479643..3e8da3acc 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java index 1e7603a7e..b6cb188f4 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbIdentityTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/DbIdentityTest.java index ad97776b4..52b23173a 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbIdentityTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java index 5d71bc7e0..f53b5baf0 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeMappingTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeMappingTest.java index 0f1307446..27fbaf159 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeMappingTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java index cf964d033..44f85c2ac 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbTypeMapTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/DbTypeMapTest.java index 7ea2e5e20..e85f6ea15 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/DbTypeMapTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java index 9af554f9e..cec87e885 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java index 1c7600861..94ff431c7 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlHistorySupportTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlHistorySupportTest.java index e6413305e..9993f5450 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlHistorySupportTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java index 676566e85..450749f96 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java index 15e9dda00..cf6b513ee 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresHistorySupportTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresHistorySupportTest.java index 2c851cbdc..6dcb81431 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresHistorySupportTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java index 6ed8c3e88..b7b6d524f 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/SequenceBatchIdGeneratorTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/SequenceBatchIdGeneratorTest.java index 7969c8778..295096e75 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/SequenceBatchIdGeneratorTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java index 306032f50..887b19a3d 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java index 092adcebe..9740f6858 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java +++ b/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 diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java index e6c622437..1ca441253 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java +++ b/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() { diff --git a/ebean-core/src/test/java/io/ebean/event/BeanFindControllerTest.java b/ebean-core/src/test/java/io/ebean/event/BeanFindControllerTest.java index 6b2468478..167d39d54 100644 --- a/ebean-core/src/test/java/io/ebean/event/BeanFindControllerTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebean/event/BeanPersistControllerTest.java b/ebean-core/src/test/java/io/ebean/event/BeanPersistControllerTest.java index 3cbb0b3ba..e42088df2 100644 --- a/ebean-core/src/test/java/io/ebean/event/BeanPersistControllerTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/event/BeanPostLoadTest.java b/ebean-core/src/test/java/io/ebean/event/BeanPostLoadTest.java index 7775ccc47..3fdfdb51f 100644 --- a/ebean-core/src/test/java/io/ebean/event/BeanPostLoadTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/event/readaudit/ReadAuditQueryPlanTest.java b/ebean-core/src/test/java/io/ebean/event/readaudit/ReadAuditQueryPlanTest.java index bcb3fac30..d29d4a432 100644 --- a/ebean-core/src/test/java/io/ebean/event/readaudit/ReadAuditQueryPlanTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebean/json/EJsonTests.java b/ebean-core/src/test/java/io/ebean/json/EJsonTests.java index 770aa8378..720e280a6 100644 --- a/ebean-core/src/test/java/io/ebean/json/EJsonTests.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java b/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java index d6edb3f0c..fd54a95a7 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java +++ b/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 diff --git a/ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java b/ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java index e48ffbe25..4c259285e 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java b/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java index cc546b742..13fc2d92c 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java b/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java index f94cf6059..ff84a576c 100644 --- a/ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebean/text/PathPropertiesTests.java b/ebean-core/src/test/java/io/ebean/text/PathPropertiesTests.java index 13acc6376..a36e23aa8 100644 --- a/ebean-core/src/test/java/io/ebean/text/PathPropertiesTests.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java b/ebean-core/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java index df6530e16..4e83f909e 100644 --- a/ebean-core/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebean/text/json/JsonContextTest.java b/ebean-core/src/test/java/io/ebean/text/json/JsonContextTest.java index 8d099565b..bb1b4056d 100644 --- a/ebean-core/src/test/java/io/ebean/text/json/JsonContextTest.java +++ b/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 diff --git a/ebean-core/src/test/java/io/ebean/text/json/JsonWriteOptionsTests.java b/ebean-core/src/test/java/io/ebean/text/json/JsonWriteOptionsTests.java index 1714d0ddb..4076d82a9 100644 --- a/ebean-core/src/test/java/io/ebean/text/json/JsonWriteOptionsTests.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebean/util/CamelCaseHelperTest.java b/ebean-core/src/test/java/io/ebean/util/CamelCaseHelperTest.java index 3341071e9..134bbb356 100644 --- a/ebean-core/src/test/java/io/ebean/util/CamelCaseHelperTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/BindParamsTest.java b/ebean-core/src/test/java/io/ebeaninternal/api/BindParamsTest.java index 0705324c1..eef160dd7 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/api/BindParamsTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/HelpScopeTransTest.java b/ebean-core/src/test/java/io/ebeaninternal/api/HelpScopeTransTest.java index 6e7862580..51a46d3bf 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/api/HelpScopeTransTest.java +++ b/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); diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java b/ebean-core/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java index b33125b49..5c3e8dc35 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java b/ebean-core/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java index cf4b284fe..b77df5424 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java b/ebean-core/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java index a9bfbb929..929b13d49 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java +++ b/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 map = createMap(); - Assert.assertTrue(map.containsKey("A")); + assertTrue(map.containsKey("A")); assertFalse(map.containsKey("Z")); } @Test public void testContainsValue() { ModifyAwareMap map = createMap(); - Assert.assertTrue(map.containsValue("one")); + assertTrue(map.containsValue("one")); assertFalse(map.containsValue("junk")); } @@ -98,7 +96,7 @@ public class ModifyAwareMapTest { ModifyAwareMap 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 other = new HashMap<>(); map.putAll(other); - Assert.assertTrue(map.isMarkedDirty()); + assertTrue(map.isMarkedDirty()); } @Test @@ -142,7 +140,7 @@ public class ModifyAwareMapTest { Map 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 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 values = map.values(); assertEquals(map.size(), values.size()); - Assert.assertTrue(values.contains("one")); + assertTrue(values.contains("one")); assertFalse(map.isMarkedDirty()); } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java index d7ab3ea5e..739e427fb 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java index 323fcc2e0..8e59de674 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java index 8f94c27af..4e0353dc5 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java index d88f42719..6b8580824 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java index 6cbc82c8f..056e6f79e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java index ecd5ed5c7..9180dd7c1 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java index 06b12c047..d1639508c 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java index 9bf023c6e..87cd7f074 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java index 184783627..c6596e6d8 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java index 0e608f3e1..aaceb6433 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java index 0209d5438..60cdf037b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java index 3ebcebea4..f05d738f6 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java index 9776ed6a5..a8df99baa 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java index f4a77caf1..0cb2018aa 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java index 483963fcc..8fefb770a 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java +++ b/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 { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java index 160bb6fbb..606e9533b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java +++ b/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; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java index 78cea8327..f578639e6 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.core; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Car; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java index 4b85f18f1..c78eafa93 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.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.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DtoQueryRequestTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java index 5065d17e5..a6027c182 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java @@ -2,9 +2,9 @@ package io.ebeaninternal.server.core; import io.ebean.config.ServerConfig; import io.ebean.datasource.DataSourceConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class InitDataSourceTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java index 7d14d858c..cd135fe60 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java @@ -6,17 +6,18 @@ import io.ebean.EbeanServer; import io.ebean.ValuePair; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.Order.Status; -import org.junit.Assert; -import org.junit.Test; import java.sql.Date; import java.sql.Timestamp; import java.util.Map; import java.util.Set; +import static org.junit.jupiter.api.Assertions.*; + public class TestDiffHelpSimple extends BaseTestCase { long firstTime = System.currentTimeMillis() - 10000; @@ -58,14 +59,14 @@ public class TestDiffHelpSimple extends BaseTestCase { Map diff = DiffHelp.diff(order1, order2, orderDesc); - Assert.assertEquals(5, diff.size()); + assertEquals(5, diff.size()); Set keySet = diff.keySet(); - Assert.assertTrue(keySet.contains("cretime")); - Assert.assertTrue(keySet.contains("status")); - Assert.assertTrue(keySet.contains("shipDate")); - Assert.assertTrue(keySet.contains("orderDate")); - Assert.assertTrue(keySet.contains("customer.id")); + assertTrue(keySet.contains("cretime")); + assertTrue(keySet.contains("status")); + assertTrue(keySet.contains("shipDate")); + assertTrue(keySet.contains("orderDate")); + assertTrue(keySet.contains("customer.id")); } @Test @@ -84,16 +85,16 @@ public class TestDiffHelpSimple extends BaseTestCase { Map diff = DiffHelp.diff(order1, order2, orderDesc); - Assert.assertEquals(5, diff.size()); + assertEquals(5, diff.size()); Set keySet = diff.keySet(); - Assert.assertTrue(keySet.contains("cretime")); - Assert.assertTrue(keySet.contains("status")); - Assert.assertTrue(keySet.contains("shipDate")); - Assert.assertTrue(keySet.contains("orderDate")); - Assert.assertTrue(keySet.contains("customer.id")); - Assert.assertEquals(2133, diff.get("customer.id").getOldValue()); - Assert.assertEquals(1234, diff.get("customer.id").getNewValue()); + assertTrue(keySet.contains("cretime")); + assertTrue(keySet.contains("status")); + assertTrue(keySet.contains("shipDate")); + assertTrue(keySet.contains("orderDate")); + assertTrue(keySet.contains("customer.id")); + assertEquals(2133, diff.get("customer.id").getOldValue()); + assertEquals(1234, diff.get("customer.id").getNewValue()); } @Test @@ -105,7 +106,7 @@ public class TestDiffHelpSimple extends BaseTestCase { Map diff = DiffHelp.diff(order1, order2, orderDesc); - Assert.assertEquals(0, diff.size()); + assertEquals(0, diff.size()); } @Test @@ -120,17 +121,17 @@ public class TestDiffHelpSimple extends BaseTestCase { Map diff = DiffHelp.diff(order1, order2, orderDesc); - Assert.assertEquals(3, diff.size()); + assertEquals(3, diff.size()); Set keySet = diff.keySet(); - Assert.assertTrue(keySet.contains("status")); - Assert.assertTrue(keySet.contains("customer.id")); - Assert.assertTrue(keySet.contains("shipDate")); + assertTrue(keySet.contains("status")); + assertTrue(keySet.contains("customer.id")); + assertTrue(keySet.contains("shipDate")); ValuePair shipDatePair = diff.get("shipDate"); - Assert.assertEquals(order1.getShipDate(), shipDatePair.getNewValue()); - Assert.assertEquals(order2.getShipDate(), shipDatePair.getOldValue()); - Assert.assertNull(shipDatePair.getOldValue()); + assertEquals(order1.getShipDate(), shipDatePair.getNewValue()); + assertEquals(order2.getShipDate(), shipDatePair.getOldValue()); + assertNull(shipDatePair.getOldValue()); } @@ -145,14 +146,14 @@ public class TestDiffHelpSimple extends BaseTestCase { Map diff = DiffHelp.diff(order1, order2, orderDesc); - Assert.assertEquals(1, diff.size()); + assertEquals(1, diff.size()); Set keySet = diff.keySet(); - Assert.assertTrue(keySet.contains("shipDate")); + assertTrue(keySet.contains("shipDate")); ValuePair shipDatePair = diff.get("shipDate"); - Assert.assertEquals(order1.getShipDate(), shipDatePair.getNewValue()); - Assert.assertEquals(order2.getShipDate(), shipDatePair.getOldValue()); - Assert.assertNull(shipDatePair.getNewValue()); + assertEquals(order1.getShipDate(), shipDatePair.getNewValue()); + assertEquals(order2.getShipDate(), shipDatePair.getOldValue()); + assertNull(shipDatePair.getNewValue()); } @Test @@ -166,6 +167,6 @@ public class TestDiffHelpSimple extends BaseTestCase { Map diff = DiffHelp.diff(order1, order2, orderDesc); - Assert.assertEquals(0, diff.size()); + assertEquals(0, diff.size()); } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java index 9162609d9..19bd30108 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java @@ -6,13 +6,14 @@ import io.ebean.EbeanServer; import io.ebean.ValuePair; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; +import org.junit.jupiter.api.Test; import org.tests.model.embedded.EMain; import org.tests.model.embedded.Eembeddable; -import org.junit.Assert; -import org.junit.Test; import java.util.Map; +import static org.junit.jupiter.api.Assertions.*; + public class TestDiffHelpWithEmbedded extends BaseTestCase { EbeanServer server; @@ -34,12 +35,12 @@ public class TestDiffHelpWithEmbedded extends BaseTestCase { emain2.getEmbeddable().setDescription("baz"); Map diff = DiffHelp.diff(emain1, emain2, emainDesc); - Assert.assertEquals(1, diff.size()); + assertEquals(1, diff.size()); ValuePair valuePair = diff.get("embeddable.description"); - Assert.assertNotNull(valuePair); - Assert.assertEquals("bar", valuePair.getNewValue()); - Assert.assertEquals("baz", valuePair.getOldValue()); + assertNotNull(valuePair); + assertEquals("bar", valuePair.getNewValue()); + assertEquals("baz", valuePair.getOldValue()); } /** @@ -57,12 +58,12 @@ public class TestDiffHelpWithEmbedded extends BaseTestCase { Map diff = DiffHelp.diff(emain1, emain2, emainDesc); - Assert.assertEquals(1, diff.size()); + assertEquals(1, diff.size()); ValuePair valuePair = diff.get("embeddable.description"); - Assert.assertNotNull(valuePair); - Assert.assertEquals("bar", valuePair.getNewValue()); - Assert.assertEquals("baz", valuePair.getOldValue()); + assertNotNull(valuePair); + assertEquals("bar", valuePair.getNewValue()); + assertEquals("baz", valuePair.getOldValue()); } @Test @@ -73,12 +74,12 @@ public class TestDiffHelpWithEmbedded extends BaseTestCase { emain2.getEmbeddable().setDescription("baz"); Map diff = DiffHelp.diff(emain1, emain2, emainDesc); - Assert.assertEquals(1, diff.size()); + assertEquals(1, diff.size()); ValuePair valuePair = diff.get("embeddable.description"); - Assert.assertNotNull(valuePair); - Assert.assertEquals("bar", valuePair.getNewValue()); - Assert.assertEquals("baz", valuePair.getOldValue()); + assertNotNull(valuePair); + assertEquals("bar", valuePair.getNewValue()); + assertEquals("baz", valuePair.getOldValue()); } @Test @@ -89,12 +90,12 @@ public class TestDiffHelpWithEmbedded extends BaseTestCase { EMain emain2 = createEMain(); Map diff = DiffHelp.diff(emain1, emain2, emainDesc); - Assert.assertEquals(1, diff.size()); + assertEquals(1, diff.size()); ValuePair valuePair = diff.get("embeddable.description"); - Assert.assertNotNull(valuePair); - Assert.assertNull(valuePair.getNewValue()); - Assert.assertEquals("bar", valuePair.getOldValue()); + assertNotNull(valuePair); + assertNull(valuePair.getNewValue()); + assertEquals("bar", valuePair.getOldValue()); } @Test @@ -105,12 +106,12 @@ public class TestDiffHelpWithEmbedded extends BaseTestCase { emain2.setEmbeddable(null); Map diff = DiffHelp.diff(emain1, emain2, emainDesc); - Assert.assertEquals(1, diff.size()); + assertEquals(1, diff.size()); ValuePair valuePair = diff.get("embeddable.description"); - Assert.assertNotNull(valuePair); - Assert.assertNull(valuePair.getOldValue()); - Assert.assertEquals("bar", valuePair.getNewValue()); + assertNotNull(valuePair); + assertNull(valuePair.getOldValue()); + assertEquals("bar", valuePair.getNewValue()); } @Test @@ -121,12 +122,12 @@ public class TestDiffHelpWithEmbedded extends BaseTestCase { emain2.setEmbeddable(null); Map diff = DiffHelp.diff(emain1, emain2, emainDesc); - Assert.assertEquals(1, diff.size()); + assertEquals(1, diff.size()); ValuePair valuePair = diff.get("embeddable.description"); - Assert.assertNotNull(valuePair); - Assert.assertNull(valuePair.getOldValue()); - Assert.assertEquals("bar", valuePair.getNewValue()); + assertNotNull(valuePair); + assertNull(valuePair.getOldValue()); + assertEquals("bar", valuePair.getNewValue()); } @Test @@ -138,7 +139,7 @@ public class TestDiffHelpWithEmbedded extends BaseTestCase { emain2.setEmbeddable(null); Map diff = DiffHelp.diff(emain1, emain2, emainDesc); - Assert.assertEquals(0, diff.size()); + assertEquals(0, diff.size()); } private EMain createEMain() { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java index 615d0433f..3484ac968 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.core.bootup; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java index 4f1063c7d..0bb79f2ae 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.core.bootup; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Set; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java index 3a0527381..190588605 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java @@ -1,11 +1,11 @@ package io.ebeaninternal.server.deploy; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.persistence.CascadeType; -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 BeanCascadeInfoTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java index d79d79427..94028e4fa 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java @@ -8,7 +8,7 @@ import io.ebeaninternal.server.core.CacheOptions; import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; import io.ebeaninternal.server.deploy.meta.DeployIdentityMode; import io.ebeanservice.docstore.api.DocStoreBeanAdapter; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.*; import org.tests.model.bridge.BSite; import org.tests.model.bridge.BUser; @@ -16,7 +16,7 @@ import org.tests.model.bridge.BUser; import java.util.Collection; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java index b2ddea188..7f85b26c0 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java @@ -5,7 +5,7 @@ import io.ebeanservice.docstore.api.mapping.DocPropertyAdapter; import io.ebeanservice.docstore.api.mapping.DocPropertyMapping; import io.ebeanservice.docstore.api.mapping.DocumentMapping; import org.tests.model.basic.Order; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java index 31721e893..fb9d7f92d 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java @@ -7,9 +7,9 @@ import io.ebean.event.BeanPersistAdapter; import io.ebean.event.BeanPersistListener; import io.ebeaninternal.api.SpiEbeanServer; import org.tests.model.basic.EBasic; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class BeanDescriptor_registerTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java index 4ea84d989..1ee4cf8f3 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java @@ -5,10 +5,10 @@ import io.ebean.Ebean; import io.ebeaninternal.api.SpiEbeanServer; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasic; -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 BeanDescriptor_whenCreatedPropertyTest extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java index 9f26e978c..92f2269f3 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.deploy; import io.ebean.meta.BasicMetricVisitor; import io.ebean.meta.MetaTimedMetric; import io.ebeaninternal.server.core.PersistRequest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java index ff35bf77e..b6b70d8dc 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.bean.BeanCollection; import io.ebean.bean.EntityBean; import io.ebean.common.BeanList; -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; @@ -13,9 +13,9 @@ 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.Assert.assertNull; -import static org.junit.Assert.assertTrue; +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 BeanPropertyAssocManyTest extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java index 5f4080163..0a4f45f90 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java @@ -1,11 +1,12 @@ package io.ebeaninternal.server.deploy; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class DeployPropertyParserMapTests { @Test @@ -19,7 +20,7 @@ public class DeployPropertyParserMapTests { DeployPropertyParserMap parser = new DeployPropertyParserMap(map); String output = parser.parse("(lower(customer.name) like ? escape'' or id > ?)"); - Assert.assertEquals("(lower(t1.name) like ? escape'' or t0.id > ?)", output); + assertEquals("(lower(t1.name) like ? escape'' or t0.id > ?)", output); } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java index cfb35f740..4ca2a3681 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.deploy; import io.ebean.BaseTestCase; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.BWithQIdent; import org.tests.model.basic.Customer; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java index 5330d3ab6..c1e4d32ff 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java index 681e82bf1..af2192d69 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.deploy; import io.ebean.BaseTestCase; import io.ebeaninternal.server.query.STreeProperty; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java index cf206edaf..2faa11bc6 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java @@ -1,8 +1,8 @@ package io.ebeaninternal.server.deploy; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class IndexDefinitionTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java index 770aba39f..9a4143f6b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.deploy; import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java index e29f58dd8..cba2035d0 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.deploy; import io.ebeaninternal.server.deploy.meta.DeployTableJoin; import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java index 815ba9888..e614df5cf 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java @@ -10,14 +10,14 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.composite.RCustomer; import org.tests.model.composite.RCustomerKey; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.embedded.UserInterestLive; import org.tests.model.embedded.UserInterestLiveKey; import java.sql.Timestamp; import java.util.Map; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestBeanDescriptorHasIdProperty extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java index 611c20fef..5027e2332 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java @@ -6,13 +6,14 @@ import io.ebean.bean.BeanCollection; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; import io.ebeaninternal.api.SpiEbeanServer; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; -import org.junit.Assert; -import org.junit.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.*; + public class TestCollectionLoadedStatus extends BaseTestCase { @Test @@ -26,16 +27,16 @@ public class TestCollectionLoadedStatus extends BaseTestCase { EntityBeanIntercept ebi = eb._ebean_getIntercept(); BeanProperty contactsProperty = custDesc.getBeanProperty("contacts"); - Assert.assertFalse(ebi.isLoadedProperty(contactsProperty.getPropertyIndex())); + assertFalse(ebi.isLoadedProperty(contactsProperty.getPropertyIndex())); Object contactsViaInternal = contactsProperty.getValue(eb); - Assert.assertNull(contactsViaInternal); - Assert.assertFalse(ebi.isLoadedProperty(contactsProperty.getPropertyIndex())); + assertNull(contactsViaInternal); + assertFalse(ebi.isLoadedProperty(contactsProperty.getPropertyIndex())); List contacts = customer.getContacts(); - Assert.assertNotNull(contacts); - Assert.assertTrue(contacts instanceof BeanCollection); - Assert.assertTrue(ebi.isLoadedProperty(contactsProperty.getPropertyIndex())); + assertNotNull(contacts); + assertTrue(contacts instanceof BeanCollection); + assertTrue(ebi.isLoadedProperty(contactsProperty.getPropertyIndex())); } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java index 58cdd45ee..45e71f7ca 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java @@ -6,7 +6,7 @@ import io.ebean.EbeanServer; import io.ebean.bean.EntityBean; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.json.SpiJsonWriter; -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.Order.Status; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java index f2a03c63d..85747f7e5 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java @@ -6,7 +6,7 @@ import io.ebean.EbeanServer; import io.ebean.bean.EntityBean; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.json.SpiJsonWriter; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.embedded.EMain; import org.tests.model.embedded.Eembeddable; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java index 014ddb4b6..b2d302848 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java @@ -2,12 +2,13 @@ package io.ebeaninternal.server.deploy; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.bean.EntityBean; +import org.junit.jupiter.api.Test; import org.tests.model.mappedsuper.ASimpleBean; import org.tests.model.mappedsuper.NotEnhancedMappedSuper; -import org.junit.Assert; -import org.junit.Test; + +import static org.junit.jupiter.api.Assertions.*; public class TestNotEnhancedMappedSuper extends BaseTestCase { @@ -17,24 +18,22 @@ public class TestNotEnhancedMappedSuper extends BaseTestCase { ASimpleBean bean = new ASimpleBean(); bean.setName("junk"); - Ebean.save(bean); - Assert.assertNotNull(bean.getId()); + DB.save(bean); + assertNotNull(bean.getId()); bean.setName("junk mod"); - Ebean.save(bean); + DB.save(bean); - ASimpleBean fetched = Ebean.find(ASimpleBean.class, bean.getId()); - Assert.assertEquals("junk mod", fetched.getName()); - Assert.assertEquals(bean.getName(), fetched.getName()); + ASimpleBean fetched = DB.find(ASimpleBean.class, bean.getId()); + assertEquals("junk mod", fetched.getName()); + assertEquals(bean.getName(), fetched.getName()); - Ebean.delete(bean); - ASimpleBean fetched2 = Ebean.find(ASimpleBean.class, bean.getId()); - Assert.assertNull(fetched2); + DB.delete(bean); + ASimpleBean fetched2 = DB.find(ASimpleBean.class, bean.getId()); + assertNull(fetched2); NotEnhancedMappedSuper mappedSuper = new NotEnhancedMappedSuper(); - boolean enhanced = (mappedSuper instanceof EntityBean); - Assert.assertTrue(enhanced); - + assertTrue((mappedSuper instanceof EntityBean)); } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java index 6c1626ce5..94e83c958 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java @@ -3,16 +3,16 @@ package io.ebeaninternal.server.deploy; import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; import java.util.Set; -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 TestReferenceWithConstructorProperties extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java index c1d76e037..101212ca9 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java @@ -3,10 +3,13 @@ package io.ebeaninternal.server.deploy.generatedproperty; import io.ebean.BaseTestCase; import io.ebean.bean.EntityBean; import io.ebeaninternal.server.deploy.BeanProperty; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; +import java.util.EmptyStackException; + import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public class GeneratedCounterLongTest extends BaseTestCase { @@ -15,16 +18,14 @@ public class GeneratedCounterLongTest extends BaseTestCase { private BeanProperty version = getBeanDescriptor(Customer.class).getBeanProperty("version"); - @Test(expected = IllegalStateException.class) - public void when_null_expect_IllegalStateException() throws Exception { - + @Test + public void when_null_expect_IllegalStateException() { Customer customer = new Customer(); - counter.getUpdateValue(version, (EntityBean)customer, System.currentTimeMillis()); + assertThrows(IllegalStateException.class, () -> counter.getUpdateValue(version, (EntityBean)customer, System.currentTimeMillis())); } @Test - public void when_set_expect_incremented() throws Exception { - + public void when_set_expect_incremented() { Customer customer = new Customer(); customer.setVersion(7L); Object value = counter.getUpdateValue(version, (EntityBean) customer, System.currentTimeMillis()); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTimeTest.java index 3d469c783..cd5903485 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTimeTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTimeTest.java @@ -1,9 +1,9 @@ package io.ebeaninternal.server.deploy.generatedproperty; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class GeneratedInsertJavaTimeTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java index e91507a96..0ce2061f3 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java @@ -2,14 +2,14 @@ package io.ebeaninternal.server.deploy.generatedproperty; import io.ebean.config.ClassLoadConfig; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; import java.time.Instant; import java.time.LocalDateTime; import java.time.OffsetDateTime; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class InsertTimestampFactoryTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java index 800423fc8..aa150304e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java @@ -2,14 +2,14 @@ package io.ebeaninternal.server.deploy.generatedproperty; import io.ebean.config.ClassLoadConfig; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; import java.time.Instant; import java.time.LocalDateTime; import java.time.OffsetDateTime; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class UpdateTimestampFactoryTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java index 5b543e764..bd9139a6a 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java @@ -7,7 +7,7 @@ import io.ebeaninternal.server.core.bootup.BootupClasses; import io.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory; import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; import io.ebeaninternal.server.type.DefaultTypeManager; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java index 2cf97ca85..3d476132c 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.dto; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.lang.reflect.Method; import java.util.HashMap; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java index 264edac57..08bc88640 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java @@ -1,8 +1,7 @@ package io.ebeaninternal.server.executor; -import io.ebeaninternal.server.executor.DefaultBackgroundExecutor; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.slf4j.MDC; import java.util.concurrent.Future; @@ -59,7 +58,7 @@ public class DefaultBackgroundExecutorTest { } @Test - @Ignore("test takes long time") + @Disabled("test takes long time") public void shutdown_when_running_expect_waitAndNiceShutdown() { DefaultBackgroundExecutor es = new DefaultBackgroundExecutor(1, 20, "test"); @@ -72,7 +71,7 @@ public class DefaultBackgroundExecutorTest { } @Test - @Ignore("test takes long time") + @Disabled("test takes long time") public void shutdown_when_rougeRunnable_expect_InterruptedException() { DefaultBackgroundExecutor es = new DefaultBackgroundExecutor(1, 10, "test"); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java b/ebean-core/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java index 563e50f3e..9a45dad71 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java @@ -4,14 +4,14 @@ import io.ebean.BackgroundExecutor; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; -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.Customer; public class TestShutdownWithBackgroundTasks extends BaseTestCase { @Test - @Ignore + @Disabled public void test() { Database server = DB.getDefault(); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java index d26a46b01..43fd9126b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java index 10b529aac..f9ebea4c9 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.expression; import io.ebeaninternal.api.SpiExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java index 4685f1290..be487ca00 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java index 75f033ced..4691cc199 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExampleExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExampleExpressionTest.java index a593bfe01..452db7dbf 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExampleExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExampleExpressionTest.java @@ -8,7 +8,7 @@ import io.ebeaninternal.api.ManyWhereJoins; import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.server.core.OrmQueryRequest; import io.ebeaninternal.server.deploy.BeanDescriptor; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java index 227f11b3f..47be406be 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.expression; import io.ebean.Expression; import io.ebeaninternal.api.SpiExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java index 89e2dcd39..1fa245832 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.expression; import io.ebean.ExpressionList; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java index ee2f37c44..b869096a1 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java index 247ac62c2..084410752 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java index 45fa3858a..ded5e7772 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java index 11ff0eae6..17039e605 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/InPairsExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/InPairsExpressionTest.java index eee6f1556..b5f1254e5 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/InPairsExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/InPairsExpressionTest.java @@ -1,10 +1,10 @@ package io.ebeaninternal.server.expression; import io.ebean.Pairs; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static junit.framework.TestCase.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 InPairsExpressionTest extends BaseExpressionTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java index 1b6345846..1ab4853b5 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java index b3d607728..921581333 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.expression; import io.ebeaninternal.api.SpiExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java index dba74742e..81689c7f1 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; -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; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java index 1a4f82dd5..83438d870 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java index fe2e1224e..b28d44c05 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.expression; import io.ebean.Expr; import io.ebean.Expression; import io.ebean.Junction; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JunctionExpressionTest extends BaseExpressionTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java index 51f0eeaae..3012daf4d 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.expression; import io.ebean.LikeType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/LogicExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/LogicExpressionTest.java index 601c607c6..2ddbd367e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/LogicExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/LogicExpressionTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.expression; import io.ebean.Expr; import io.ebean.Expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java index bb745b47c..bede240f6 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/NoopExpressionTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.expression; import io.ebean.Ebean; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.onetoone.album.Cover; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/NotExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/NotExpressionTest.java index a65b81c97..fc82a7dc9 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/NotExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/NotExpressionTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.expression; import io.ebean.Expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static io.ebean.Expr.eq; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/NullExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/NullExpressionTest.java index 02c47948f..302ea3f9e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/NullExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/NullExpressionTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.expression; import io.ebeaninternal.api.ManyWhereJoins; import io.ebeaninternal.api.SpiExpression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java index b33019cce..364e23ca3 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java @@ -5,12 +5,12 @@ import io.ebean.Ebean; import io.ebean.ExpressionList; import io.ebeaninternal.api.SpiExpression; import org.tests.model.basic.Order; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; -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 PrepareDocNestedTest extends BaseTestCase { @Test diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionBuilderTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionBuilderTest.java index 8f3c4bf43..81e5c312b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionBuilderTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionBuilderTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java index eb12ff460..27a696a34 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import io.ebeaninternal.api.BindValuesKey; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/SameTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/SameTest.java index f5cd05852..76e3d27a3 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/SameTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/SameTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/SimpleExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/SimpleExpressionTest.java index 1ce846e45..d9ce5d9fd 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/SimpleExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/SimpleExpressionTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/H2DbExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/H2DbExpressionTest.java index 9cd0f687c..e002e84ed 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/H2DbExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/H2DbExpressionTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.expression.platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java index c367ba601..0daf5ea9f 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java @@ -3,9 +3,9 @@ package io.ebeaninternal.server.expression.platform; import io.ebeaninternal.api.SpiExpressionRequest; import io.ebeaninternal.server.expression.DefaultExpressionRequest; import io.ebeaninternal.server.expression.Op; -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 HanaDbExpressionTest { private HanaDbExpression expression = new HanaDbExpression(); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/MySqlDbExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/MySqlDbExpressionTest.java index d53657bec..032075298 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/MySqlDbExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/MySqlDbExpressionTest.java @@ -3,9 +3,9 @@ package io.ebeaninternal.server.expression.platform; import io.ebeaninternal.api.SpiExpressionRequest; import io.ebeaninternal.server.expression.DefaultExpressionRequest; import io.ebeaninternal.server.expression.Op; -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 MySqlDbExpressionTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/OracleDbExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/OracleDbExpressionTest.java index 6608927c2..d05f61594 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/OracleDbExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/OracleDbExpressionTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression.platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java index 526ca3353..80c0ccff0 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression.platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresDbExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresDbExpressionTest.java index e9e4ae2d4..1a4c4c85b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresDbExpressionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresDbExpressionTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression.platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java index e6281364b..092578572 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java @@ -9,7 +9,7 @@ import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebeaninternal.api.SpiQuery; 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.OrderDetail; import org.tests.model.basic.ResetBasicData; @@ -21,13 +21,14 @@ import java.util.HashSet; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public class EqlParserTest extends BaseTestCase { - @Test(expected = IllegalArgumentException.class) + @Test public void illegal_syntax() { - parse("find Article where name = :p0"); + assertThrows(IllegalArgumentException.class, () -> parse("find Article where name = :p0")); } @Test @@ -389,27 +390,23 @@ public class EqlParserTest extends BaseTestCase { assertSql(query).doesNotContain("where"); } - @Test(expected = IllegalArgumentException.class) + @Test//(expected = IllegalArgumentException.class) public void query_inOrEmpty_withVals() { - - Query query = parse("where name inOrEmpty (:names)"); - query.setParameter("names", Arrays.asList("Baz", "Maz", "Jim")); - query.findList(); - - platformAssertIn(query.getGeneratedSql(), "where t0.name"); + assertThrows(IllegalArgumentException.class, () -> parse("where name inOrEmpty (:names)")); +// query.setParameter("names", Arrays.asList("Baz", "Maz", "Jim")); +// query.findList(); +// platformAssertIn(query.getGeneratedSql(), "where t0.name"); } /** * This test fails in that we can't use inOrEmpty with named parameters. */ - @Test(expected = IllegalArgumentException.class) + @Test//(expected = IllegalArgumentException.class) public void query_inOrEmpty_withNamedParams_expect_IllegalArgument() { - - Query query = parse("where name inOrEmpty (:names)"); - query.setParameter("names", new ArrayList<>()); - query.findList(); - - assertSql(query).doesNotContain("where"); + assertThrows(IllegalArgumentException.class, () -> parse("where name inOrEmpty (:names)")); +// query.setParameter("names", new ArrayList<>()); +// assertThrows(IllegalArgumentException.class, query::findList); +// assertSql(query).doesNotContain("where"); } @Test diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java index c4976f56d..6d86c65d1 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java @@ -1,10 +1,10 @@ package io.ebeaninternal.server.grammer; import io.ebean.FetchConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class ParseFetchConfigTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java b/ebean-core/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java index 3623fdd73..50f8e81b9 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java @@ -5,7 +5,7 @@ package io.ebeaninternal.server.idgen; import io.ebean.config.dbplatform.PlatformIdGenerator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; import java.util.UUID; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java index c48756ed7..f07ffe3a6 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java @@ -2,18 +2,17 @@ package io.ebeaninternal.server.lib; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.event.ShutdownManager; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; public class ShutdownManagerTest extends BaseTestCase { /** * Run this test manually. Most typical when we want the application code to control shutdown. */ - @Ignore + @Disabled @Test public void test_disableShutdownHook_shutdownManually() { // disable hook to make sure app code controls when shutdown is executed @@ -28,7 +27,7 @@ public class ShutdownManagerTest extends BaseTestCase { /** * Run this test manually. */ - @Ignore + @Disabled @Test public void test_shutdownHook() { DB.getDefault(); // shutdown fired via shutdown hook, default behaviour @@ -37,7 +36,7 @@ public class ShutdownManagerTest extends BaseTestCase { /** * Run this test manually. */ - @Ignore + @Disabled @Test public void test_disableShutdownHook() { DB.getDefault(); @@ -47,7 +46,7 @@ public class ShutdownManagerTest extends BaseTestCase { /** * Run this test manually. */ - @Ignore + @Disabled @Test public void test_shutdownManually() { DB.getDefault(); @@ -59,7 +58,7 @@ public class ShutdownManagerTest extends BaseTestCase { /** * Run this test manually. */ - @Ignore + @Disabled @Test public void test_deregisterShutdownHook() { DB.getDefault(); @@ -69,7 +68,7 @@ public class ShutdownManagerTest extends BaseTestCase { /** * Run this test manually. */ - @Ignore + @Disabled @Test public void test_noShutdownHook() { System.setProperty("ebean.registerShutdownHook", "false"); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java index 991198b3e..d9e207338 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java @@ -7,7 +7,7 @@ import io.ebeaninternal.server.core.OrmQueryRequest; import io.ebeaninternal.server.core.OrmQueryRequestTestHelper; import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; import org.tests.model.basic.Order; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java index d9640e7da..47cd5c2a3 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java @@ -1,8 +1,8 @@ package io.ebeaninternal.server.persist; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class BatchDepthOrderTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java index 0753a3841..5c1f8c879 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.persist; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/persist/TrimLogSqlTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/persist/TrimLogSqlTest.java index a90fc99c7..b9bf22ae9 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/persist/TrimLogSqlTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/persist/TrimLogSqlTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.persist; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java index 9d99b17ce..3762cd51b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.profile; import io.ebean.metric.MetricFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java index cb6d4d662..2fc54e117 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.profile; import io.ebean.meta.BasicMetricVisitor; import io.ebean.meta.MetaTimedMetric; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java index 6dbbb45d3..46285255e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.profile; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java index 29658566c..570913db7 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java @@ -2,14 +2,14 @@ package io.ebeaninternal.server.profile; import io.ebean.meta.MetaTimedMetric; import io.ebean.meta.SortMetric; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class SortMetricTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java index 0b26078ff..12f1edcd9 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.profile; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java index d515f6a71..1f918c97d 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java @@ -1,8 +1,8 @@ package io.ebeaninternal.server.query; -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 DbOrderByTrimTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java index 3ceb37305..3d33ca922 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java index d7de421c7..3286c7e4b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java @@ -3,10 +3,10 @@ package io.ebeaninternal.server.query; import io.ebean.BaseTestCase; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiQuery; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class LimitOffsetPagedListTest extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java index 35f3cf546..e278eb6d7 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.query; import io.ebean.Version; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; import java.util.ArrayList; @@ -9,7 +9,7 @@ import java.util.Collections; 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 OrderVersionDescTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java index 906492fe5..dd32c9317 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java index d26322792..7351ab2f4 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java @@ -1,10 +1,10 @@ package io.ebeaninternal.server.query; import io.ebean.util.SplitName; -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 SplitNameTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeAliasTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeAliasTest.java index d2dda1092..c12786757 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeAliasTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeAliasTest.java @@ -1,9 +1,9 @@ package io.ebeaninternal.server.query; import io.ebeaninternal.api.SpiQuery; -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 SqlTreeAliasTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java index 241c218da..6a03ea57f 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java @@ -1,8 +1,8 @@ package io.ebeaninternal.server.query; -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 SqlTreeBuilderTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java index 1e9bf307d..7ea376eee 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java @@ -1,8 +1,8 @@ package io.ebeaninternal.server.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.FutureIds; import io.ebean.FutureList; import io.ebean.FutureRowCount; @@ -10,11 +10,12 @@ import io.ebean.Query; import io.ebean.Transaction; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.concurrent.ExecutionException; +import static org.junit.jupiter.api.Assertions.*; + public class TestFutureRowCountErrorHandling extends BaseTestCase { @Test @@ -22,7 +23,7 @@ public class TestFutureRowCountErrorHandling extends BaseTestCase { ResetBasicData.reset(); - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); Query query = server.createQuery(Customer.class) .where().eq("doesNotExist", "this will fail") @@ -35,11 +36,11 @@ public class TestFutureRowCountErrorHandling extends BaseTestCase { try { futureRowCount.get(); - Assert.assertTrue("never get here as the SQL is invalid", false); + fail("never get here as the SQL is invalid"); } catch (ExecutionException e) { // Confirm the Transaction has been rolled back - Assert.assertFalse("Underlying transaction was rolled back cleanly", t.isActive()); + assertFalse(t.isActive()); } } @@ -49,7 +50,7 @@ public class TestFutureRowCountErrorHandling extends BaseTestCase { ResetBasicData.reset(); - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); Query query = server.createQuery(Customer.class) .where().eq("doesNotExist", "this will fail") @@ -62,11 +63,11 @@ public class TestFutureRowCountErrorHandling extends BaseTestCase { try { internalFuture.get(); - Assert.assertTrue("never get here as the SQL is invalid", false); + fail("never get here as the SQL is invalid"); } catch (ExecutionException e) { // Confirm the Transaction has been rolled back - Assert.assertFalse("Underlying transaction was rolled back cleanly", t.isActive()); + assertFalse(t.isActive()); } } @@ -77,7 +78,7 @@ public class TestFutureRowCountErrorHandling extends BaseTestCase { ResetBasicData.reset(); - EbeanServer server = Ebean.getDefaultServer(); + Database server = DB.getDefault(); Query query = server.createQuery(Customer.class) .where().eq("doesNotExist", "this will fail") @@ -90,11 +91,11 @@ public class TestFutureRowCountErrorHandling extends BaseTestCase { try { internalFuture.get(); - Assert.assertTrue("never get here as the SQL is invalid", false); + fail("never get here as the SQL is invalid"); } catch (ExecutionException e) { // Confirm the Transaction has been rolled back - Assert.assertFalse("Underlying transaction was rolled back cleanly", t.isActive()); + assertFalse(t.isActive()); } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java index 1a7d3b39f..c2712478a 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.querydefn; import io.ebeaninternal.api.BindValuesKey; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java index b2b4902ad..5c35154e6 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java @@ -7,7 +7,7 @@ import io.ebean.Ebean; import io.ebeaninternal.api.BindValuesKey; import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.server.core.OrmQueryRequest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java index f7f829118..d6354f9a0 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java @@ -1,11 +1,10 @@ package io.ebeaninternal.server.querydefn; import io.ebean.BaseTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class OrmQueryDetailParserTest extends BaseTestCase { @@ -14,19 +13,18 @@ public class OrmQueryDetailParserTest extends BaseTestCase { return new OrmQueryDetailParser(query).parse(); } - @Test(expected = NullPointerException.class) - public void parse_when_nullString() throws Exception { - parse(null); + @Test + public void parse_when_nullString() { + assertThrows(NullPointerException.class, () -> parse(null)); } @Test - public void parse_when_emptyString() throws Exception { + public void parse_when_emptyString() { assertTrue(parse("").isEmpty()); } @Test - public void testParseBasic() throws Exception { - + public void testParseBasic() { OrmQueryDetail detail = parse("select (id,name)"); OrmQueryProperties root = detail.getChunk(null, false); @@ -35,8 +33,7 @@ public class OrmQueryDetailParserTest extends BaseTestCase { } @Test - public void testParseEmptySelect() throws Exception { - + public void testParseEmptySelect() { OrmQueryDetail detail = parse("select fetch customer (email)"); OrmQueryProperties root = detail.getChunk(null, false); @@ -49,8 +46,7 @@ public class OrmQueryDetailParserTest extends BaseTestCase { } @Test - public void testParseSelectFetch() throws Exception { - + public void testParseSelectFetch() { OrmQueryDetail detail = parse("select (id,name) fetch customer (email)"); OrmQueryProperties root = detail.getChunk(null, false); @@ -63,8 +59,7 @@ public class OrmQueryDetailParserTest extends BaseTestCase { } @Test - public void testParseSelectFetchMore() throws Exception { - + public void testParseSelectFetchMore() { OrmQueryDetail detail = parse("select (id,name) fetch customer (email) fetch details.product (sku,description)"); OrmQueryProperties root = detail.getChunk(null, false); @@ -81,8 +76,7 @@ public class OrmQueryDetailParserTest extends BaseTestCase { } @Test - public void testParseWithPlusQuery() throws Exception { - + public void testParseWithPlusQuery() { OrmQueryDetail detail = parse("select (id,name) fetch customer (+query,id,name,email)"); OrmQueryProperties root = detail.getChunk(null, false); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java index 5c3ef69b6..03f14cae3 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java @@ -3,10 +3,10 @@ package io.ebeaninternal.server.querydefn; import io.ebean.BaseTestCase; import io.ebeaninternal.server.deploy.BeanDescriptor; import org.tests.model.basic.Order; -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 OrmQueryDetailTest extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java index 305f9122b..e132f8320 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java @@ -9,7 +9,7 @@ import io.ebeaninternal.server.deploy.TableJoin; import io.ebeaninternal.server.deploy.meta.DeployTableJoin; import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; import io.ebeaninternal.server.expression.BaseExpressionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import java.sql.Timestamp; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java index a7c103b83..f15576f63 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.querydefn; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java index 8df439a58..15dce130e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.querydefn; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashSet; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java index db534d131..da7e95299 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java @@ -1,8 +1,8 @@ package io.ebeaninternal.server.querydefn; -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 OrmUpdatePropertiesTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java index 86ec1cadd..ce793d8a7 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.rawsql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java index 58391ece3..bc7ddc8a2 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java @@ -1,8 +1,8 @@ package io.ebeaninternal.server.rawsql; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class DRawSqlServiceTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java index 54efa28c5..b46714a99 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.rawsql; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java index 274e98a7f..5c1652684 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java @@ -12,7 +12,7 @@ import io.ebean.annotation.Platform; import io.ebean.datasource.DataSourceConfig; import io.ebeaninternal.server.core.DefaultServer; import io.ebeaninternal.server.rawsql.SpiRawSql.Sql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasicClob; import org.tests.model.basic.PersistentFileContent; @@ -30,8 +30,8 @@ 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.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestRawSqlBuilder extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilderDistinct.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilderDistinct.java index 146b6d5e0..7ea56e68f 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilderDistinct.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilderDistinct.java @@ -3,20 +3,22 @@ package io.ebeaninternal.server.rawsql; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; import io.ebeaninternal.server.rawsql.SpiRawSql.Sql; -import junit.framework.TestCase; -import org.junit.Assert; +import org.junit.jupiter.api.Test; -public class TestRawSqlBuilderDistinct extends TestCase { +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +public class TestRawSqlBuilderDistinct { + + @Test public void testDistinct() { RawSql r = RawSqlBuilder.parse("select distinct id, name from t_cust").create(); Sql sql = ((SpiRawSql)r).getSql(); - Assert.assertEquals("id, name", sql.getPreFrom()); - Assert.assertEquals("from t_cust", sql.getPreWhere()); - Assert.assertEquals("", sql.getPreHaving()); - Assert.assertNull(sql.getOrderBy()); - + assertEquals("id, name", sql.getPreFrom()); + assertEquals("from t_cust", sql.getPreWhere()); + assertEquals("", sql.getPreHaving()); + assertNull(sql.getOrderBy()); } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java index b9b5175db..6cf39f216 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java @@ -2,11 +2,11 @@ package io.ebeaninternal.server.rawsql; import io.ebeaninternal.server.rawsql.SpiRawSql.ColumnMapping; import io.ebeaninternal.server.rawsql.SpiRawSql.ColumnMapping.Column; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestRawSqlColumnParsing { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java index 8618431b1..0985f2ff8 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java @@ -8,7 +8,7 @@ import io.ebean.RawSqlBuilder; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebeaninternal.server.rawsql.SpiRawSql.Sql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; import org.tests.rawsql.A2Customer; @@ -17,7 +17,7 @@ import org.tests.rawsql.ACustomer; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestRawSqlParsing extends BaseTestCase { @@ -37,7 +37,7 @@ public class TestRawSqlParsing extends BaseTestCase { Sql rs = ((SpiRawSql)rawSql).getSql(); String s = rs.toString(); - assertTrue(s, s.contains("[order_id, sum")); + assertTrue(s.contains("[order_id, sum")); } @Test diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java index 699e33ac7..5e2f415c5 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.rawsql; import io.ebean.BaseTestCase; import io.ebean.SqlRow; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.ResultSet; import java.sql.ResultSetMetaData; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java index 1a5ef7fe1..b3dc68dea 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java @@ -6,7 +6,7 @@ import io.ebean.config.ServerConfig; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebeaninternal.server.core.bootup.BootupClasses; import io.ebeaninternal.server.type.DefaultTypeManager; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.StringWriter; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java index bc065946a..b451bff9b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java @@ -11,7 +11,7 @@ import org.tests.model.basic.Contact; import org.tests.model.basic.Country; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.List; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java index b557f6b45..e9fde86c1 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java @@ -9,13 +9,13 @@ import org.tests.model.basic.Address; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.StringReader; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestTextJsonBeanReadVisitor extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java index 6d7e6e597..a83cbfedc 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java @@ -8,14 +8,14 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.StringWriter; import java.sql.Date; import java.util.List; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class WriteJsonDirtyTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonTest.java index e7950dfbc..ec9514c72 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonTest.java @@ -4,7 +4,7 @@ import io.ebean.DB; import io.ebean.FetchPath; import io.ebean.Query; import io.ebean.text.PathProperties; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java index 87dbf4fa3..4184980d0 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.transaction; import io.ebean.bean.PersistenceContext; import io.ebeaninternal.server.deploy.PersistenceContextUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Car; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; @@ -10,8 +10,8 @@ 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.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 DefaultPersistenceContextTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultProfileHandlerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultProfileHandlerTest.java index 0a6ee1e3a..758ee8964 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultProfileHandlerTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultProfileHandlerTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.transaction; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DefaultProfileHandlerTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java index 0f3da4105..5a77cde6f 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java @@ -9,15 +9,15 @@ import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.config.DatabaseConfig; import io.ebeaninternal.api.SpiTransaction; -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; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; public class DefaultTransactionThreadLocalTest extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java index ae7405354..ac3eeacf9 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java @@ -5,7 +5,7 @@ import io.ebean.Transaction; import io.ebean.TransactionCallbackAdapter; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; -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.EBasic; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/RemoteTransactionEventTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/RemoteTransactionEventTest.java index bea6709f2..db62950e7 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/RemoteTransactionEventTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/RemoteTransactionEventTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.transaction; import io.ebeaninternal.server.cache.RemoteCacheEvent; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.HashSet; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java index f2ab59bd9..26acfc183 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java @@ -1,13 +1,13 @@ package io.ebeaninternal.server.transaction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.HashSet; 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 TableModStateTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java index da624fdbb..b5f6c0559 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java @@ -8,7 +8,7 @@ import io.ebeaninternal.api.ScopedTransaction; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiTransaction; import io.ebeaninternal.api.SpiTransactionManager; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tests.model.basic.Customer; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java index aca97f3ca..3e09e8b22 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java @@ -5,7 +5,7 @@ import org.postgresql.util.PGobject; import java.sql.SQLException; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; class BasePlatformArrayTypeFactoryTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java index 83c7ad3e5..73f869f1a 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressTest.java @@ -1,10 +1,10 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.net.InetAddress; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ConvertInetAddressTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressesTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressesTest.java index 0c78eb178..a2177d243 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressesTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ConvertInetAddressesTest.java @@ -1,10 +1,10 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.net.InetAddress; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ConvertInetAddressesTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java index d90cfb26e..7a7d19dd3 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java @@ -1,13 +1,13 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DecimalUtilsTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java index e023c9d7d..0a0a6c0b2 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java @@ -1,11 +1,11 @@ package io.ebeaninternal.server.type; import io.ebean.core.type.ScalarType; -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 DefaultTypeFactoryTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java index 950a805fd..797c66e7d 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java @@ -4,7 +4,7 @@ import io.ebean.config.DatabaseConfig; import io.ebean.config.dbplatform.postgres.PostgresPlatform; import io.ebean.core.type.ScalarType; import io.ebeaninternal.server.core.bootup.BootupClasses; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.array.IntEnum; import org.tests.model.array.VarcharEnum; import org.tests.model.basic.Car; @@ -14,8 +14,8 @@ import java.time.DayOfWeek; import java.time.Month; 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 DefaultTypeManagerTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java index 79e3f1ef4..75e600ee6 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.time.Instant; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTester.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTester.java index b50efaad2..8db4b633e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTester.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTester.java @@ -11,7 +11,7 @@ import io.ebeaninternal.server.text.json.WriteJson; import java.io.IOException; import java.io.StringWriter; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Base class to help json testing. diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java index 622ceb3f7..c08ceeab7 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java index 3674a261c..57b4943cc 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebeaninternal.json.ModifyAwareFlag; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java index a7ebbecda..cac5747d5 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.type; import io.ebeaninternal.json.ModifyAwareList; import io.ebeaninternal.json.ModifyAwareSet; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -16,7 +16,7 @@ import java.util.List; import java.util.ListIterator; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ModifyAwareListTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java index 3c0a9bdf9..8a97f37ce 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebeaninternal.json.ModifyAwareMap; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java index abb8a4e2e..1c1b17d90 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebeaninternal.json.ModifyAwareSet; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2Test.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2Test.java index b23a2126d..ad1f1d44c 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2Test.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2Test.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.SQLException; import java.util.UUID; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java index 13496e407..03a77f6ad 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArrayListTest.java @@ -6,7 +6,7 @@ import io.ebean.DB; import io.ebean.core.type.DataReader; import io.ebean.core.type.ScalarType; import io.ebean.text.json.EJson; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.io.IOException; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2Test.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2Test.java index ece3a122b..d8c2ea53d 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2Test.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2Test.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonParser; import io.ebean.DB; import io.ebean.core.type.ScalarType; import io.ebean.text.json.EJson; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.StringReader; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetTest.java index 1fa9732d7..b5e162d0e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeArraySetTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.SQLException; import java.util.UUID; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java index 5c4c83ea5..46569ed74 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeBooleanTest.java @@ -4,14 +4,14 @@ package io.ebeaninternal.server.type; import io.ebean.Ebean; import io.ebean.text.json.JsonContext; import org.tests.model.basic.TOne; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Types; 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 ScalarTypeBooleanTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java index 922beadeb..4edc4c059 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.config.JsonConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Types; import java.util.Calendar; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java index e69a4ce2c..caa293a6b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java @@ -1,13 +1,13 @@ package io.ebeaninternal.server.type; import io.ebean.config.JsonConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.sql.Date; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ScalarTypeDateTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java index c9173d58f..1a57f6080 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.text.TextException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -9,7 +9,7 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.time.Duration; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ScalarTypeDurationTest { @@ -75,22 +75,19 @@ public class ScalarTypeDurationTest { } @Test - public void testParse() throws Exception { - + public void testParse() { Duration duration = type.parse("PT20M34S"); assertEquals(Duration.ofSeconds(1234), duration); } @Test - public void testIsDateTimeCapable() throws Exception { - + public void testIsDateTimeCapable() { assertFalse(type.isDateTimeCapable()); } - @Test(expected = TextException.class) - public void testConvertFromMillis() throws Exception { - - type.convertFromMillis(1000); + @Test + public void testConvertFromMillis() { + assertThrows(TextException.class, () -> type.convertFromMillis(1000)); } @Test diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java index f3fd9ff62..60e4ffe29 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.text.TextException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -10,7 +10,7 @@ import java.io.ObjectOutputStream; import java.math.BigDecimal; import java.time.Duration; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ScalarTypeDurationWithNanosTest { @@ -74,28 +74,24 @@ public class ScalarTypeDurationWithNanosTest { } @Test - public void testParse() throws Exception { - + public void testParse() { Duration duration = Duration.ofSeconds(323, 1500000); Duration val1 = type.parse("PT5M23.0015S"); assertEquals(duration, val1); } @Test - public void testIsDateTimeCapable() throws Exception { - + public void testIsDateTimeCapable() { assertFalse(type.isDateTimeCapable()); } - @Test(expected = TextException.class) - public void testConvertFromMillis() throws Exception { - - type.convertFromMillis(1000); + @Test + public void testConvertFromMillis() { + assertThrows(TextException.class, () -> type.convertFromMillis(1000)); } @Test public void testJsonRead() throws Exception { - Duration duration = Duration.ofSeconds(323, 1500000); JsonTester jsonTester = new JsonTester<>(type); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java index 07ecd0867..b2205f0fa 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.config.JsonConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -11,9 +11,9 @@ import java.sql.Timestamp; import java.time.Instant; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -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.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ScalarTypeInstantTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java index 2f4e53cb0..ba292a20a 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java index 250356338..0d3719f8a 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.type; import io.ebean.config.JsonConfig; import org.joda.time.LocalDate; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.sql.Date; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java index 3c8205602..933176623 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java @@ -3,11 +3,11 @@ package io.ebeaninternal.server.type; import io.ebean.config.JsonConfig; import org.joda.time.DateTimeZone; import org.joda.time.LocalDateTime; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ScalarTypeJodaLocalDateTimeTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java index 64d3d93aa..6fe49a87a 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java @@ -5,12 +5,12 @@ import org.tests.model.basic.TJodaEntity; import org.joda.time.DateTimeZone; import org.joda.time.LocalDateTime; import org.joda.time.LocalTime; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ScalarTypeJodaLocalTimeTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java index 3a58e9fbf..aafbe3a92 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import org.joda.time.Period; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJsonListTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJsonListTest.java index 43ed867ba..27d8a7698 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJsonListTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJsonListTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.type; import io.ebean.config.dbplatform.ExtraDbTypes; import io.ebean.core.type.DocPropertyType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.SQLException; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java index b76c5cad3..076bad958 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java @@ -1,15 +1,15 @@ package io.ebeaninternal.server.type; import io.ebean.config.JsonConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.sql.Date; import java.time.LocalDate; import static org.assertj.core.api.Assertions.assertThat; -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 ScalarTypeLocalDateTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java index 65423e012..623402fb7 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java @@ -3,14 +3,14 @@ package io.ebeaninternal.server.type; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import io.ebean.config.JsonConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.StringWriter; import java.sql.Timestamp; import java.time.LocalDateTime; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ScalarTypeLocalDateTimeTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java index c2e73356f..e98cdef0f 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.text.TextException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -10,7 +10,7 @@ import java.io.ObjectOutputStream; import java.sql.Time; import java.time.LocalTime; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ScalarTypeLocalTimeTest { @@ -71,28 +71,24 @@ public class ScalarTypeLocalTimeTest { } @Test - public void testParse() throws Exception { - + public void testParse() { LocalTime localTime = LocalTime.of(9, 23, 45); LocalTime val1 = type.parse("09:23:45"); assertEquals(localTime, val1); } @Test - public void testIsDateTimeCapable() throws Exception { - + public void testIsDateTimeCapable() { assertFalse(type.isDateTimeCapable()); } - @Test(expected = TextException.class) - public void testConvertFromMillis() throws Exception { - - type.convertFromMillis(1234); + @Test + public void testConvertFromMillis() { + assertThrows(TextException.class, () -> type.convertFromMillis(1234)); } @Test public void testJsonRead() throws Exception { - LocalTime localTime = LocalTime.of(9, 23, 45); JsonTester jsonTester = new JsonTester<>(type); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java index a415a0dd7..6e2e24057 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.text.TextException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -9,7 +9,7 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.time.LocalTime; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ScalarTypeLocalTimeWithNanosTest { @@ -62,36 +62,30 @@ public class ScalarTypeLocalTimeWithNanosTest { @Test public void testFormatValue() throws Exception { - LocalTime localTime = LocalTime.of(9, 23, 45); String formatted = type.formatValue(localTime); assertEquals("09:23:45", formatted); } @Test - public void testParse() throws Exception { - + public void testParse() { LocalTime localTime = LocalTime.of(9, 23, 45); LocalTime val1 = type.parse("09:23:45"); assertEquals(localTime, val1); } @Test - public void testIsDateTimeCapable() throws Exception { - + public void testIsDateTimeCapable() { assertFalse(type.isDateTimeCapable()); } - @Test(expected = TextException.class) - public void testConvertFromMillis() throws Exception { - - type.convertFromMillis(1234); + @Test + public void testConvertFromMillis() { + assertThrows(TextException.class, () -> type.convertFromMillis(1234)); } @Test public void testJsonRead() throws Exception { - - LocalTime localTime = LocalTime.of(9, 23, 45); JsonTester jsonTester = new JsonTester<>(type); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLongTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLongTest.java index d8186457d..dbf3c3815 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLongTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLongTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java index 83f28acd3..efe128b91 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java @@ -1,13 +1,12 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Date; import java.time.LocalDate; import java.time.MonthDay; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.*; public class ScalarTypeMonthDayTest { @@ -40,8 +39,7 @@ public class ScalarTypeMonthDayTest { } @Test - public void testFormatParse() throws Exception { - + public void testFormatParse() { MonthDay value = MonthDay.of(4, 29); String val1 = type.formatValue(value); MonthDay monthDay = type.parse(val1); @@ -50,27 +48,21 @@ public class ScalarTypeMonthDayTest { assertEquals(value, monthDay); } - @Test - public void testIsDateTimeCapable() throws Exception { + public void testIsDateTimeCapable() { assertFalse(type.isDateTimeCapable()); } - @Test(expected = RuntimeException.class) - public void testConvertFromMillis() throws Exception { - type.convertFromMillis(1203); + @Test + public void testConvertFromMillis() { + assertThrows(RuntimeException.class, () -> type.convertFromMillis(1203)); } @Test public void testJson() throws Exception { - MonthDay value = MonthDay.of(4, 29); JsonTester jsonTester = new JsonTester<>(type); jsonTester.test(value); } - @Test - public void testReadWriteData() throws Exception { - - } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java index b0b2b1eb0..540491c4f 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.config.JsonConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; import java.time.OffsetDateTime; @@ -9,9 +9,9 @@ import java.time.ZoneOffset; import java.util.TimeZone; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ScalarTypeOffsetDateTimeTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java index a4dbe0bcc..a5aabbe7e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java @@ -1,10 +1,10 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.time.OffsetTime; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ScalarTypeOffsetTimeTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePathTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePathTest.java index 549004463..1f4616061 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePathTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePathTest.java @@ -1,12 +1,12 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.nio.file.Path; import java.nio.file.Paths; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ScalarTypePathTest { private static final String TEMP_PATH = new File("/tmp").getAbsolutePath(); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java index 858c2d10d..29d6e6767 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.time.Period; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java index 7ca187dc2..382cd1db0 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import io.ebeaninternal.json.ModifyAwareMap; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.StringWriter; @@ -13,7 +13,7 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ScalarTypePostgresHstoreTest { @@ -22,17 +22,17 @@ public class ScalarTypePostgresHstoreTest { JsonFactory jsonFactory = new JsonFactory(); @Test - public void testIsMutable() throws Exception { + public void testIsMutable() { assertTrue(hstore.isMutable()); } @Test - public void testIsDateTimeCapable() throws Exception { + public void testIsDateTimeCapable() { assertFalse(hstore.isDateTimeCapable()); } @Test - public void testIsDirty() throws Exception { + public void testIsDirty() { Map emptyMap = new HashMap<>(); assertTrue(hstore.isDirty(emptyMap)); @@ -44,25 +44,25 @@ public class ScalarTypePostgresHstoreTest { @Test @SuppressWarnings("unchecked") - public void testParse() throws Exception { + public void testParse() { Map map = (Map) hstore.parse("{\"name\":\"rob\"}"); assertEquals(1, map.size()); assertEquals("rob", map.get("name")); } - @Test(expected = RuntimeException.class) + @Test @SuppressWarnings("unchecked") - public void testParseDateTime() throws Exception { - Map map = (Map) hstore.convertFromMillis(1234L); - assertEquals(1, map.size()); - assertEquals("rob", map.get("name")); + public void testParseDateTime() { + assertThrows(RuntimeException.class, () -> { + Map map = (Map) hstore.convertFromMillis(1234L); + assertEquals(1, map.size()); + assertEquals("rob", map.get("name")); + }); } @Test public void testJsonWrite() throws Exception { - Map map = new LinkedHashMap<>(); - assertEquals("{\"key\":{}}", generateJson(map)); map.put("name", "rob"); @@ -74,7 +74,6 @@ public class ScalarTypePostgresHstoreTest { @Test public void testJsonRead() throws Exception { - Map map = parseHstore("{\"name\":\"rob\"}"); assertEquals(1, map.size()); assertEquals("rob", map.get("name")); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java index b2fb2599e..9c9412025 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.config.JsonConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java index 397588994..29cdef05d 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.UUID; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java index b39e8d347..b8e1149e9 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.config.JsonConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Date; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java index 1f79db003..bd085d73a 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.persistence.AttributeConverter; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperOidTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperOidTest.java index cb602e7f2..d84371df9 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperOidTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperOidTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.ivo.Oid; import org.tests.model.ivo.converter.OidTypeConverter; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java index ec0979bd6..d2af88cae 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.config.JsonConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.sql.Date; @@ -11,7 +11,7 @@ import java.time.ZoneOffset; import java.time.ZonedDateTime; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ScalarTypeYearMonthDateTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java index be37fb162..c37282744 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.text.TextException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -9,7 +9,7 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.time.Year; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ScalarTypeYearTest { @@ -64,33 +64,28 @@ public class ScalarTypeYearTest { @Test public void testFormatValue() throws Exception { - String formatted = type.formatValue(Year.of(2013)); assertEquals("2013", formatted); } @Test - public void testParse() throws Exception { - + public void testParse() { Year year = type.parse("2013"); assertEquals(Year.of(2013), year); } @Test - public void testIsDateTimeCapable() throws Exception { - + public void testIsDateTimeCapable() { assertFalse(type.isDateTimeCapable()); } - @Test(expected = TextException.class) - public void testConvertFromMillis() throws Exception { - - type.convertFromMillis(1000); + @Test + public void testConvertFromMillis() { + assertThrows(TextException.class, () -> type.convertFromMillis(1000)); } @Test public void testJson() throws Exception { - JsonTester jsonTester = new JsonTester<>(type); jsonTester.test(Year.of(2013)); } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java index a48ed0427..4dfbfd886 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java @@ -1,10 +1,10 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.time.ZoneId; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ScalarTypeZoneIdTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java index 65b544f5f..be581d818 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java @@ -1,12 +1,12 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.time.ZoneId; import java.time.ZoneOffset; import java.time.ZonedDateTime; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ScalarTypeZoneOffsetTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java index 168041723..f7942b397 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.config.JsonConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; import java.time.OffsetDateTime; @@ -11,7 +11,7 @@ import java.time.ZonedDateTime; import java.util.TimeZone; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class ScalarTypeZonedDateTimeTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java index 69dc36751..b96c190f7 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java @@ -3,14 +3,14 @@ package io.ebeaninternal.server.type; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.SqlRow; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; import java.util.List; import java.util.UUID; -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 TestBinaryUUID extends BaseTestCase { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestEnumToBeanType.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestEnumToBeanType.java index 366adcc58..10596b7f2 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestEnumToBeanType.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestEnumToBeanType.java @@ -2,10 +2,11 @@ package io.ebeaninternal.server.type; import io.ebeaninternal.server.type.ScalarTypeEnumStandard.OrdinalEnum; import io.ebeaninternal.server.type.ScalarTypeEnumStandard.StringEnum; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; -import org.junit.Assert; -import org.junit.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestEnumToBeanType { @@ -25,14 +26,13 @@ public class TestEnumToBeanType { Object approved = stringEnum.toBeanType(Order.Status.APPROVED); - Assert.assertTrue(approved == Order.Status.APPROVED); + assertEquals(approved, Order.Status.APPROVED); approved = ordinalEnum.toBeanType(Order.Status.APPROVED); - Assert.assertTrue(approved == Order.Status.APPROVED); + assertEquals(approved, Order.Status.APPROVED); Object active = withMapping.toBeanType(Customer.Status.ACTIVE); - Assert.assertTrue(active == Customer.Status.ACTIVE); - + assertEquals(active, Customer.Status.ACTIVE); } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestLocaleParse.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestLocaleParse.java index 6e81002da..2c7192841 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestLocaleParse.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestLocaleParse.java @@ -1,11 +1,11 @@ package io.ebeaninternal.server.type; -import io.ebeaninternal.server.type.ScalarTypeLocale; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Locale; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestLocaleParse { @Test @@ -14,36 +14,34 @@ public class TestLocaleParse { // Examples: "en", "de_DE", "_GB", "en_US_WIN", "de__POSIX", "fr__MAC" Locale l = parse("en"); - Assert.assertEquals("en", l.getLanguage()); + assertEquals("en", l.getLanguage()); l = parse("de_DE"); - Assert.assertEquals("de", l.getLanguage()); - Assert.assertEquals("DE", l.getCountry()); + assertEquals("de", l.getLanguage()); + assertEquals("DE", l.getCountry()); l = parse("en_US_WIN"); - Assert.assertEquals("en", l.getLanguage()); - Assert.assertEquals("US", l.getCountry()); - Assert.assertEquals("WIN", l.getVariant()); + assertEquals("en", l.getLanguage()); + assertEquals("US", l.getCountry()); + assertEquals("WIN", l.getVariant()); l = parse("_GB"); - Assert.assertEquals("", l.getLanguage()); - Assert.assertEquals("GB", l.getCountry()); - Assert.assertEquals("", l.getVariant()); + assertEquals("", l.getLanguage()); + assertEquals("GB", l.getCountry()); + assertEquals("", l.getVariant()); l = parse("fr__MAC"); - Assert.assertEquals("fr", l.getLanguage()); - Assert.assertEquals("", l.getCountry()); - Assert.assertEquals("MAC", l.getVariant()); + assertEquals("fr", l.getLanguage()); + assertEquals("", l.getCountry()); + assertEquals("MAC", l.getVariant()); l = parse("de__POSIX"); - Assert.assertEquals("de", l.getLanguage()); - Assert.assertEquals("", l.getCountry()); - Assert.assertEquals("POSIX", l.getVariant()); + assertEquals("de", l.getLanguage()); + assertEquals("", l.getCountry()); + assertEquals("POSIX", l.getVariant()); } private Locale parse(String value) { - - ScalarTypeLocale st = new ScalarTypeLocale(); - return (Locale) st.parse(value); + return new ScalarTypeLocale().parse(value); } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java index d5e5bd109..818502d94 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java @@ -1,34 +1,33 @@ package io.ebeaninternal.server.type; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.UUID; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestScalarTypeUUIDBinaryConversion { @Test public void testConversion() { - UUID id = UUID.randomUUID(); byte[] bytes = ScalarTypeUUIDBinary.convertToBytes(id, false); - Assert.assertEquals(16, bytes.length); + assertEquals(16, bytes.length); UUID id2 = ScalarTypeUUIDBinary.convertFromBytes(bytes, false); - Assert.assertEquals(id, id2); + assertEquals(id, id2); } @Test public void testConversionOptimized() { - UUID id = UUID.randomUUID(); byte[] bytes = ScalarTypeUUIDBinary.convertToBytes(id, true); - Assert.assertEquals(16, bytes.length); + assertEquals(16, bytes.length); UUID id2 = ScalarTypeUUIDBinary.convertFromBytes(bytes, true); - Assert.assertEquals(id, id2); + assertEquals(id, id2); } } diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java index da942345d..d74a4fc2b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java @@ -8,11 +8,7 @@ import io.ebean.server.type.MyDayOfWeek; import io.ebean.server.type.MyEnum; import io.ebean.server.type.MySex; import io.ebeaninternal.server.core.bootup.BootupClasses; -import io.ebeaninternal.server.type.DefaultTypeManager; -import io.ebeaninternal.server.type.RsetDataReader; -import io.ebeaninternal.server.type.ScalarTypeEnumStandard; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.ivo.Money; import org.tests.model.ivo.converter.MoneyTypeConverter; @@ -21,7 +17,9 @@ import java.sql.SQLException; import java.sql.Types; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; public class TestTypeManager extends BaseTestCase { @@ -51,7 +49,7 @@ public class TestTypeManager extends BaseTestCase { try { typeManager.createEnumScalarType(MyEnum.class, EnumType.STRING); - assertTrue("never get here",false); + fail("never get here"); } catch (IllegalStateException e) { assertThat(e.getMessage()).contains("It is mapped using 2 different modes when only one is supported"); } @@ -81,7 +79,7 @@ public class TestTypeManager extends BaseTestCase { try { typeManager.createEnumScalarType(MyDayOfWeek.class, EnumType.ORDINAL); - assertTrue("never get here",false); + fail("never get here"); } catch (IllegalStateException e) { assertThat(e.getMessage()).contains("It is mapped using 2 different modes when only one is supported"); } @@ -89,14 +87,12 @@ public class TestTypeManager extends BaseTestCase { @Test public void test() { - DefaultTypeManager typeManager = createTypeManager(); ScalarType scalarType = typeManager.getScalarType(Money.class); - assertTrue(scalarType.getJdbcType() == Types.DECIMAL); - assertTrue(!scalarType.isJdbcNative()); - Assert.assertEquals(Money.class, scalarType.getType()); - + assertEquals(Types.DECIMAL, scalarType.getJdbcType()); + assertFalse(scalarType.isJdbcNative()); + assertEquals(Money.class, scalarType.getType()); } @Test diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java index aed4f42ee..20da9cf98 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.type; import io.ebean.config.ScalarTypeConverter; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.ivo.Money; import org.tests.model.ivo.Oid; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/UtilDateParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/UtilDateParserTest.java index 50131893b..859519881 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/UtilDateParserTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/UtilDateParserTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Date; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java index 2b9661727..4d54b968e 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java @@ -1,17 +1,17 @@ package io.ebeaninternal.server.util; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.EmptyStackException; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public class ArrayStackTest { @Test - public void testPushPop() throws Exception { - + public void testPushPop() { ArrayStack stack = new ArrayStack<>(); stack.push("1"); stack.push("2"); @@ -23,8 +23,7 @@ public class ArrayStackTest { } @Test - public void testPushPop_given_stackInitialSizeExceeded() throws Exception { - + public void testPushPop_given_stackInitialSizeExceeded() { ArrayStack stack = new ArrayStack<>(2); stack.push("1"); stack.push("2"); @@ -35,34 +34,28 @@ public class ArrayStackTest { assertThat(stack.pop()).isEqualTo("1"); } - @Test(expected = EmptyStackException.class) - public void testPop_given_emptyStack_throws() throws Exception { - + @Test + public void testPop_given_emptyStack_throws() { ArrayStack stack = new ArrayStack<>(); - stack.pop(); - } - - @Test(expected = EmptyStackException.class) - public void testPeek_given_empty_throws() throws Exception { - - ArrayStack stack = new ArrayStack<>(); - - assertThat(stack.peek()); + assertThrows(EmptyStackException.class, stack::pop); } @Test - public void testPeek_given_notEmpty() throws Exception { + public void testPeek_given_empty_throws() { + ArrayStack stack = new ArrayStack<>(); + assertThrows(EmptyStackException.class, stack::peek); + } + @Test + public void testPeek_given_notEmpty() { ArrayStack stack = new ArrayStack<>(); stack.push("1"); assertThat(stack.peek()).isEqualTo("1"); } @Test - public void testPeekWithNull() throws Exception { - + public void testPeekWithNull() { ArrayStack stack = new ArrayStack<>(); - assertThat(stack.peekWithNull()).isNull(); stack.push("1"); @@ -70,8 +63,7 @@ public class ArrayStackTest { } @Test - public void testIsEmpty() throws Exception { - + public void testIsEmpty() { ArrayStack stack = new ArrayStack<>(); assertThat(stack.isEmpty()).isTrue(); @@ -80,8 +72,7 @@ public class ArrayStackTest { } @Test - public void testSize() throws Exception { - + public void testSize() { ArrayStack stack = new ArrayStack<>(); assertThat(stack.size()).isEqualTo(0); @@ -92,8 +83,7 @@ public class ArrayStackTest { } @Test - public void testContains() throws Exception { - + public void testContains() { ArrayStack stack = new ArrayStack<>(); stack.push("1"); diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java index 0b874aa8f..cebfe6784 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java @@ -1,11 +1,11 @@ package io.ebeaninternal.server.util; import io.ebeaninternal.api.BindParams; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class BindParamsParserTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java index 9eceabb0a..440712865 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.util; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java index cc9234925..5e0ebcbbb 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.util; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Set; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/util/Md5Test.java b/ebean-core/src/test/java/io/ebeaninternal/server/util/Md5Test.java index 9f0106cae..bc1bf8272 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/util/Md5Test.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/util/Md5Test.java @@ -1,9 +1,9 @@ package io.ebeaninternal.server.util; -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 Md5Test { diff --git a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java index bbc8c5752..4d14bd503 100644 --- a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java +++ b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java @@ -10,7 +10,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; import io.ebeanservice.docstore.api.DocStoreUpdateContext; import org.tests.model.basic.Order; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java index 14eacd3ed..1f435c725 100644 --- a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java +++ b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java @@ -6,7 +6,7 @@ import io.ebean.EbeanServer; import io.ebean.plugin.BeanDocType; import io.ebean.plugin.BeanType; import io.ebeanservice.docstore.api.DocStoreUpdates; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.tests.model.basic.Order; diff --git a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java index eb95708f1..4efc3c97d 100644 --- a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java +++ b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java @@ -7,7 +7,7 @@ import io.ebean.plugin.BeanDocType; import io.ebean.plugin.BeanType; import io.ebeanservice.docstore.api.DocStoreUpdates; import org.tests.model.basic.Order; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.util.List; diff --git a/ebean-core/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java b/ebean-core/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java index 5076ce1c1..034dd6b1f 100644 --- a/ebean-core/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java +++ b/ebean-core/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java @@ -6,8 +6,8 @@ import io.ebean.DatabaseFactory; import io.ebean.config.DatabaseConfig; import io.ebean.config.TenantMode; import org.ebeantest.LoggedSqlCollector; -import org.junit.AfterClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; @@ -32,7 +32,7 @@ public class MultiTenantPartitionTest extends BaseTestCase { server.saveAll(tenants()); } - @AfterClass + @AfterAll public static void shutdown() { server.shutdown(); } diff --git a/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java b/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java index 223316cc1..188ab2dac 100644 --- a/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java +++ b/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; 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; @@ -15,7 +15,7 @@ import org.tests.model.basic.ResetBasicData; 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 TestAggregateFormula extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java b/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java index fd15df520..3735b5940 100644 --- a/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java +++ b/ebean-core/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java @@ -3,7 +3,7 @@ package org.tests.aggregateformula; import io.ebean.BaseTestCase; import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/basic/MainDbBoolean.java b/ebean-core/src/test/java/org/tests/basic/MainDbBoolean.java index 9db84d2c1..90c3f4705 100644 --- a/ebean-core/src/test/java/org/tests/basic/MainDbBoolean.java +++ b/ebean-core/src/test/java/org/tests/basic/MainDbBoolean.java @@ -7,13 +7,15 @@ import io.ebean.SqlRow; import io.ebean.config.ServerConfig; import io.ebean.config.dbplatform.postgres.PostgresPlatform; import io.ebean.datasource.DataSourceConfig; -import org.junit.Assert; import org.tests.model.basic.TOne; import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + /** * Used to run some tests manually on a specific Database type. */ @@ -125,18 +127,18 @@ public class MainDbBoolean { .order("id") .findList(); - Assert.assertTrue(list.size() == 2); - Assert.assertTrue(list.get(0).isActive()); - Assert.assertFalse(!list.get(0).isActive()); + assertTrue(list.size() == 2); + assertTrue(list.get(0).isActive()); + assertFalse(!list.get(0).isActive()); String sql = "select id, name, active from t_oneb order by id"; List sqlRows = server.sqlQuery(sql).findList(); - Assert.assertTrue(sqlRows.size() == 2); + assertTrue(sqlRows.size() == 2); Object active0 = sqlRows.get(0).get("active"); Object active1 = sqlRows.get(1).get("active"); - Assert.assertTrue("T".equals(active0)); - Assert.assertTrue("F".equals(active1)); + assertTrue("T".equals(active0)); + assertTrue("F".equals(active1)); Query query = server.find(TOne.class) @@ -144,7 +146,7 @@ public class MainDbBoolean { .order("id"); int rc = query.findCount(); - Assert.assertTrue(rc > 0); + assertTrue(rc > 0); System.out.println("done"); diff --git a/ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java b/ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java index c5781174d..f8541b894 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java +++ b/ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java @@ -8,7 +8,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanProperty; import io.ebeaninternal.server.deploy.IndexDefinition; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.ValidationGroupSomething; import javax.persistence.Entity; @@ -25,9 +25,9 @@ import java.util.Set; import static io.ebean.annotation.Platform.H2; import static io.ebean.annotation.Platform.POSTGRES; -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 TestAnnotationBase extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/TestAssocOneEqExpression.java b/ebean-core/src/test/java/org/tests/basic/TestAssocOneEqExpression.java index 77d987761..fa03ed9a2 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestAssocOneEqExpression.java +++ b/ebean-core/src/test/java/org/tests/basic/TestAssocOneEqExpression.java @@ -7,8 +7,9 @@ import org.tests.model.basic.Address; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestAssocOneEqExpression extends BaseTestCase { @@ -26,7 +27,7 @@ public class TestAssocOneEqExpression extends BaseTestCase { query.findList(); String sql = query.getGeneratedSql(); - Assert.assertTrue(sql.contains("where t0.kcustomer_id = ?")); + assertTrue(sql.contains("where t0.kcustomer_id = ?")); Address b = new Address(); b.setId(1); @@ -37,7 +38,7 @@ public class TestAssocOneEqExpression extends BaseTestCase { q2.findList(); sql = q2.getGeneratedSql(); - Assert.assertTrue(sql.contains("where t1.billing_address_id = ?")); + assertTrue(sql.contains("where t1.billing_address_id = ?")); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestBatchLazy.java b/ebean-core/src/test/java/org/tests/basic/TestBatchLazy.java index 60952e34e..c3569e8e5 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestBatchLazy.java +++ b/ebean-core/src/test/java/org/tests/basic/TestBatchLazy.java @@ -7,7 +7,7 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/basic/TestBatchLazyMany.java b/ebean-core/src/test/java/org/tests/basic/TestBatchLazyMany.java index 8b29b6cb5..f20a5e1a6 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestBatchLazyMany.java +++ b/ebean-core/src/test/java/org/tests/basic/TestBatchLazyMany.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestBatchLazyMany extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java b/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java index d20ceb952..465bd0450 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java +++ b/ebean-core/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java @@ -7,11 +7,12 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.Order.Status; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Date; +import static org.junit.jupiter.api.Assertions.*; + public class TestBeanReferenceRefresh extends BaseTestCase { @Test @@ -24,27 +25,27 @@ public class TestBeanReferenceRefresh extends BaseTestCase { Order order = Ebean.getReference(Order.class, 1); - Assert.assertTrue(Ebean.getBeanState(order).isReference()); + assertTrue(Ebean.getBeanState(order).isReference()); // invoke lazy loading Date orderDate = order.getOrderDate(); - Assert.assertNotNull(orderDate); + assertNotNull(orderDate); Customer customer = order.getCustomer(); - Assert.assertNotNull(customer); + assertNotNull(customer); - Assert.assertFalse(Ebean.getBeanState(order).isReference()); - Assert.assertNotNull(order.getStatus()); - Assert.assertNotNull(order.getDetails()); - Assert.assertNull(Ebean.getBeanState(order).getLoadedProps()); + assertFalse(Ebean.getBeanState(order).isReference()); + assertNotNull(order.getStatus()); + assertNotNull(order.getDetails()); + assertNull(Ebean.getBeanState(order).getLoadedProps()); Status status = order.getStatus(); - Assert.assertTrue(status != Order.Status.SHIPPED); + assertTrue(status != Order.Status.SHIPPED); order.setStatus(Order.Status.SHIPPED); Ebean.refresh(order); Status statusRefresh = order.getStatus(); - Assert.assertEquals(status, statusRefresh); + assertEquals(status, statusRefresh); } diff --git a/ebean-core/src/test/java/org/tests/basic/TestCreateEntityBean.java b/ebean-core/src/test/java/org/tests/basic/TestCreateEntityBean.java index af15e5380..56f3eea3f 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestCreateEntityBean.java +++ b/ebean-core/src/test/java/org/tests/basic/TestCreateEntityBean.java @@ -5,11 +5,11 @@ import io.ebean.DB; import io.ebean.Ebean; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EDefaultProp; -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 TestCreateEntityBean extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeleteByIdCollection.java b/ebean-core/src/test/java/org/tests/basic/TestDeleteByIdCollection.java index d84b8caf4..044ea4871 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestDeleteByIdCollection.java +++ b/ebean-core/src/test/java/org/tests/basic/TestDeleteByIdCollection.java @@ -6,12 +6,14 @@ import io.ebean.TransactionalTestCase; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + public class TestDeleteByIdCollection extends TransactionalTestCase { @Test @@ -28,8 +30,8 @@ public class TestDeleteByIdCollection extends TransactionalTestCase { Customer c0Back = Ebean.find(Customer.class, c0.getId()); Customer c1Back = Ebean.find(Customer.class, "" + c1.getId()); - Assert.assertNotNull(c0Back); - Assert.assertNotNull(c1Back); + assertNotNull(c0Back); + assertNotNull(c1Back); List ids = new ArrayList<>(); // also test id type conversion @@ -43,8 +45,8 @@ public class TestDeleteByIdCollection extends TransactionalTestCase { c0Back = Ebean.find(Customer.class, c0.getId()); c1Back = Ebean.find(Customer.class, "" + c1.getId()); - Assert.assertNull(c0Back); - Assert.assertNull(c1Back); + assertNull(c0Back); + assertNull(c1Back); } @Test @@ -58,8 +60,8 @@ public class TestDeleteByIdCollection extends TransactionalTestCase { Order o0Back = Ebean.find(Order.class, order0.getId()); Order o1Back = Ebean.find(Order.class, order1.getId()); - Assert.assertNotNull(o0Back); - Assert.assertNotNull(o1Back); + assertNotNull(o0Back); + assertNotNull(o1Back); List ids = new ArrayList<>(); @@ -73,8 +75,8 @@ public class TestDeleteByIdCollection extends TransactionalTestCase { o0Back = Ebean.find(Order.class, order0.getId()); o1Back = Ebean.find(Order.class, order1.getId()); - Assert.assertNull(o0Back); - Assert.assertNull(o1Back); + assertNull(o0Back); + assertNull(o1Back); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java b/ebean-core/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java index 770719f33..eabcbb380 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java +++ b/ebean-core/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java @@ -2,7 +2,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Article; import org.tests.model.basic.Section; import org.tests.model.basic.SubSection; diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeleteImportedPartial.java b/ebean-core/src/test/java/org/tests/basic/TestDeleteImportedPartial.java index 5ce7c6904..74b88e648 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestDeleteImportedPartial.java +++ b/ebean-core/src/test/java/org/tests/basic/TestDeleteImportedPartial.java @@ -4,8 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.PFile; import org.tests.model.basic.PFileContent; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNull; public class TestDeleteImportedPartial extends BaseTestCase { @@ -27,8 +28,7 @@ public class TestDeleteImportedPartial extends BaseTestCase { PFile file1 = Ebean.find(PFile.class, id); PFileContent content1 = Ebean.find(PFileContent.class, contentId); - Assert.assertNull(file1); - Assert.assertNull(content1); - + assertNull(file1); + assertNull(content1); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOne.java b/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOne.java index 6f3151099..77e3d4d7f 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOne.java +++ b/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOne.java @@ -4,8 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.PersistentFile; import org.tests.model.basic.PersistentFileContent; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNull; public class TestDeleteOneToOne extends BaseTestCase { @@ -25,9 +26,8 @@ public class TestDeleteOneToOne extends BaseTestCase { PersistentFile file1 = Ebean.find(PersistentFile.class, id); PersistentFileContent content1 = Ebean.find(PersistentFileContent.class, contentId); - Assert.assertNull(file1); - Assert.assertNull(content1); - + assertNull(file1); + assertNull(content1); } // public void testDeleteMany() { @@ -44,7 +44,7 @@ public class TestDeleteOneToOne extends BaseTestCase { // // Customer deletedCustomer = Ebean.find(Customer.class, c.getId()); // - // Assert.assertNull(deletedCustomer); + // assertNull(deletedCustomer); // // } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java b/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java index fc4e38b01..2ce2b3c5d 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java +++ b/ebean-core/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java @@ -4,8 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.PFile; import org.tests.model.basic.PFileContent; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNull; public class TestDeleteOneToOneMultiple extends BaseTestCase { @@ -29,9 +30,8 @@ public class TestDeleteOneToOneMultiple extends BaseTestCase { PFile file1 = Ebean.find(PFile.class, id); PFileContent content1 = Ebean.find(PFileContent.class, contentId); - Assert.assertNull(file1); - Assert.assertNull(content1); - + assertNull(file1); + assertNull(content1); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java b/ebean-core/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java index 5a4e3468b..d5c69a2a1 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java +++ b/ebean-core/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java @@ -3,8 +3,9 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.TMapSuperEntity; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestDeletePartialNoVersion extends BaseTestCase { @@ -22,7 +23,7 @@ public class TestDeletePartialNoVersion extends BaseTestCase { .select("id, name") .findOne(); - Assert.assertNotNull(e2); + assertNotNull(e2); e2.setName("banaban2"); Ebean.save(e2); @@ -44,7 +45,7 @@ public class TestDeletePartialNoVersion extends BaseTestCase { .select("id, name, version") .findOne(); - Assert.assertNotNull(e2); + assertNotNull(e2); e2.setName("banaban2two"); Ebean.save(e2); diff --git a/ebean-core/src/test/java/org/tests/basic/TestDynamicUpdate.java b/ebean-core/src/test/java/org/tests/basic/TestDynamicUpdate.java index 6f3d21332..c0f31775f 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestDynamicUpdate.java +++ b/ebean-core/src/test/java/org/tests/basic/TestDynamicUpdate.java @@ -5,8 +5,9 @@ import io.ebean.BeanState; import io.ebean.Ebean; import io.ebean.EbeanServer; import org.tests.model.embedded.EMain; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; public class TestDynamicUpdate extends BaseTestCase { @@ -22,7 +23,7 @@ public class TestDynamicUpdate extends BaseTestCase { server.save(b); - Assert.assertNotNull(b.getId()); + assertNotNull(b.getId()); // reload object und update the name EMain b2 = server.find(EMain.class, b.getId()); @@ -31,14 +32,14 @@ public class TestDynamicUpdate extends BaseTestCase { BeanState beanState = server.beanState(b2); boolean dirty = beanState.isDirty(); - Assert.assertTrue(dirty); + assertTrue(dirty); server.save(b2); server.beginTransaction(); try { EMain b3 = server.find(EMain.class, b.getId()); - Assert.assertEquals("ABC", b3.getEmbeddable().getDescription()); + assertEquals("ABC", b3.getEmbeddable().getDescription()); } finally { server.endTransaction(); } @@ -48,6 +49,6 @@ public class TestDynamicUpdate extends BaseTestCase { server.save(b4); EMain b5 = server.find(EMain.class, b.getId()); - Assert.assertEquals("123", b5.getEmbeddable().getDescription()); + assertEquals("123", b5.getEmbeddable().getDescription()); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java b/ebean-core/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java index 94895a77b..c1ef80247 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java +++ b/ebean-core/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java @@ -5,24 +5,22 @@ import io.ebean.BeanState; import io.ebean.Ebean; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestEnhancementCollectionInitialisation extends BaseTestCase { @Test public void testListInitialisation() { - Customer customer = new Customer(); BeanState beanState = Ebean.getBeanState(customer); if (beanState != null) { List orders = customer.getOrders(); - Assert.assertNotNull(orders); + assertNotNull(orders); } - } - } diff --git a/ebean-core/src/test/java/org/tests/basic/TestErrorBindLog.java b/ebean-core/src/test/java/org/tests/basic/TestErrorBindLog.java index 481f385ee..0147c0b25 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestErrorBindLog.java +++ b/ebean-core/src/test/java/org/tests/basic/TestErrorBindLog.java @@ -2,12 +2,13 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import javax.persistence.PersistenceException; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestErrorBindLog extends BaseTestCase { @Test @@ -19,10 +20,10 @@ public class TestErrorBindLog extends BaseTestCase { } catch (PersistenceException e) { String msg = e.getMessage(); if (isHana()) { - Assert.assertTrue(msg.contains("Error with property[1] dt[12]data[JUNK]")); + assertTrue(msg.contains("Error with property[1] dt[12]data[JUNK]")); } else { - Assert.assertTrue(msg.contains("Bind values:")); + assertTrue(msg.contains("Bind values:")); } } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestExplicitInsert.java b/ebean-core/src/test/java/org/tests/basic/TestExplicitInsert.java index 3dae9111d..baf77c061 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestExplicitInsert.java +++ b/ebean-core/src/test/java/org/tests/basic/TestExplicitInsert.java @@ -6,13 +6,12 @@ import io.ebean.EbeanServer; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasic; import org.tests.model.basic.MyEBasicConfigStartup; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; 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.*; public class TestExplicitInsert extends BaseTestCase { @@ -54,11 +53,8 @@ public class TestExplicitInsert extends BaseTestCase { EbeanServer server = Ebean.getDefaultServer(); server.insert(b); - - Assert.assertNotNull(b.getId()); - - Assert.assertEquals(b.getId(), server.beanId(b)); - + assertNotNull(b.getId()); + assertEquals(b.getId(), server.beanId(b)); EBasic b2 = server.find(EBasic.class, b.getId()); b2.setId(null); @@ -66,8 +62,8 @@ public class TestExplicitInsert extends BaseTestCase { b2.setName("force insert"); server.insert(b2); - Assert.assertNotNull(b2.getId()); - Assert.assertTrue(!b.getId().equals(b2.getId())); + assertNotNull(b2.getId()); + assertTrue(!b.getId().equals(b2.getId())); List list = server.find(EBasic.class).where().in("id", b.getId(), b2.getId()).findList(); diff --git a/ebean-core/src/test/java/org/tests/basic/TestFetchId.java b/ebean-core/src/test/java/org/tests/basic/TestFetchId.java index c830208d5..cfc14dd36 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestFetchId.java +++ b/ebean-core/src/test/java/org/tests/basic/TestFetchId.java @@ -10,7 +10,7 @@ import io.ebeantest.LoggedSql; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.concurrent.ExecutionException; @@ -40,7 +40,7 @@ public class TestFetchId extends BaseTestCase { List idList = futureIds.get(); assertThat(idList).isNotEmpty(); } - + @Test public void testFetchIdWithExists() throws InterruptedException, ExecutionException { @@ -62,7 +62,7 @@ public class TestFetchId extends BaseTestCase { List idList = futureIds.get(); assertThat(idList).isNotEmpty(); } - + @Test public void testFetchIdWithOrderFormula() throws InterruptedException, ExecutionException { diff --git a/ebean-core/src/test/java/org/tests/basic/TestIUDVanilla.java b/ebean-core/src/test/java/org/tests/basic/TestIUDVanilla.java index 6a88595ef..bdc902609 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestIUDVanilla.java +++ b/ebean-core/src/test/java/org/tests/basic/TestIUDVanilla.java @@ -2,14 +2,15 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; import org.tests.model.basic.UTMaster; import javax.persistence.OptimisticLockException; import java.sql.Timestamp; +import static org.junit.jupiter.api.Assertions.*; + public class TestIUDVanilla extends BaseTestCase { @Test @@ -19,8 +20,8 @@ public class TestIUDVanilla extends BaseTestCase { e0.save(); - Assert.assertNotNull(e0.getId()); - Assert.assertNotNull(e0.getLastUpdate()); + assertNotNull(e0.getId()); + assertNotNull(e0.getLastUpdate()); Timestamp lastUpdate0 = e0.getLastUpdate(); @@ -28,8 +29,8 @@ public class TestIUDVanilla extends BaseTestCase { e0.save(); Timestamp lastUpdate1 = e0.getLastUpdate(); - Assert.assertNotNull(lastUpdate1); - Assert.assertNotSame(lastUpdate0, lastUpdate1); + assertNotNull(lastUpdate1); + assertNotSame(lastUpdate0, lastUpdate1); EBasicVer e2 = DB.getDefault().createEntityBean(EBasicVer.class); @@ -69,14 +70,13 @@ public class TestIUDVanilla extends BaseTestCase { e3.update(); } - @Test(expected = OptimisticLockException.class) + @Test public void modifyVersion_expect_optimisticLock() { - UTMaster e0 = new UTMaster("save me"); e0.save(); // for this case we know 42 should throw OptimisticLockException e0.setVersion(42); - e0.update(); + assertThrows(OptimisticLockException.class, () -> e0.update()); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestInEmpty.java b/ebean-core/src/test/java/org/tests/basic/TestInEmpty.java index 0da8d823a..e7dd22ce3 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestInEmpty.java +++ b/ebean-core/src/test/java/org/tests/basic/TestInEmpty.java @@ -4,12 +4,12 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; import org.tests.model.basic.Order; -import org.junit.Test; +import org.junit.jupiter.api.Test; 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 TestInEmpty extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/TestInheritRef.java b/ebean-core/src/test/java/org/tests/basic/TestInheritRef.java index e345bc8d3..f8515ee6d 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestInheritRef.java +++ b/ebean-core/src/test/java/org/tests/basic/TestInheritRef.java @@ -5,11 +5,13 @@ import io.ebean.Ebean; import org.tests.model.basic.Car; import org.tests.model.basic.Truck; import org.tests.model.basic.Vehicle; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestInheritRef extends BaseTestCase { @Test @@ -33,7 +35,7 @@ public class TestInheritRef extends BaseTestCase { .setAutoTune(false) .findList(); - Assert.assertTrue(!list.isEmpty()); + assertTrue(!list.isEmpty()); Truck foundTruck = null; int found = 0; @@ -48,8 +50,8 @@ public class TestInheritRef extends BaseTestCase { } } - Assert.assertEquals(1, found); - Assert.assertTrue(foundTruck.getCapacity() == 20D); + assertEquals(1, found); + assertTrue(foundTruck.getCapacity() == 20D); } finally { Ebean.rollbackTransaction(); diff --git a/ebean-core/src/test/java/org/tests/basic/TestJodaType.java b/ebean-core/src/test/java/org/tests/basic/TestJodaType.java index a7f76a3d7..0fff445fd 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestJodaType.java +++ b/ebean-core/src/test/java/org/tests/basic/TestJodaType.java @@ -8,10 +8,10 @@ import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanProperty; import org.tests.model.basic.TJodaEntity; import org.joda.time.LocalTime; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestJodaType extends BaseTestCase { @@ -23,7 +23,7 @@ public class TestJodaType extends BaseTestCase { BeanProperty beanProperty = beanDescriptor.getBeanProperty("localTime"); ScalarType scalarType = beanProperty.getScalarType(); - Assert.assertNotNull(scalarType); + assertNotNull(scalarType); } @Test diff --git a/ebean-core/src/test/java/org/tests/basic/TestJoinInheritance.java b/ebean-core/src/test/java/org/tests/basic/TestJoinInheritance.java index 0bfb8af45..9d5282c42 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestJoinInheritance.java +++ b/ebean-core/src/test/java/org/tests/basic/TestJoinInheritance.java @@ -7,7 +7,7 @@ import org.tests.model.basic.Car; import org.tests.model.basic.Trip; import org.tests.model.basic.Vehicle; import org.tests.model.basic.VehicleDriver; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; import java.util.Date; diff --git a/ebean-core/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java b/ebean-core/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java index 4135d09aa..dd3d69ff6 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java +++ b/ebean-core/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java @@ -2,14 +2,15 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.Ebean; -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 java.util.List; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestLazyLoadEmptyOneToMany extends BaseTestCase { @Test @@ -32,7 +33,7 @@ public class TestLazyLoadEmptyOneToMany extends BaseTestCase { List contacts = c1.getContacts(); int sz = contacts.size(); - Assert.assertTrue(sz == 0); + assertTrue(sz == 0); // cleanup Ebean.delete(c1); diff --git a/ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java b/ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java index 84512076a..87c1affee 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java +++ b/ebean-core/src/test/java/org/tests/basic/TestLazyLoadInCache.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.CacheMode; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; @@ -12,8 +12,8 @@ import org.tests.model.basic.ResetBasicData; import java.util.Map; 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 TestLazyLoadInCache extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/TestLimitQuery.java b/ebean-core/src/test/java/org/tests/basic/TestLimitQuery.java index 8b6fd2bc7..b499d207b 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestLimitQuery.java +++ b/ebean-core/src/test/java/org/tests/basic/TestLimitQuery.java @@ -3,14 +3,15 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestLimitQuery extends BaseTestCase { @@ -62,8 +63,8 @@ public class TestLimitQuery extends BaseTestCase { boolean hasOffset = sql.contains("offset"); if (isH2()) { - Assert.assertTrue(sql, hasLimit); - Assert.assertFalse(sql, hasOffset); + assertTrue(hasLimit); + assertFalse(hasOffset); } } @@ -84,8 +85,8 @@ public class TestLimitQuery extends BaseTestCase { boolean hasOffset = sql.contains("offset"); if (isH2()) { - Assert.assertFalse(hasLimit); - Assert.assertFalse(hasOffset); + assertFalse(hasLimit); + assertFalse(hasOffset); } } @@ -101,7 +102,7 @@ public class TestLimitQuery extends BaseTestCase { List list = query.findList(); - Assert.assertTrue("sz > 0", !list.isEmpty()); + assertTrue(!list.isEmpty()); String sql = query.getGeneratedSql(); boolean hasDetailsJoin = sql.contains("join o_order_detail"); @@ -109,11 +110,11 @@ public class TestLimitQuery extends BaseTestCase { boolean hasSelectedDetails = sql.contains("od.id,"); boolean hasDistinct = sql.contains("select distinct"); - Assert.assertTrue(hasDetailsJoin); - Assert.assertFalse(hasSelectedDetails); - Assert.assertTrue(hasDistinct); + assertTrue(hasDetailsJoin); + assertFalse(hasSelectedDetails); + assertTrue(hasDistinct); if (isH2()) { - Assert.assertTrue(hasLimit); + assertTrue(hasLimit); } query = Ebean.find(Order.class) @@ -129,11 +130,11 @@ public class TestLimitQuery extends BaseTestCase { hasSelectedDetails = sql.contains("od.id"); hasDistinct = sql.contains("select distinct"); - Assert.assertFalse("no join with maxRows", hasDetailsJoin); - Assert.assertFalse(hasSelectedDetails); - Assert.assertFalse(hasDistinct); + assertFalse(hasDetailsJoin); + assertFalse(hasSelectedDetails); + assertFalse(hasDistinct); if (isH2()) { - Assert.assertTrue(hasLimit); + assertTrue(hasLimit); } } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestLoadBeanCache.java b/ebean-core/src/test/java/org/tests/basic/TestLoadBeanCache.java index 1962ddede..cca4587c5 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestLoadBeanCache.java +++ b/ebean-core/src/test/java/org/tests/basic/TestLoadBeanCache.java @@ -4,11 +4,12 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.Country; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestLoadBeanCache extends BaseTestCase { @Test @@ -28,6 +29,6 @@ public class TestLoadBeanCache extends BaseTestCase { // this will hit the cache Country nz = Ebean.find(Country.class, "NZ"); - Assert.assertTrue(loadedNz == nz); + assertTrue(loadedNz == nz); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestLogTransLogOnError.java b/ebean-core/src/test/java/org/tests/basic/TestLogTransLogOnError.java index 2c9b4b8cd..08ea3ec65 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestLogTransLogOnError.java +++ b/ebean-core/src/test/java/org/tests/basic/TestLogTransLogOnError.java @@ -3,8 +3,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Transaction; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasicVer; import org.tests.model.basic.Order; @@ -12,6 +11,9 @@ import org.tests.model.basic.ResetBasicData; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestLogTransLogOnError extends BaseTestCase { @Test @@ -32,14 +34,14 @@ public class TestLogTransLogOnError extends BaseTestCase { // t.log("--- next query should error"); List list = Ebean.find(Customer.class).where().eq("id", "NotAnInt!!").findList(); - Assert.assertEquals(0, list.size()); + assertEquals(0, list.size()); // Get here with mysql? - // Assert.assertTrue(false); + // assertTrue(false); txn.commit(); } catch (RuntimeException e) { // e.printStackTrace(); - Assert.assertTrue(true); + assertTrue(true); } } @@ -61,12 +63,12 @@ public class TestLogTransLogOnError extends BaseTestCase { Ebean.save(newBean); // never get here - Assert.assertTrue(false); + assertTrue(false); txn.commit(); } catch (RuntimeException e) { // e.printStackTrace(); - Assert.assertTrue(true); + assertTrue(true); } } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestM2MCascadeOne.java b/ebean-core/src/test/java/org/tests/basic/TestM2MCascadeOne.java index 851d8bc6b..4e23d4904 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestM2MCascadeOne.java +++ b/ebean-core/src/test/java/org/tests/basic/TestM2MCascadeOne.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.Query; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestM2MCascadeOne extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/TestM2MVanilla.java b/ebean-core/src/test/java/org/tests/basic/TestM2MVanilla.java index 536ebd9b8..76393ea15 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestM2MVanilla.java +++ b/ebean-core/src/test/java/org/tests/basic/TestM2MVanilla.java @@ -3,14 +3,15 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; import java.util.ArrayList; import java.util.List; +import static org.junit.jupiter.api.Assertions.*; + public class TestM2MVanilla extends BaseTestCase { @Test @@ -50,8 +51,8 @@ public class TestM2MVanilla extends BaseTestCase { MUser checkUser = DB.find(MUser.class, u0.getUserid()); List checkRoles = checkUser.getRoles(); - Assert.assertNotNull(checkRoles); - Assert.assertEquals(2, checkRoles.size()); + assertNotNull(checkRoles); + assertEquals(2, checkRoles.size()); checkRoles.add(r3); @@ -60,8 +61,8 @@ public class TestM2MVanilla extends BaseTestCase { MUser checkUser2 = DB.find(MUser.class, u0.getUserid()); List checkRoles2 = checkUser2.getRoles(); - Assert.assertNotNull(checkRoles2); - Assert.assertEquals("added a role", 3, checkRoles2.size()); + assertNotNull(checkRoles2); + assertEquals(3, checkRoles2.size()); Query rolesQuery0 = DB.find(MUser.class).where().eq("roles", r1).query(); @@ -70,7 +71,7 @@ public class TestM2MVanilla extends BaseTestCase { Query rolesQuery = DB.find(MUser.class).where().in("roles", roleList).query(); List userInRolesList = rolesQuery.findList(); - Assert.assertTrue(!userInRolesList.isEmpty()); + assertTrue(!userInRolesList.isEmpty()); List list = DB.find(MUser.class) .where().in("roles", roleList) @@ -79,7 +80,7 @@ public class TestM2MVanilla extends BaseTestCase { MUser mUser = list.get(0); List roles = mUser.getRoles(); - Assert.assertEquals(1, roles.size()); + assertEquals(1, roles.size()); checkRoles2.remove(0); checkRoles2.remove(0); @@ -87,11 +88,10 @@ public class TestM2MVanilla extends BaseTestCase { checkUser2 = DB.find(MUser.class, u0.getUserid()); checkRoles2 = checkUser2.getRoles(); - Assert.assertNotNull(checkRoles2); - Assert.assertEquals("added a role", 1, checkRoles2.size()); + assertNotNull(checkRoles2); + assertEquals(1, checkRoles2.size()); DB.delete(checkUser2); - } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestManyLazyLoad.java b/ebean-core/src/test/java/org/tests/basic/TestManyLazyLoad.java index 3d1b932e2..36948823b 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestManyLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/basic/TestManyLazyLoad.java @@ -5,12 +5,12 @@ import io.ebean.Ebean; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Date; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestManyLazyLoad extends BaseTestCase { @@ -22,7 +22,7 @@ public class TestManyLazyLoad extends BaseTestCase { awaitL2Cache(); List list = Ebean.find(Order.class).order().asc("id").findList(); - assertTrue(list.size() + " > 0", !list.isEmpty()); + assertFalse(list.isEmpty()); // just use the first one Order order = list.get(0); @@ -38,7 +38,7 @@ public class TestManyLazyLoad extends BaseTestCase { // lazy load the details int sz = details.size(); - assertTrue(sz + " > 0", sz > 0); + assertTrue(sz > 0); OrderDetail orderDetail = details.get(0); Order o = orderDetail.getOrder(); @@ -55,7 +55,7 @@ public class TestManyLazyLoad extends BaseTestCase { // lazy load the details int sz2 = details2.size(); - assertTrue(sz2 + " > 0", sz2 > 0); + assertTrue(sz2 > 0); Order o2 = details2.get(0).getOrder(); assertSame(o2, order2); diff --git a/ebean-core/src/test/java/org/tests/basic/TestManyOneInterface.java b/ebean-core/src/test/java/org/tests/basic/TestManyOneInterface.java index c27e6fc02..a291c97fe 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestManyOneInterface.java +++ b/ebean-core/src/test/java/org/tests/basic/TestManyOneInterface.java @@ -7,7 +7,7 @@ import org.tests.model.interfaces.Address; import org.tests.model.interfaces.IAddress; import org.tests.model.interfaces.IPerson; import org.tests.model.interfaces.Person; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestManyOneInterface extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/TestMappedSuper.java b/ebean-core/src/test/java/org/tests/basic/TestMappedSuper.java index ae7340816..41e1598b6 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestMappedSuper.java +++ b/ebean-core/src/test/java/org/tests/basic/TestMappedSuper.java @@ -3,8 +3,9 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.TMapSuperEntity; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestMappedSuper extends BaseTestCase { @@ -22,7 +23,7 @@ public class TestMappedSuper extends BaseTestCase { .select("id, name, myint, someObject, bananan") .findOne(); - Assert.assertNotNull(e2); + assertNotNull(e2); TMapSuperEntity eSaveDelete = new TMapSuperEntity(); eSaveDelete.setName("babana"); diff --git a/ebean-core/src/test/java/org/tests/basic/TestMetaAnnotation.java b/ebean-core/src/test/java/org/tests/basic/TestMetaAnnotation.java index f4638884e..d8f74ee54 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestMetaAnnotation.java +++ b/ebean-core/src/test/java/org/tests/basic/TestMetaAnnotation.java @@ -6,12 +6,12 @@ import io.ebean.annotation.Platform; import io.ebean.annotation.IgnorePlatform; import org.tests.model.basic.Address; import org.tests.model.basic.metaannotation.SizeMedium; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.persistence.PersistenceException; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Very simple test case to check if Ebean recognizes meta-annotation correctly. diff --git a/ebean-core/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java b/ebean-core/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java index 57a0a8fc2..8d501bfb0 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java +++ b/ebean-core/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java @@ -3,12 +3,14 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Transaction; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.OCar; import org.tests.model.basic.OEngine; import org.tests.model.basic.OGearBox; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + public class TestMultipleOneToOneIUD extends BaseTestCase { @Test @@ -30,17 +32,17 @@ public class TestMultipleOneToOneIUD extends BaseTestCase { Ebean.save(gearBox); Ebean.save(car); - Assert.assertNotNull(car.getId()); - Assert.assertNotNull(engine.getEngineId()); - Assert.assertNotNull(gearBox.getId()); + assertNotNull(car.getId()); + assertNotNull(engine.getEngineId()); + assertNotNull(gearBox.getId()); txn.commit(); } OCar c2 = Ebean.find(OCar.class, car.getId()); - Assert.assertNotNull(c2); - Assert.assertNotNull(c2.getEngine()); + assertNotNull(c2); + assertNotNull(c2.getEngine()); // gearBox not assigned yet - Assert.assertNull(c2.getGearBox()); + assertNull(c2.getGearBox()); // ok, assign gearBox c2.setGearBox(gearBox); @@ -48,9 +50,9 @@ public class TestMultipleOneToOneIUD extends BaseTestCase { // now all should be there... OCar c3 = Ebean.find(OCar.class, car.getId()); - Assert.assertNotNull(c3); - Assert.assertNotNull(c3.getEngine()); - Assert.assertNotNull(c3.getGearBox()); + assertNotNull(c3); + assertNotNull(c3.getEngine()); + assertNotNull(c3.getGearBox()); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestNonUpdateProperty.java b/ebean-core/src/test/java/org/tests/basic/TestNonUpdateProperty.java index 08678b83d..567b30482 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestNonUpdateProperty.java +++ b/ebean-core/src/test/java/org/tests/basic/TestNonUpdateProperty.java @@ -3,7 +3,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.MNonUpdPropEntity; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestNonUpdateProperty extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/TestOrderByAnnotation.java b/ebean-core/src/test/java/org/tests/basic/TestOrderByAnnotation.java index 90ee62c0d..9559f6ca8 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestOrderByAnnotation.java +++ b/ebean-core/src/test/java/org/tests/basic/TestOrderByAnnotation.java @@ -7,11 +7,12 @@ import io.ebean.TransactionalTestCase; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestOrderByAnnotation extends TransactionalTestCase { @Test @@ -22,8 +23,7 @@ public class TestOrderByAnnotation extends TransactionalTestCase { Customer customer = Ebean.find(Customer.class, custTest.getId()); List orders = customer.getOrders(); - Assert.assertTrue(!orders.isEmpty()); - + assertTrue(!orders.isEmpty()); Query q1 = Ebean.find(Order.class) .fetch("details"); @@ -32,6 +32,6 @@ public class TestOrderByAnnotation extends TransactionalTestCase { String s1 = q1.getGeneratedSql(); - Assert.assertTrue(s1.contains("order by t0.id, t1.id asc, t1.order_qty asc, t1.cretime desc")); + assertTrue(s1.contains("order by t0.id, t1.id asc, t1.order_qty asc, t1.cretime desc")); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java b/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java index 4a27102d4..1362b7fdf 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java +++ b/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java b/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java index 414e2c250..66c58b6c2 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java +++ b/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java @@ -1,19 +1,13 @@ package org.tests.basic; -import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.Query; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; -import org.junit.Assert; -import org.junit.Test; +import io.ebean.*; +import org.junit.jupiter.api.Test; import org.tests.model.basic.OrderAggregate; import org.tests.model.basic.ResetBasicData; 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.assertTrue; public class TestOrderTotalAmountReportBean extends BaseTestCase { @@ -44,7 +38,7 @@ public class TestOrderTotalAmountReportBean extends BaseTestCase { .having().lt("totalItems", 3).gt("totalAmount", 50).findList(); for (OrderAggregate r2 : l2) { - Assert.assertTrue(r2.getTotalItems() < 3); + assertTrue(r2.getTotalItems() < 3); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java b/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java index 9d6a26f36..2f647ac38 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java +++ b/ebean-core/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java @@ -3,12 +3,13 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.SqlRow; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.ResetBasicData; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestOrderTotalAmountSql extends BaseTestCase { @Test @@ -22,8 +23,8 @@ public class TestOrderTotalAmountSql extends BaseTestCase { for (SqlRow sqlRow : sqlRows) { Integer id = sqlRow.getInteger("order_id"); Double amount = sqlRow.getDouble("total_amount"); - Assert.assertNotNull("sqlRows: " + sqlRows, id); - Assert.assertNotNull("sqlRows: " + sqlRows, amount); + assertNotNull(id); + assertNotNull(amount); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestPersistenceContext.java b/ebean-core/src/test/java/org/tests/basic/TestPersistenceContext.java index 2e786d5bb..07310f349 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestPersistenceContext.java +++ b/ebean-core/src/test/java/org/tests/basic/TestPersistenceContext.java @@ -5,8 +5,10 @@ import io.ebean.Ebean; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestPersistenceContext extends BaseTestCase { @@ -29,7 +31,7 @@ public class TestPersistenceContext extends BaseTestCase { // not the same instance ...as a different // persistence context - Assert.assertTrue(order != oBefore); + assertTrue(order != oBefore); // finds an existing bean in the persistence context @@ -38,8 +40,8 @@ public class TestPersistenceContext extends BaseTestCase { Order o3 = Ebean.getReference(Order.class, 1); // all the same instance - Assert.assertTrue(order == o2); - Assert.assertTrue(order == o3); + assertTrue(order == o2); + assertTrue(order == o3); } finally { Ebean.endTransaction(); @@ -49,8 +51,8 @@ public class TestPersistenceContext extends BaseTestCase { // persistence context Order oAfter = Ebean.find(Order.class, 1); - Assert.assertTrue(oAfter != oBefore); - Assert.assertTrue(oAfter != order); + assertTrue(oAfter != oBefore); + assertTrue(oAfter != order); // start a persistence context Ebean.beginTransaction(); @@ -68,9 +70,8 @@ public class TestPersistenceContext extends BaseTestCase { Order order2 = Ebean.find(Order.class, orderId); Customer customer2 = order2.getCustomer(); - Assert.assertEquals(customer.getId(), customer2.getId()); - - Assert.assertTrue(customer == customer2); + assertEquals(customer.getId(), customer2.getId()); + assertTrue(customer == customer2); } finally { Ebean.endTransaction(); diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdate.java b/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdate.java index ee224ccd5..37d424b31 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdate.java +++ b/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdate.java @@ -9,7 +9,7 @@ import io.ebean.Transaction; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; 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.EBasic; import org.tests.model.basic.ResetBasicData; @@ -17,7 +17,7 @@ import org.tests.model.basic.ResetBasicData; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestQueryForUpdate extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java b/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java index eee072594..a014c8b86 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java +++ b/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tests.model.basic.Article; diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryUsingConnection.java b/ebean-core/src/test/java/org/tests/basic/TestQueryUsingConnection.java index c7aba0ab8..4e12f1bc5 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestQueryUsingConnection.java +++ b/ebean-core/src/test/java/org/tests/basic/TestQueryUsingConnection.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; import org.tests.model.basic.ResetBasicData; @@ -14,7 +14,7 @@ import java.sql.Connection; import java.sql.SQLException; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestQueryUsingConnection extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryUsingDatabase.java b/ebean-core/src/test/java/org/tests/basic/TestQueryUsingDatabase.java index 1648ed49c..54fa6b72a 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestQueryUsingDatabase.java +++ b/ebean-core/src/test/java/org/tests/basic/TestQueryUsingDatabase.java @@ -2,9 +2,9 @@ package org.tests.basic; import io.ebean.DB; import io.ebean.Database; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.tests.model.basic.ESimple; import java.util.List; @@ -17,13 +17,13 @@ public class TestQueryUsingDatabase { public static final ESimple RECORD1 = new ESimple(); public static final ESimple RECORD2 = new ESimple(); - @Before + @BeforeEach public void setupNonDefaultDatabase() { DB.byName(SOME_OTHER_DB_NAME).insert(RECORD1); DB.byName(SOME_OTHER_DB_NAME).insert(RECORD2); } - @After + @AfterEach public void shutdown() { DB.byName(SOME_OTHER_DB_NAME).shutdown(); } diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryWhereBetween.java b/ebean-core/src/test/java/org/tests/basic/TestQueryWhereBetween.java index aef27680e..3ba345b9d 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestQueryWhereBetween.java +++ b/ebean-core/src/test/java/org/tests/basic/TestQueryWhereBetween.java @@ -3,14 +3,15 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Assert; -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.Order; import org.tests.model.basic.ResetBasicData; import java.sql.Timestamp; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestQueryWhereBetween extends BaseTestCase { long statCount; @@ -29,10 +30,10 @@ public class TestQueryWhereBetween extends BaseTestCase { query.findList(); String sql = query.getGeneratedSql(); - Assert.assertTrue(sql.contains("between t0.cretime and t0.updtime")); + assertTrue(sql.contains("between t0.cretime and t0.updtime")); } - @Ignore + @Disabled @Test public void doStuff() { diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryWhereInRange.java b/ebean-core/src/test/java/org/tests/basic/TestQueryWhereInRange.java index 27b752231..03579c200 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestQueryWhereInRange.java +++ b/ebean-core/src/test/java/org/tests/basic/TestQueryWhereInRange.java @@ -3,7 +3,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java b/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java index 914191cc9..8ff0561ae 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java +++ b/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java @@ -10,10 +10,10 @@ import io.ebeaninternal.server.core.CacheOptions; import io.ebeaninternal.server.deploy.BeanDescriptor; import org.tests.model.basic.Country; import org.tests.model.basic.ResetBasicData; -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 TestQueryWithCache extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java b/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java index 64d449fda..6e150e80e 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java +++ b/ebean-core/src/test/java/org/tests/basic/TestReadOnlyPropagation.java @@ -3,8 +3,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -15,7 +14,8 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestReadOnlyPropagation extends BaseTestCase { @@ -30,61 +30,61 @@ public class TestReadOnlyPropagation extends BaseTestCase { .setId(1) .findOne(); - Assert.assertTrue(DB.beanState(order).isReadOnly()); + assertTrue(DB.beanState(order).isReadOnly()); Customer customer = order.getCustomer(); - Assert.assertTrue(DB.beanState(customer).isReadOnly()); + assertTrue(DB.beanState(customer).isReadOnly()); Address billingAddress = customer.getBillingAddress(); assertNotNull(billingAddress); - Assert.assertTrue(DB.beanState(billingAddress).isReadOnly()); + assertTrue(DB.beanState(billingAddress).isReadOnly()); List details = order.getDetails(); BeanCollection bc = (BeanCollection) details; - Assert.assertTrue(bc.isReadOnly()); - Assert.assertTrue(!bc.isPopulated()); + assertTrue(bc.isReadOnly()); + assertTrue(!bc.isPopulated()); bc.size(); - Assert.assertTrue(!bc.isEmpty()); - Assert.assertTrue(bc.isReadOnly()); - Assert.assertTrue(bc.isPopulated()); + assertTrue(!bc.isEmpty()); + assertTrue(bc.isReadOnly()); + assertTrue(bc.isPopulated()); try { details.add(new OrderDetail()); - Assert.assertTrue(false); + assertTrue(false); } catch (IllegalStateException e) { - Assert.assertTrue(true); + assertTrue(true); } try { details.remove(0); - Assert.assertTrue(false); + assertTrue(false); } catch (IllegalStateException e) { - Assert.assertTrue(true); + assertTrue(true); } try { Iterator it = details.iterator(); it.next(); it.remove(); - Assert.assertTrue(false); + assertTrue(false); } catch (IllegalStateException e) { - Assert.assertTrue(true); + assertTrue(true); } try { ListIterator it = details.listIterator(); it.next(); it.remove(); - Assert.assertTrue(false); + assertTrue(false); } catch (IllegalStateException e) { - Assert.assertTrue(true); + assertTrue(true); } try { List subList = details.subList(0, 1); subList.remove(0); - Assert.assertTrue(false); + assertTrue(false); } catch (UnsupportedOperationException e) { - Assert.assertTrue(true); + assertTrue(true); } diff --git a/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java b/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java index 85b816b70..e4aa4d488 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java +++ b/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java @@ -4,8 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.PersistentFile; import org.tests.model.basic.PersistentFileContent; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestSaveDeleteOneToOne extends BaseTestCase { @@ -29,9 +30,8 @@ public class TestSaveDeleteOneToOne extends BaseTestCase { PersistentFileContent persistentFileContent = persistentFile.getPersistentFileContent(); - Assert.assertNotNull(persistentFileContent); - - Assert.assertNotNull("load byte content", persistentFileContent.getContent()); + assertNotNull(persistentFileContent); + assertNotNull(persistentFileContent.getContent()); Ebean.delete(persistentFile); } diff --git a/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java b/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java index 91dd7fea9..96b0b8536 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java +++ b/ebean-core/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java @@ -4,8 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.PFile; import org.tests.model.basic.PFileContent; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestSaveDeleteOneToOneMultiple extends BaseTestCase { @@ -28,10 +29,8 @@ public class TestSaveDeleteOneToOneMultiple extends BaseTestCase { PFileContent persistentFileContent = persistentFile.getFileContent(); - Assert.assertNotNull(persistentFileContent); - - Assert.assertNotNull("load byte content", persistentFileContent.getContent()); - + assertNotNull(persistentFileContent); + assertNotNull(persistentFileContent.getContent()); Ebean.delete(persistentFile); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestSharedInstancePropagation.java b/ebean-core/src/test/java/org/tests/basic/TestSharedInstancePropagation.java index 3f85c0486..af865e1ac 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestSharedInstancePropagation.java +++ b/ebean-core/src/test/java/org/tests/basic/TestSharedInstancePropagation.java @@ -7,11 +7,11 @@ import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.Product; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestSharedInstancePropagation extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/TestTransient.java b/ebean-core/src/test/java/org/tests/basic/TestTransient.java index ef0db80bb..8ea4d3f86 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestTransient.java +++ b/ebean-core/src/test/java/org/tests/basic/TestTransient.java @@ -3,17 +3,17 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import java.sql.Types; import java.util.Optional; 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 TestTransient extends BaseTestCase { @@ -31,7 +31,7 @@ public class TestTransient extends BaseTestCase { assertNotNull(c); BeanState beanState = DB.beanState(c); - assertFalse("not new or dirty as transient", beanState.isNewOrDirty()); + assertFalse(beanState.isNewOrDirty()); c.getLock().tryLock(); try { @@ -43,7 +43,7 @@ public class TestTransient extends BaseTestCase { Boolean selected = c.getSelected(); assertNotNull(selected); - assertFalse("not new or dirty as transient", beanState.isNewOrDirty()); + assertFalse(beanState.isNewOrDirty()); DB.save(c); @@ -51,13 +51,13 @@ public class TestTransient extends BaseTestCase { assertNotNull(selected); c.setName("Modified"); - assertTrue("dirty now", beanState.isNewOrDirty()); + assertTrue(beanState.isNewOrDirty()); selected = c.getSelected(); assertNotNull(selected); DB.save(c); - assertFalse("Not dirty after save", beanState.isNewOrDirty()); + assertFalse(beanState.isNewOrDirty()); selected = c.getSelected(); assertNotNull(selected); diff --git a/ebean-core/src/test/java/org/tests/basic/TestUpdateManyToOne.java b/ebean-core/src/test/java/org/tests/basic/TestUpdateManyToOne.java index 1a86cdcde..8e7f4a0c3 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestUpdateManyToOne.java +++ b/ebean-core/src/test/java/org/tests/basic/TestUpdateManyToOne.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/basic/TestUuidInsert.java b/ebean-core/src/test/java/org/tests/basic/TestUuidInsert.java index b0ae3fcc2..bf28864c6 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestUuidInsert.java +++ b/ebean-core/src/test/java/org/tests/basic/TestUuidInsert.java @@ -3,7 +3,7 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.TUuidEntity; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestUuidInsert extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java b/ebean-core/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java index 49e49fc12..0b224683d 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java +++ b/ebean-core/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.UUOne; import org.tests.model.basic.UUTwo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/ebean-core/src/test/java/org/tests/basic/TestWhereAnnotation.java b/ebean-core/src/test/java/org/tests/basic/TestWhereAnnotation.java index 9bc32faf9..01877eca9 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestWhereAnnotation.java +++ b/ebean-core/src/test/java/org/tests/basic/TestWhereAnnotation.java @@ -7,12 +7,12 @@ import io.ebean.TransactionalTestCase; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestWhereAnnotation extends TransactionalTestCase { @@ -24,7 +24,7 @@ public class TestWhereAnnotation extends TransactionalTestCase { Customer customer = Ebean.find(Customer.class, custTest.getId()); List orders = customer.getOrders(); - Assert.assertTrue(!orders.isEmpty()); + assertTrue(!orders.isEmpty()); Query q1 = Ebean.find(Customer.class).setUseCache(false).fetch("orders").where() .idEq(1).query(); diff --git a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java index 7cc33ffc8..940af23ad 100644 --- a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java +++ b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java @@ -7,11 +7,13 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestDeleteByIdList extends BaseTestCase { @Test @@ -24,13 +26,13 @@ public class TestDeleteByIdList extends BaseTestCase { server.getBeanDescriptor(OrderDetail.class).cacheBeanPut(dummy); Customer c0 = ResetBasicData.createCustAndOrder("DelIdList-0"); - Assert.assertNotNull(c0); + assertNotNull(c0); Customer c1 = ResetBasicData.createCustAndOrder("DelIdList-1"); List orderIds = Ebean.find(Order.class).where().in("customer", c0, c1).findIds(); - Assert.assertEquals(2, orderIds.size()); + assertEquals(2, orderIds.size()); Ebean.deleteAll(Order.class, orderIds); Ebean.delete(c0); diff --git a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java index 97511df79..f0881d9db 100644 --- a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java +++ b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java @@ -7,11 +7,13 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestDeleteCascadeById extends BaseTestCase { @Test @@ -24,13 +26,13 @@ public class TestDeleteCascadeById extends BaseTestCase { server.getBeanDescriptor(OrderDetail.class).cacheBeanPut(dummy); Customer cust = ResetBasicData.createCustAndOrder("DelCas"); - Assert.assertNotNull(cust); + assertNotNull(cust); List orders = Ebean.find(Order.class).where().eq("customer", cust).findList(); - Assert.assertEquals(1, orders.size()); + assertEquals(1, orders.size()); Order o = orders.get(0); - Assert.assertNotNull(o); + assertNotNull(o); // cleanup Ebean.delete(o); diff --git a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java index 5da596325..f42b1a8f2 100644 --- a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java +++ b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java @@ -1,42 +1,40 @@ package org.tests.basic.delete; -import static org.assertj.core.api.Assertions.assertThat; - import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.tests.model.onetoone.OtoUser; import org.tests.model.onetoone.OtoUserOptional; +import static org.assertj.core.api.Assertions.assertThat; + public class TestDeleteCascadeByQuery extends BaseTestCase { - + private OtoUser testUser; private OtoUserOptional userOptional; private Query userOptionalQuery = Ebean.find(OtoUserOptional.class); private Query userQuery = Ebean.find(OtoUser.class); - + /** * Init each test. Delete all existing beans. Then create OtoUser, add OtoUserOptional and save. */ - @Before + @BeforeEach public void init() { Ebean.deleteAll(userQuery.findList()); Ebean.deleteAll(userOptionalQuery.findList()); - + userOptional = new OtoUserOptional(); Ebean.save(userOptional); testUser = new OtoUser(); testUser.setOptional(userOptional); Ebean.save(testUser); } - + /** - * Test that validates deleting a bean using Ebean.delete() respects the CascadeType.DELETE + * Test that validates deleting a bean using Ebean.delete() respects the CascadeType.DELETE * setting. */ @Test @@ -49,14 +47,14 @@ public class TestDeleteCascadeByQuery extends BaseTestCase { + "did not delete the OneToOne mapped entity as set with CascadeType.ALL") .isEqualTo(0); } - + /** - * Test that validates deleting a bean with OneToOne mapping with a query respects the + * Test that validates deleting a bean with OneToOne mapping with a query respects the * CascadeType.DELETE setting. */ @Test public void testDeleteCascadeByQuery() { - + assertThat(userQuery.delete()).isEqualTo(1); assertThat(userOptionalQuery.findCount()) @@ -64,11 +62,11 @@ public class TestDeleteCascadeByQuery extends BaseTestCase { + "did not delete the OneToOne mapped entity as set with CascadeType.ALL") .isEqualTo(0); } - + /** * Cleanup - Delete all existing beans for the next test. */ - @After + @AfterEach public void cleanup() { Ebean.deleteAll(userQuery.findList()); Ebean.deleteAll(userOptionalQuery.findList()); diff --git a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncrypt.java b/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncrypt.java index 74eeec665..ca8a47f3b 100644 --- a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncrypt.java +++ b/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncrypt.java @@ -8,7 +8,7 @@ import io.ebean.annotation.Platform; import io.ebean.config.dbplatform.DbEncrypt; import io.ebeaninternal.api.SpiEbeanServer; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicEncrypt; import org.tests.model.basic.EBasicEncryptRelate; @@ -16,7 +16,7 @@ import java.sql.Date; 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 TestEncrypt extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java b/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java index 2a8e4224c..3265bf574 100644 --- a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java +++ b/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java @@ -3,12 +3,13 @@ package org.tests.basic.encrypt; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.SqlRow; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicEncryptBinary; import java.sql.Timestamp; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestEncryptBinary extends BaseTestCase { @Test @@ -38,7 +39,7 @@ public class TestEncryptBinary extends BaseTestCase { e1.getDescription(); - Assert.assertEquals(t0, t1); + assertEquals(t0, t1); e1.setName("testmod"); e1.setDescription("moddesc"); diff --git a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java b/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java index e5d59a07b..90eef2c71 100644 --- a/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java +++ b/ebean-core/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java @@ -2,7 +2,7 @@ package org.tests.basic.encrypt; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicEncryptClient; import java.time.LocalDate; diff --git a/ebean-core/src/test/java/org/tests/basic/event/TestPreInsertValidation.java b/ebean-core/src/test/java/org/tests/basic/event/TestPreInsertValidation.java index 9b025b0c3..c05c5fcd7 100644 --- a/ebean-core/src/test/java/org/tests/basic/event/TestPreInsertValidation.java +++ b/ebean-core/src/test/java/org/tests/basic/event/TestPreInsertValidation.java @@ -4,8 +4,9 @@ package org.tests.basic.event; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.TWithPreInsert; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestPreInsertValidation extends BaseTestCase { @@ -19,8 +20,8 @@ public class TestPreInsertValidation extends BaseTestCase { Ebean.save(e); // the save worked and name set in preInsert - Assert.assertNotNull(e.getId()); - Assert.assertNotNull(e.getName()); + assertNotNull(e.getId()); + assertNotNull(e.getName()); TWithPreInsert e1 = Ebean.find(TWithPreInsert.class, e.getId()); @@ -43,7 +44,7 @@ public class TestPreInsertValidation extends BaseTestCase { Ebean.update(bean2); // title set on preUpdate - Assert.assertNotNull(bean2.getTitle()); + assertNotNull(bean2.getTitle()); } } diff --git a/ebean-core/src/test/java/org/tests/basic/event/TestQueryAdapter.java b/ebean-core/src/test/java/org/tests/basic/event/TestQueryAdapter.java index 425610c9f..84f369cf5 100644 --- a/ebean-core/src/test/java/org/tests/basic/event/TestQueryAdapter.java +++ b/ebean-core/src/test/java/org/tests/basic/event/TestQueryAdapter.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.Query; import io.ebean.QueryType; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.ResetBasicData; import org.tests.model.basic.TOne; diff --git a/ebean-core/src/test/java/org/tests/basic/join/TestSecondaryJoin.java b/ebean-core/src/test/java/org/tests/basic/join/TestSecondaryJoin.java index b218b6168..c46dd323a 100644 --- a/ebean-core/src/test/java/org/tests/basic/join/TestSecondaryJoin.java +++ b/ebean-core/src/test/java/org/tests/basic/join/TestSecondaryJoin.java @@ -6,7 +6,7 @@ import io.ebean.TransactionalTestCase; import org.tests.model.basic.Order; import org.tests.model.basic.Order.Status; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java b/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java index 831ec4ee5..408234021 100644 --- a/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java +++ b/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java @@ -6,12 +6,12 @@ import io.ebean.EbeanServer; import io.ebean.Query; import org.tests.model.basic.EBasicClobFetchEager; import org.ebeantest.LoggedSqlCollector; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestBasicClobFetchEager extends BaseTestCase { @@ -42,7 +42,7 @@ public class TestBasicClobFetchEager extends BaseTestCase { // Assert query same as previous ... List loggedSql = LoggedSqlCollector.stop(); - Assert.assertEquals(1, loggedSql.size()); + assertEquals(1, loggedSql.size()); assertThat(trimSql(loggedSql.get(0), 6)).contains(expectedSql); @@ -64,7 +64,7 @@ public class TestBasicClobFetchEager extends BaseTestCase { // Test refresh function - Assert.assertEquals("initialClobValue", entity.getDescription()); + assertEquals("initialClobValue", entity.getDescription()); LoggedSqlCollector.start(); @@ -73,9 +73,9 @@ public class TestBasicClobFetchEager extends BaseTestCase { // Assert all properties fetched in refresh loggedSql = LoggedSqlCollector.stop(); - Assert.assertEquals(1, loggedSql.size()); + assertEquals(1, loggedSql.size()); assertThat(trimSql(loggedSql.get(0), 6)).contains(expectedSql); - Assert.assertEquals("modified", entity.getDescription()); + assertEquals("modified", entity.getDescription()); } diff --git a/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java b/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java index f33a42a42..eed250046 100644 --- a/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java +++ b/ebean-core/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Query; import org.tests.model.basic.EBasicClobNoVer; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/basic/lob/TestByteOnly.java b/ebean-core/src/test/java/org/tests/basic/lob/TestByteOnly.java index d675cb6b7..f5bb0cd0e 100644 --- a/ebean-core/src/test/java/org/tests/basic/lob/TestByteOnly.java +++ b/ebean-core/src/test/java/org/tests/basic/lob/TestByteOnly.java @@ -3,7 +3,7 @@ package org.tests.basic.lob; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.TBytesOnly; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestByteOnly extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java b/ebean-core/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java index 48ad933cf..9232a878c 100644 --- a/ebean-core/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java +++ b/ebean-core/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java @@ -2,11 +2,11 @@ package org.tests.basic.one2one; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; public class TestOne2OneBookingInvoice extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java b/ebean-core/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java index 6203d3071..5105cb2b3 100644 --- a/ebean-core/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java +++ b/ebean-core/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java @@ -2,7 +2,7 @@ package org.tests.basic.one2one; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestOneToOneWheelTire extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java b/ebean-core/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java index e7b8577cb..0ebacbde6 100644 --- a/ebean-core/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java +++ b/ebean-core/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java @@ -4,8 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.SqlQuery; import io.ebean.SqlRow; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; import org.tests.model.basic.EBasic.Status; import org.tests.model.basic.EBasicEnumId; @@ -13,8 +12,9 @@ import org.tests.model.basic.EBasicEnumInt; import java.util.Optional; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.assertj.core.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestEnumValueAnnotation extends BaseTestCase { @@ -65,7 +65,7 @@ public class TestEnumValueAnnotation extends BaseTestCase { try { b = DB.find(EBasicEnumId.class, b.getStatus()); } catch (java.lang.IllegalArgumentException iae) { - Assert.fail("The use of an enum as id should work : " + iae.getLocalizedMessage()); + fail("The use of an enum as id should work : " + iae.getLocalizedMessage()); } assertEquals(EBasicEnumId.Status.NEW, b.getStatus()); diff --git a/ebean-core/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java b/ebean-core/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java index 2d68014c7..d65a823fb 100644 --- a/ebean-core/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java +++ b/ebean-core/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java @@ -3,15 +3,15 @@ package org.tests.basic.type; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.ESomeType; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Currency; import java.util.List; import java.util.Locale; import java.util.TimeZone; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestExtraScalarTypes extends BaseTestCase { @@ -31,9 +31,9 @@ public class TestExtraScalarTypes extends BaseTestCase { ESomeType e2 = Ebean.find(ESomeType.class).setAutoTune(false).setId(e.getId()).findOne(); - Assert.assertNotNull(e2.getCurrency()); - Assert.assertNotNull(e2.getLocale()); - Assert.assertNotNull(e2.getTimeZone()); + assertNotNull(e2.getCurrency()); + assertNotNull(e2.getLocale()); + assertNotNull(e2.getTimeZone()); List list = Ebean.find(ESomeType.class) .setAutoTune(false).where() diff --git a/ebean-core/src/test/java/org/tests/basic/type/TestInetAddressType.java b/ebean-core/src/test/java/org/tests/basic/type/TestInetAddressType.java index 66910df8f..ec226169b 100644 --- a/ebean-core/src/test/java/org/tests/basic/type/TestInetAddressType.java +++ b/ebean-core/src/test/java/org/tests/basic/type/TestInetAddressType.java @@ -4,7 +4,7 @@ import io.ebean.DB; import io.ebean.TransactionalTestCase; import io.ebean.types.Cidr; import io.ebean.types.Inet; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EWithInetAddr; import java.net.InetAddress; @@ -13,8 +13,8 @@ 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.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestInetAddressType extends TransactionalTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java b/ebean-core/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java index 043150526..0c700c8ef 100644 --- a/ebean-core/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java +++ b/ebean-core/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java @@ -3,7 +3,7 @@ package org.tests.basic.type; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.TOne; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestQueryBooleanProperty extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/type/TestSqlRowUUID.java b/ebean-core/src/test/java/org/tests/basic/type/TestSqlRowUUID.java index 77b67724a..d2b3084f3 100644 --- a/ebean-core/src/test/java/org/tests/basic/type/TestSqlRowUUID.java +++ b/ebean-core/src/test/java/org/tests/basic/type/TestSqlRowUUID.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.SqlQuery; import io.ebean.SqlRow; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.TUuidEntity; import java.util.Arrays; @@ -12,8 +12,8 @@ import java.util.List; import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestSqlRowUUID extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/basic/type/TestTransientMap.java b/ebean-core/src/test/java/org/tests/basic/type/TestTransientMap.java index cb6f7b8c1..7ee4ca9a9 100644 --- a/ebean-core/src/test/java/org/tests/basic/type/TestTransientMap.java +++ b/ebean-core/src/test/java/org/tests/basic/type/TestTransientMap.java @@ -2,7 +2,7 @@ package org.tests.basic.type; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashMap; diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java index 2f9cdf7f1..aa1482cbf 100644 --- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java +++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java @@ -14,7 +14,7 @@ import io.ebean.meta.MetaTimedMetric; import io.ebean.meta.ServerMetrics; import io.ebeaninternal.api.SpiTransaction; 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.EBasicVer; import org.tests.model.basic.TSDetail; @@ -24,7 +24,7 @@ import java.sql.Timestamp; 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 TestBatchInsertFlush extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java index 620b926bb..92101e4b4 100644 --- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java +++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertOneToOne.java @@ -3,7 +3,7 @@ package org.tests.batchinsert; import io.ebean.Ebean; import io.ebean.annotation.PersistBatch; import io.ebean.annotation.Transactional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.batchinsert.o2o.MeterAddressData; import org.tests.batchinsert.o2o.MeterContractData; import org.tests.batchinsert.o2o.MeterSpecialNeedsClient; diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java index e6d75eef2..253ac5f52 100644 --- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java +++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java @@ -8,7 +8,7 @@ import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.PersistBatch; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.UTDetail; import org.tests.model.basic.UTMaster; @@ -17,7 +17,7 @@ import java.util.List; import java.util.Random; //import static org.assertj.core.api.Assertions.assertThat; -//import static org.junit.Assert.assertNull; +//import static org.junit.jupiter.api.Assertions.assertNull; public class TestBatchInsertSimple extends BaseTestCase { @@ -209,7 +209,7 @@ public class TestBatchInsertSimple extends BaseTestCase { return detail; } - @Test(expected = Test.None.class)// no exception expected + @Test public void npe_addBatch_withoutAnyBindParams() { try (Transaction txn = DB.beginTransaction()) { // don't write code like this please ... diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java index 5a6fadfca..84fc0837a 100644 --- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java +++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Transaction; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.OCachedBean; import java.util.ArrayList; diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java index 947b904d4..edba34622 100644 --- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java +++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java @@ -9,7 +9,7 @@ import io.ebean.annotation.Platform; import io.ebeaninternal.api.SpiTransaction; import io.ebeaninternal.server.persist.BatchControl; import org.assertj.core.api.Assertions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicWithUniqueCon; import org.tests.model.basic.EOptOneB; import org.tests.model.basic.EOptOneC; diff --git a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java index c92440fa6..6a86d8a2f 100644 --- a/ebean-core/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java +++ b/ebean-core/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java @@ -6,10 +6,10 @@ import io.ebean.EbeanServer; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestBatchSaveWithGetBeanId extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java b/ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java index 9656832a1..15e198d6d 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestBasicLazy.java @@ -11,14 +11,15 @@ import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; +import static org.junit.jupiter.api.Assertions.*; + public class TestBasicLazy extends BaseTestCase { @Test @@ -29,15 +30,15 @@ public class TestBasicLazy extends BaseTestCase { Order order = Ebean.find(Order.class).select("totalAmount").setMaxRows(1).order("id") .findOne(); - Assert.assertNotNull(order); + assertNotNull(order); Customer customer = order.getCustomer(); - Assert.assertNotNull(customer); - Assert.assertNotNull(customer.getName()); + assertNotNull(customer); + assertNotNull(customer.getName()); Address address = customer.getBillingAddress(); - Assert.assertNotNull(address); - Assert.assertNotNull(address.getCity()); + assertNotNull(address); + assertNotNull(address.getCity()); } public void test_N1N() { @@ -46,26 +47,26 @@ public class TestBasicLazy extends BaseTestCase { // safety check to see if our customer we are going to use for the test has // some contacts Customer c = Ebean.find(Customer.class).setId(1).findOne(); - Assert.assertNotNull(c.getContacts()); - Assert.assertTrue("no contacts on test customer 1", !c.getContacts().isEmpty()); + assertNotNull(c.getContacts()); + assertTrue(!c.getContacts().isEmpty()); // start transaction so we have a "long running" persistence context Transaction tx = Ebean.beginTransaction(); try { List order = Ebean.find(Order.class).where(Expr.eq("customer.id", 1)).findList(); - Assert.assertNotNull(order); - Assert.assertTrue(!order.isEmpty()); + assertNotNull(order); + assertTrue(!order.isEmpty()); Customer customer = order.get(0).getCustomer(); - Assert.assertNotNull(customer); - Assert.assertEquals(1, customer.getId().intValue()); + assertNotNull(customer); + assertEquals(1, customer.getId().intValue()); // this should lazily fetch the contacts List contacts = customer.getContacts(); - Assert.assertNotNull(contacts); - Assert.assertTrue("contacts not lazily fetched", !contacts.isEmpty()); + assertNotNull(contacts); + assertTrue(!contacts.isEmpty()); } finally { tx.commit(); } @@ -77,19 +78,19 @@ public class TestBasicLazy extends BaseTestCase { Order order = Ebean.find(Order.class).select("totalAmount").setMaxRows(1).order("id") .findOne(); - Assert.assertNotNull(order); + assertNotNull(order); final Customer customer = order.getCustomer(); - Assert.assertNotNull(customer); + assertNotNull(customer); - Assert.assertTrue(Ebean.getBeanState(customer).isReference()); + assertTrue(Ebean.getBeanState(customer).isReference()); final Throwable throwables[] = new Throwable[2]; Thread t1 = new Thread() { @Override public void run() { try { - Assert.assertNotNull(customer.getName()); + assertNotNull(customer.getName()); } catch (Throwable e) { throwables[0] = e; } @@ -100,7 +101,7 @@ public class TestBasicLazy extends BaseTestCase { @Override public void run() { try { - Assert.assertNotNull(customer.getName()); + assertNotNull(customer.getName()); } catch (Throwable e) { throwables[1] = e; } @@ -119,7 +120,7 @@ public class TestBasicLazy extends BaseTestCase { MyTestDataSourcePoolListener.SLEEP_AFTER_BORROW = 0; } - Assert.assertFalse(Ebean.getBeanState(customer).isReference()); + assertFalse(Ebean.getBeanState(customer).isReference()); if (throwables[0] != null) { throw throwables[0]; @@ -178,7 +179,7 @@ public class TestBasicLazy extends BaseTestCase { new FetchThread(tg, 3).start(); orders = Ebean.find(Order.class).fetchLazy("customer").findList(); - Assert.assertTrue(orders.size() >= 4); + assertTrue(orders.size() >= 4); try { MyTestDataSourcePoolListener.SLEEP_AFTER_BORROW = 2000; @@ -200,7 +201,7 @@ public class TestBasicLazy extends BaseTestCase { for (Throwable exception : exceptions) { exception.printStackTrace(); } - Assert.fail(); + fail(); } } } diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java b/ebean-core/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java index 5354c7cf3..1b884bac2 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java @@ -2,14 +2,15 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.Ebean; -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 java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestBasicNavOnEmpty extends BaseTestCase { @Test @@ -25,7 +26,7 @@ public class TestBasicNavOnEmpty extends BaseTestCase { c = Ebean.find(Customer.class, c.getId()); List contacts = c.getContacts(); - Assert.assertEquals(0, contacts.size()); + assertEquals(0, contacts.size()); // cleanup Ebean.delete(c); diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java b/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java index 4558594a5..00307797e 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java @@ -6,14 +6,14 @@ import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; import org.tests.model.basic.UUOne; import org.ebeantest.LoggedSqlCollector; -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.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestBatchLazyWithCacheHits extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java b/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java index a91cbbd76..55cd76eae 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java @@ -2,15 +2,16 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import io.ebean.FetchConfig; +import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; import org.tests.model.basic.UUTwo; -import org.junit.Assert; -import org.junit.Test; import javax.persistence.EntityNotFoundException; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestBatchLazyWithDeleted extends BaseTestCase { @Test @@ -53,12 +54,12 @@ public class TestBatchLazyWithDeleted extends BaseTestCase { // is NOT the bean that will invoke the lazy loading // (in this case it is the second bean in the list). int deletedCount = Ebean.delete(UUOne.class, oneB.getId()); - Assert.assertEquals(1, deletedCount); + assertEquals(1, deletedCount); for (UUTwo u : list) { u.getMaster(); //BeanState beanState = Ebean.getBeanState(master); - //Assert.assertTrue(beanState.isReference()); + //assertTrue(beanState.isReference()); } // invoke lazy loading on the second 'master' bean @@ -73,10 +74,10 @@ public class TestBatchLazyWithDeleted extends BaseTestCase { // it was removed from the "lazy load context" earlier try { list.get(2).getMaster().getName(); - Assert.assertTrue(false); + assertTrue(false); } catch (EntityNotFoundException e) { // this bean was deleted and lazy loading failed - Assert.assertTrue(true); + assertTrue(true); } diff --git a/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java b/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java index c6ef4fbd1..5dc8c59ee 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestBeanState.java @@ -5,7 +5,7 @@ import io.ebean.BeanState; import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; @@ -13,7 +13,7 @@ import java.util.ArrayList; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestBeanState extends BaseTestCase { @@ -106,9 +106,8 @@ public class TestBeanState extends BaseTestCase { assertThat(beanState.getChangedProps()).containsOnly("contacts"); } - @Test(expected = IllegalStateException.class) + @Test public void readOnly_when_setManyProperty() { - Customer customer = new Customer(); customer.setContacts(new ArrayList<>()); @@ -117,13 +116,11 @@ public class TestBeanState extends BaseTestCase { beanState.setReadOnly(true); // act, try to mutate read only bean - customer.setContacts(new ArrayList<>()); + assertThrows(IllegalStateException.class, () -> customer.setContacts(new ArrayList<>())); } - - @Test(expected = IllegalStateException.class) + @Test public void readOnly_when_setProperty() { - Customer customer = new Customer(); customer.setName("a"); @@ -132,6 +129,6 @@ public class TestBeanState extends BaseTestCase { beanState.setReadOnly(true); // act, try to mutate read only bean - customer.setName("b"); + assertThrows(IllegalStateException.class, () -> customer.setName("b")); } } diff --git a/ebean-core/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java b/ebean-core/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java index 40be470a8..8be7c68a8 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java @@ -2,7 +2,7 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.Ebean; -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.Order.Status; diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin.java b/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin.java index bd15f2f6d..2ca9de453 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin.java @@ -7,11 +7,12 @@ import org.tests.model.basic.Address; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestLazyJoin extends BaseTestCase { @Test @@ -36,7 +37,7 @@ public class TestLazyJoin extends BaseTestCase { // in the customer (not just name and status) Address billingAddress = customer.getBillingAddress(); - Assert.assertNotNull(billingAddress); + assertNotNull(billingAddress); } } diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin2.java b/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin2.java index b44e173dc..4576adbc3 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin2.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestLazyJoin2.java @@ -2,17 +2,14 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import io.ebean.FetchConfig; -import org.tests.model.basic.Address; -import org.tests.model.basic.Contact; -import org.tests.model.basic.Customer; -import org.tests.model.basic.Order; -import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.tests.model.basic.*; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestLazyJoin2 extends BaseTestCase { @Test @@ -33,7 +30,7 @@ public class TestLazyJoin2 extends BaseTestCase { Order o0 = l0.get(0); Customer c0 = o0.getCustomer(); List contacts = c0.getContacts(); - Assert.assertTrue(!contacts.isEmpty()); + assertTrue(!contacts.isEmpty()); // query 1) find order (status, shipDate) // query 2) find orderDetail (quantity, price) join product (sku, name) @@ -57,7 +54,7 @@ public class TestLazyJoin2 extends BaseTestCase { // in the customer (not just name and status) Address billingAddress = customer.getBillingAddress(); - Assert.assertNotNull(billingAddress); + assertNotNull(billingAddress); List list = Ebean.find(Order.class).fetchLazy("customer", "name") .fetch("customer.contacts", "contactName, phone, email").fetch("customer.shippingAddress") @@ -67,7 +64,7 @@ public class TestLazyJoin2 extends BaseTestCase { Customer customer2 = order2.getCustomer(); // customer2.getStatus(); String name = customer2.getName(); - Assert.assertNotNull(name); + assertNotNull(name); } diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java index 8f8c770aa..81e7ec0ae 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java @@ -6,7 +6,7 @@ import io.ebean.TransactionalTestCase; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java index 0beb20db4..4e948723b 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java @@ -3,12 +3,13 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.UUOne; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.persistence.EntityNotFoundException; import java.util.UUID; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestLazyLoadNonExistantBean extends BaseTestCase { @Test @@ -20,10 +21,10 @@ public class TestLazyLoadNonExistantBean extends BaseTestCase { try { // invoke lazy loading one.getName(); - Assert.assertTrue(false); + assertTrue(false); } catch (EntityNotFoundException e) { // expecting this - Assert.assertTrue(true); + assertTrue(true); } } } diff --git a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java index 966080ba8..f52c01ae6 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java @@ -3,12 +3,13 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.UUOne; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.persistence.EntityNotFoundException; import java.util.UUID; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestLazyLoadNonExistentBean extends BaseTestCase { @Test @@ -20,10 +21,10 @@ public class TestLazyLoadNonExistentBean extends BaseTestCase { try { // invoke lazy loading one.getName(); - Assert.assertTrue(false); + assertTrue(false); } catch (EntityNotFoundException e) { // expecting this - Assert.assertTrue(true); + assertTrue(true); } } } diff --git a/ebean-core/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java b/ebean-core/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java index e446ae57b..97e7f7011 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java @@ -6,13 +6,13 @@ import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; 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 TestQueryDisableLazyLoad extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java index 822f80a21..90c32ad90 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoin.java @@ -9,11 +9,12 @@ import org.tests.model.basic.Address; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.*; + public class TestQueryJoin extends BaseTestCase { @Test @@ -36,21 +37,21 @@ public class TestQueryJoin extends BaseTestCase { Order order = list.get(0); BeanState beanStateOrder = Ebean.getBeanState(order); - Assert.assertNotNull(beanStateOrder.getLoadedProps()); - // Assert.assertTrue(beanStateOrder.getLoadedProps().contains("id")); - Assert.assertTrue(beanStateOrder.getLoadedProps().contains("status")); - Assert.assertTrue(beanStateOrder.getLoadedProps().contains("shipments")); - Assert.assertTrue(beanStateOrder.getLoadedProps().contains("customer")); + assertNotNull(beanStateOrder.getLoadedProps()); + // assertTrue(beanStateOrder.getLoadedProps().contains("id")); + assertTrue(beanStateOrder.getLoadedProps().contains("status")); + assertTrue(beanStateOrder.getLoadedProps().contains("shipments")); + assertTrue(beanStateOrder.getLoadedProps().contains("customer")); Customer customer = order.getCustomer(); BeanState beanStateCustomer = Ebean.getBeanState(customer); - Assert.assertTrue(beanStateCustomer.isReference()); + assertTrue(beanStateCustomer.isReference()); customer.getName(); - Assert.assertNotNull(beanStateCustomer.getLoadedProps()); - Assert.assertTrue(beanStateCustomer.getLoadedProps().contains("name")); - Assert.assertTrue(beanStateCustomer.getLoadedProps().contains("status")); - Assert.assertFalse(beanStateCustomer.getLoadedProps().contains("billingAddress")); + assertNotNull(beanStateCustomer.getLoadedProps()); + assertTrue(beanStateCustomer.getLoadedProps().contains("name")); + assertTrue(beanStateCustomer.getLoadedProps().contains("status")); + assertFalse(beanStateCustomer.getLoadedProps().contains("billingAddress")); customer.getName(); @@ -58,7 +59,7 @@ public class TestQueryJoin extends BaseTestCase { System.out.println(billingAddress); billingAddress.getLine1(); - Assert.assertTrue(!list.isEmpty()); + assertTrue(!list.isEmpty()); } } diff --git a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java index 04883177e..480f799be 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.FetchConfig; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java b/ebean-core/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java index e8a21786c..df54a6ef9 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java @@ -3,12 +3,12 @@ package org.tests.batchload; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.FetchConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -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 TestSecondQueryNoRows extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java b/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java index e2895c493..a55361bd7 100644 --- a/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java +++ b/ebean-core/src/test/java/org/tests/batchload/TestSecondaryQueries.java @@ -2,7 +2,7 @@ package org.tests.batchload; import 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.Order; import org.tests.model.basic.ResetBasicData; @@ -10,9 +10,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.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestSecondaryQueries extends TransactionalTestCase { diff --git a/ebean-core/src/test/java/org/tests/cache/TestBeanCache.java b/ebean-core/src/test/java/org/tests/cache/TestBeanCache.java index 80ef3b99d..7265bebe2 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestBeanCache.java +++ b/ebean-core/src/test/java/org/tests/cache/TestBeanCache.java @@ -6,7 +6,7 @@ import io.ebean.Transaction; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; 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.Country; @@ -18,7 +18,7 @@ import java.util.List; import java.util.stream.Collectors; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * Test class testing deleting/invalidating of cached beans diff --git a/ebean-core/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java b/ebean-core/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java index 9eb438032..232ca0e57 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java @@ -3,7 +3,7 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebeantest.LoggedSql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; diff --git a/ebean-core/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java b/ebean-core/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java index ffb88f150..908dae151 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java +++ b/ebean-core/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java @@ -3,15 +3,15 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.OCachedBean; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; /** * Test class testing clearing cache with delete query diff --git a/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java b/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java index 4144ca557..bbf3f08d8 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java +++ b/ebean-core/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java @@ -6,7 +6,7 @@ import io.ebean.FetchGroup; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; 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.Order; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java b/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java index 20fa503c7..7131d0f97 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheBasic.java @@ -6,8 +6,9 @@ import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; import org.tests.model.basic.Country; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; public class TestCacheBasic extends BaseTestCase { @@ -20,7 +21,7 @@ public class TestCacheBasic extends BaseTestCase { ServerCache countryCache = Ebean.getServerCacheManager().beanCache(Country.class); loadCountryCache(); - Assert.assertTrue(countryCache.size() > 0); + assertTrue(countryCache.size() > 0); // reset the statistics countryCache.statistics(true); @@ -28,26 +29,26 @@ public class TestCacheBasic extends BaseTestCase { Country c0 = Ebean.getReference(Country.class, "NZ"); ServerCacheStatistics statistics = countryCache.statistics(false); long hc = statistics.getHitCount(); - Assert.assertEquals(1, hc); - Assert.assertNotNull(c0); + assertEquals(1, hc); + assertNotNull(c0); // Country c1 = Ebean.getReference(Country.class, "NZ"); - // Assert.assertEquals(2, countryCache.getStatistics(false).getHitCount()); - // //Assert.assertEquals(100, + // assertEquals(2, countryCache.getStatistics(false).getHitCount()); + // //assertEquals(100, // countryCache.getStatistics(false).getHitRatio()); // // // same instance as caching with readOnly=true - // Assert.assertTrue(c0 != c1); + // assertTrue(c0 != c1); // // c0.getName(); // c1.getName(); // // // reset the statistics - // Assert.assertEquals(2,countryCache.getStatistics(true).getHitCount()); + // assertEquals(2,countryCache.getStatistics(true).getHitCount()); // // now the count should be 0 again - // Assert.assertEquals(0, countryCache.getStatistics(false).getHitCount()); + // assertEquals(0, countryCache.getStatistics(false).getHitCount()); // // and hitRatio is 0 as well - // Assert.assertEquals(0, countryCache.getStatistics(false).getHitRatio()); + // assertEquals(0, countryCache.getStatistics(false).getHitRatio()); // // // hit the country cache automatically via join // @@ -59,7 +60,7 @@ public class TestCacheBasic extends BaseTestCase { // Country c2 = billingAddress.getCountry(); // c2.getName(); // - // Assert.assertTrue(countryCache.getStatistics(false).getHitCount() > 0); + // assertTrue(countryCache.getStatistics(false).getHitCount() > 0); // // //Country c3 = Ebean.getReference(Country.class, "NZ"); // //Country c4 = Ebean.find(Country.class, "NZ"); @@ -76,28 +77,28 @@ public class TestCacheBasic extends BaseTestCase { // Country c5 = billingAddress.getCountry(); // // but cache is empty so c5 is reference that will load cache // // if it is lazy loaded - // Assert.assertEquals("empty cache",0,countryCache.getStatistics(false).getSize()); - // //Assert.assertEquals("missCount 1",1,countryCache.getStatistics(false).getMissCount()); + // assertEquals("empty cache",0,countryCache.getStatistics(false).getSize()); + // //assertEquals("missCount 1",1,countryCache.getStatistics(false).getMissCount()); // // // lazy load on c5 populates the cache // c5.getName(); - // Assert.assertEquals("cache populated via lazy load",1,countryCache.getStatistics(false).getSize()); + // assertEquals("cache populated via lazy load",1,countryCache.getStatistics(false).getSize()); // // // now these get hits in the cache // Country c6 = Ebean.find(Country.class, "NZ"); // - // Assert.assertTrue("different instance as cache cleared",c2 != c5); - // Assert.assertTrue("these 2 are different",c5 != c6); + // assertTrue("different instance as cache cleared",c2 != c5); + // assertTrue("these 2 are different",c5 != c6); // // // by default readOnly based on deployment annotation - // Assert.assertTrue("read only",Ebean.getBeanState(c6).isReadOnly()); + // assertTrue("read only",Ebean.getBeanState(c6).isReadOnly()); // // try { // // can't modify a readOnly bean // c6.setName("Nu Zilund"); - // Assert.assertFalse("Never get here",true); + // assertFalse("Never get here",true); // } catch (IllegalStateException e){ - // Assert.assertTrue("This is readOnly",true); + // assertTrue("This is readOnly",true); // } // // Country c8 = Ebean.find(Country.class) @@ -106,14 +107,14 @@ public class TestCacheBasic extends BaseTestCase { // .findOne(); // // // Explicitly NOT readOnly - // Assert.assertFalse("NOT read only",Ebean.getBeanState(c8).isReadOnly()); + // assertFalse("NOT read only",Ebean.getBeanState(c8).isReadOnly()); // - // Assert.assertEquals("1 countries in cache", 1, countryCache.size()); + // assertEquals("1 countries in cache", 1, countryCache.size()); // c8.setName("Nu Zilund"); // // the update will remove the entry from the cache // Ebean.save(c8); // - // Assert.assertEquals("1 country in cache", 1, countryCache.size()); + // assertEquals("1 country in cache", 1, countryCache.size()); // // Country c9 = Ebean.find(Country.class) // .setReadOnly(false) @@ -121,26 +122,26 @@ public class TestCacheBasic extends BaseTestCase { // .findOne(); // // // Find loads cache ... - // Assert.assertFalse(Ebean.getBeanState(c9).isReadOnly()); - // Assert.assertTrue(countryCache.size() > 0); + // assertFalse(Ebean.getBeanState(c9).isReadOnly()); + // assertTrue(countryCache.size() > 0); // // Country c10 = Ebean.find(Country.class,"NZ"); // - // Assert.assertTrue(Ebean.getBeanState(c10).isReadOnly()); - // Assert.assertTrue(countryCache.size() > 0); + // assertTrue(Ebean.getBeanState(c10).isReadOnly()); + // assertTrue(countryCache.size() > 0); // // Ebean.getServerCacheManager().clear(Country.class); - // Assert.assertEquals("0 country in cache", 0, countryCache.size()); + // assertEquals("0 country in cache", 0, countryCache.size()); // // // reference doesn't load cache yet // Country c11 = Ebean.getReference(Country.class, "NZ"); // // // still 0 in cache - // Assert.assertEquals("0 country in cache", 0, countryCache.size()); + // assertEquals("0 country in cache", 0, countryCache.size()); // // // will invoke lazy loading.. // c11.getName(); - // Assert.assertTrue(countryCache.size() > 0); + // assertTrue(countryCache.size() > 0); } } diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheCollectionIds.java b/ebean-core/src/test/java/org/tests/cache/TestCacheCollectionIds.java index 0fcef9cee..f72510f95 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheCollectionIds.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheCollectionIds.java @@ -9,8 +9,8 @@ import io.ebean.Update; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; import io.ebeaninternal.server.cache.CachedManyIds; -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.Contact; import org.tests.model.basic.Country; import org.tests.model.basic.Customer; @@ -24,10 +24,10 @@ import org.tests.model.basic.ResetBasicData; import java.util.ArrayList; 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 TestCacheCollectionIds extends BaseTestCase { @@ -303,10 +303,10 @@ public class TestCacheCollectionIds extends BaseTestCase { assertEquals(2, dummyCountries.size()); // assert that the cache contains the expected entry - assertEquals("countries cache now loaded with 1 entry", 1, cachedBeanCountriesCache.size()); + assertEquals(1, cachedBeanCountriesCache.size()); CachedManyIds dummyEntry = (CachedManyIds) cachedBeanCountriesCache.get(dummyLoad.getId()); assertNotNull(dummyEntry); - assertEquals("2 ids in the entry", 2, dummyEntry.getIdList().size()); + assertEquals(2, dummyEntry.getIdList().size()); assertTrue(dummyEntry.getIdList().contains("NZ")); assertTrue(dummyEntry.getIdList().contains("AU")); @@ -320,7 +320,7 @@ public class TestCacheCollectionIds extends BaseTestCase { Ebean.update(update); awaitL2Cache(); - assertEquals("countries entry still there (but updated)", 1, cachedBeanCountriesCache.size()); + assertEquals(1, cachedBeanCountriesCache.size()); CachedManyIds cachedManyIds = (CachedManyIds) cachedBeanCountriesCache.get(update.getId()); @@ -369,7 +369,7 @@ public class TestCacheCollectionIds extends BaseTestCase { * When doing an ORM update the collection cache must be cleared. */ @Test - @Ignore + @Disabled public void testClearingCollectionCacheOnORMUpdate() { // arrange ResetBasicData.reset(); @@ -404,7 +404,7 @@ public class TestCacheCollectionIds extends BaseTestCase { * This is true for all changes insert,update, delete. Tested for delete here. */ @Test - @Ignore + @Disabled public void testClearingCollectionCacheOnExternalModification() { // arrange ResetBasicData.reset(); diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheCustomer.java b/ebean-core/src/test/java/org/tests/cache/TestCacheCustomer.java index 68a91678c..74f7cc3b5 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheCustomer.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheCustomer.java @@ -3,8 +3,7 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.CacheMode; import io.ebean.Ebean; -import org.junit.Assert; -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.Country; @@ -13,6 +12,8 @@ import org.tests.model.basic.ResetBasicData; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestCacheCustomer extends BaseTestCase { @Test @@ -42,7 +43,7 @@ public class TestCacheCustomer extends BaseTestCase { List list = Ebean.find(Customer.class).setAutoTune(false).setBeanCacheMode(CacheMode.PUT) .findList(); - Assert.assertTrue(list.size() > 1); + assertTrue(list.size() > 1); for (Customer customer : list) { Address billingAddress = customer.getBillingAddress(); diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheDelete.java b/ebean-core/src/test/java/org/tests/cache/TestCacheDelete.java index a5f5e111e..c73954ff9 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheDelete.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheDelete.java @@ -2,11 +2,11 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.OCachedBean; import org.tests.model.basic.OCachedBeanChild; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test class testing deleting/invalidating of cached beans diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheEmbeddedId.java b/ebean-core/src/test/java/org/tests/cache/TestCacheEmbeddedId.java index ccc65f820..ce511ea58 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheEmbeddedId.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheEmbeddedId.java @@ -2,11 +2,11 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.CKeyParent; import org.tests.model.basic.CKeyParentId; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestCacheEmbeddedId extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java b/ebean-core/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java index 992d3eabc..95fc22d92 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java @@ -2,13 +2,13 @@ package org.tests.cache; import io.ebean.BaseTestCase; import io.ebean.Ebean; -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; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestCacheInterceptSaveWhenLazyLoaded extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheManyToOne.java b/ebean-core/src/test/java/org/tests/cache/TestCacheManyToOne.java index fd6e209b0..c54202896 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheManyToOne.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheManyToOne.java @@ -4,10 +4,10 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.OCachedInhChildA; import org.tests.model.basic.OCachedInhRoot; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * Test class testing deleting/invalidating of cached beans diff --git a/ebean-core/src/test/java/org/tests/cache/TestCacheNaturalId.java b/ebean-core/src/test/java/org/tests/cache/TestCacheNaturalId.java index 608b481d7..412010235 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestCacheNaturalId.java +++ b/ebean-core/src/test/java/org/tests/cache/TestCacheNaturalId.java @@ -5,15 +5,15 @@ import io.ebean.CacheMode; import io.ebean.Ebean; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.ResetBasicData; import java.util.List; -import static org.junit.Assert.assertEquals; -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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestCacheNaturalId extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/cache/TestExternalNotification.java b/ebean-core/src/test/java/org/tests/cache/TestExternalNotification.java index ef863dc65..dddb4f7d8 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestExternalNotification.java +++ b/ebean-core/src/test/java/org/tests/cache/TestExternalNotification.java @@ -7,10 +7,10 @@ import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; import org.tests.model.basic.Country; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; -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 TestExternalNotification extends BaseTestCase { @@ -55,7 +55,7 @@ public class TestExternalNotification extends BaseTestCase { loadCountryCache(); int cacheSize = countryCache.size(); - assertTrue("cacheSize: " + cacheSize, cacheSize > 0); + assertTrue(cacheSize > 0); SqlUpdate sqlUpdate = Ebean .createSqlUpdate("update o_country set name = :name where code = :code"); diff --git a/ebean-core/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java b/ebean-core/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java index 7e02c995c..044c1f932 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java +++ b/ebean-core/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java @@ -5,11 +5,10 @@ import io.ebean.Ebean; import io.ebean.Query; import io.ebean.cache.ServerCache; import io.ebeaninternal.server.querydefn.OrmQueryDetail; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.FeatureDescription; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.*; public class TestL2CacheWithSharedBean extends BaseTestCase { @@ -48,12 +47,12 @@ public class TestL2CacheWithSharedBean extends BaseTestCase { // load the cache FeatureDescription fetchOne = Ebean.find(FeatureDescription.class, f1.getId()); - Assert.assertNotNull(fetchOne); + assertNotNull(fetchOne); assertEquals(1, beanCache.statistics(false).getSize()); FeatureDescription fetchTwo = Ebean.find(FeatureDescription.class, f1.getId()); FeatureDescription fetchThree = Ebean.find(FeatureDescription.class, f1.getId()); - Assert.assertSame(fetchTwo, fetchThree); + assertSame(fetchTwo, fetchThree); String description1 = fetchThree.getDescription(); assertEquals("helloOne", description1); diff --git a/ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java b/ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java index 6032728a4..ea50565d8 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java @@ -4,13 +4,13 @@ import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.Ebean; import io.ebean.Transaction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.L2CachedLazyDirtFlagResetBean; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestL2DirtyFlagOnLazyLoad extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/cache/TestM2MCache.java b/ebean-core/src/test/java/org/tests/cache/TestM2MCache.java index 83cb402f1..40eee3349 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestM2MCache.java +++ b/ebean-core/src/test/java/org/tests/cache/TestM2MCache.java @@ -2,7 +2,7 @@ package org.tests.cache; import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.cache.M2MCacheChild; import org.tests.model.cache.M2MCacheMaster; diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java index 0c4dc2317..b9db72a07 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java +++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCache.java @@ -7,8 +7,7 @@ import io.ebean.ExpressionList; import io.ebean.bean.BeanCollection; import io.ebean.cache.ServerCache; import org.ebeantest.LoggedSqlCollector; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; import org.tests.model.cache.EColAB; @@ -17,6 +16,7 @@ import java.util.List; import java.util.function.Consumer; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.*; public class TestQueryCache extends BaseTestCase { @@ -224,10 +224,10 @@ public class TestQueryCache extends BaseTestCase { .ilike("name", "Rob").findList(); BeanCollection bc = (BeanCollection) list; - Assert.assertTrue(bc.isReadOnly()); - Assert.assertFalse(bc.isEmpty()); - Assert.assertTrue(!list.isEmpty()); - Assert.assertTrue(DB.beanState(list.get(0)).isReadOnly()); + assertTrue(bc.isReadOnly()); + assertFalse(bc.isEmpty()); + assertTrue(!list.isEmpty()); + assertTrue(DB.beanState(list.get(0)).isReadOnly()); List list2 = DB.find(Customer.class).setUseQueryCache(true).setReadOnly(true).where() .ilike("name", "Rob").findList(); @@ -236,25 +236,22 @@ public class TestQueryCache extends BaseTestCase { // .setReadOnly(true) .where().ilike("name", "Rob").findList(); - Assert.assertSame(list, list2); + assertSame(list, list2); // readOnly defaults to true for query cache - Assert.assertSame(list, list2B); - - - + assertSame(list, list2B); List list3 = DB.find(Customer.class).setUseQueryCache(true).setReadOnly(false).where() .ilike("name", "Rob").findList(); - Assert.assertNotSame(list, list3); + assertNotSame(list, list3); BeanCollection bc3 = (BeanCollection) list3; - Assert.assertFalse(bc3.isReadOnly()); - Assert.assertFalse(bc3.isEmpty()); - Assert.assertTrue(list3.size() > 0); + assertFalse(bc3.isReadOnly()); + assertFalse(bc3.isEmpty()); + assertTrue(list3.size() > 0); // TODO: At this stage setReadOnly(false) does create a shallow copy of the List/Set/Map, but does not // change the read only state in the entities. - // Assert.assertFalse(Ebean.getBeanState(list3.get(0)).isReadOnly()); + // assertFalse(Ebean.getBeanState(list3.get(0)).isReadOnly()); } diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheCountry.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheCountry.java index 6e442fa4f..54e94fce9 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheCountry.java +++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheCountry.java @@ -1,27 +1,25 @@ package org.tests.cache; import io.ebean.BaseTestCase; +import io.ebean.DB; import io.ebean.Ebean; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; import io.ebean.cache.ServerCacheStatistics; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; 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.assertNotSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestQueryCacheCountry extends BaseTestCase { - private ServerCacheManager cacheManager = Ebean.getServerCacheManager(); - private ServerCache queryCache = cacheManager.queryCache(Country.class); - private ServerCache beanCache = cacheManager.beanCache(Country.class); + private final ServerCacheManager cacheManager = DB.getServerCacheManager(); + private final ServerCache queryCache = cacheManager.queryCache(Country.class); + private final ServerCache beanCache = cacheManager.beanCache(Country.class); private void clearCache() { queryCache.clear(); @@ -29,7 +27,6 @@ public class TestQueryCacheCountry extends BaseTestCase { queryCache.statistics(true); } - @Test public void emptyQueryResult_expect_cached() { @@ -142,7 +139,7 @@ public class TestQueryCacheCountry extends BaseTestCase { ServerCacheStatistics statistics = queryCache.statistics(false); assertEquals(1, statistics.getSize()); assertEquals(1, statistics.getHitCount()); - Assert.assertSame(countryList1, countryList0); + assertSame(countryList1, countryList0); Country nz = Ebean.find(Country.class, "NZ"); nz.setName("New Zealandia"); diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheInsert.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheInsert.java index 0b5517eb7..88cdd7d06 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheInsert.java +++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheInsert.java @@ -5,15 +5,15 @@ import io.ebean.Ebean; import io.ebean.EbeanServer; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; import java.util.List; import java.util.Optional; -import static org.junit.Assert.assertEquals; -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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestQueryCacheInsert extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java index a8b1bb524..73123adde 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java +++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java @@ -7,7 +7,7 @@ import io.ebean.EbeanServer; import io.ebean.Query; import org.tests.model.basic.EBasicVer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Map; @@ -23,7 +23,7 @@ public class TestQueryCacheReadOnly extends BaseTestCase { EbeanServer server = Ebean.getServer(null); EBasicVer account = new EBasicVer("an other junk"); server.save(account); - + Query baseQuery = server.find(EBasicVer.class).setUseQueryCache(CacheMode.ON); List alist = baseQuery.findList(); @@ -82,10 +82,10 @@ public class TestQueryCacheReadOnly extends BaseTestCase { Map amap = baseQuery.setMapKey("name").findMap(); assertThat(amap).isNotEmpty(); - amap.clear(); + amap.clear(); amap = baseQuery.setMapKey("name").findMap(); assertThat(amap).isNotEmpty(); - amap.clear(); + amap.clear(); Set aset = baseQuery.findSet(); assertThat(aset).isNotEmpty(); diff --git a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java index 46c910f83..97511cef9 100644 --- a/ebean-core/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java +++ b/ebean-core/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java @@ -6,7 +6,7 @@ import io.ebean.Ebean; import io.ebean.Query; import io.ebean.cache.ServerCache; -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; diff --git a/ebean-core/src/test/java/org/tests/cache/embeddedid/TestBeanCacheEmbeddedIdPrimitives.java b/ebean-core/src/test/java/org/tests/cache/embeddedid/TestBeanCacheEmbeddedIdPrimitives.java index c3d6ba97d..49649482c 100644 --- a/ebean-core/src/test/java/org/tests/cache/embeddedid/TestBeanCacheEmbeddedIdPrimitives.java +++ b/ebean-core/src/test/java/org/tests/cache/embeddedid/TestBeanCacheEmbeddedIdPrimitives.java @@ -1,10 +1,10 @@ package org.tests.cache.embeddedid; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestBeanCacheEmbeddedIdPrimitives { diff --git a/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java b/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java index a5d950009..d351a693b 100644 --- a/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java +++ b/ebean-core/src/test/java/org/tests/cache/personinfo/PersonCacheTests.java @@ -5,7 +5,7 @@ import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheRegion; import io.ebean.cache.ServerCacheStatistics; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -13,7 +13,7 @@ import java.util.Arrays; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class PersonCacheTests { diff --git a/ebean-core/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java b/ebean-core/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java index 6379491ff..3434c48eb 100644 --- a/ebean-core/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java +++ b/ebean-core/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java @@ -2,7 +2,7 @@ package org.tests.cache.personinfo; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/callable/TestMysqlCallable.java b/ebean-core/src/test/java/org/tests/callable/TestMysqlCallable.java index 11db943a6..70caa7d29 100644 --- a/ebean-core/src/test/java/org/tests/callable/TestMysqlCallable.java +++ b/ebean-core/src/test/java/org/tests/callable/TestMysqlCallable.java @@ -4,11 +4,11 @@ import io.ebean.BaseTestCase; import io.ebean.CallableSql; import io.ebean.Ebean; import io.ebean.EbeanServer; +import org.junit.jupiter.api.Disabled; import org.tests.model.basic.EBasic; -import org.junit.Ignore; -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 TestMysqlCallable extends BaseTestCase { @@ -28,7 +28,7 @@ public class TestMysqlCallable extends BaseTestCase { /** * Only run this test manually against MySQL with the above stored procedure. */ - @Ignore + @Disabled @Test public void test() { diff --git a/ebean-core/src/test/java/org/tests/cascade/TestCascadeOrphanStatelessUpdate.java b/ebean-core/src/test/java/org/tests/cascade/TestCascadeOrphanStatelessUpdate.java index 178c5271c..5468657b0 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestCascadeOrphanStatelessUpdate.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestCascadeOrphanStatelessUpdate.java @@ -3,14 +3,14 @@ package org.tests.cascade; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static java.util.Arrays.asList; import static java.util.stream.Collectors.toList; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestCascadeOrphanStatelessUpdate extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java b/ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java index f4356d2bf..324774d01 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java @@ -2,7 +2,7 @@ package org.tests.cascade; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/cascade/TestJsonMarshallingOTM.java b/ebean-core/src/test/java/org/tests/cascade/TestJsonMarshallingOTM.java index 63e47b301..bd45cc8ba 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestJsonMarshallingOTM.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestJsonMarshallingOTM.java @@ -1,7 +1,7 @@ package org.tests.cascade; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/cascade/TestMasterDetailDelete.java b/ebean-core/src/test/java/org/tests/cascade/TestMasterDetailDelete.java index 7ff1477cc..853ff3ae2 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestMasterDetailDelete.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestMasterDetailDelete.java @@ -7,7 +7,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestMasterDetailDelete extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java b/ebean-core/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java index f0e007547..e98e21878 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java @@ -5,9 +5,9 @@ import io.ebean.DB; import io.ebean.Ebean; import io.ebean.Transaction; import org.ebeantest.LoggedSqlCollector; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.tests.model.site.DataContainer; import org.tests.model.site.Site; import org.tests.model.site.SiteAddress; @@ -21,12 +21,12 @@ public class TestMultiCascadeBatch extends BaseTestCase { private Transaction txn; - @Before + @BeforeEach public void before() { txn = Ebean.beginTransaction(); } - @After + @AfterEach public void after() { if (txn != null) { txn.end(); diff --git a/ebean-core/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java b/ebean-core/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java index 8da56d1b1..1fecd07d9 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java @@ -2,7 +2,7 @@ package org.tests.cascade; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/cascade/TestOrderedList.java b/ebean-core/src/test/java/org/tests/cascade/TestOrderedList.java index a306cb105..5757b10e2 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestOrderedList.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestOrderedList.java @@ -3,7 +3,7 @@ package org.tests.cascade; import io.ebean.BaseTestCase; import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwned.java b/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwned.java index 5c9ee8235..4965fa834 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwned.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwned.java @@ -6,14 +6,14 @@ import io.ebean.bean.BeanCollection; import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestPrivateOwned extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java b/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java index 42321dc43..7c7bf8c67 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java @@ -4,8 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestPrivateOwnedAddRemoveOrphan extends BaseTestCase { @@ -28,6 +29,6 @@ public class TestPrivateOwnedAddRemoveOrphan extends BaseTestCase { TSMaster master2 = Ebean.find(master1.getClass(), master1.getId()); - Assert.assertTrue(master2.getDetails().isEmpty()); + assertTrue(master2.getDetails().isEmpty()); } } diff --git a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java b/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java index d3b81fa05..3ce671419 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java @@ -3,7 +3,7 @@ package org.tests.cascade; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Transaction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; diff --git a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java b/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java index 462956d94..50cf83a9d 100644 --- a/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java +++ b/ebean-core/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java @@ -4,11 +4,13 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.persistence.OptimisticLockException; +import static org.assertj.core.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestPrivateOwnedIgnoreTransientOrphan extends BaseTestCase { @Test @@ -35,12 +37,12 @@ public class TestPrivateOwnedIgnoreTransientOrphan extends BaseTestCase { Ebean.save(master1); } catch (OptimisticLockException exception) { // Occured when the "unsaved" bean was wrongly being deleted - Assert.fail("Optimistic lock exception wrongly thrown: " + exception.getMessage()); + fail("Optimistic lock exception wrongly thrown: " + exception.getMessage()); return; } master2 = master1 = Ebean.find(master1.getClass(), master1.getId()); - Assert.assertTrue(master2.getDetails().isEmpty()); + assertTrue(master2.getDetails().isEmpty()); } } diff --git a/ebean-core/src/test/java/org/tests/changelog/TestChangeLog.java b/ebean-core/src/test/java/org/tests/changelog/TestChangeLog.java index 75f8c97bd..b67ad2a14 100644 --- a/ebean-core/src/test/java/org/tests/changelog/TestChangeLog.java +++ b/ebean-core/src/test/java/org/tests/changelog/TestChangeLog.java @@ -8,19 +8,11 @@ import io.ebean.DatabaseFactory; import io.ebean.annotation.ChangeLog; import io.ebean.config.DatabaseConfig; import io.ebean.event.BeanPersistRequest; -import io.ebean.event.changelog.BeanChange; -import io.ebean.event.changelog.ChangeLogFilter; -import io.ebean.event.changelog.ChangeLogListener; -import io.ebean.event.changelog.ChangeLogPrepare; -import io.ebean.event.changelog.ChangeLogRegister; -import io.ebean.event.changelog.ChangeSet; -import io.ebean.event.changelog.ChangeType; -import io.ebean.event.changelog.TxnState; +import io.ebean.event.changelog.*; import io.ebeantest.LoggedSql; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicChangeLog; import org.tests.model.json.PlainBean; @@ -28,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestChangeLog extends BaseTestCase { @@ -40,12 +32,12 @@ public class TestChangeLog extends BaseTestCase { Database server; - @Before + @BeforeEach public void setup() { server = createServer(); } - @After + @AfterEach public void shutdown() { server.shutdown(); } @@ -133,7 +125,7 @@ public class TestChangeLog extends BaseTestCase { assertThat(change.getEvent()).isEqualTo(ChangeType.DELETE); assertThat(change.getData()).isNull(); } - + @Test public void testWithJsonMutationDetection() { @@ -142,23 +134,23 @@ public class TestChangeLog extends BaseTestCase { bean.setShortDescription("hello"); PlainBean jsonBean = new PlainBean(); bean.setPlainBean(jsonBean); - jsonBean.setName("A"); + jsonBean.setName("A"); server.save(bean); - + BeanChange change = firstChange(); assertThat(change.getEvent()).isEqualTo(ChangeType.INSERT); - + jsonBean.setName("B"); LoggedSql.start(); server.save(bean); assertThat(LoggedSql.stop()).isNotEmpty(); - + change = firstChange(); assertThat(change.getEvent()).isEqualTo(ChangeType.UPDATE); assertThat(change.getData()).contains("\"plainBean\":{\"name\":\"B\""); assertThat(change.getOldData()).contains("\"plainBean\":{\"name\":\"A\""); } - + @Test public void testMutationWithCache() throws Exception { EBasicChangeLog bean = new EBasicChangeLog(); diff --git a/ebean-core/src/test/java/org/tests/changelog/TestChangeLogInt.java b/ebean-core/src/test/java/org/tests/changelog/TestChangeLogInt.java index 3cd3dfa39..fe42c14cb 100644 --- a/ebean-core/src/test/java/org/tests/changelog/TestChangeLogInt.java +++ b/ebean-core/src/test/java/org/tests/changelog/TestChangeLogInt.java @@ -2,7 +2,7 @@ package org.tests.changelog; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicChangeLog; public class TestChangeLogInt extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyDelete.java b/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyDelete.java index acd40ad4c..eeb66a5e4 100644 --- a/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyDelete.java +++ b/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyDelete.java @@ -2,15 +2,15 @@ package org.tests.compositekeys; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.CKeyParent; import org.tests.model.basic.CKeyParentId; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestCKeyDelete extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java b/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java index b8a0f0781..aefb28085 100644 --- a/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java +++ b/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java @@ -8,12 +8,13 @@ import org.tests.model.composite.RCustomer; import org.tests.model.composite.RCustomerKey; import org.tests.model.composite.ROrder; import org.tests.model.composite.ROrderPK; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestCKeyIdInExpression extends BaseTestCase { @Test @@ -62,14 +63,14 @@ public class TestCKeyIdInExpression extends BaseTestCase { query.findList(); String sql = query.getGeneratedSql(); - Assert.assertTrue(sql.contains("(t0.company=? and t0.order_number=?) or")); + assertTrue(sql.contains("(t0.company=? and t0.order_number=?) or")); Query query2 = server.find(ROrder.class).setId(k0); query2.findOne(); sql = query2.getGeneratedSql(); - Assert.assertTrue(sql.contains("t0.company = ? ")); - Assert.assertTrue(sql.contains(" and t0.order_number = ?")); + assertTrue(sql.contains("t0.company = ? ")); + assertTrue(sql.contains(" and t0.order_number = ?")); server.delete(ROrder.class, k0); diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java b/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java index 7e5aed4d0..f58453e3f 100644 --- a/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java @@ -8,14 +8,14 @@ import org.tests.model.basic.CKeyAssoc; import org.tests.model.basic.CKeyDetail; import org.tests.model.basic.CKeyParent; import org.tests.model.basic.CKeyParentId; -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.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestCKeyLazyLoad extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java b/ebean-core/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java index 028c9c9c6..0cea9e28f 100644 --- a/ebean-core/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java +++ b/ebean-core/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.compositekeys.db.CaoBean; import org.tests.compositekeys.db.CaoKey; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestCaoCompositeKeyWithAnnotationOverrides extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestCore.java b/ebean-core/src/test/java/org/tests/compositekeys/TestCore.java index 0a1f96500..2db126951 100644 --- a/ebean-core/src/test/java/org/tests/compositekeys/TestCore.java +++ b/ebean-core/src/test/java/org/tests/compositekeys/TestCore.java @@ -4,22 +4,15 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; import io.ebean.Transaction; - -import org.junit.Before; -import org.junit.Test; -import org.tests.compositekeys.db.Item; -import org.tests.compositekeys.db.ItemKey; -import org.tests.compositekeys.db.Region; -import org.tests.compositekeys.db.RegionKey; -import org.tests.compositekeys.db.SubType; -import org.tests.compositekeys.db.SubTypeKey; -import org.tests.compositekeys.db.Type; -import org.tests.compositekeys.db.TypeKey; - -import static org.junit.Assert.*; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.tests.compositekeys.db.*; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + /** * Test some of the Avaje core functionality in conjunction with composite keys like *
    @@ -29,9 +22,8 @@ import java.util.List; */ public class TestCore extends BaseTestCase { - @Before + @BeforeEach public void setUp() throws Exception { - Ebean.createUpdate(Item.class, "delete from Item").execute(); Ebean.createUpdate(Region.class, "delete from Region").execute(); Ebean.createUpdate(Type.class, "delete from Type").execute(); diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java b/ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java index 358c1c8e0..a632649ef 100644 --- a/ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java +++ b/ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java @@ -6,8 +6,8 @@ import io.ebean.annotation.Identity; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.persistence.CascadeType; import javax.persistence.Embeddable; @@ -24,7 +24,7 @@ import java.util.List; import java.util.Set; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Read more at https://groups.google.com/forum/#!topic/ebean/VD1MV2-LrOc @@ -32,7 +32,7 @@ import static org.junit.Assert.assertEquals; public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase { - @Before + @BeforeEach public void before() { // remove all the User records first diff --git a/ebean-core/src/test/java/org/tests/config/TestTableName.java b/ebean-core/src/test/java/org/tests/config/TestTableName.java index 83fefa08b..be7f699aa 100644 --- a/ebean-core/src/test/java/org/tests/config/TestTableName.java +++ b/ebean-core/src/test/java/org/tests/config/TestTableName.java @@ -2,10 +2,11 @@ package org.tests.config; import io.ebean.BaseTestCase; import io.ebean.config.TableName; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestTableName extends BaseTestCase { @@ -31,26 +32,26 @@ public class TestTableName extends BaseTestCase { public void test() { TableName t = new TableName("a"); - Assert.assertEquals("a", t.getName()); - Assert.assertNull(t.getCatalog()); - Assert.assertNull(t.getSchema()); + assertEquals("a", t.getName()); + assertNull(t.getCatalog()); + assertNull(t.getSchema()); t = new TableName("b.a"); - Assert.assertEquals("a", t.getName()); - Assert.assertEquals("b", t.getSchema()); - Assert.assertNull(t.getCatalog()); + assertEquals("a", t.getName()); + assertEquals("b", t.getSchema()); + assertNull(t.getCatalog()); t = new TableName("c.b.a"); - Assert.assertEquals("a", t.getName()); - Assert.assertEquals("b", t.getSchema()); - Assert.assertEquals("c", t.getCatalog()); + assertEquals("a", t.getName()); + assertEquals("b", t.getSchema()); + assertEquals("c", t.getCatalog()); // try { // TableName t2 = new TableName("d.c.b.a"); -// Assert.assertNotNull(t2); -// Assert.assertTrue(false); +// assertNotNull(t2); +// assertTrue(false); // } catch (RuntimeException e){ -// Assert.assertTrue(true); +// assertTrue(true); // } @@ -60,8 +61,8 @@ public class TestTableName extends BaseTestCase { // UnderscoreNamingConvention nc = new UnderscoreNamingConvention(); // TableName intTab = nc.getM2MJoinTableName(lhs, rhs); // -// Assert.assertNull(intTab.getCatalog()); -// Assert.assertEquals("test", intTab.getSchema()); -// Assert.assertEquals("oe_order_cust", intTab.getName()); +// assertNull(intTab.getCatalog()); +// assertEquals("test", intTab.getSchema()); +// assertEquals("oe_order_cust", intTab.getName()); } } diff --git a/ebean-core/src/test/java/org/tests/contructor/TestProtectedConstructor.java b/ebean-core/src/test/java/org/tests/contructor/TestProtectedConstructor.java index 44f0175b8..6715efb5c 100644 --- a/ebean-core/src/test/java/org/tests/contructor/TestProtectedConstructor.java +++ b/ebean-core/src/test/java/org/tests/contructor/TestProtectedConstructor.java @@ -6,8 +6,9 @@ import io.ebean.Ebean; import io.ebean.EbeanServer; import io.ebean.bean.EntityBean; import org.tests.model.basic.MProtectedConstructBean; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; public class TestProtectedConstructor extends BaseTestCase { @@ -18,7 +19,7 @@ public class TestProtectedConstructor extends BaseTestCase { // check that we can construc a bean with a protected constructor MProtectedConstructBean bean = server.createEntityBean(MProtectedConstructBean.class); - Assert.assertNotNull(bean); + assertNotNull(bean); // Note1 that the enhancement ClassAdapterEntity line 239 makes a default constructor publically accessible // Note2 the ClassAdpater will call DefaultConstructor.add() to add a default constructor if it doesn't exist @@ -27,10 +28,10 @@ public class TestProtectedConstructor extends BaseTestCase { EntityBean entityBean = (EntityBean) bean; Object newBeanInstance = entityBean._ebean_newInstance(); - Assert.assertNotNull(newBeanInstance); + assertNotNull(newBeanInstance); BeanState beanState = Ebean.getBeanState(newBeanInstance); - Assert.assertTrue(beanState.isNew()); - Assert.assertNotSame(entityBean, newBeanInstance); + assertTrue(beanState.isNew()); + assertNotSame(entityBean, newBeanInstance); } diff --git a/ebean-core/src/test/java/org/tests/ddd/iud/TestDExhEntityEl.java b/ebean-core/src/test/java/org/tests/ddd/iud/TestDExhEntityEl.java index 92aaab8de..fed74f781 100644 --- a/ebean-core/src/test/java/org/tests/ddd/iud/TestDExhEntityEl.java +++ b/ebean-core/src/test/java/org/tests/ddd/iud/TestDExhEntityEl.java @@ -1,9 +1,10 @@ package org.tests.ddd.iud; -import junit.framework.TestCase; +import org.junit.jupiter.api.Test; -public class TestDExhEntityEl extends TestCase { +public class TestDExhEntityEl { + @Test public void test() { // GlobalProperties.put("classes", DExhEntity.class.toString()); diff --git a/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java b/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java index 260a98962..72aaa6d9b 100644 --- a/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java +++ b/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java @@ -8,13 +8,13 @@ import io.ebean.plugin.SpiServer; import io.ebean.text.json.JsonContext; import org.tests.model.ddd.DPerson; import org.tests.model.ivo.Money; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Currency; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestDPersonEl { diff --git a/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonIUD.java b/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonIUD.java index 2992a533d..897d0563a 100644 --- a/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonIUD.java +++ b/ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonIUD.java @@ -1,10 +1,10 @@ package org.tests.ddd.iud; -import junit.framework.TestCase; - -public class TestDPersonIUD extends TestCase { +import org.junit.jupiter.api.Test; +public class TestDPersonIUD { + @Test public void test() { // GlobalProperties.put("classes", DPerson.class.toString()); diff --git a/ebean-core/src/test/java/org/tests/ddl/TestForeignKeyModes.java b/ebean-core/src/test/java/org/tests/ddl/TestForeignKeyModes.java index f6f2ee64e..9dc78289b 100644 --- a/ebean-core/src/test/java/org/tests/ddl/TestForeignKeyModes.java +++ b/ebean-core/src/test/java/org/tests/ddl/TestForeignKeyModes.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/defaultvalues/TestDefaults.java b/ebean-core/src/test/java/org/tests/defaultvalues/TestDefaults.java index a5f7affb2..1ccdf17e7 100644 --- a/ebean-core/src/test/java/org/tests/defaultvalues/TestDefaults.java +++ b/ebean-core/src/test/java/org/tests/defaultvalues/TestDefaults.java @@ -3,7 +3,7 @@ package org.tests.defaultvalues; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java b/ebean-core/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java index c0a63888b..2db15fdee 100644 --- a/ebean-core/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java +++ b/ebean-core/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java @@ -2,10 +2,10 @@ package org.tests.delete; import io.ebean.BaseTestCase; import org.tests.model.onetoone.Account; -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 TestDeleteByIdUsingModel extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java b/ebean-core/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java index 6858e12d4..2e94a0732 100644 --- a/ebean-core/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java +++ b/ebean-core/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java @@ -4,13 +4,14 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.EbeanServer; import io.ebean.Transaction; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Product; import org.tests.model.basic.ResetBasicData; import java.util.Arrays; +import static org.junit.jupiter.api.Assertions.assertNull; + public class TestDeleteByIdWithPersistenceContext extends BaseTestCase { @Test @@ -38,9 +39,8 @@ public class TestDeleteByIdWithPersistenceContext extends BaseTestCase { Product shadow1 = server.find(Product.class, prod1.getId()); Product shadow2 = server.find(Product.class, prod2.getId()); - Assert.assertNull(shadow1); - Assert.assertNull(shadow2); - + assertNull(shadow1); + assertNull(shadow2); } // cleanup diff --git a/ebean-core/src/test/java/org/tests/delete/TestDeleteByQuery.java b/ebean-core/src/test/java/org/tests/delete/TestDeleteByQuery.java index 7ef161e5f..65c60e755 100644 --- a/ebean-core/src/test/java/org/tests/delete/TestDeleteByQuery.java +++ b/ebean-core/src/test/java/org/tests/delete/TestDeleteByQuery.java @@ -8,7 +8,7 @@ import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.BBookmarkUser; import org.tests.model.basic.Contact; import org.tests.model.basic.Country; diff --git a/ebean-core/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java b/ebean-core/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java index ccf49f0d7..d36bca9b4 100644 --- a/ebean-core/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java +++ b/ebean-core/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java @@ -3,7 +3,7 @@ package org.tests.delete; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java b/ebean-core/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java index 20eff9e4d..87b357a93 100644 --- a/ebean-core/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java +++ b/ebean-core/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.EbeanServer; import io.ebean.Transaction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.EBasicVer; import org.tests.model.converstation.Group; diff --git a/ebean-core/src/test/java/org/tests/docstore/CustomerReportTest.java b/ebean-core/src/test/java/org/tests/docstore/CustomerReportTest.java index e7047cc37..d3729226c 100644 --- a/ebean-core/src/test/java/org/tests/docstore/CustomerReportTest.java +++ b/ebean-core/src/test/java/org/tests/docstore/CustomerReportTest.java @@ -5,7 +5,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Product; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/draftable/DocLinkTest.java b/ebean-core/src/test/java/org/tests/draftable/DocLinkTest.java index 5c698098e..f1693e3fb 100644 --- a/ebean-core/src/test/java/org/tests/draftable/DocLinkTest.java +++ b/ebean-core/src/test/java/org/tests/draftable/DocLinkTest.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.EbeanServer; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.draftable.Doc; import org.tests.model.draftable.Link; @@ -14,7 +14,8 @@ import java.sql.Timestamp; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DocLinkTest extends BaseTestCase { @@ -102,11 +103,11 @@ public class DocLinkTest extends BaseTestCase { try { Ebean.deletePermanent(live); - assertTrue("never get here", false); + fail("never get here"); } catch (PersistenceException e) { // assert nice message when trying to delete live bean - assertThat(e.getMessage().contains("Explicit Delete is not allowed on a 'live' bean - only draft beans")); + assertThat(e.getMessage()).contains("Explicit Delete is not allowed on a 'live' bean - only draft beans"); } } @@ -148,7 +149,7 @@ public class DocLinkTest extends BaseTestCase { // Expect a nice try { live.save(); - assertTrue("Never get here", false); + fail("Never get here"); } catch (PersistenceException e) { // we want to assert the message is nice and meaningful (and not a optimistic locking exception etc) @@ -158,7 +159,6 @@ public class DocLinkTest extends BaseTestCase { @Test public void testDirtyState() { - Timestamp when = new Timestamp(System.currentTimeMillis()); String comment = "Really interesting"; diff --git a/ebean-core/src/test/java/org/tests/draftable/LinkQueryPublishTest.java b/ebean-core/src/test/java/org/tests/draftable/LinkQueryPublishTest.java index 070371ee0..d8cf7837e 100644 --- a/ebean-core/src/test/java/org/tests/draftable/LinkQueryPublishTest.java +++ b/ebean-core/src/test/java/org/tests/draftable/LinkQueryPublishTest.java @@ -5,7 +5,7 @@ import io.ebean.EbeanServer; import io.ebean.PagedList; import io.ebean.Query; import org.tests.model.draftable.Link; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/draftable/OrganisationTest.java b/ebean-core/src/test/java/org/tests/draftable/OrganisationTest.java index 3d2dd4b2c..a632f2607 100644 --- a/ebean-core/src/test/java/org/tests/draftable/OrganisationTest.java +++ b/ebean-core/src/test/java/org/tests/draftable/OrganisationTest.java @@ -2,7 +2,7 @@ package org.tests.draftable; import io.ebean.Ebean; import io.ebean.EbeanServer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.draftable.Document; import org.tests.model.draftable.DocumentMedia; import org.tests.model.draftable.Organisation; @@ -10,8 +10,8 @@ import org.tests.model.draftable.Organisation; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class OrganisationTest { diff --git a/ebean-core/src/test/java/org/tests/el/TestELBasic.java b/ebean-core/src/test/java/org/tests/el/TestELBasic.java index b58a75438..c5e155b3e 100644 --- a/ebean-core/src/test/java/org/tests/el/TestELBasic.java +++ b/ebean-core/src/test/java/org/tests/el/TestELBasic.java @@ -11,8 +11,9 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; import io.ebeaninternal.server.el.ElPropertyChain; import io.ebeaninternal.server.el.ElPropertyDeploy; import org.tests.model.basic.Customer; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; public class TestELBasic extends BaseTestCase { @@ -23,46 +24,46 @@ public class TestELBasic extends BaseTestCase { BeanDescriptor descriptor = server.getBeanDescriptor(Customer.class); ElPropertyDeploy elId = descriptor.getElPropertyDeploy("id"); - Assert.assertTrue(elId instanceof BeanProperty); + assertTrue(elId instanceof BeanProperty); ElPropertyDeploy elBillAddress = descriptor.getElPropertyDeploy("billingAddress"); - Assert.assertTrue(elBillAddress instanceof BeanPropertyAssocOne); + assertTrue(elBillAddress instanceof BeanPropertyAssocOne); ElPropertyDeploy elBillAddressId = descriptor.getElPropertyDeploy("billingAddress.id"); - Assert.assertTrue(elBillAddressId instanceof BeanFkeyProperty); - Assert.assertEquals("billing_address_id", elBillAddressId.getDbColumn()); - Assert.assertEquals("billingAddress.id", elBillAddressId.getName()); - Assert.assertNull(elBillAddressId.getElPrefix()); + assertTrue(elBillAddressId instanceof BeanFkeyProperty); + assertEquals("billing_address_id", elBillAddressId.getDbColumn()); + assertEquals("billingAddress.id", elBillAddressId.getName()); + assertNull(elBillAddressId.getElPrefix()); ElPropertyDeploy elBillAddressCity = descriptor.getElPropertyDeploy("billingAddress.city"); - Assert.assertTrue(elBillAddressCity instanceof ElPropertyChain); - Assert.assertEquals("billingAddress", elBillAddressCity.getElPrefix()); - Assert.assertEquals("city", elBillAddressCity.getName()); - Assert.assertEquals("${billingAddress}city", elBillAddressCity.getElPlaceholder(false)); - Assert.assertEquals("city", elBillAddressCity.getDbColumn()); + assertTrue(elBillAddressCity instanceof ElPropertyChain); + assertEquals("billingAddress", elBillAddressCity.getElPrefix()); + assertEquals("city", elBillAddressCity.getName()); + assertEquals("${billingAddress}city", elBillAddressCity.getElPlaceholder(false)); + assertEquals("city", elBillAddressCity.getDbColumn()); // ElPropertyDeploy elBillAddressCountry = descriptor.getElPropertyDeploy("billingAddress.country"); ElPropertyDeploy elOrders = descriptor.getElPropertyDeploy("orders"); - Assert.assertTrue(elOrders instanceof BeanPropertyAssocMany); + assertTrue(elOrders instanceof BeanPropertyAssocMany); ElPropertyDeploy elOrderStatus = descriptor.getElPropertyDeploy("orders.status"); - Assert.assertTrue(elOrderStatus instanceof ElPropertyChain); - Assert.assertEquals("orders", elOrderStatus.getElPrefix()); - Assert.assertEquals("status", elOrderStatus.getName()); - Assert.assertEquals("${orders}status", elOrderStatus.getElPlaceholder(false)); - Assert.assertEquals("status", elOrderStatus.getDbColumn()); + assertTrue(elOrderStatus instanceof ElPropertyChain); + assertEquals("orders", elOrderStatus.getElPrefix()); + assertEquals("status", elOrderStatus.getName()); + assertEquals("${orders}status", elOrderStatus.getElPlaceholder(false)); + assertEquals("status", elOrderStatus.getDbColumn()); ElPropertyDeploy elOrderCust = descriptor.getElPropertyDeploy("orders.customer"); - Assert.assertTrue(elOrderCust instanceof ElPropertyChain); + assertTrue(elOrderCust instanceof ElPropertyChain); ElPropertyDeploy elOrderDetails = descriptor.getElPropertyDeploy("orders.details"); - Assert.assertTrue(elOrderDetails instanceof ElPropertyChain); + assertTrue(elOrderDetails instanceof ElPropertyChain); ElPropertyDeploy elOrderDetailsId = descriptor.getElPropertyDeploy("orders.details.id"); - Assert.assertTrue(elOrderDetailsId instanceof ElPropertyChain); + assertTrue(elOrderDetailsId instanceof ElPropertyChain); } diff --git a/ebean-core/src/test/java/org/tests/el/TestPathExpression.java b/ebean-core/src/test/java/org/tests/el/TestPathExpression.java index 0852b6327..10b7d45d0 100644 --- a/ebean-core/src/test/java/org/tests/el/TestPathExpression.java +++ b/ebean-core/src/test/java/org/tests/el/TestPathExpression.java @@ -8,9 +8,9 @@ import io.ebean.plugin.SpiServer; import org.tests.model.basic.Address; 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.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestPathExpression { diff --git a/ebean-core/src/test/java/org/tests/el/TestUnderscoreParam.java b/ebean-core/src/test/java/org/tests/el/TestUnderscoreParam.java index 2e82d1a83..0a14628de 100644 --- a/ebean-core/src/test/java/org/tests/el/TestUnderscoreParam.java +++ b/ebean-core/src/test/java/org/tests/el/TestUnderscoreParam.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; import org.tests.model.basic.Customer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/embedded/TestEmbeddedEmpty.java b/ebean-core/src/test/java/org/tests/embedded/TestEmbeddedEmpty.java index eda307b53..0ef60c906 100644 --- a/ebean-core/src/test/java/org/tests/embedded/TestEmbeddedEmpty.java +++ b/ebean-core/src/test/java/org/tests/embedded/TestEmbeddedEmpty.java @@ -1,7 +1,7 @@ package org.tests.embedded; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.embedded.EAddress; import org.tests.model.embedded.EAddressStatus; import org.tests.model.embedded.EPerson3; diff --git a/ebean-core/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java b/ebean-core/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java index e328b3b8c..ef33658fd 100644 --- a/ebean-core/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java +++ b/ebean-core/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java @@ -3,7 +3,7 @@ package org.tests.enhancement; import io.ebean.BaseTestCase; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java b/ebean-core/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java index 4b148c02e..fc12e6ea1 100644 --- a/ebean-core/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java +++ b/ebean-core/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java @@ -5,8 +5,9 @@ import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; import org.tests.model.basic.PFile; import org.tests.model.basic.PFileContent; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestConstructorPutfieldReplacement extends BaseTestCase { @@ -21,9 +22,8 @@ public class TestConstructorPutfieldReplacement extends BaseTestCase { int namePos = ebi.findProperty("name"); int fileContentPos = ebi.findProperty("fileContent"); - Assert.assertTrue(ebi.isLoadedProperty(namePos)); - Assert.assertTrue(ebi.isLoadedProperty(fileContentPos)); - + assertTrue(ebi.isLoadedProperty(namePos)); + assertTrue(ebi.isLoadedProperty(fileContentPos)); } } diff --git a/ebean-core/src/test/java/org/tests/enhancement/TestEnhancementEquals.java b/ebean-core/src/test/java/org/tests/enhancement/TestEnhancementEquals.java index 10bd1b0d6..515d45e73 100644 --- a/ebean-core/src/test/java/org/tests/enhancement/TestEnhancementEquals.java +++ b/ebean-core/src/test/java/org/tests/enhancement/TestEnhancementEquals.java @@ -1,9 +1,10 @@ package org.tests.enhancement; import io.ebean.BaseTestCase; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Product; -import org.junit.Assert; -import org.junit.Test; + +import static org.junit.jupiter.api.Assertions.*; /** * Note take care if you run this test in an IDE with a debugger as that can trigger the equals and @@ -22,12 +23,12 @@ public class TestEnhancementEquals extends BaseTestCase { Product product2 = new Product(); product2.setId(345); - Assert.assertEquals("equal based on id", product1, product2); - Assert.assertEquals("hashCode equal based on id", product1.hashCode(), product2.hashCode()); + assertEquals(product1, product2); + assertEquals(product1.hashCode(), product2.hashCode()); product2.setName("kumera"); - Assert.assertEquals("still equal based on identity", product1, product2); - Assert.assertEquals("still hashCode equal based on id", product1.hashCode(), product2.hashCode()); + assertEquals(product1, product2); + assertEquals(product1.hashCode(), product2.hashCode()); } @@ -42,13 +43,13 @@ public class TestEnhancementEquals extends BaseTestCase { product1.setId(345); int hashcode2 = product1.hashCode(); - Assert.assertEquals("hashCode can't change", hashcode1, hashcode2); + assertEquals(hashcode1, hashcode2); Product product2 = new Product(); product2.setId(345); - Assert.assertFalse("Not equal now", product1.equals(product2)); - Assert.assertTrue("Different hashCode", product1.hashCode() != product2.hashCode()); + assertNotEquals(product1, product2); + assertTrue(product1.hashCode() != product2.hashCode()); } } diff --git a/ebean-core/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java b/ebean-core/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java index 013060804..6ed9b84d1 100644 --- a/ebean-core/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java +++ b/ebean-core/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java @@ -2,7 +2,7 @@ package org.tests.expression.bitwise; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/family/TestInheritance.java b/ebean-core/src/test/java/org/tests/family/TestInheritance.java index a24127737..02ae8f0bb 100644 --- a/ebean-core/src/test/java/org/tests/family/TestInheritance.java +++ b/ebean-core/src/test/java/org/tests/family/TestInheritance.java @@ -7,16 +7,16 @@ import io.ebean.annotation.Platform; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanProperty; import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; import org.tests.model.family.ChildPerson; import org.tests.model.family.GrandParentPerson; import org.tests.model.family.ParentPerson; -import static org.junit.Assert.assertEquals; -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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestInheritance extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/generated/TestGeneratedProperties.java b/ebean-core/src/test/java/org/tests/generated/TestGeneratedProperties.java index da9aa3ceb..ec5f044f9 100644 --- a/ebean-core/src/test/java/org/tests/generated/TestGeneratedProperties.java +++ b/ebean-core/src/test/java/org/tests/generated/TestGeneratedProperties.java @@ -3,10 +3,10 @@ package org.tests.generated; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.EGenProps; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestGeneratedProperties extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/generated/TestGeneratedWho.java b/ebean-core/src/test/java/org/tests/generated/TestGeneratedWho.java index 9adb3bb5a..2b3c873f4 100644 --- a/ebean-core/src/test/java/org/tests/generated/TestGeneratedWho.java +++ b/ebean-core/src/test/java/org/tests/generated/TestGeneratedWho.java @@ -4,13 +4,13 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.MyCurrentUserProvider; import org.tests.model.EWhoProps; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.generated.User; import org.tests.model.generated.WhoPropsOneToMany; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestGeneratedWho extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/genkey/TestGeneratedKeys.java b/ebean-core/src/test/java/org/tests/genkey/TestGeneratedKeys.java index 78af8f844..eaf7d57b4 100644 --- a/ebean-core/src/test/java/org/tests/genkey/TestGeneratedKeys.java +++ b/ebean-core/src/test/java/org/tests/genkey/TestGeneratedKeys.java @@ -1,13 +1,14 @@ package org.tests.genkey; import io.ebean.Ebean; +import org.junit.jupiter.api.Test; import org.tests.model.basic.TOne; -import junit.framework.TestCase; -import org.junit.Assert; -public class TestGeneratedKeys extends TestCase { +import static org.junit.jupiter.api.Assertions.assertNotNull; +public class TestGeneratedKeys { + @Test public void testJdbcBatchInsert() { TOne c = new TOne(); @@ -26,11 +27,10 @@ public class TestGeneratedKeys extends TestCase { Ebean.commitTransaction(); } Integer id = c.getId(); - Assert.assertNotNull("Get Id back after insert", id); + assertNotNull(id); Integer id1 = c1.getId(); - Assert.assertNotNull("Get Id back after insert", id1); - + assertNotNull(id1); } } diff --git a/ebean-core/src/test/java/org/tests/genkey/TestSeqBatch.java b/ebean-core/src/test/java/org/tests/genkey/TestSeqBatch.java index 24b0b787d..a46684808 100644 --- a/ebean-core/src/test/java/org/tests/genkey/TestSeqBatch.java +++ b/ebean-core/src/test/java/org/tests/genkey/TestSeqBatch.java @@ -4,8 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.config.dbplatform.IdType; import io.ebeaninternal.server.deploy.BeanDescriptor; import org.tests.model.basic.TOne; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestSeqBatch extends BaseTestCase { @@ -16,15 +17,11 @@ public class TestSeqBatch extends BaseTestCase { } BeanDescriptor d = spiEbeanServer().getBeanDescriptor(TOne.class); - Object id = d.nextId(null); - Assert.assertNotNull(id); - // System.out.println(id); - + assertNotNull(id); for (int i = 0; i < 16; i++) { Object id2 = d.nextId(null); - Assert.assertNotNull(id2); - // System.out.println(id2); + assertNotNull(id2); } } diff --git a/ebean-core/src/test/java/org/tests/history/TestHistoryInsert.java b/ebean-core/src/test/java/org/tests/history/TestHistoryInsert.java index 61db881a1..c5d3f5560 100644 --- a/ebean-core/src/test/java/org/tests/history/TestHistoryInsert.java +++ b/ebean-core/src/test/java/org/tests/history/TestHistoryInsert.java @@ -9,7 +9,7 @@ import io.ebean.Version; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebeantest.LoggedSql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tests.model.converstation.User; diff --git a/ebean-core/src/test/java/org/tests/idkeys/TestCustomId.java b/ebean-core/src/test/java/org/tests/idkeys/TestCustomId.java index 6f94dbd53..8a96e3a18 100644 --- a/ebean-core/src/test/java/org/tests/idkeys/TestCustomId.java +++ b/ebean-core/src/test/java/org/tests/idkeys/TestCustomId.java @@ -3,11 +3,11 @@ package org.tests.idkeys; import io.avaje.moduuid.ModUUID; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.ECustomId; -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 TestCustomId extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/idkeys/TestGeneratedKeys.java b/ebean-core/src/test/java/org/tests/idkeys/TestGeneratedKeys.java index ee46be72f..9632bebcf 100644 --- a/ebean-core/src/test/java/org/tests/idkeys/TestGeneratedKeys.java +++ b/ebean-core/src/test/java/org/tests/idkeys/TestGeneratedKeys.java @@ -6,7 +6,7 @@ import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.config.dbplatform.IdType; import io.ebeaninternal.api.SpiEbeanServer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.idkeys.db.GenKeyIdentity; import org.tests.idkeys.db.GenKeySequence; @@ -14,9 +14,9 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestGeneratedKeys extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/idkeys/TestLazyLoad.java b/ebean-core/src/test/java/org/tests/idkeys/TestLazyLoad.java index 1ea628a36..d6fb39d36 100644 --- a/ebean-core/src/test/java/org/tests/idkeys/TestLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/idkeys/TestLazyLoad.java @@ -1,11 +1,11 @@ package org.tests.idkeys; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.TOne; import io.ebean.BaseTestCase; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.sql.SQLException; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java b/ebean-core/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java index 25d72bae2..f00c65b87 100644 --- a/ebean-core/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java +++ b/ebean-core/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java @@ -1,22 +1,22 @@ package org.tests.idkeys; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.ESimple; -import org.junit.Assert; -import org.junit.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestSimpleIdInsert extends BaseTestCase { @Test public void test() { - ESimple e = new ESimple(); e.setName("name"); - Ebean.save(e); + DB.save(e); - Assert.assertNotNull(e.getId()); + assertNotNull(e.getId()); } diff --git a/ebean-core/src/test/java/org/tests/inherit/InheritDiscIntTest.java b/ebean-core/src/test/java/org/tests/inherit/InheritDiscIntTest.java index 3b892b864..14712485e 100644 --- a/ebean-core/src/test/java/org/tests/inherit/InheritDiscIntTest.java +++ b/ebean-core/src/test/java/org/tests/inherit/InheritDiscIntTest.java @@ -1,10 +1,10 @@ package org.tests.inherit; 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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class InheritDiscIntTest { diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java b/ebean-core/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java index 2b53a3d4a..e17879542 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java @@ -3,12 +3,13 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.AttributeHolder; import org.tests.model.basic.ListAttribute; import org.tests.model.basic.ListAttributeValue; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestDuplicateKeyException extends BaseTestCase { /** @@ -44,7 +45,7 @@ public class TestDuplicateKeyException extends BaseTestCase { //Ebean.save(holder); }); } catch (Exception e) { - Assert.assertEquals(e.getMessage(), "test rollback"); + assertEquals(e.getMessage(), "test rollback"); } } } diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritInsert.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritInsert.java index 9376a400f..ec8caac39 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritInsert.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritInsert.java @@ -9,12 +9,12 @@ import org.tests.model.basic.CarFuse; import org.tests.model.basic.Truck; import org.tests.model.basic.Vehicle; import org.tests.model.basic.VehicleDriver; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestInheritInsert extends BaseTestCase { @@ -32,7 +32,7 @@ public class TestInheritInsert extends BaseTestCase { assertEquals(Double.valueOf(10d), ((Truck) v).getCapacity()); assertNotNull(t0.getId()); } else { - assertTrue("v not a Truck?", false); + fail(); } VehicleDriver driver = new VehicleDriver(); @@ -48,7 +48,7 @@ public class TestInheritInsert extends BaseTestCase { assertEquals(Double.valueOf(10d), capacity); assertNotNull(v.getId()); } else { - assertTrue("v not a Truck?", false); + fail("v not a Truck?"); } List list = Ebean.find(VehicleDriver.class).findList(); diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java index df91ad2de..228f1d861 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceBatchLazyLoad.java @@ -4,7 +4,7 @@ import io.ebean.Ebean; import org.tests.model.basic.Car; import org.tests.model.basic.Truck; import org.tests.model.basic.Vehicle; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java index 9bcdad41b..a42250f49 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java @@ -3,7 +3,7 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.EbeanServer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.inheritance.model.GroupConfiguration; import org.tests.inheritance.model.ProductConfiguration; diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceJoins.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceJoins.java index 695bc09d0..47b76df8a 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceJoins.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceJoins.java @@ -5,8 +5,7 @@ import io.ebean.DB; import io.ebean.Database; import io.ebean.Ebean; import io.ebean.EbeanServer; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.inheritance.model.CalculationResult; import org.tests.inheritance.model.Configurations; import org.tests.inheritance.model.GroupConfiguration; @@ -15,6 +14,8 @@ import org.tests.inheritance.model.ProductConfiguration; import java.util.Collections; import java.util.List; +import static org.junit.jupiter.api.Assertions.*; + public class TestInheritanceJoins extends BaseTestCase { @Test @@ -57,7 +58,7 @@ public class TestInheritanceJoins extends BaseTestCase { CalculationResult result = server.find(CalculationResult.class, r.getId()); GroupConfiguration group = result.getGroupConfiguration(); - Assert.assertEquals(group.getId(), gc.getId()); + assertEquals(group.getId(), gc.getId()); } @Test @@ -99,7 +100,7 @@ public class TestInheritanceJoins extends BaseTestCase { List groups = configurationsQueried.getGroupConfigurations(); - Assert.assertTrue(!groups.isEmpty()); + assertTrue(!groups.isEmpty()); } @Test @@ -112,7 +113,7 @@ public class TestInheritanceJoins extends BaseTestCase { Configurations configurationsQueried = server.find(Configurations.class).fetch("groupConfigurations").where().idEq(configurations.getId()).findOne(); - Assert.assertNotNull(configurationsQueried); + assertNotNull(configurationsQueried); } @Test @@ -132,8 +133,8 @@ public class TestInheritanceJoins extends BaseTestCase { Configurations configurationsQueried = database.find(Configurations.class).fetch("groupConfigurations").fetch("productConfigurations").where().idEq(configurations.getId()).findOne(); - Assert.assertEquals(Collections.singletonList(gc), configurationsQueried.getGroupConfigurations()); - Assert.assertEquals(Collections.singletonList(pc), configurationsQueried.getProductConfigurations()); + assertEquals(Collections.singletonList(gc), configurationsQueried.getGroupConfigurations()); + assertEquals(Collections.singletonList(pc), configurationsQueried.getProductConfigurations()); } } diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java index 1a0bc812c..78fba42ba 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.bean.BeanCollection.ModifyListenMode; import io.ebean.common.BeanList; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Animal; import org.tests.model.basic.AnimalShelter; import org.tests.model.basic.BigDog; @@ -15,8 +15,8 @@ import org.tests.model.basic.Dog; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -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 TestInheritanceOnMany extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java index dd6ef5832..e0ede7386 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebeantest.LoggedSql; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.inheritance.order.OrderMasterInheritance; import org.tests.inheritance.order.OrderedA; import org.tests.inheritance.order.OrderedB; diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceQuery.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceQuery.java index 3d16b0e46..7de74f3c1 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceQuery.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceQuery.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.inherit.ChildA; import org.tests.inherit.ChildB; import org.tests.inherit.Parent; diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java index 040a5e424..8731fc1b9 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java @@ -4,8 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Truck; import org.tests.model.basic.Vehicle; import org.tests.model.basic.VehicleLeaseLong; @@ -15,6 +14,8 @@ import java.time.LocalDate; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestInheritanceRawSql extends BaseTestCase { @@ -38,13 +39,13 @@ public class TestInheritanceRawSql extends BaseTestCase { .setParameter("id", truck.getId()) .findList(); - Assert.assertEquals(1, list.size()); + assertEquals(1, list.size()); Vehicle vehicle2 = list.get(0); - Assert.assertTrue(vehicle2 instanceof Truck); + assertTrue(vehicle2 instanceof Truck); Truck truck2 = (Truck) vehicle2; - Assert.assertEquals("ASB23", truck2.getLicenseNumber()); + assertEquals("ASB23", truck2.getLicenseNumber()); // invoke lazy loading and set the capacity truck2.setCapacity(30D); diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java index f38000825..8774b3fef 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java @@ -1,13 +1,13 @@ package org.tests.inheritance; -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; import org.ebeantest.LoggedSqlCollector; import org.tests.inherit.ChildA; import org.tests.inherit.ChildB; import org.tests.inherit.Parent; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.ebean.BaseTestCase; diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestIntInherit.java b/ebean-core/src/test/java/org/tests/inheritance/TestIntInherit.java index 42a2bb210..61cb4a3c8 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestIntInherit.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestIntInherit.java @@ -5,8 +5,9 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.TIntChild; import org.tests.model.basic.TIntRoot; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestIntInherit extends BaseTestCase { @@ -34,13 +35,13 @@ public class TestIntInherit extends BaseTestCase { Ebean.save(c2); TIntRoot result1 = Ebean.find(TIntRoot.class, r.getId()); - Assert.assertTrue(result1 instanceof TIntRoot); + assertTrue(result1 instanceof TIntRoot); TIntRoot ref3 = Ebean.getReference(TIntRoot.class, c1.getId()); - Assert.assertTrue(ref3 instanceof TIntRoot); + assertTrue(ref3 instanceof TIntRoot); TIntRoot result3 = Ebean.find(TIntRoot.class, c1.getId()); - Assert.assertTrue(result3 instanceof TIntChild); + assertTrue(result3 instanceof TIntChild); } diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java b/ebean-core/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java index 3dd088406..b956704ff 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java @@ -2,7 +2,7 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestNpeOnDiscriminator extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestSkippable.java b/ebean-core/src/test/java/org/tests/inheritance/TestSkippable.java index 9f5448823..6cc099987 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestSkippable.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestSkippable.java @@ -5,11 +5,12 @@ import io.ebean.Ebean; import org.tests.model.basic.AttributeHolder; import org.tests.model.basic.ListAttribute; import org.tests.model.basic.ListAttributeValue; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.*; + public class TestSkippable extends BaseTestCase { private static final Logger logger = LoggerFactory.getLogger(TestSkippable.class); @@ -36,10 +37,10 @@ public class TestSkippable extends BaseTestCase { logger.info(" -- seeded data"); final ListAttribute listAttributeDB = Ebean.find(ListAttribute.class, listAttribute.getId()); - Assert.assertNotNull(listAttributeDB); + assertNotNull(listAttributeDB); final ListAttributeValue value1_DB = listAttributeDB.getValues().iterator().next(); - Assert.assertTrue(value1.getId().equals(value1_DB.getId())); + assertTrue(value1.getId().equals(value1_DB.getId())); logger.info(" -- asserted data in db"); @@ -61,12 +62,12 @@ public class TestSkippable extends BaseTestCase { final ListAttribute listAttributeDB_2 = Ebean.find(ListAttribute.class, listAttributeDB.getId()); - Assert.assertNotNull(listAttributeDB_2); + assertNotNull(listAttributeDB_2); final ListAttributeValue value2_DB_2 = listAttributeDB_2.getValues().iterator().next(); - Assert.assertEquals(value2.getId(), value2_DB_2.getId()); - Assert.assertTrue("Cascade failed", value2.getId().equals(value2_DB_2.getId())); + assertEquals(value2.getId(), value2_DB_2.getId()); + assertTrue(value2.getId().equals(value2_DB_2.getId())); Ebean.delete(listAttributeDB_2); diff --git a/ebean-core/src/test/java/org/tests/inheritance/TestTreeOrganisations.java b/ebean-core/src/test/java/org/tests/inheritance/TestTreeOrganisations.java index 3bdc08d8a..8adec83ec 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/TestTreeOrganisations.java +++ b/ebean-core/src/test/java/org/tests/inheritance/TestTreeOrganisations.java @@ -3,9 +3,9 @@ package org.tests.inheritance; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestTreeOrganisations extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java b/ebean-core/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java index 42f36d263..f31360ba9 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java +++ b/ebean-core/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java @@ -2,7 +2,7 @@ package org.tests.inheritance.abstrakt; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestInheritanceNum extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java b/ebean-core/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java index df7a28462..70ddcd518 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java +++ b/ebean-core/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Database; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.stream.Collectors; diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java b/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java index 3c88e598e..9b533afd9 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java +++ b/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java @@ -1,8 +1,9 @@ package org.tests.inheritance.cache; import io.ebean.DB; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestInheritCacheRefLoad { @@ -29,17 +30,17 @@ public class TestInheritCacheRefLoad { // 2 - Read Data (no Cache Hit) //========================================================================= Class streetClass = reloadCustomer(customer, false); //returns Street -> OK - Assert.assertEquals("org.tests.inheritance.cache.CIStreet", streetClass.getName()); + assertEquals("org.tests.inheritance.cache.CIStreet", streetClass.getName()); streetClass = reloadCustomer(customer, false); //returns Street -> OK - Assert.assertEquals("org.tests.inheritance.cache.CIStreet", streetClass.getName()); + assertEquals("org.tests.inheritance.cache.CIStreet", streetClass.getName()); //========================================================================= // 3 - Read Data (L2-Cache Hit) //========================================================================= streetClass = reloadCustomer(customer, true); //returns Street -> OK - Assert.assertEquals("org.tests.inheritance.cache.CIStreet", streetClass.getName()); + assertEquals("org.tests.inheritance.cache.CIStreet", streetClass.getName()); streetClass = reloadCustomer(customer, true); //returns StreetParent -> NOT OK - Assert.assertEquals("org.tests.inheritance.cache.CIStreet", streetClass.getName()); + assertEquals("org.tests.inheritance.cache.CIStreet", streetClass.getName()); } diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java b/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java index f4161d79e..72bb02fa0 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java +++ b/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java @@ -5,7 +5,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.cache.CInhOne; import org.tests.model.basic.cache.CInhRoot; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java b/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java index ad104db21..a390674ba 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java +++ b/ebean-core/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java @@ -3,7 +3,7 @@ package org.tests.inheritance.cache; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.cache.CInhOne; import org.tests.model.basic.cache.CInhRef; import org.tests.model.basic.cache.CInhRoot; diff --git a/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java b/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java index 269642b2f..b11abf5ed 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java +++ b/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java @@ -2,10 +2,10 @@ package org.tests.inheritance.cascadedelete; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static java.util.Arrays.asList; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestInheritanceDeleteCascade extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java b/ebean-core/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java index 4e4e5b64a..84e4ccd37 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java +++ b/ebean-core/src/test/java/org/tests/inheritance/company/domain/TestInheritAbstract.java @@ -2,13 +2,16 @@ package org.tests.inheritance.company.domain; import io.ebean.Ebean; import io.ebean.EbeanServer; -import junit.framework.TestCase; -import org.junit.Assert; +import org.junit.jupiter.api.Test; import java.util.List; -public class TestInheritAbstract extends TestCase { +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.*; +public class TestInheritAbstract { + + @Test public void testMe() { EbeanServer server = Ebean.getServer(null); @@ -16,13 +19,13 @@ public class TestInheritAbstract extends TestCase { List list0 = server.find(AbstractBar.class) .findList(); - Assert.assertNotNull(list0); + assertNotNull(list0); List list1 = server.find(AbstractBar.class) .fetch("foo", "importantText") .findList(); - Assert.assertNotNull(list1); + assertNotNull(list1); Foo f = new Foo(); f.setImportantText("blah"); @@ -37,13 +40,13 @@ public class TestInheritAbstract extends TestCase { .fetch("foo", "importantText") .findList(); - Assert.assertNotNull(list2); - Assert.assertTrue(!list2.isEmpty()); + assertNotNull(list2); + assertThat(list2).isNotEmpty(); for (AbstractBar abstractBar : list2) { Foo foo = abstractBar.getFoo(); String importantText = foo.getImportantText(); - Assert.assertNotNull(importantText); + assertNotNull(importantText); } diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertCheckUnique.java b/ebean-core/src/test/java/org/tests/insert/TestInsertCheckUnique.java index a58e2b418..4cbf3dbaa 100644 --- a/ebean-core/src/test/java/org/tests/insert/TestInsertCheckUnique.java +++ b/ebean-core/src/test/java/org/tests/insert/TestInsertCheckUnique.java @@ -4,8 +4,8 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.plugin.Property; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.tests.model.draftable.Document; import java.util.Set; @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class TestInsertCheckUnique extends BaseTestCase { - @Before + @BeforeEach public void clearDb() { DB.find(Document.class).asDraft().where().contains("title", "UniqueKey").delete(); DB.find(Document.class).asDraft().where().isNull("title").delete(); diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertCollection.java b/ebean-core/src/test/java/org/tests/insert/TestInsertCollection.java index 87b5d98cf..bbf529b92 100644 --- a/ebean-core/src/test/java/org/tests/insert/TestInsertCollection.java +++ b/ebean-core/src/test/java/org/tests/insert/TestInsertCollection.java @@ -3,12 +3,13 @@ package org.tests.insert; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.Customer; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; +import static org.junit.jupiter.api.Assertions.*; + public class TestInsertCollection extends BaseTestCase { @Test @@ -26,13 +27,13 @@ public class TestInsertCollection extends BaseTestCase { Ebean.insertAll(customers); - Assert.assertNotNull(cust1.getId()); - Assert.assertNotNull(cust2.getId()); + assertNotNull(cust1.getId()); + assertNotNull(cust2.getId()); Customer cust1Check = Ebean.find(Customer.class, cust1.getId()); - Assert.assertEquals(cust1.getName(), cust1Check.getName()); + assertEquals(cust1.getName(), cust1Check.getName()); Customer cust2Check = Ebean.find(Customer.class, cust2.getId()); - Assert.assertEquals(cust2.getName(), cust2Check.getName()); + assertEquals(cust2.getName(), cust2Check.getName()); cust1.setName("jim-changed"); cust2.setName("bob-changed"); @@ -41,9 +42,9 @@ public class TestInsertCollection extends BaseTestCase { awaitL2Cache(); Customer cust1Check2 = Ebean.find(Customer.class, cust1.getId()); - Assert.assertEquals("jim-changed", cust1Check2.getName()); + assertEquals("jim-changed", cust1Check2.getName()); Customer cust2Check2 = Ebean.find(Customer.class, cust2.getId()); - Assert.assertEquals("bob-changed", cust2Check2.getName()); + assertEquals("bob-changed", cust2Check2.getName()); cust1Check2.setName("jim-updated"); @@ -59,9 +60,9 @@ public class TestInsertCollection extends BaseTestCase { Customer cust1Check3 = Ebean.find(Customer.class, cust1.getId()); - Assert.assertEquals("jim-updated", cust1Check3.getName()); + assertEquals("jim-updated", cust1Check3.getName()); Customer cust3Check = Ebean.find(Customer.class, cust3.getId()); - Assert.assertEquals("mac", cust3Check.getName()); + assertEquals("mac", cust3Check.getName()); List deleteList = new ArrayList<>(); deleteList.add(cust1Check3); @@ -71,11 +72,9 @@ public class TestInsertCollection extends BaseTestCase { Ebean.deleteAll(deleteList); awaitL2Cache(); - Assert.assertNull(Ebean.find(Customer.class, cust1Check3.getId())); - Assert.assertNull(Ebean.find(Customer.class, cust2Check2.getId())); - Assert.assertNull(Ebean.find(Customer.class, cust3.getId())); - + assertNull(Ebean.find(Customer.class, cust1Check3.getId())); + assertNull(Ebean.find(Customer.class, cust2Check2.getId())); + assertNull(Ebean.find(Customer.class, cust3.getId())); } - } diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java b/ebean-core/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java index 539f05f8d..157c4579f 100644 --- a/ebean-core/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java +++ b/ebean-core/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java @@ -6,18 +6,21 @@ import io.ebean.DataIntegrityException; import io.ebean.Ebean; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -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; +import javax.persistence.PersistenceException; + +import static org.junit.jupiter.api.Assertions.assertThrows; + public class TestInsertDataIntegrityException extends BaseTestCase { @IgnorePlatform(Platform.NUODB) - @Test(expected = DataIntegrityException.class) + @Test public void insert_invalidForeignKey() { - ResetBasicData.reset(); // an invalid foreign key value @@ -27,6 +30,6 @@ public class TestInsertDataIntegrityException extends BaseTestCase { order.setStatus(Order.Status.NEW); order.setCustomer(invalidCustomer); - DB.save(order); + assertThrows(DataIntegrityException.class, () -> DB.save(order)); } } diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertDuplicateKey.java b/ebean-core/src/test/java/org/tests/insert/TestInsertDuplicateKey.java index 0c728eaa3..efa1fad4a 100644 --- a/ebean-core/src/test/java/org/tests/insert/TestInsertDuplicateKey.java +++ b/ebean-core/src/test/java/org/tests/insert/TestInsertDuplicateKey.java @@ -5,8 +5,8 @@ import io.ebean.DuplicateKeyException; import io.ebean.Ebean; import io.ebean.annotation.Transactional; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tests.model.draftable.Document; @@ -15,46 +15,47 @@ import java.sql.SQLException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public class TestInsertDuplicateKey extends BaseTestCase { private static final Logger log = LoggerFactory.getLogger(TestInsertDuplicateKey.class); - @Before + @BeforeEach public void clearDb() { server().find(Document.class).asDraft().where().contains("title", "UniqueKey").delete(); } - @Test(expected = DuplicateKeyException.class) + @Test public void insert_duplicateKey() { - Document doc1 = new Document(); doc1.setTitle("ThisIsAUniqueKey"); doc1.setBody("one"); - doc1.save(); - Document doc2 = new Document(); - doc2.setTitle("ThisIsAUniqueKey"); - doc2.setBody("clashes with doc1"); + assertThrows(DuplicateKeyException.class, () -> { + Document doc2 = new Document(); + doc2.setTitle("ThisIsAUniqueKey"); + doc2.setBody("clashes with doc1"); + doc2.save(); + }); + } - doc2.save(); + @Test + public void insertBatch_duplicateKey() { + assertThrows(DuplicateKeyException.class, this::insertBatch_duplicateKey_action); } @Transactional(batchSize = 100) - @Test(expected = DuplicateKeyException.class) - public void insertBatch_duplicateKey() { - + void insertBatch_duplicateKey_action() { Document doc1 = new Document(); doc1.setTitle("ThisIsASecondUniqueKey"); doc1.setBody("one"); - doc1.save(); Document doc2 = new Document(); doc2.setTitle("ThisIsASecondUniqueKey"); doc2.setBody("clash when batch flushed"); - doc2.save(); } diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertOnStringKey.java b/ebean-core/src/test/java/org/tests/insert/TestInsertOnStringKey.java index 1a856001d..60d8bbfe6 100644 --- a/ebean-core/src/test/java/org/tests/insert/TestInsertOnStringKey.java +++ b/ebean-core/src/test/java/org/tests/insert/TestInsertOnStringKey.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.orderentity.OrderEntity; import org.tests.model.orderentity.OrderItemEntity; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/ebean-core/src/test/java/org/tests/insert/TestInsertWithIdAndUuid.java b/ebean-core/src/test/java/org/tests/insert/TestInsertWithIdAndUuid.java index d2777fc3b..e2c1b9ebc 100644 --- a/ebean-core/src/test/java/org/tests/insert/TestInsertWithIdAndUuid.java +++ b/ebean-core/src/test/java/org/tests/insert/TestInsertWithIdAndUuid.java @@ -2,7 +2,7 @@ package org.tests.insert; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/insert/TestOnlyIdEntity.java b/ebean-core/src/test/java/org/tests/insert/TestOnlyIdEntity.java index cb576612c..effd778e5 100644 --- a/ebean-core/src/test/java/org/tests/insert/TestOnlyIdEntity.java +++ b/ebean-core/src/test/java/org/tests/insert/TestOnlyIdEntity.java @@ -6,7 +6,7 @@ import io.ebean.Database; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java b/ebean-core/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java index 20d320a80..d6a6d401b 100644 --- a/ebean-core/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java +++ b/ebean-core/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java @@ -1,7 +1,7 @@ package org.tests.insert; import io.ebean.BaseTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.SQLException; diff --git a/ebean-core/src/test/java/org/tests/iud/TestCarWheelIud.java b/ebean-core/src/test/java/org/tests/iud/TestCarWheelIud.java index 7d2be0607..87b97e24d 100644 --- a/ebean-core/src/test/java/org/tests/iud/TestCarWheelIud.java +++ b/ebean-core/src/test/java/org/tests/iud/TestCarWheelIud.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Ebean; import io.ebean.PagedList; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.carwheel.Car; import org.tests.model.carwheel.Tire; import org.tests.model.carwheel.Wheel; diff --git a/ebean-core/src/test/java/org/tests/iud/TestInfoOneToOne.java b/ebean-core/src/test/java/org/tests/iud/TestInfoOneToOne.java index 9fad6d8ec..e2aa263e4 100644 --- a/ebean-core/src/test/java/org/tests/iud/TestInfoOneToOne.java +++ b/ebean-core/src/test/java/org/tests/iud/TestInfoOneToOne.java @@ -4,11 +4,11 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.info.InfoCompany; import org.tests.model.info.InfoCustomer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestInfoOneToOne extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java b/ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java index d191bff8c..e9a324e12 100644 --- a/ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java +++ b/ebean-core/src/test/java/org/tests/iud/TestInsertQueryUpdate.java @@ -4,11 +4,12 @@ import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.Ebean; import org.tests.model.basic.EBasicVer; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Set; +import static org.junit.jupiter.api.Assertions.assertFalse; + public class TestInsertQueryUpdate extends BaseTestCase { @Test @@ -25,7 +26,7 @@ public class TestInsertQueryUpdate extends BaseTestCase { BeanState beanState = Ebean.getBeanState(e1); Set loadedProps = beanState.getLoadedProps(); - Assert.assertFalse(loadedProps.contains("description")); + assertFalse(loadedProps.contains("description")); //lastUpdate e1.setName("name1"); diff --git a/ebean-core/src/test/java/org/tests/iud/TestInsertUpdateTrans.java b/ebean-core/src/test/java/org/tests/iud/TestInsertUpdateTrans.java index 32dc30f16..f6bee6094 100644 --- a/ebean-core/src/test/java/org/tests/iud/TestInsertUpdateTrans.java +++ b/ebean-core/src/test/java/org/tests/iud/TestInsertUpdateTrans.java @@ -3,10 +3,12 @@ package org.tests.iud; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Transaction; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestInsertUpdateTrans extends BaseTestCase { @Test @@ -18,9 +20,9 @@ public class TestInsertUpdateTrans extends BaseTestCase { e0.setDescription("something"); Ebean.save(e0); - Assert.assertNotNull(e0.getId()); - Assert.assertNotNull(e0.getLastUpdate()); - Assert.assertEquals("onInsert", e0.getName()); + assertNotNull(e0.getId()); + assertNotNull(e0.getLastUpdate()); + assertEquals("onInsert", e0.getName()); e0.setName("onUpdate"); e0.setDescription("differentFromInsert"); @@ -30,9 +32,9 @@ public class TestInsertUpdateTrans extends BaseTestCase { EBasicVer e1 = Ebean.find(EBasicVer.class, e0.getId()); // we should fetch back the updated data (not inserted) - Assert.assertEquals(e0.getId(), e1.getId()); - Assert.assertEquals("onUpdate", e1.getName()); - Assert.assertEquals("differentFromInsert", e1.getDescription()); + assertEquals(e0.getId(), e1.getId()); + assertEquals("onUpdate", e1.getName()); + assertEquals("differentFromInsert", e1.getDescription()); txn.commit(); } diff --git a/ebean-core/src/test/java/org/tests/iud/TestPersistCascade.java b/ebean-core/src/test/java/org/tests/iud/TestPersistCascade.java index e523ddf83..0cd2bcda1 100644 --- a/ebean-core/src/test/java/org/tests/iud/TestPersistCascade.java +++ b/ebean-core/src/test/java/org/tests/iud/TestPersistCascade.java @@ -3,7 +3,7 @@ package org.tests.iud; import io.avaje.moduuid.ModUUID; import io.ebean.BaseTestCase; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson.java index 1107c6b8d..44ed27534 100644 --- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson.java +++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson.java @@ -3,7 +3,7 @@ package org.tests.json; import com.fasterxml.jackson.databind.ObjectMapper; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonJackson; import org.tests.model.json.EBasicJsonJackson2; import org.tests.model.json.LongJacksonType; diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson2.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson2.java index 01b971ab8..e83ff4839 100644 --- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson2.java +++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson2.java @@ -3,7 +3,7 @@ package org.tests.json; import com.fasterxml.jackson.databind.ObjectMapper; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonJackson2; import org.tests.model.json.LongJacksonType; import org.tests.model.json.StringJacksonType; diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java index 0c16edc7d..66dd79cf6 100644 --- a/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java +++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java @@ -7,7 +7,7 @@ import io.ebean.ValuePair; import io.ebean.event.BeanPersistAdapter; import io.ebean.event.BeanPersistRequest; import io.ebeantest.LoggedSql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonJackson3; import org.tests.model.json.EBasicJsonList; import org.tests.model.json.EBasicJsonMulti; diff --git a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java index 771a5f54a..f7d4650ab 100644 --- a/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java +++ b/ebean-core/src/test/java/org/tests/json/TestDbJson_List.java @@ -6,7 +6,7 @@ import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.text.TextException; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonList; import org.tests.model.json.PlainBean; @@ -18,10 +18,10 @@ 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.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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestDbJson_List extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonMapBasic.java b/ebean-core/src/test/java/org/tests/json/TestJsonMapBasic.java index 01d105760..fd10d9e99 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonMapBasic.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonMapBasic.java @@ -6,7 +6,7 @@ import io.ebean.Query; import io.ebean.text.json.EJson; import io.ebeantest.LoggedSql; import org.tests.model.json.EBasicJsonMap; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonMapDetail; import java.io.IOException; @@ -14,7 +14,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.jupiter.api.Assertions.assertEquals; public class TestJsonMapBasic extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonMapBlob.java b/ebean-core/src/test/java/org/tests/json/TestJsonMapBlob.java index 25091d91c..6f2285dd6 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonMapBlob.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonMapBlob.java @@ -4,12 +4,12 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.text.json.EJson; import org.tests.model.json.EBasicJsonMapBlob; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestJsonMapBlob extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonMapClob.java b/ebean-core/src/test/java/org/tests/json/TestJsonMapClob.java index ecf21b7fe..b8c5b1f6c 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonMapClob.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonMapClob.java @@ -4,12 +4,12 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.text.json.EJson; import org.tests.model.json.EBasicJsonMapClob; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestJsonMapClob extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonMapJsonB.java b/ebean-core/src/test/java/org/tests/json/TestJsonMapJsonB.java index d33efe02f..e5292734d 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonMapJsonB.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonMapJsonB.java @@ -4,12 +4,12 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.text.json.EJson; import org.tests.model.json.EBasicJsonMapJsonB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestJsonMapJsonB extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonMapVarchar.java b/ebean-core/src/test/java/org/tests/json/TestJsonMapVarchar.java index 96b775ef3..7564c2d5e 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonMapVarchar.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonMapVarchar.java @@ -4,12 +4,12 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.text.json.EJson; import org.tests.model.json.EBasicJsonMapVarchar; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestJsonMapVarchar extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java b/ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java index 9141b171e..7d166819d 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonNodeBasic.java @@ -10,17 +10,17 @@ import org.tests.model.basic.Order; import org.tests.model.json.EBasicJsonNode; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.StringWriter; import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestJsonNodeBasic extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java b/ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java index ace17c972..d775fc01a 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonNodeBlob.java @@ -5,12 +5,12 @@ import io.ebean.Ebean; import org.tests.model.json.EBasicJsonNodeBlob; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Set; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestJsonNodeBlob extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java b/ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java index a50ce5d44..1e3121146 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonNodeJsonb.java @@ -5,12 +5,12 @@ import io.ebean.Ebean; import org.tests.model.json.EBasicJsonNodeJsonB; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Set; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestJsonNodeJsonb extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java b/ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java index eaa17ba62..903b425ca 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonNodeVarchar.java @@ -5,12 +5,12 @@ import io.ebean.Ebean; import org.tests.model.json.EBasicJsonNodeVarchar; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Set; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestJsonNodeVarchar extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/json/TestJsonNullValues.java b/ebean-core/src/test/java/org/tests/json/TestJsonNullValues.java index 7ae086e8d..593e19080 100644 --- a/ebean-core/src/test/java/org/tests/json/TestJsonNullValues.java +++ b/ebean-core/src/test/java/org/tests/json/TestJsonNullValues.java @@ -2,7 +2,7 @@ package org.tests.json; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicOldValue; import java.util.ArrayList; diff --git a/ebean-core/src/test/java/org/tests/json/TestOldValue.java b/ebean-core/src/test/java/org/tests/json/TestOldValue.java index fd108204e..549063869 100644 --- a/ebean-core/src/test/java/org/tests/json/TestOldValue.java +++ b/ebean-core/src/test/java/org/tests/json/TestOldValue.java @@ -1,16 +1,14 @@ package org.tests.json; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.ValuePair; - -import org.assertj.core.api.SoftAssertions; -import org.junit.Ignore; -import org.junit.Test; -import org.tests.model.json.EBasicOldValue; - import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; +import io.ebean.BaseTestCase; +import io.ebean.DB; +import io.ebean.ValuePair; +import org.assertj.core.api.SoftAssertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.tests.model.json.EBasicOldValue; import java.util.List; import java.util.Map; @@ -18,11 +16,9 @@ import java.util.Set; public class TestOldValue extends BaseTestCase { - - @SuppressWarnings({ "rawtypes", "unchecked" }) @Test - public void testDbJsonOldValue() throws Exception { + public void testDbJsonOldValue() { EBasicOldValue bean = new EBasicOldValue(); JsonNodeFactory jnf = new JsonNodeFactory(false); @@ -86,7 +82,7 @@ public class TestOldValue extends BaseTestCase { @SuppressWarnings({ "rawtypes", "unchecked" }) @Test - @Ignore("Old value detection does not work for @DbArray") + @Disabled("Old value detection does not work for @DbArray") public void testDbArrayOldValue() throws Exception { EBasicOldValue bean = new EBasicOldValue(); @@ -98,8 +94,6 @@ public class TestOldValue extends BaseTestCase { bean.getStringArr().add("sa2"); - - Map dirty = DB.beanState(bean).getDirtyValues(); SoftAssertions softly = new SoftAssertions(); softly.assertThat(dirty).hasSize(1); diff --git a/ebean-core/src/test/java/org/tests/json/TestUnmappedProperties.java b/ebean-core/src/test/java/org/tests/json/TestUnmappedProperties.java index 095c4c011..99d1a4974 100644 --- a/ebean-core/src/test/java/org/tests/json/TestUnmappedProperties.java +++ b/ebean-core/src/test/java/org/tests/json/TestUnmappedProperties.java @@ -3,7 +3,7 @@ package org.tests.json; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.json.EBasicJsonUnmapped; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java index 646060eef..04b8714b6 100644 --- a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java +++ b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyList.java @@ -4,11 +4,11 @@ import io.ebean.Ebean; import io.ebean.config.JsonConfig; import io.ebean.text.json.JsonWriteOptions; import org.tests.model.basic.Order; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestJsonExcludeEmptyList { diff --git a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java index d0fc56e7e..06528823b 100644 --- a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java +++ b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptyMap.java @@ -4,11 +4,11 @@ import io.ebean.Ebean; import io.ebean.config.JsonConfig; import io.ebean.text.json.JsonWriteOptions; import org.tests.model.json.EBasicJsonMap; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestJsonExcludeEmptyMap { diff --git a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java index b7bdb5be5..6ade9c12c 100644 --- a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java +++ b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeEmptySet.java @@ -4,11 +4,11 @@ import io.ebean.Ebean; import io.ebean.config.JsonConfig; import io.ebean.text.json.JsonWriteOptions; import org.tests.model.basic.AttributeHolder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashSet; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestJsonExcludeEmptySet { diff --git a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeNull.java b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeNull.java index fea06e6bb..4f99bce89 100644 --- a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeNull.java +++ b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeNull.java @@ -4,9 +4,9 @@ import io.ebean.Ebean; import io.ebean.config.JsonConfig; import io.ebean.text.json.JsonWriteOptions; import org.tests.json.transientproperties.EJsonTransientObject; -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 TestJsonExcludeNull { diff --git a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java index f10e67ece..661503290 100644 --- a/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java +++ b/ebean-core/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java @@ -6,12 +6,12 @@ import io.ebean.text.PathProperties; import io.ebean.text.json.JsonWriteOptions; import org.tests.json.transientproperties.EJsonTransientEntityList; import org.tests.json.transientproperties.EJsonTransientList; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestJsonExcludeTransientEmptyList { diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/TestJacksonIgnore.java b/ebean-core/src/test/java/org/tests/json/transientproperties/TestJacksonIgnore.java index 234e3aa8b..c0feb5070 100644 --- a/ebean-core/src/test/java/org/tests/json/transientproperties/TestJacksonIgnore.java +++ b/ebean-core/src/test/java/org/tests/json/transientproperties/TestJacksonIgnore.java @@ -1,9 +1,9 @@ package org.tests.json.transientproperties; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestJacksonIgnore { diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/TestModelAJson.java b/ebean-core/src/test/java/org/tests/json/transientproperties/TestModelAJson.java index e81acc734..c55ec91a1 100644 --- a/ebean-core/src/test/java/org/tests/json/transientproperties/TestModelAJson.java +++ b/ebean-core/src/test/java/org/tests/json/transientproperties/TestModelAJson.java @@ -2,7 +2,7 @@ package org.tests.json.transientproperties; import io.ebean.Ebean; import io.ebean.text.PathProperties; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientListProperty.java b/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientListProperty.java index bf89a3482..2dc7fd597 100644 --- a/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientListProperty.java +++ b/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientListProperty.java @@ -1,9 +1,9 @@ package org.tests.json.transientproperties; import io.ebean.Ebean; -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 TestTransientListProperty { diff --git a/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientObjectProperty.java b/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientObjectProperty.java index cfd7e54c6..2add46e7a 100644 --- a/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientObjectProperty.java +++ b/ebean-core/src/test/java/org/tests/json/transientproperties/TestTransientObjectProperty.java @@ -1,9 +1,9 @@ package org.tests.json.transientproperties; import io.ebean.Ebean; -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 TestTransientObjectProperty { diff --git a/ebean-core/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java b/ebean-core/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java index 679556fe2..8ecedd6c6 100644 --- a/ebean-core/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java +++ b/ebean-core/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java @@ -6,20 +6,18 @@ import io.ebean.Ebean; import io.ebean.Query; import io.ebean.text.PathProperties; import org.ebeantest.LoggedSqlCollector; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; 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.*; public class TestLazyForeignKeys extends BaseTestCase { - @Before + @BeforeEach public void prepare() { MainEntity ent1 = new MainEntity(); ent1.setId("ent1"); @@ -37,7 +35,7 @@ public class TestLazyForeignKeys extends BaseTestCase { DB.save(rel1); } - @After + @AfterEach public void cleanup() { DB.find(MainEntity.class).delete(); DB.find(MainEntityRelation.class).delete(); diff --git a/ebean-core/src/test/java/org/tests/lazyloadconf/BeanCollectionLazyLoadingTest.java b/ebean-core/src/test/java/org/tests/lazyloadconf/BeanCollectionLazyLoadingTest.java index b0ef7592b..dea936887 100644 --- a/ebean-core/src/test/java/org/tests/lazyloadconf/BeanCollectionLazyLoadingTest.java +++ b/ebean-core/src/test/java/org/tests/lazyloadconf/BeanCollectionLazyLoadingTest.java @@ -2,7 +2,7 @@ package org.tests.lazyloadconf; import io.ebean.DB; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.AbstractMap; import java.util.ArrayList; diff --git a/ebean-core/src/test/java/org/tests/level/test/ManyToManyTest.java b/ebean-core/src/test/java/org/tests/level/test/ManyToManyTest.java index 52cf6098f..bbfb37b0a 100644 --- a/ebean-core/src/test/java/org/tests/level/test/ManyToManyTest.java +++ b/ebean-core/src/test/java/org/tests/level/test/ManyToManyTest.java @@ -6,13 +6,13 @@ import org.tests.level.Level1; import org.tests.level.Level2; import org.tests.level.Level3; import org.tests.level.Level4; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Set; -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 ManyToManyTest extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java b/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java index 8ecd7cdcf..6fe0948b3 100644 --- a/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java +++ b/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java @@ -6,7 +6,7 @@ import io.ebean.Ebean; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; import org.tests.model.basic.EBasicWithLifecycle; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java b/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java index 3e5ddf4a3..b3bd52fa2 100644 --- a/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java +++ b/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java @@ -3,7 +3,7 @@ package org.tests.lifecycle; import io.ebean.BaseTestCase; import io.ebean.DB; import org.tests.model.basic.EBasicWithLifecycleExceptions; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java b/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java index 56bb64311..97b07b941 100644 --- a/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java +++ b/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java @@ -5,7 +5,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicLog; import org.tests.model.basic.EBasicWithLog; diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java b/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java index f8e2189e3..12f2f9806 100644 --- a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java +++ b/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java @@ -3,12 +3,12 @@ package org.tests.m2m; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.SqlRow; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.m2m.MnyA; import org.tests.model.m2m.MnyB; import org.tests.model.m2m.MnyC; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestM2MDeleteCascadeFromParent extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java b/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java index fde4594fb..995641642 100644 --- a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java +++ b/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java @@ -6,8 +6,8 @@ import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.tests.model.basic.MnocRole; import org.tests.model.basic.MnocUser; @@ -22,7 +22,7 @@ public class TestM2MDeleteNoCascade extends BaseTestCase { private static MnocRole r1 = new MnocRole("r1"); private static MnocRole r2 = new MnocRole("r2"); - @BeforeClass + @BeforeAll public static void setup() { DB.save(r0); DB.save(r1); diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java b/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java index b5a8f5137..a4554fd7b 100644 --- a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java +++ b/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java @@ -5,13 +5,14 @@ import io.ebean.Ebean; import org.tests.model.m2m.Permission; import org.tests.model.m2m.Role; import org.tests.model.m2m.Tenant; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashSet; import java.util.List; import java.util.Set; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestM2MDeleteObjectWithCascadeToM2m extends BaseTestCase { @Test @@ -45,9 +46,9 @@ public class TestM2MDeleteObjectWithCascadeToM2m extends BaseTestCase { List roleList = Ebean.find(Role.class).fetch("permissions").findList(); List permissionList = Ebean.find(Permission.class).fetch("roles").findList(); - Assert.assertEquals(1, tenantList.size()); - Assert.assertEquals(2, permissionList.size()); - Assert.assertEquals(1, roleList.size()); + assertEquals(1, tenantList.size()); + assertEquals(2, permissionList.size()); + assertEquals(1, roleList.size()); Ebean.delete(tenant1); @@ -55,9 +56,9 @@ public class TestM2MDeleteObjectWithCascadeToM2m extends BaseTestCase { List roleList2 = Ebean.find(Role.class).fetch("permissions").findList(); List permissionList2 = Ebean.find(Permission.class).fetch("roles").findList(); - Assert.assertEquals(0, tenantList2.size()); - Assert.assertEquals(0, roleList2.size()); - Assert.assertEquals(2, permissionList2.size()); + assertEquals(0, tenantList2.size()); + assertEquals(0, roleList2.size()); + assertEquals(2, permissionList2.size()); } } diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java b/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java index ac44be657..f1571c4e7 100644 --- a/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java +++ b/ebean-core/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java @@ -4,13 +4,15 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + public class TestM2MDeleteWithCascade extends BaseTestCase { @Test @@ -34,19 +36,19 @@ public class TestM2MDeleteWithCascade extends BaseTestCase { Ebean.delete(u0); MUser notThere = Ebean.find(MUser.class, u0.getUserid()); - Assert.assertNull("been deleted", notThere); + assertNull(notThere); List roleIds = new ArrayList<>(); Collections.addAll(roleIds, r0.getRoleid(), r1.getRoleid()); int rc = Ebean.find(MRole.class).where().idIn(roleIds).findCount(); - Assert.assertEquals("roles not deleted", 2, rc); + assertEquals(2, rc); Ebean.deleteAll(roles); rc = Ebean.find(MRole.class).where().idIn(roleIds).findCount(); - Assert.assertEquals("roles deleted now", 0, rc); + assertEquals(0, rc); } } diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java b/ebean-core/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java index d06989acb..cf10919f7 100644 --- a/ebean-core/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java +++ b/ebean-core/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebeantest.LoggedSql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.m2m.Permission; import org.tests.model.m2m.Role; diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MModifyTest.java b/ebean-core/src/test/java/org/tests/m2m/TestM2MModifyTest.java index 3a50fa547..7089bedca 100644 --- a/ebean-core/src/test/java/org/tests/m2m/TestM2MModifyTest.java +++ b/ebean-core/src/test/java/org/tests/m2m/TestM2MModifyTest.java @@ -2,7 +2,7 @@ package org.tests.m2m; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MMultipleLists.java b/ebean-core/src/test/java/org/tests/m2m/TestM2MMultipleLists.java index a1f9db3eb..a94a7198d 100644 --- a/ebean-core/src/test/java/org/tests/m2m/TestM2MMultipleLists.java +++ b/ebean-core/src/test/java/org/tests/m2m/TestM2MMultipleLists.java @@ -4,9 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.m2m.MailBox; import org.tests.model.m2m.MailUser; -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 TestM2MMultipleLists extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java b/ebean-core/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java index 1683f5aa8..91fcb23fe 100644 --- a/ebean-core/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java +++ b/ebean-core/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java @@ -3,7 +3,7 @@ package org.tests.m2m; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.m2m.MnyTopic; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Added to test DDL generation for ManyToMany related back to itself. diff --git a/ebean-core/src/test/java/org/tests/m2m/TestM2mDeleteObject.java b/ebean-core/src/test/java/org/tests/m2m/TestM2mDeleteObject.java index 3ccad9fb8..a96294c3b 100644 --- a/ebean-core/src/test/java/org/tests/m2m/TestM2mDeleteObject.java +++ b/ebean-core/src/test/java/org/tests/m2m/TestM2mDeleteObject.java @@ -3,8 +3,7 @@ package org.tests.m2m; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.meta.MetaTimedMetric; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.m2m.Permission; import org.tests.model.m2m.Role; import org.tests.model.m2m.Tenant; @@ -14,6 +13,7 @@ import java.util.List; import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestM2mDeleteObject extends BaseTestCase { @@ -55,9 +55,9 @@ public class TestM2mDeleteObject extends BaseTestCase { List roleList = Ebean.find(Role.class).fetch("permissions").findList(); List permissionList = Ebean.find(Permission.class).fetch("roles").findList(); - Assert.assertEquals(1, tenantList.size()); - Assert.assertEquals(2, permissionList.size()); - Assert.assertEquals(1, roleList.size()); + assertEquals(1, tenantList.size()); + assertEquals(2, permissionList.size()); + assertEquals(1, roleList.size()); Ebean.delete(role1); @@ -65,9 +65,9 @@ public class TestM2mDeleteObject extends BaseTestCase { List roleList2 = Ebean.find(Role.class).fetch("permissions").findList(); List permissionList2 = Ebean.find(Permission.class).fetch("roles").findList(); - Assert.assertEquals(0, roleList2.size()); - Assert.assertEquals(1, tenantList2.size()); - Assert.assertEquals(2, permissionList2.size()); + assertEquals(0, roleList2.size()); + assertEquals(1, tenantList2.size()); + assertEquals(2, permissionList2.size()); } diff --git a/ebean-core/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java b/ebean-core/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java index 2dbd07c90..5c2866043 100644 --- a/ebean-core/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java +++ b/ebean-core/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java @@ -3,13 +3,13 @@ package org.tests.m2m.softdelete; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -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 TestM2MSoftDeleteExists extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/merge/TestMergeBasic.java b/ebean-core/src/test/java/org/tests/merge/TestMergeBasic.java index 1e274d6bb..05af24970 100644 --- a/ebean-core/src/test/java/org/tests/merge/TestMergeBasic.java +++ b/ebean-core/src/test/java/org/tests/merge/TestMergeBasic.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.MergeOptions; import io.ebean.MergeOptionsBuilder; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; import org.tests.model.basic.UUTwo; diff --git a/ebean-core/src/test/java/org/tests/merge/TestMergeCustomer.java b/ebean-core/src/test/java/org/tests/merge/TestMergeCustomer.java index 61a1a9cfc..f7f4fdb7f 100644 --- a/ebean-core/src/test/java/org/tests/merge/TestMergeCustomer.java +++ b/ebean-core/src/test/java/org/tests/merge/TestMergeCustomer.java @@ -7,7 +7,7 @@ import io.ebean.MergeOptions; import io.ebean.MergeOptionsBuilder; import io.ebean.text.PathProperties; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/merge/TestMergeM2M.java b/ebean-core/src/test/java/org/tests/merge/TestMergeM2M.java index 6ad18dbec..1c6e20e38 100644 --- a/ebean-core/src/test/java/org/tests/merge/TestMergeM2M.java +++ b/ebean-core/src/test/java/org/tests/merge/TestMergeM2M.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.MergeOptions; import io.ebean.MergeOptionsBuilder; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/mockito/TestMockitoMock.java b/ebean-core/src/test/java/org/tests/mockito/TestMockitoMock.java index b9222f8b6..86cb2ab2b 100644 --- a/ebean-core/src/test/java/org/tests/mockito/TestMockitoMock.java +++ b/ebean-core/src/test/java/org/tests/mockito/TestMockitoMock.java @@ -1,6 +1,6 @@ package org.tests.mockito; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.tests.model.aggregation.DOrg; import org.tests.model.basic.PersistentFile; diff --git a/ebean-core/src/test/java/org/tests/model/aggregation/TestAggregationMany.java b/ebean-core/src/test/java/org/tests/model/aggregation/TestAggregationMany.java index 6c7fa4d62..b2b778e6a 100644 --- a/ebean-core/src/test/java/org/tests/model/aggregation/TestAggregationMany.java +++ b/ebean-core/src/test/java/org/tests/model/aggregation/TestAggregationMany.java @@ -3,7 +3,7 @@ package org.tests.model.aggregation; import io.ebean.BaseTestCase; import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java b/ebean-core/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java index 30ee89027..3199bc005 100644 --- a/ebean-core/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java +++ b/ebean-core/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java @@ -4,8 +4,8 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.time.LocalDate; @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class TestAggregationTopLevel extends BaseTestCase { - @BeforeClass + @BeforeAll public static void setup() { loadData(); } diff --git a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java b/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java index 907bac4ac..cc4eb48ba 100644 --- a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java +++ b/ebean-core/src/test/java/org/tests/model/array/TestDbArray_asSet.java @@ -6,7 +6,7 @@ import io.ebean.Query; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashSet; import java.util.LinkedHashSet; @@ -15,7 +15,7 @@ import java.util.Set; import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestDbArray_asSet extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java b/ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java index f6c7b7da1..bdd88410e 100644 --- a/ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java +++ b/ebean-core/src/test/java/org/tests/model/array/TestDbArray_basic.java @@ -8,7 +8,7 @@ import io.ebean.annotation.ForPlatform; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.SQLException; import java.util.ArrayList; @@ -18,8 +18,8 @@ import java.util.Set; import java.util.UUID; 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 TestDbArray_basic extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java index bad02c0c4..917a9f494 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java +++ b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java @@ -7,7 +7,7 @@ import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; import io.ebean.cache.ServerCacheStatistics; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java index 34175b77c..4befd66a9 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java +++ b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java @@ -8,7 +8,7 @@ import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; import io.ebean.cache.ServerCacheStatistics; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Map; diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java index d96d49b17..0099f9e73 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java +++ b/ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; import io.ebeantest.LoggedSql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWhenNull.java b/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWhenNull.java index 13c8a299c..ac34b2fce 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWhenNull.java +++ b/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWhenNull.java @@ -2,7 +2,7 @@ package org.tests.model.basic.cache; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java b/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java index d40c14ac5..ca1c71f7d 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java +++ b/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCacheStatistics; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java b/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java index 74ecd0f08..53aedd28a 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java +++ b/ebean-core/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java @@ -4,13 +4,13 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCacheStatistics; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestNatKeyUid extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/basic/first/TestFirstSecond.java b/ebean-core/src/test/java/org/tests/model/basic/first/TestFirstSecond.java index 9907fa04e..e4a160bf7 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/first/TestFirstSecond.java +++ b/ebean-core/src/test/java/org/tests/model/basic/first/TestFirstSecond.java @@ -2,7 +2,7 @@ package org.tests.model.basic.first; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestFirstSecond extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java b/ebean-core/src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java index 85f7c06c0..7dff5caf5 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java +++ b/ebean-core/src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java @@ -2,8 +2,10 @@ package org.tests.model.basic.mapsuper; import io.ebean.BaseTestCase; import io.ebean.bean.EntityBean; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; public class TestMapSuperEquals extends BaseTestCase { @@ -23,10 +25,10 @@ public class TestMapSuperEquals extends BaseTestCase { a.setId(456l); - Assert.assertTrue("equals By Id value on enhanced mapped super", a.equals(b)); - Assert.assertTrue(b.equals(a)); - Assert.assertTrue(!a.equals(c)); - Assert.assertTrue(!b.equals(c)); + assertEquals(a, b); + assertEquals(b, a); + assertNotEquals(a, c); + assertNotEquals(b, c); } else { System.out.println("--- ok, not running TestMapSuperEquals test"); diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/DummyDao.java b/ebean-core/src/test/java/org/tests/model/basic/xtra/DummyDao.java index 29caa03a4..18ed4403d 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/xtra/DummyDao.java +++ b/ebean-core/src/test/java/org/tests/model/basic/xtra/DummyDao.java @@ -8,9 +8,9 @@ import io.ebean.annotation.TxType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -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 DummyDao { diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java b/ebean-core/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java index fbaeac4d2..0412c5d75 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java +++ b/ebean-core/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java @@ -1,23 +1,24 @@ package org.tests.model.basic.xtra; -import io.ebean.Ebean; -import io.ebean.EbeanServer; +import io.ebean.DB; +import io.ebean.Database; import io.ebean.SqlUpdate; import io.ebean.Transaction; import io.ebean.annotation.Transactional; import org.tests.model.basic.EBasicVer; -import org.junit.Assert; import javax.persistence.PersistenceException; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; + public class OptimisticLockExceptionThrowingDao { Transaction inMethodTransaction; @Transactional public void doSomething(EBasicVer v) { - - EbeanServer server = Ebean.getServer(null); + Database server = DB.getDefault(); inMethodTransaction = server.currentTransaction(); @@ -25,15 +26,15 @@ public class OptimisticLockExceptionThrowingDao { SqlUpdate u = server.sqlUpdate("update e_basicver set last_update = last_update+1 where id = ?"); u.setParameter(1, v.getId()); int count = server.execute(u, t); - Assert.assertEquals(1, count); + assertEquals(1, count); t.commit(); v.setName("some change"); try { - Ebean.save(v); + DB.save(v); // never get here - Assert.assertTrue(false); + fail(); } catch (PersistenceException e) { throw e; } diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java index 2291bd0b7..427f10752 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java +++ b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.SqlUpdate; import io.ebean.Transaction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java index f42b1c2b7..8d849f9c1 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java +++ b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java @@ -6,14 +6,14 @@ import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -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.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestInsertBatchThenFlushThenUpdate extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java index 7ccd6c4d2..d5fea0e3e 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java +++ b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java @@ -6,7 +6,7 @@ import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java index 9bfe75f00..eceb8e12c 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java +++ b/ebean-core/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java @@ -6,12 +6,12 @@ import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestInsertBatchWithDifferentRootTypes extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java b/ebean-core/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java index ed22ae4c4..b7c579fb3 100644 --- a/ebean-core/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java +++ b/ebean-core/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java @@ -2,7 +2,7 @@ package org.tests.model.bridge; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java b/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java index 2e00493fe..a148dc262 100644 --- a/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java +++ b/ebean-core/src/test/java/org/tests/model/bridge/TestIdClassScalar.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.Ebean; import io.ebean.Transaction; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.UUID; diff --git a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java b/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java index b7d4b3970..f5253f69a 100644 --- a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java +++ b/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java @@ -3,7 +3,7 @@ package org.tests.model.carwheeltruck; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebeantest.LoggedSql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java b/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java index 62ed889d4..030898a62 100644 --- a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java +++ b/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java @@ -3,7 +3,7 @@ package org.tests.model.carwheeltruck; import io.ebean.BaseTestCase; import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java b/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java index 179754200..be67a92a1 100644 --- a/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java +++ b/ebean-core/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java @@ -2,7 +2,7 @@ package org.tests.model.carwheeltruck; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Random; diff --git a/ebean-core/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java b/ebean-core/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java index 3499c5162..13fc0d96e 100644 --- a/ebean-core/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java +++ b/ebean-core/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java @@ -3,7 +3,7 @@ package org.tests.model.composite; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/ddd/TestScalarTypeConverter.java b/ebean-core/src/test/java/org/tests/model/ddd/TestScalarTypeConverter.java index dec65742a..ee59d1eeb 100644 --- a/ebean-core/src/test/java/org/tests/model/ddd/TestScalarTypeConverter.java +++ b/ebean-core/src/test/java/org/tests/model/ddd/TestScalarTypeConverter.java @@ -1,7 +1,7 @@ package org.tests.model.ddd; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.ivo.Oid; import org.tests.model.ivo.converter.AnEnumType; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java b/ebean-core/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java index dc50fe412..19f250680 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java @@ -5,7 +5,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java b/ebean-core/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java index df763beaf..ac815b67b 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java index 78562fb6d..a64be330d 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Transaction; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java index dee55eeea..a690a47f1 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.annotation.PersistBatch; import io.ebeaninternal.api.SpiEbeanServer; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java index 277e7bb37..6101352c3 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java @@ -3,7 +3,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java index 0fc42ea26..a3553900e 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java @@ -3,7 +3,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java index 564c00b8d..614c6afb2 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.annotation.PersistBatch; import io.ebeaninternal.api.SpiEbeanServer; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java index 02f6fa5d3..4b43b702a 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java @@ -3,7 +3,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Set; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascade.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascade.java index 4518420f6..7d949d94a 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascade.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascade.java @@ -2,7 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java index e7291ba33..4569132f8 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.Transactional; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java index 47e47727b..923ba37af 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java @@ -3,7 +3,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java index 56c22aa4c..1182f6773 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java @@ -3,7 +3,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java index a214b225c..4b88410de 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java @@ -3,7 +3,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Map; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java index 94d970101..593326fc3 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java @@ -3,7 +3,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java index 2a26c5ea0..e60921867 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java @@ -2,7 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionResused.java b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionResused.java index d95b2549e..2c55ceae4 100644 --- a/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionResused.java +++ b/ebean-core/src/test/java/org/tests/model/elementcollection/TestElementCollectionResused.java @@ -2,7 +2,7 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java index 264bef274..34a042947 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java @@ -3,7 +3,7 @@ package org.tests.model.embedded; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedEqualsWhenCreated.java b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedEqualsWhenCreated.java index f5dcb38b9..77fca97ee 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedEqualsWhenCreated.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedEqualsWhenCreated.java @@ -1,9 +1,9 @@ package org.tests.model.embedded; import io.ebean.DB; -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 TestEmbeddedEqualsWhenCreated { diff --git a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java index bfbb97d46..8b86aab7e 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.plugin.BeanType; import io.ebean.plugin.Property; 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.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedNullableOverride.java b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedNullableOverride.java index 2b19bc612..f6f636c1e 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedNullableOverride.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedNullableOverride.java @@ -2,10 +2,10 @@ package org.tests.model.embedded; import io.ebean.BaseTestCase; 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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestEmbeddedNullableOverride extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java b/ebean-core/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java index ffe82ac75..10773c52e 100644 --- a/ebean-core/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java +++ b/ebean-core/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java @@ -7,13 +7,13 @@ import io.ebean.Version; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestHistoryEmbeddedId extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/history/TestHistoryExclude.java b/ebean-core/src/test/java/org/tests/model/history/TestHistoryExclude.java index 0132f9d7f..ad852a427 100644 --- a/ebean-core/src/test/java/org/tests/model/history/TestHistoryExclude.java +++ b/ebean-core/src/test/java/org/tests/model/history/TestHistoryExclude.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/history/TestHistoryInclude.java b/ebean-core/src/test/java/org/tests/model/history/TestHistoryInclude.java index 1ba178b70..31afb8e03 100644 --- a/ebean-core/src/test/java/org/tests/model/history/TestHistoryInclude.java +++ b/ebean-core/src/test/java/org/tests/model/history/TestHistoryInclude.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; diff --git a/ebean-core/src/test/java/org/tests/model/history/TestHistoryOneToMany.java b/ebean-core/src/test/java/org/tests/model/history/TestHistoryOneToMany.java index 75e0bc871..2ccd4d03c 100644 --- a/ebean-core/src/test/java/org/tests/model/history/TestHistoryOneToMany.java +++ b/ebean-core/src/test/java/org/tests/model/history/TestHistoryOneToMany.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java b/ebean-core/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java index 36ba5d279..0ce7505c2 100644 --- a/ebean-core/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java +++ b/ebean-core/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java @@ -2,7 +2,7 @@ package org.tests.model.history; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java b/ebean-core/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java index aea5586cf..0817a0967 100644 --- a/ebean-core/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java +++ b/ebean-core/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java @@ -3,7 +3,7 @@ package org.tests.model.inheritexposedtype.test; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.inheritexposedtype.IXPhoto; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestInheritExposeDtype extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java b/ebean-core/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java index baf913b7c..f03fc7626 100644 --- a/ebean-core/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java +++ b/ebean-core/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java @@ -3,11 +3,12 @@ package org.tests.model.inheritmany; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Random; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestMediaInheritanceJoinToMany extends BaseTestCase { @Test @@ -24,7 +25,7 @@ public class TestMediaInheritanceJoinToMany extends BaseTestCase { // assert we get the profile with a null picture MProfile profile = query.findOne(); - Assert.assertNotNull(profile); + assertNotNull(profile); String generatedSql = query.getGeneratedSql(); assertSql(generatedSql).contains("select t0.id, t0.name, t1.type, t1.id, t1.url, t1.note from mprofile t0 left join mmedia t1 on t1.id = t0.picture_id and t1.type = 'Picture' where t0.name = ?"); diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/TestSelfMany.java b/ebean-core/src/test/java/org/tests/model/interfaces/TestSelfMany.java index e12c47cfd..ec164715d 100644 --- a/ebean-core/src/test/java/org/tests/model/interfaces/TestSelfMany.java +++ b/ebean-core/src/test/java/org/tests/model/interfaces/TestSelfMany.java @@ -2,7 +2,7 @@ package org.tests.model.interfaces; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestSelfMany extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/interfaces/TestTargetEntity.java b/ebean-core/src/test/java/org/tests/model/interfaces/TestTargetEntity.java index 9db04f045..974d7aeef 100644 --- a/ebean-core/src/test/java/org/tests/model/interfaces/TestTargetEntity.java +++ b/ebean-core/src/test/java/org/tests/model/interfaces/TestTargetEntity.java @@ -2,7 +2,7 @@ package org.tests.model.interfaces; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java b/ebean-core/src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java index d1396dde4..57a4d97ad 100644 --- a/ebean-core/src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java +++ b/ebean-core/src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java @@ -2,7 +2,7 @@ package org.tests.model.ivo.test; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.ivo.ESomeConvertType; import org.tests.model.ivo.Money; diff --git a/ebean-core/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java b/ebean-core/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java index b29737060..61f1f66ff 100644 --- a/ebean-core/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java +++ b/ebean-core/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java @@ -6,12 +6,12 @@ import org.joda.time.DateTime; import org.joda.time.LocalDate; import org.joda.time.LocalDateTime; import org.joda.time.Period; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; public class TestJodaInsertUpdate extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java b/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java index 2a7456b07..164bbe1b9 100644 --- a/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java +++ b/ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java @@ -3,7 +3,7 @@ package org.tests.model.json; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebeantest.LoggedSql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java b/ebean-core/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java index ce5d35b26..aa6c04542 100644 --- a/ebean-core/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java @@ -1,6 +1,6 @@ package org.tests.model.lazywithcache; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.ebean.BaseTestCase; import io.ebean.DB; diff --git a/ebean-core/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java b/ebean-core/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java index f230cec9e..2a475f40b 100644 --- a/ebean-core/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java +++ b/ebean-core/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java @@ -2,7 +2,7 @@ package org.tests.model.lazywithid; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/m2m/TestM2MDoubleInsert.java b/ebean-core/src/test/java/org/tests/model/m2m/TestM2MDoubleInsert.java index 1c59dbf3e..5c5b8a840 100644 --- a/ebean-core/src/test/java/org/tests/model/m2m/TestM2MDoubleInsert.java +++ b/ebean-core/src/test/java/org/tests/model/m2m/TestM2MDoubleInsert.java @@ -1,7 +1,7 @@ package org.tests.model.m2m; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestM2MDoubleInsert { diff --git a/ebean-core/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java b/ebean-core/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java index 6a6c8e85e..48680f619 100644 --- a/ebean-core/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java +++ b/ebean-core/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java @@ -4,7 +4,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.ebean.BaseTestCase; import io.ebean.DB; diff --git a/ebean-core/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java b/ebean-core/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java index eb993da93..bc074d9be 100644 --- a/ebean-core/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java +++ b/ebean-core/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/model/map/BeanMapOrphanRemovalTest.java b/ebean-core/src/test/java/org/tests/model/map/BeanMapOrphanRemovalTest.java index 48288e7a3..089df1a94 100644 --- a/ebean-core/src/test/java/org/tests/model/map/BeanMapOrphanRemovalTest.java +++ b/ebean-core/src/test/java/org/tests/model/map/BeanMapOrphanRemovalTest.java @@ -1,7 +1,7 @@ package org.tests.model.map; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Map; diff --git a/ebean-core/src/test/java/org/tests/model/nofk/Test2NoFk.java b/ebean-core/src/test/java/org/tests/model/nofk/Test2NoFk.java index bf00656a8..9f80ac280 100644 --- a/ebean-core/src/test/java/org/tests/model/nofk/Test2NoFk.java +++ b/ebean-core/src/test/java/org/tests/model/nofk/Test2NoFk.java @@ -5,21 +5,21 @@ import io.ebean.DB; import io.ebean.Ebean; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.persistence.EntityNotFoundException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -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; // test that simulates relations with @formula public class Test2NoFk extends BaseTestCase { - @Before + @BeforeEach public void setup() { // Reset t DB.truncate(EFile2NoFk.class, EUserNoFk.class, EUserNoFkSoftDel.class); diff --git a/ebean-core/src/test/java/org/tests/model/nofk/TestNoFk.java b/ebean-core/src/test/java/org/tests/model/nofk/TestNoFk.java index e9ed12dbe..e7d352d32 100644 --- a/ebean-core/src/test/java/org/tests/model/nofk/TestNoFk.java +++ b/ebean-core/src/test/java/org/tests/model/nofk/TestNoFk.java @@ -6,21 +6,21 @@ import io.ebean.Ebean; import io.ebean.SqlRow; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import javax.persistence.EntityNotFoundException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -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 TestNoFk extends BaseTestCase { - @Before + @BeforeEach public void setup() { // Reset t Ebean.find(EFileNoFk.class).delete(); @@ -334,7 +334,7 @@ public class TestNoFk extends BaseTestCase { @Test - @Ignore("this would be a bonus task :)") + @Disabled("this would be a bonus task :)") public void testLazyLoadUser500() { // user 500 does not exist in DB EUserNoFk owner = Ebean.find(EUserNoFk.class, 500); @@ -360,7 +360,7 @@ public class TestNoFk extends BaseTestCase { } @Test - @Ignore("Bonus Task 2") + @Disabled("Bonus Task 2") public void testM2mLazyLoadFile() { List files = Ebean.find(EFileNoFk.class).findList(); assertThat(files).hasSize(2); diff --git a/ebean-core/src/test/java/org/tests/model/nofk/TestTruncate.java b/ebean-core/src/test/java/org/tests/model/nofk/TestTruncate.java index bf22cb284..3e468714d 100644 --- a/ebean-core/src/test/java/org/tests/model/nofk/TestTruncate.java +++ b/ebean-core/src/test/java/org/tests/model/nofk/TestTruncate.java @@ -1,7 +1,7 @@ package org.tests.model.nofk; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/model/noid/TestInsertNoIdBean.java b/ebean-core/src/test/java/org/tests/model/noid/TestInsertNoIdBean.java index b7257afcf..bc4b7c94a 100644 --- a/ebean-core/src/test/java/org/tests/model/noid/TestInsertNoIdBean.java +++ b/ebean-core/src/test/java/org/tests/model/noid/TestInsertNoIdBean.java @@ -1,26 +1,22 @@ package org.tests.model.noid; import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import org.junit.Test; +import io.ebean.DB; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.assertThat; public class TestInsertNoIdBean extends BaseTestCase { @Test public void testInsert() { - - NoIdBean bean = new NoIdBean(); bean.setName("Rocky"); bean.setSubject("Blowing up stuff"); - Ebean.save(bean); - - int rowCount = Ebean.find(NoIdBean.class).findCount(); - - assertTrue("rowCount:" + rowCount, rowCount > 0); + DB.save(bean); + int rowCount = DB.find(NoIdBean.class).findCount(); + assertThat(rowCount).isGreaterThan(0); } } diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java index eedfaa2fb..b39351ca8 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java @@ -2,15 +2,14 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestOneToOneCascadeSave extends BaseTestCase { @Test public void test() { - - OtoMaster master = new OtoMaster(); master.setName("CName"); @@ -24,12 +23,11 @@ public class TestOneToOneCascadeSave extends BaseTestCase { Ebean.save(master); - Assert.assertNotNull(child.getId()); + assertNotNull(child.getId()); OtoChild child2 = Ebean.find(OtoChild.class, child.getId()); OtoMaster master2 = child2.getMaster(); - Assert.assertNotNull(master2); - + assertNotNull(master2); } } diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java index f23e3ce39..32a39cdbf 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.EbeanServer; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java index 60d7eab3b..866568799 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java @@ -2,7 +2,7 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestOneToOneJoinColumn extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneManyDelete.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneManyDelete.java index 6ba85879a..46f7bf476 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneManyDelete.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneManyDelete.java @@ -1,7 +1,7 @@ package org.tests.model.onetoone; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestOneToOneManyDelete { diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java index c53205e48..34ecf0879 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java @@ -2,16 +2,16 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; import org.ebeantest.LoggedSqlCollector; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.*; + public class TestOneToOneOptionalRelationship extends BaseTestCase { @Test public void test() { - Account account = new Account(); account.setName("AC234"); account.save(); @@ -19,10 +19,10 @@ public class TestOneToOneOptionalRelationship extends BaseTestCase { LoggedSqlCollector.start(); Account fetchedAccount = Account.find.byId(account.getId()); - Assert.assertNotNull(fetchedAccount); + assertNotNull(fetchedAccount); List loggedSql = LoggedSqlCollector.stop(); - Assert.assertEquals(1, loggedSql.size()); + assertEquals(1, loggedSql.size()); // select t0.id c0, t0.name c1, t0.version c2, t0.when_created c3, t0.when_updated c4, t1.id c5 // from oto_account t0 @@ -30,8 +30,8 @@ public class TestOneToOneOptionalRelationship extends BaseTestCase { // where t0.id = ? String sql = trimSql(loggedSql.get(0), 1); - Assert.assertTrue(sql.contains("select t0.id, t0.name")); - Assert.assertTrue(sql.contains(" from oto_account t0 left join oto_user t1 on t1.account_id = t0.id where t0.id = ?")); + assertTrue(sql.contains("select t0.id, t0.name")); + assertTrue(sql.contains(" from oto_account t0 left join oto_user t1 on t1.account_id = t0.id where t0.id = ?")); } @@ -50,14 +50,14 @@ public class TestOneToOneOptionalRelationship extends BaseTestCase { LoggedSqlCollector.start(); Account fetchedAccount = Account.find.byId(account.getId()); - Assert.assertNotNull(fetchedAccount); + assertNotNull(fetchedAccount); - Assert.assertNotNull(fetchedAccount.getUser()); - Assert.assertEquals(user.getId(), fetchedAccount.getUser().getId()); - Assert.assertEquals(user.getName(), fetchedAccount.getUser().getName()); + assertNotNull(fetchedAccount.getUser()); + assertEquals(user.getId(), fetchedAccount.getUser().getId()); + assertEquals(user.getName(), fetchedAccount.getUser().getName()); List loggedSql = LoggedSqlCollector.stop(); - Assert.assertEquals(2, loggedSql.size()); + assertEquals(2, loggedSql.size()); // select t0.id c0, t0.name c1, t0.version c2, t0.when_created c3, t0.when_updated c4, t1.id c5 // from oto_account t0 @@ -65,11 +65,11 @@ public class TestOneToOneOptionalRelationship extends BaseTestCase { // where t0.id = ? String sql = trimSql(loggedSql.get(0), 1); - Assert.assertTrue(sql.contains("select t0.id, t0.name")); - Assert.assertTrue(sql.contains(" from oto_account t0 left join oto_user t1 on t1.account_id = t0.id where t0.id = ?")); + assertTrue(sql.contains("select t0.id, t0.name")); + assertTrue(sql.contains(" from oto_account t0 left join oto_user t1 on t1.account_id = t0.id where t0.id = ?")); String lazyLoadSql = trimSql(loggedSql.get(1), 5); - Assert.assertTrue(lazyLoadSql.contains("select t0.id, t0.name, t0.version, t0.when_created, t0.when_modified, t0.account_id from oto_user t0 where t0.id = ?")); + assertTrue(lazyLoadSql.contains("select t0.id, t0.name, t0.version, t0.when_created, t0.when_modified, t0.account_id from oto_user t0 where t0.id = ?")); } @@ -88,14 +88,14 @@ public class TestOneToOneOptionalRelationship extends BaseTestCase { LoggedSqlCollector.start(); Account fetchedAccount = Account.find.query().fetch("user").setId(account.getId()).findOne(); - Assert.assertNotNull(fetchedAccount); + assertNotNull(fetchedAccount); - Assert.assertNotNull(fetchedAccount.getUser()); - Assert.assertEquals(user.getId(), fetchedAccount.getUser().getId()); - Assert.assertEquals(user.getName(), fetchedAccount.getUser().getName()); + assertNotNull(fetchedAccount.getUser()); + assertEquals(user.getId(), fetchedAccount.getUser().getId()); + assertEquals(user.getName(), fetchedAccount.getUser().getName()); List loggedSql = LoggedSqlCollector.stop(); - Assert.assertEquals(1, loggedSql.size()); + assertEquals(1, loggedSql.size()); // select t0.id c0, t0.name c1, t0.version c2, t0.when_created c3, t0.when_updated c4, t1.id c5 // from oto_account t0 @@ -103,7 +103,7 @@ public class TestOneToOneOptionalRelationship extends BaseTestCase { // where t0.id = ? String sql = trimSql(loggedSql.get(0), 1); - Assert.assertTrue(sql.contains("select t0.id, t0.name")); - Assert.assertTrue(sql.contains(" from oto_account t0 left join oto_user t1 on t1.account_id = t0.id where t0.id = ?")); + assertTrue(sql.contains("select t0.id, t0.name")); + assertTrue(sql.contains(" from oto_account t0 left join oto_user t1 on t1.account_id = t0.id where t0.id = ?")); } } diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java index 7c0828c25..6cb1040de 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java @@ -6,7 +6,7 @@ import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java index 6867177ed..17655b945 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java @@ -3,7 +3,7 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java index 0265b1c14..a2fb61c7f 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java index 6f5921435..e7958eb79 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java index 173bb87b8..fa5c5ee1d 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java index 326f822dc..4497dc27e 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java @@ -2,7 +2,7 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java b/ebean-core/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java index ddadfe530..77e835ffc 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java @@ -4,14 +4,14 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import org.ebeantest.LoggedSqlCollector; -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.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class DeleteById_SoftDelete_Tests extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java b/ebean-core/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java index 41011c84b..9f96fa221 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java @@ -3,7 +3,7 @@ package org.tests.model.onetoone.album; import io.ebean.BaseTestCase; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/onetoone/calcd/TestOneToOnePrimaryKeyJoinMapping.java b/ebean-core/src/test/java/org/tests/model/onetoone/calcd/TestOneToOnePrimaryKeyJoinMapping.java index 9e1aa68f0..e115543ee 100644 --- a/ebean-core/src/test/java/org/tests/model/onetoone/calcd/TestOneToOnePrimaryKeyJoinMapping.java +++ b/ebean-core/src/test/java/org/tests/model/onetoone/calcd/TestOneToOnePrimaryKeyJoinMapping.java @@ -1,7 +1,7 @@ package org.tests.model.onetoone.calcd; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemovalOverwrite.java b/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemovalOverwrite.java index 9c6fa045b..446fff4b2 100644 --- a/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemovalOverwrite.java +++ b/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemovalOverwrite.java @@ -1,12 +1,12 @@ package org.tests.model.orphanremoval; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static java.util.Collections.singletonList; -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 TestOrphanRemovalOverwrite { @@ -29,9 +29,8 @@ public class TestOrphanRemovalOverwrite { // Refreshing here generates new objects for the associated children that are referred to by the parent. parent.refresh(); - assertNotNull("The children should now have Ids as they are persisted to the db.", childList.get(0).getId()); - assertEquals("The children should have the same Id as the ones on the parent.", - childList.get(0).getId(), parent.getChildren().get(0).getId()); - assertEquals("The children should therefore equal the children on the parent.", childList, parent.getChildren()); + assertNotNull(childList.get(0).getId()); + assertEquals(childList.get(0).getId(), parent.getChildren().get(0).getId()); + assertEquals(childList, parent.getChildren()); } } diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java b/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java index 0148979fa..c40131fa4 100644 --- a/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java +++ b/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java @@ -3,7 +3,7 @@ package org.tests.model.orphanremoval; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java b/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java index 74c1c5fc1..cdfe68995 100644 --- a/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java +++ b/ebean-core/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java @@ -2,7 +2,7 @@ package org.tests.model.orphanremoval; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java b/ebean-core/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java index afdcfb78a..d44184b16 100644 --- a/ebean-core/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java +++ b/ebean-core/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java @@ -2,7 +2,7 @@ package org.tests.model.prnt; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestPrinterStateIssue extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/pview/TestPview.java b/ebean-core/src/test/java/org/tests/model/pview/TestPview.java index d1de56f0d..541d310ae 100644 --- a/ebean-core/src/test/java/org/tests/model/pview/TestPview.java +++ b/ebean-core/src/test/java/org/tests/model/pview/TestPview.java @@ -3,7 +3,7 @@ package org.tests.model.pview; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.UUID; diff --git a/ebean-core/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java b/ebean-core/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java index fbb2ee7ae..f3c803365 100644 --- a/ebean-core/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java +++ b/ebean-core/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java @@ -3,7 +3,7 @@ package org.tests.model.selfref; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.EbeanServer; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestResourceFileSelfRef extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/selfref/TestSelfRefExample.java b/ebean-core/src/test/java/org/tests/model/selfref/TestSelfRefExample.java index 65e00f683..2c27bc798 100644 --- a/ebean-core/src/test/java/org/tests/model/selfref/TestSelfRefExample.java +++ b/ebean-core/src/test/java/org/tests/model/selfref/TestSelfRefExample.java @@ -3,13 +3,13 @@ package org.tests.model.selfref; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.persistence.PersistenceException; 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 TestSelfRefExample extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java b/ebean-core/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java index 5163c9ffb..48134bd4f 100644 --- a/ebean-core/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java +++ b/ebean-core/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java @@ -3,11 +3,12 @@ package org.tests.model.selfref; import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.Ebean; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertFalse; + public class TestTextJsonSelfRef extends BaseTestCase { @Test @@ -39,7 +40,7 @@ public class TestTextJsonSelfRef extends BaseTestCase { // Check that there are no 'reference' beans here for (SelfRefCustomer cust : customers) { BeanState beanState = Ebean.getBeanState(cust); - Assert.assertFalse(beanState.isReference()); + assertFalse(beanState.isReference()); } // JsonWriteOptions options = JsonWriteOptions.parsePath("(id,name,referredBy(id))"); diff --git a/ebean-core/src/test/java/org/tests/model/site/TestTreeModel.java b/ebean-core/src/test/java/org/tests/model/site/TestTreeModel.java index 54eb9b808..ecfff5430 100644 --- a/ebean-core/src/test/java/org/tests/model/site/TestTreeModel.java +++ b/ebean-core/src/test/java/org/tests/model/site/TestTreeModel.java @@ -2,7 +2,7 @@ package org.tests.model.site; import io.ebean.BaseTestCase; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/survey/TestOrderByFetch.java b/ebean-core/src/test/java/org/tests/model/survey/TestOrderByFetch.java index b401696f0..2fc281e2a 100644 --- a/ebean-core/src/test/java/org/tests/model/survey/TestOrderByFetch.java +++ b/ebean-core/src/test/java/org/tests/model/survey/TestOrderByFetch.java @@ -2,12 +2,12 @@ package org.tests.model.survey; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestOrderByFetch extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java b/ebean-core/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java index 377087985..01bf94513 100644 --- a/ebean-core/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java +++ b/ebean-core/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java @@ -2,7 +2,7 @@ package org.tests.model.tevent; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestAssocOneNullTraverse extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/model/uuidsibling/SoftDeleteCascadeTest.java b/ebean-core/src/test/java/org/tests/model/uuidsibling/SoftDeleteCascadeTest.java index 42cfa2a62..25e56347b 100644 --- a/ebean-core/src/test/java/org/tests/model/uuidsibling/SoftDeleteCascadeTest.java +++ b/ebean-core/src/test/java/org/tests/model/uuidsibling/SoftDeleteCascadeTest.java @@ -1,13 +1,10 @@ package org.tests.model.uuidsibling; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.UUID; -import static org.hamcrest.core.Is.is; -import static org.hamcrest.core.IsNot.not; -import static org.hamcrest.core.IsNull.nullValue; -import static org.junit.Assert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class SoftDeleteCascadeTest { @@ -36,31 +33,15 @@ public class SoftDeleteCascadeTest { parent.refresh(); - assertThat("Parent should have one child loaded", - parent.getChildren().size(), - is(1) - ); - - assertThat("Parent should have correct child loaded", - parent.getChildren().get(0).getId(), - is(child.getId()) - ); - - assertThat("Child that was loaded should have its sibling available", - parent.getChildren().get(0).getChildSibling(), - not(nullValue()) - ); - - assertThat( - "Child that was loaded should have loaded correct sibling", - parent.getChildren().get(0).getChildSibling().getId(), - is(childSibling.getId()) - ); + assertThat(parent.getChildren()).hasSize(1); + assertThat(parent.getChildren().get(0).getId()).isEqualTo(child.getId()); + assertThat(parent.getChildren().get(0).getChildSibling()).isNotNull(); + assertThat(parent.getChildren().get(0).getChildSibling().getId()).isEqualTo(childSibling.getId()); } private void assertAfter(Long parentId, UUID childId, Long childSiblingId) { - assertThat(USibParent.find.byId(parentId), is(nullValue())); - assertThat(USibChild.find.byId(childId), is(nullValue())); - assertThat(USibChildSibling.find.byId(childSiblingId), is(nullValue())); + assertThat(USibParent.find.byId(parentId)).isNull(); + assertThat(USibChild.find.byId(childId)).isNull(); + assertThat(USibChildSibling.find.byId(childSiblingId)).isNull(); } } diff --git a/ebean-core/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java b/ebean-core/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java index 8c7608450..efdd41302 100644 --- a/ebean-core/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java +++ b/ebean-core/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java @@ -2,15 +2,15 @@ package org.tests.model.version; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; public class TestVersionHierarchyModification extends BaseTestCase { - @Before + @BeforeEach public void setup() { final VersionParent parent = new VersionParent(); parent.setName("vParent"); @@ -42,7 +42,7 @@ public class TestVersionHierarchyModification extends BaseTestCase { Ebean.save(parent); } - @After + @AfterEach public void cleanUp() { Ebean.find(VersionParent.class).delete(); } diff --git a/ebean-core/src/test/java/org/tests/model/view/TestViewBaseEntity.java b/ebean-core/src/test/java/org/tests/model/view/TestViewBaseEntity.java index a341644af..2068496ba 100644 --- a/ebean-core/src/test/java/org/tests/model/view/TestViewBaseEntity.java +++ b/ebean-core/src/test/java/org/tests/model/view/TestViewBaseEntity.java @@ -3,7 +3,7 @@ package org.tests.model.view; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/model/zero/TestWithZero.java b/ebean-core/src/test/java/org/tests/model/zero/TestWithZero.java index ce7b68719..7c71c20d3 100644 --- a/ebean-core/src/test/java/org/tests/model/zero/TestWithZero.java +++ b/ebean-core/src/test/java/org/tests/model/zero/TestWithZero.java @@ -2,10 +2,10 @@ package org.tests.model.zero; import io.ebean.BaseTestCase; import io.ebean.Ebean; -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 TestWithZero extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java b/ebean-core/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java index cb95ad388..9505d9d50 100644 --- a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java +++ b/ebean-core/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java @@ -3,13 +3,13 @@ package org.tests.o2m; import io.ebean.BaseTestCase; import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; public class TestOneToManyNoMappedBy extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java b/ebean-core/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java index a07c415d4..9ca312ce8 100644 --- a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java +++ b/ebean-core/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java @@ -4,13 +4,13 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebeaninternal.server.deploy.BeanDescriptor; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.UUID; -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 TestOneToManyOnlyBean extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyWhere.java b/ebean-core/src/test/java/org/tests/o2m/TestOneToManyWhere.java index e2dca664a..66ec5e744 100644 --- a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyWhere.java +++ b/ebean-core/src/test/java/org/tests/o2m/TestOneToManyWhere.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebeantest.LoggedSql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyWildcard.java b/ebean-core/src/test/java/org/tests/o2m/TestOneToManyWildcard.java index 2cf5561c8..6b4674a94 100644 --- a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyWildcard.java +++ b/ebean-core/src/test/java/org/tests/o2m/TestOneToManyWildcard.java @@ -1,7 +1,7 @@ package org.tests.o2m; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java b/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java index c0747fb7a..560f86ee9 100644 --- a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java +++ b/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java @@ -3,7 +3,7 @@ package org.tests.o2m.jointable; import io.ebean.BaseTestCase; import io.ebean.DB; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java b/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java index 19e600b7b..b469d4489 100644 --- a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java +++ b/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.config.dbplatform.IdType; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.o2m.jointable.inheritance.ClassA; import org.tests.o2m.jointable.inheritance.ClassB; diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java b/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java index 500a0ef79..607a1a4ed 100644 --- a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java +++ b/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/o2m/lazy/TestLazyManyViaPath.java b/ebean-core/src/test/java/org/tests/o2m/lazy/TestLazyManyViaPath.java index 8eee5d3e8..f6c41bebe 100644 --- a/ebean-core/src/test/java/org/tests/o2m/lazy/TestLazyManyViaPath.java +++ b/ebean-core/src/test/java/org/tests/o2m/lazy/TestLazyManyViaPath.java @@ -2,7 +2,7 @@ package org.tests.o2m.lazy; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java b/ebean-core/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java index a80277abd..8af0550d8 100644 --- a/ebean-core/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java +++ b/ebean-core/src/test/java/org/tests/o2o/TestOneToOneSaveWithoutChanges.java @@ -3,7 +3,7 @@ package org.tests.o2o; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/o2o/TestReferenceSave.java b/ebean-core/src/test/java/org/tests/o2o/TestReferenceSave.java index 11d3bd9f2..84c858b1f 100644 --- a/ebean-core/src/test/java/org/tests/o2o/TestReferenceSave.java +++ b/ebean-core/src/test/java/org/tests/o2o/TestReferenceSave.java @@ -3,7 +3,7 @@ package org.tests.o2o; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.update.EPersonOnline; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/order/TestOrderColumn.java b/ebean-core/src/test/java/org/tests/order/TestOrderColumn.java index a3722daad..431b7a30c 100644 --- a/ebean-core/src/test/java/org/tests/order/TestOrderColumn.java +++ b/ebean-core/src/test/java/org/tests/order/TestOrderColumn.java @@ -3,7 +3,7 @@ package org.tests.order; import io.ebean.Ebean; import io.ebean.TransactionalTestCase; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Comparator; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java b/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java index 93adb4e01..c67369022 100644 --- a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java +++ b/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.EbeanServer; import org.tests.model.basic.EBasic; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java b/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java index 6e80dc3d4..9e95b7c5d 100644 --- a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java +++ b/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java @@ -3,13 +3,13 @@ package org.tests.persistencecontext; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; import static io.ebean.PersistenceContextScope.QUERY; import static io.ebean.PersistenceContextScope.TRANSACTION; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; public class TestPersistenceContextQueryScope extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java b/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java index 2db2125f9..c93df67bd 100644 --- a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java +++ b/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashSet; @@ -13,8 +13,8 @@ import java.util.List; import java.util.Set; import static io.ebean.PersistenceContextScope.QUERY; -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 TestPersistenceContextScopeUsingOrders extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java b/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java index 73175fb06..f17a8ffa7 100644 --- a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java +++ b/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java @@ -9,12 +9,12 @@ import io.ebean.config.ContainerConfig; import io.ebean.config.DatabaseConfig; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiQuery; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; import java.util.Properties; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestPersistenceContextServerConfig extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/profile/ProfileLocationTest.java b/ebean-core/src/test/java/org/tests/profile/ProfileLocationTest.java index c7b0edfe9..b89c5e448 100644 --- a/ebean-core/src/test/java/org/tests/profile/ProfileLocationTest.java +++ b/ebean-core/src/test/java/org/tests/profile/ProfileLocationTest.java @@ -1,7 +1,7 @@ package org.tests.profile; import io.ebean.ProfileLocation; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java b/ebean-core/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java index 1a7e708aa..60329b4e3 100644 --- a/ebean-core/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java +++ b/ebean-core/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.PagedList; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java b/ebean-core/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java index 0c21fb250..ae0839bfd 100644 --- a/ebean-core/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java +++ b/ebean-core/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java @@ -10,7 +10,7 @@ import org.tests.model.basic.Address; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java b/ebean-core/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java index baddc58dc..6f848175b 100644 --- a/ebean-core/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java +++ b/ebean-core/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java @@ -4,8 +4,9 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; import org.tests.model.basic.Customer; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.fail; public class TestConnectionCloseOnSqlerr extends BaseTestCase { @@ -27,7 +28,7 @@ public class TestConnectionCloseOnSqlerr extends BaseTestCase { q0.findList(); } catch (Exception e) { if (e.getMessage().contains("Unsuccessfully waited")) { - Assert.fail("No connections found while only one thread is running. (after " + i + " queries)"); + fail(); } else { e.printStackTrace(); } @@ -58,7 +59,7 @@ public class TestConnectionCloseOnSqlerr extends BaseTestCase { Ebean.commitTransaction(); } catch (Exception e) { if (e.getMessage().contains("Unsuccessfully waited")) { - Assert.fail("No connections found while only one thread is running. (after " + i + " queries)"); + fail("No connections found while only one thread is running. (after " + i + " queries)"); } else { e.printStackTrace(); } diff --git a/ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java b/ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java index dffdadb96..0a33ced29 100644 --- a/ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java +++ b/ebean-core/src/test/java/org/tests/query/TestDefaultFetchLazy.java @@ -5,11 +5,12 @@ import io.ebean.BeanState; import io.ebean.Ebean; import io.ebean.Query; import org.tests.model.basic.MyLobSize; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Set; +import static org.junit.jupiter.api.Assertions.*; + public class TestDefaultFetchLazy extends BaseTestCase { @Test @@ -22,20 +23,20 @@ public class TestDefaultFetchLazy extends BaseTestCase { Ebean.save(m); - Assert.assertNotNull(m.getId()); + assertNotNull(m.getId()); MyLobSize myLobSize = Ebean.find(MyLobSize.class, m.getId()); BeanState beanState = Ebean.getBeanState(myLobSize); Set loadedProps = beanState.getLoadedProps(); - Assert.assertNotNull(loadedProps); - Assert.assertTrue(loadedProps.contains("id")); - Assert.assertTrue(loadedProps.contains("name")); + assertNotNull(loadedProps); + assertTrue(loadedProps.contains("id")); + assertTrue(loadedProps.contains("name")); // FetchType.LAZY properties excluded - Assert.assertFalse(loadedProps.contains("myLob")); - Assert.assertFalse(loadedProps.contains("myCount")); + assertFalse(loadedProps.contains("myLob")); + assertFalse(loadedProps.contains("myCount")); // the details is also tuned Query queryMany = Ebean.find(MyLobSize.class).fetch("details")// ,"+query") @@ -44,8 +45,8 @@ public class TestDefaultFetchLazy extends BaseTestCase { queryMany.findList(); String generatedSql = queryMany.getGeneratedSql(); - Assert.assertTrue(generatedSql.contains("t1.other")); - Assert.assertFalse(generatedSql.contains("t1.something")); + assertTrue(generatedSql.contains("t1.other")); + assertFalse(generatedSql.contains("t1.something")); } } diff --git a/ebean-core/src/test/java/org/tests/query/TestExprNestedDisjunction.java b/ebean-core/src/test/java/org/tests/query/TestExprNestedDisjunction.java index cceeb63ae..e290bb817 100644 --- a/ebean-core/src/test/java/org/tests/query/TestExprNestedDisjunction.java +++ b/ebean-core/src/test/java/org/tests/query/TestExprNestedDisjunction.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/query/TestFindOneOrEmpty.java b/ebean-core/src/test/java/org/tests/query/TestFindOneOrEmpty.java index d9952c8c0..7bdad3793 100644 --- a/ebean-core/src/test/java/org/tests/query/TestFindOneOrEmpty.java +++ b/ebean-core/src/test/java/org/tests/query/TestFindOneOrEmpty.java @@ -2,7 +2,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/query/TestIContains.java b/ebean-core/src/test/java/org/tests/query/TestIContains.java index 236e7895a..f100b6cab 100644 --- a/ebean-core/src/test/java/org/tests/query/TestIContains.java +++ b/ebean-core/src/test/java/org/tests/query/TestIContains.java @@ -8,7 +8,7 @@ import io.ebean.RawSql; import io.ebean.RawSqlBuilder; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java b/ebean-core/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java index eac3303fb..868e50c7e 100644 --- a/ebean-core/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java +++ b/ebean-core/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/query/TestInvalidFetchPath.java b/ebean-core/src/test/java/org/tests/query/TestInvalidFetchPath.java index 987dc058d..fd96088ba 100644 --- a/ebean-core/src/test/java/org/tests/query/TestInvalidFetchPath.java +++ b/ebean-core/src/test/java/org/tests/query/TestInvalidFetchPath.java @@ -1,34 +1,35 @@ package org.tests.query; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; -import org.junit.Test; import javax.persistence.PersistenceException; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class TestInvalidFetchPath extends BaseTestCase { - @Test(expected = PersistenceException.class) + @Test public void invalidFetchPathAndProperties_expect_error() { - - Ebean.find(Customer.class) - .fetch("notValidPath", "notHaveProps") - .findList(); + assertThrows(PersistenceException.class, () -> + DB.find(Customer.class) + .fetch("notValidPath", "notHaveProps") + .findList()); } - @Test(expected = PersistenceException.class) + @Test public void invalidFetchPath_expect_error() { - - Ebean.find(Customer.class) - .fetch("notValidPath") - .findList(); + assertThrows(PersistenceException.class, () -> + DB.find(Customer.class) + .fetch("notValidPath") + .findList()); } @Test public void fetchWithInvalidPropertyName_expect_allowed() { - - Ebean.find(Customer.class) + DB.find(Customer.class) .fetch("billingAddress", "invalidPropertyName") .findList(); } diff --git a/ebean-core/src/test/java/org/tests/query/TestJoinOptOneCascade.java b/ebean-core/src/test/java/org/tests/query/TestJoinOptOneCascade.java index 881117d75..8f3202f34 100644 --- a/ebean-core/src/test/java/org/tests/query/TestJoinOptOneCascade.java +++ b/ebean-core/src/test/java/org/tests/query/TestJoinOptOneCascade.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EOptOneA; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/query/TestLimitAlterFetchMany.java b/ebean-core/src/test/java/org/tests/query/TestLimitAlterFetchMany.java index b5ac9abcc..5b571781f 100644 --- a/ebean-core/src/test/java/org/tests/query/TestLimitAlterFetchMany.java +++ b/ebean-core/src/test/java/org/tests/query/TestLimitAlterFetchMany.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/query/TestLimitQuery.java b/ebean-core/src/test/java/org/tests/query/TestLimitQuery.java index 4c9f9f3e5..af7200141 100644 --- a/ebean-core/src/test/java/org/tests/query/TestLimitQuery.java +++ b/ebean-core/src/test/java/org/tests/query/TestLimitQuery.java @@ -4,11 +4,12 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestLimitQuery extends BaseTestCase { @Test @@ -24,7 +25,7 @@ public class TestLimitQuery extends BaseTestCase { .findList(); // should at least find the "Cust NoAddress" customer - Assert.assertTrue(!customers.isEmpty()); + assertTrue(!customers.isEmpty()); } } diff --git a/ebean-core/src/test/java/org/tests/query/TestManyWhereJoin.java b/ebean-core/src/test/java/org/tests/query/TestManyWhereJoin.java index b90751c83..e583e9430 100644 --- a/ebean-core/src/test/java/org/tests/query/TestManyWhereJoin.java +++ b/ebean-core/src/test/java/org/tests/query/TestManyWhereJoin.java @@ -7,7 +7,7 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.Product; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/query/TestManyWhereJoinM2M.java b/ebean-core/src/test/java/org/tests/query/TestManyWhereJoinM2M.java index f936e2442..54ba80459 100644 --- a/ebean-core/src/test/java/org/tests/query/TestManyWhereJoinM2M.java +++ b/ebean-core/src/test/java/org/tests/query/TestManyWhereJoinM2M.java @@ -4,14 +4,14 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; import io.ebean.Transaction; +import org.junit.jupiter.api.Test; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; -import org.junit.Assert; -import org.junit.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestManyWhereJoinM2M extends BaseTestCase { @@ -60,10 +60,10 @@ public class TestManyWhereJoinM2M extends BaseTestCase { query.findList(); String sql = query.getGeneratedSql(); - Assert.assertTrue(sql.contains("select distinct")); - Assert.assertTrue(sql.contains("left join mrole ")); - Assert.assertTrue(sql.contains("join mrole ")); - Assert.assertTrue(sql.contains(".role_name = ?")); + assertTrue(sql.contains("select distinct")); + assertTrue(sql.contains("left join mrole ")); + assertTrue(sql.contains("join mrole ")); + assertTrue(sql.contains(".role_name = ?")); isEmpty(); isNotEmpty(); diff --git a/ebean-core/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java b/ebean-core/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java index 65f6efd1f..e7426c427 100644 --- a/ebean-core/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java +++ b/ebean-core/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java @@ -7,10 +7,10 @@ import io.ebean.RawSql; import io.ebean.RawSqlBuilder; import org.tests.model.basic.MyAdHoc; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestMyAdHocSqlSelect extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java b/ebean-core/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java index 69cb9383e..19645684e 100644 --- a/ebean-core/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java +++ b/ebean-core/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java @@ -6,11 +6,11 @@ import io.ebean.Query; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.concurrent.atomic.AtomicInteger; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestOneToManyCorrectGrouping extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/TestOuterJoin.java b/ebean-core/src/test/java/org/tests/query/TestOuterJoin.java index 61b7ffd25..4f548b1cc 100644 --- a/ebean-core/src/test/java/org/tests/query/TestOuterJoin.java +++ b/ebean-core/src/test/java/org/tests/query/TestOuterJoin.java @@ -3,8 +3,8 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebeantest.LoggedSql; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -21,12 +21,11 @@ import static org.assertj.core.api.Assertions.assertThat; */ public class TestOuterJoin extends BaseTestCase { - @BeforeClass + @BeforeAll public static void setup() { ResetBasicData.reset(); } - @Test public void testOuterOnNullQuery() throws Exception { diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryAlias.java b/ebean-core/src/test/java/org/tests/query/TestQueryAlias.java index 4e77d49d6..d3df77f11 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryAlias.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryAlias.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.CKeyParent; import org.tests.model.basic.ResetBasicData; @@ -36,7 +36,7 @@ public class TestQueryAlias extends BaseTestCase { assertThat(sql).contains("ckey_parent myt0"); assertThat(sql).contains("(myt0.one_key) in (select st0.one_key from ckey_parent st0)"); } - + @Test public void testExistsWithConcat() { diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryBaseTable.java b/ebean-core/src/test/java/org/tests/query/TestQueryBaseTable.java index 22caeeace..4b4c1b1b0 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryBaseTable.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryBaseTable.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; 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; diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryExists.java b/ebean-core/src/test/java/org/tests/query/TestQueryExists.java index 6034e16ab..a83fb6d83 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryExists.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryExists.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebeantest.LoggedSql; -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; diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java b/ebean-core/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java index 68a382e5c..df5c17d04 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java @@ -2,15 +2,15 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import io.ebean.FetchConfig; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; 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 TestQueryFetchJoinWithOrder extends BaseTestCase { @Test @@ -23,7 +23,7 @@ public class TestQueryFetchJoinWithOrder extends BaseTestCase { .order().asc("id") .order().desc("details.id").findList(); - Assert.assertNotNull(list); + assertNotNull(list); List list2 = Ebean.find(Order.class) .fetchQuery("customer") @@ -32,7 +32,7 @@ public class TestQueryFetchJoinWithOrder extends BaseTestCase { .order().asc("customer.contacts.lastName") .findList(); - Assert.assertNotNull(list2); + assertNotNull(list2); List list3 = Ebean.find(Customer.class) .fetch("orders") @@ -40,7 +40,7 @@ public class TestQueryFetchJoinWithOrder extends BaseTestCase { .order().desc("orders.id") .findList(); - Assert.assertNotNull(list3); + assertNotNull(list3); } } diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java b/ebean-core/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java index 048a6e97c..90e10f4c6 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java @@ -8,13 +8,13 @@ import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.OrderShipment; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -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 TestQueryFetchManyTwoDeep extends BaseTestCase { @@ -36,7 +36,7 @@ public class TestQueryFetchManyTwoDeep extends BaseTestCase { List sql = LoggedSqlCollector.stop(); - assertTrue("has rows", !list.isEmpty()); + assertTrue(!list.isEmpty()); String mainSql = sqlOf(query); assertThat(mainSql).contains("from o_customer t0 "); assertThat(mainSql).contains("left join o_order t1 on t1.kcustomer_id = t0.id"); @@ -78,7 +78,7 @@ public class TestQueryFetchManyTwoDeep extends BaseTestCase { .fetch("order.details"); List shipList = shipQuery.findList(); - assertTrue("has rows", !shipList.isEmpty()); + assertTrue(!shipList.isEmpty()); String generatedSql = shipQuery.getGeneratedSql(); @@ -119,7 +119,7 @@ public class TestQueryFetchManyTwoDeep extends BaseTestCase { .fetch("customer.orders"); List shipList = query.findList(); - assertTrue("has rows", !shipList.isEmpty()); + assertTrue(!shipList.isEmpty()); String generatedSql = query.getGeneratedSql(); @@ -151,7 +151,7 @@ public class TestQueryFetchManyTwoDeep extends BaseTestCase { .query(); List list = query.findList(); - assertTrue("has rows", !list.isEmpty()); + assertTrue(!list.isEmpty()); String generatedSql = query.getGeneratedSql(); diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFetchSkipPath.java b/ebean-core/src/test/java/org/tests/query/TestQueryFetchSkipPath.java index 196b56fa4..10f95d355 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFetchSkipPath.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFetchSkipPath.java @@ -7,7 +7,7 @@ import org.tests.model.basic.ContactNote; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java b/ebean-core/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java index 86a71b324..c7ac0311f 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java @@ -2,8 +2,8 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; @@ -13,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class TestQueryFilterCaseInsensitive extends BaseTestCase { - @BeforeClass + @BeforeAll public static void setup() { ResetBasicData.reset(); } diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java b/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java index eafadf8b8..3babba0f6 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFilterMany.java @@ -5,7 +5,7 @@ import io.ebean.DB; import io.ebean.ExpressionList; import io.ebean.Query; 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.Order; import org.tests.model.basic.ResetBasicData; @@ -15,7 +15,7 @@ import java.util.List; import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestQueryFilterMany extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java b/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java index 02cc7c9e2..37e2bbf75 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.MUser; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestQueryFilterManyOnM2M extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java b/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java index f87c4c9c9..9db665351 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java @@ -9,11 +9,13 @@ import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.Product; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestQueryFilterManyOnSecondary extends BaseTestCase { @Test @@ -31,7 +33,7 @@ public class TestQueryFilterManyOnSecondary extends BaseTestCase { for (Customer customer : list) { List orders = customer.getOrders(); for (Order order : orders) { - Assert.assertEquals(Order.Status.NEW, order.getStatus()); + assertEquals(Order.Status.NEW, order.getStatus()); } } @@ -55,7 +57,7 @@ public class TestQueryFilterManyOnSecondary extends BaseTestCase { for (OrderDetail orderDetail : details) { Product product = orderDetail.getProduct(); String name = product.getName(); - Assert.assertTrue(name.startsWith("C")); + assertTrue(name.startsWith("C")); } } } diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManySimple.java b/ebean-core/src/test/java/org/tests/query/TestQueryFilterManySimple.java index 7dae5d580..7c3bcead7 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFilterManySimple.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFilterManySimple.java @@ -6,7 +6,7 @@ import io.ebean.FetchConfig; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Date; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java index b37f67279..f1de21cfc 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindEach.java @@ -8,7 +8,7 @@ import io.ebean.annotation.Transactional; import io.ebean.bean.PersistenceContext; import io.ebeaninternal.api.SpiTransaction; 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.Contact; @@ -18,12 +18,13 @@ import org.tests.model.basic.ResetBasicData; import org.tests.o2m.OmBasicChild; import org.tests.o2m.OmBasicParent; +import javax.persistence.PersistenceException; import java.util.List; import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestQueryFindEach extends BaseTestCase { @@ -59,7 +60,7 @@ public class TestQueryFindEach extends BaseTestCase { private void seedData() { for (int i = 0; i < 15; i++) { - EBasicLog log = new EBasicLog("findEachBatch "+i); + EBasicLog log = new EBasicLog("findEachBatch " + i); DB.save(log); } } @@ -101,7 +102,7 @@ public class TestQueryFindEach extends BaseTestCase { private void findEachWithBatch(int batchSize) { DB.find(EBasicLog.class) - .where().startsWith("name","findEachBatch") + .where().startsWith("name", "findEachBatch") .findEach(batchSize, batch -> { int batchId = batchCount.incrementAndGet(); int rows = rowCount.addAndGet(batch.size()); @@ -140,9 +141,8 @@ public class TestQueryFindEach extends BaseTestCase { /** * Test the behaviour when an exception is thrown inside the findVisit(). */ - @Test(expected = IllegalStateException.class) + @Test public void testVisitThrowingException() { - ResetBasicData.reset(); Query query = DB.find(Customer.class) @@ -152,14 +152,13 @@ public class TestQueryFindEach extends BaseTestCase { final AtomicInteger counter = new AtomicInteger(0); - query.findEach(customer -> { - counter.incrementAndGet(); - if (counter.intValue() > 0) { - throw new IllegalStateException("cause a failure"); - } - }); - - fail("Never get here - exception thrown"); + assertThrows(IllegalStateException.class, () -> + query.findEach(customer -> { + counter.incrementAndGet(); + if (counter.intValue() > 0) { + throw new IllegalStateException("cause a failure"); + } + })); } @Test diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindEachWhile.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindEachWhile.java index 2588edf56..c7a2dbb98 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindEachWhile.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindEachWhile.java @@ -4,15 +4,13 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.FetchConfig; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; import java.util.concurrent.atomic.AtomicInteger; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.*; public class TestQueryFindEachWhile extends BaseTestCase { @@ -41,9 +39,8 @@ public class TestQueryFindEachWhile extends BaseTestCase { /** * Test the behaviour when an exception is thrown inside the findVisit(). */ - @Test(expected = IllegalStateException.class) + @Test public void testVisitThrowingException() { - ResetBasicData.reset(); Query query = DB.find(Customer.class).setAutoTune(false) @@ -52,14 +49,14 @@ public class TestQueryFindEachWhile extends BaseTestCase { final AtomicInteger counter = new AtomicInteger(0); - query.findEachWhile(customer -> { - counter.incrementAndGet(); - if (counter.intValue() > 0) { - throw new IllegalStateException("cause a failure"); - } - return true; - }); - - fail("Never get here - exception thrown"); + assertThrows(IllegalStateException.class, () -> { + query.findEachWhile(customer -> { + counter.incrementAndGet(); + if (counter.intValue() > 0) { + throw new IllegalStateException("cause a failure"); + } + return true; + }); + }); } } diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindFutureList.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindFutureList.java index 074603e41..57a04439c 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindFutureList.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindFutureList.java @@ -6,13 +6,13 @@ import io.ebean.FutureList; import io.ebean.Transaction; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestQueryFindFutureList extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java index 7ad3fe99e..1b0715e86 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java @@ -4,10 +4,12 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.QueryIterator; +import io.ebean.annotation.ForPlatform; +import io.ebean.annotation.Platform; import io.ebean.datasource.DataSourcePool; import io.ebean.plugin.SpiServer; 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.Order; import org.tests.model.basic.OrderShipment; @@ -19,10 +21,7 @@ import java.util.NoSuchElementException; import java.util.concurrent.atomic.AtomicInteger; 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.Assert.fail; +import static org.junit.jupiter.api.Assertions.*; public class TestQueryFindIterate extends BaseTestCase { @@ -173,14 +172,14 @@ public class TestQueryFindIterate extends BaseTestCase { List loggedSql = LoggedSqlCollector.stop(); - assertEquals("Got SQL: " + loggedSql, 2, loggedSql.size()); + assertEquals(2, loggedSql.size()); assertThat(trimSql(loggedSql.get(0), 7).contains("select t0.id, t0.status, t0.order_date, t1.id, t1.name, t2.id, t2.order_qty, t2.ship_qty")); assertThat(trimSql(loggedSql.get(1), 7).contains("select t0.order_id, t0.id, t0.ship_time, t0.cretime, t0.updtime, t0.version, t0.order_id from or_order_ship")); } - @Test(expected = PersistenceException.class) + @ForPlatform(Platform.H2) + @Test public void testWithExceptionInQuery() { - ResetBasicData.reset(); // intentionally a query with incorrect type binding @@ -190,21 +189,11 @@ public class TestQueryFindIterate extends BaseTestCase { .setMaxRows(2).query(); // this throws an exception immediately - query.findEach(bean -> { - - }); - - if (!DB.getDefault().name().equals("h2")) { - // MySql allows the query with type conversion? - throw new PersistenceException("H2 does expected thing but MySql does not"); - } - fail("Never get here as exception thrown"); + assertThrows(PersistenceException.class, () -> query.findEach(bean -> { })); } - - @Test(expected = IllegalStateException.class) + @Test public void testWithExceptionInLoop() { - ResetBasicData.reset(); Query query = DB.find(Customer.class) @@ -212,11 +201,12 @@ public class TestQueryFindIterate extends BaseTestCase { .where().gt("id", 0) .setMaxRows(2).query(); - query.findEach(customer -> { - if (customer != null) { - throw new IllegalStateException("cause an exception"); - } - }); + assertThrows(IllegalStateException.class, () -> + query.findEach(customer -> { + if (customer != null) { + throw new IllegalStateException("cause an exception"); + } + })); } @Test @@ -267,7 +257,7 @@ public class TestQueryFindIterate extends BaseTestCase { assertFalse(queryIterator.hasNext()); assertThat(dsPool.getStatus(false).getBusy()).isEqualTo(startConns); - try { + try { queryIterator.next(); fail("noSuchElementException expected"); } catch (NoSuchElementException e) { diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java index 8ea8457a0..195350e39 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java @@ -2,7 +2,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.Ebean; -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.Product; @@ -11,7 +11,7 @@ import org.tests.model.basic.ResetBasicData; import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestQueryFindMapTypedKey extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java index 8e11d3328..35693707e 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindNative.java @@ -6,7 +6,7 @@ import io.ebean.FetchConfig; import io.ebean.PagedList; import org.assertj.core.util.Lists; import org.ebeantest.LoggedSqlCollector; -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; diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindPagedList.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindPagedList.java index 16e1e8ee3..a4561aa0f 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindPagedList.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindPagedList.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.PagedList; 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.Order; import org.tests.model.basic.ResetBasicData; @@ -17,9 +17,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; 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 TestQueryFindPagedList extends BaseTestCase { @@ -37,15 +35,14 @@ public class TestQueryFindPagedList extends BaseTestCase { assertThat(empty.getDisplayXtoYofZ("a", "b")).isEqualTo(""); } - @Test(expected = PersistenceException.class) + @Test public void test_noMaxRows() { - - Ebean.find(Order.class).findPagedList(); + assertThrows(PersistenceException.class, () -> + Ebean.find(Order.class).findPagedList()); } @Test public void test_maxRows_NoCount() { - ResetBasicData.reset(); PagedList pagedList = Ebean.find(Order.class) @@ -59,7 +56,7 @@ public class TestQueryFindPagedList extends BaseTestCase { assertTrue(!orders.isEmpty()); List loggedSql = LoggedSqlCollector.stop(); - assertEquals("Only 1 SQL statement, no count query", 1, loggedSql.size()); + assertEquals(1, loggedSql.size()); } @@ -167,7 +164,7 @@ public class TestQueryFindPagedList extends BaseTestCase { assertTrue(!orders.isEmpty()); List loggedSql = LoggedSqlCollector.stop(); - assertEquals("Only 1 SQL statement, no count query", 1, loggedSql.size()); + assertEquals(1, loggedSql.size()); } @Test diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindReadOnly.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindReadOnly.java index 5df8231fc..02b8063a1 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindReadOnly.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindReadOnly.java @@ -3,13 +3,14 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.CacheMode; import io.ebean.Ebean; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Article; import org.tests.model.basic.Section; import java.util.List; +import static org.junit.jupiter.api.Assertions.*; + public class TestQueryFindReadOnly extends BaseTestCase { @Test @@ -23,25 +24,25 @@ public class TestQueryFindReadOnly extends BaseTestCase { Article ar1 = Ebean.find(Article.class).setReadOnly(true).setId(a0.getId()).findOne(); - Assert.assertNotNull(ar1); - Assert.assertTrue("readonly", Ebean.getBeanState(ar1).isReadOnly()); + assertNotNull(ar1); + assertTrue(Ebean.getBeanState(ar1).isReadOnly()); List
    ar1sections = ar1.getSections(); - Assert.assertEquals(1, ar1sections.size()); + assertEquals(1, ar1sections.size()); Section s2 = ar1sections.get(0); - Assert.assertTrue("readonly cascading", Ebean.getBeanState(s2).isReadOnly()); + assertTrue(Ebean.getBeanState(s2).isReadOnly()); Ebean.find(Article.class).setBeanCacheMode(CacheMode.PUT).findList(); Article ar0 = Ebean.find(Article.class, a0.getId()); - Assert.assertNotNull(ar0); - Assert.assertFalse(Ebean.getBeanState(ar0).isReadOnly()); + assertNotNull(ar0); + assertFalse(Ebean.getBeanState(ar0).isReadOnly()); List
    ar0sections = ar0.getSections(); Section s1 = ar0sections.get(0); - Assert.assertFalse(Ebean.getBeanState(s1).isReadOnly()); + assertFalse(Ebean.getBeanState(s1).isReadOnly()); } diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryFindStream.java b/ebean-core/src/test/java/org/tests/query/TestQueryFindStream.java index c4a852f38..63a6c5c8f 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryFindStream.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryFindStream.java @@ -2,7 +2,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryInAssocOne.java b/ebean-core/src/test/java/org/tests/query/TestQueryInAssocOne.java index 9de07f3ff..3dafbe3c4 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryInAssocOne.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryInAssocOne.java @@ -6,7 +6,7 @@ import io.ebean.Query; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryInIdTypeConversion.java b/ebean-core/src/test/java/org/tests/query/TestQueryInIdTypeConversion.java index d92e3e096..72a6d98a5 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryInIdTypeConversion.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryInIdTypeConversion.java @@ -2,7 +2,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryIsNull.java b/ebean-core/src/test/java/org/tests/query/TestQueryIsNull.java index f80aee9f5..ff3a7b1a6 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryIsNull.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryIsNull.java @@ -6,7 +6,7 @@ import io.ebean.Query; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; import org.tests.model.m2m.Role; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryJoinBatchSize.java b/ebean-core/src/test/java/org/tests/query/TestQueryJoinBatchSize.java index 721939ef9..1945c8951 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryJoinBatchSize.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryJoinBatchSize.java @@ -6,7 +6,7 @@ import io.ebean.FetchConfig; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java b/ebean-core/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java index b4cf4e8ac..42df03083 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java @@ -5,11 +5,12 @@ import io.ebean.Ebean; import org.tests.model.basic.Contact; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestQueryJoinMulipleMany extends BaseTestCase { @Test @@ -20,7 +21,7 @@ public class TestQueryJoinMulipleMany extends BaseTestCase { List list = Ebean.find(Order.class).fetch("customer").fetch("customer.contacts").where() .gt("id", 0).findList(); - Assert.assertNotNull(list); + assertNotNull(list); for (Order order : list) { List contacts = order.getCustomer().getContacts(); diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryMultiManyOrder.java b/ebean-core/src/test/java/org/tests/query/TestQueryMultiManyOrder.java index 674cf07e9..407bf8f72 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryMultiManyOrder.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryMultiManyOrder.java @@ -5,11 +5,13 @@ import io.ebean.Ebean; import io.ebean.Query; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestQueryMultiManyOrder extends BaseTestCase { @Test @@ -23,12 +25,12 @@ public class TestQueryMultiManyOrder extends BaseTestCase { List list = q.findList(); String sql = q.getGeneratedSql(); - Assert.assertTrue(!list.isEmpty()); - Assert.assertTrue(sql.contains("join o_customer ")); + assertTrue(!list.isEmpty()); + assertTrue(sql.contains("join o_customer ")); - Assert.assertFalse(sql.contains("left join contact ")); - Assert.assertFalse(sql.contains("left join o_order_detail ")); - Assert.assertFalse(sql.contains("left join o_product ")); + assertFalse(sql.contains("left join contact ")); + assertFalse(sql.contains("left join o_order_detail ")); + assertFalse(sql.contains("left join o_product ")); } } diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryNullAssocOne.java b/ebean-core/src/test/java/org/tests/query/TestQueryNullAssocOne.java index d47143442..97b10c468 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryNullAssocOne.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryNullAssocOne.java @@ -5,11 +5,13 @@ import io.ebean.Ebean; import io.ebean.Query; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestQueryNullAssocOne extends BaseTestCase { @Test @@ -20,26 +22,26 @@ public class TestQueryNullAssocOne extends BaseTestCase { Query q0 = Ebean.find(Order.class).where().eq("customer", null).query(); List orders = q0.findList(); - Assert.assertNotNull(orders); - Assert.assertTrue(q0.getGeneratedSql().contains("where t0.kcustomer_id is null")); + assertNotNull(orders); + assertTrue(q0.getGeneratedSql().contains("where t0.kcustomer_id is null")); Query q1 = Ebean.find(Order.class).where().eq("customer.id", null).query(); List o1 = q1.findList(); - Assert.assertTrue(o1.size() == orders.size()); - Assert.assertTrue(q1.getGeneratedSql().contains("where t0.kcustomer_id is null")); + assertTrue(o1.size() == orders.size()); + assertTrue(q1.getGeneratedSql().contains("where t0.kcustomer_id is null")); Query q2 = Ebean.find(Order.class).where().isNull("customer").query(); List o2 = q2.findList(); - Assert.assertTrue(o2.size() == orders.size()); - Assert.assertTrue(q2.getGeneratedSql().contains("where t0.kcustomer_id is null")); + assertTrue(o2.size() == orders.size()); + assertTrue(q2.getGeneratedSql().contains("where t0.kcustomer_id is null")); Query q3 = Ebean.find(Order.class).where().isNull("customer").query(); List o3 = q3.findList(); - Assert.assertTrue(o3.size() == orders.size()); - Assert.assertTrue(q3.getGeneratedSql().contains("where t0.kcustomer_id is null")); + assertTrue(o3.size() == orders.size()); + assertTrue(q3.getGeneratedSql().contains("where t0.kcustomer_id is null")); } } diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryOrderById.java b/ebean-core/src/test/java/org/tests/query/TestQueryOrderById.java index 3c536a6f8..c9f5c8bb3 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryOrderById.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryOrderById.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java b/ebean-core/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java index 74ea5496b..be27bcc7a 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java @@ -4,11 +4,12 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestQueryPathJoinAndOrder extends BaseTestCase { @Test @@ -19,7 +20,7 @@ public class TestQueryPathJoinAndOrder extends BaseTestCase { List list = Ebean.find(Customer.class).select("id,name, status").fetch("contacts") .order().asc("id").order().desc("contacts.firstName").setMaxRows(3).findList(); - Assert.assertNotNull(list); + assertNotNull(list); // can't really assert that the contacts are batch loaded // via a secondary query join diff --git a/ebean-core/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java b/ebean-core/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java index 0abc2b414..6ee11db34 100644 --- a/ebean-core/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java +++ b/ebean-core/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java @@ -5,11 +5,13 @@ import io.ebean.Ebean; import io.ebean.Query; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; + public class TestQueryPlanCacheRowCount extends BaseTestCase { @Test @@ -23,19 +25,19 @@ public class TestQueryPlanCacheRowCount extends BaseTestCase { int rc0 = query.findCount(); List ids = query.findIds(); - Assert.assertEquals(rc0, ids.size()); + assertEquals(rc0, ids.size()); List list0 = query.findList(); - Assert.assertEquals(rc0, list0.size()); + assertEquals(rc0, list0.size()); int rc1 = query.findCount(); - Assert.assertEquals(rc0, rc1); + assertEquals(rc0, rc1); List ids1 = query.findIds(); - Assert.assertEquals(rc0, ids1.size()); + assertEquals(rc0, ids1.size()); List list1 = query.findList(); - Assert.assertEquals(rc0, list1.size()); + assertEquals(rc0, list1.size()); int idGt = 5; if (!ids1.isEmpty()) { @@ -50,13 +52,13 @@ public class TestQueryPlanCacheRowCount extends BaseTestCase { int rc2 = query2.findCount(); System.out.println("Expection Not same " + rc0 + " != " + rc2); - Assert.assertNotSame(rc0, rc2); + assertNotSame(rc0, rc2); List ids2 = query2.findIds(); - Assert.assertEquals(rc2, ids2.size()); + assertEquals(rc2, ids2.size()); List list2 = query2.findList(); - Assert.assertEquals(rc2, list2.size()); + assertEquals(rc2, list2.size()); } diff --git a/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java b/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java index 340b6c275..09cb4514f 100644 --- a/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java +++ b/ebean-core/src/test/java/org/tests/query/TestRefToLazyLoadMany.java @@ -5,11 +5,12 @@ import io.ebean.Ebean; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestRefToLazyLoadMany extends BaseTestCase { @Test @@ -22,7 +23,7 @@ public class TestRefToLazyLoadMany extends BaseTestCase { Customer c = custList.get(0); List contacts2 = c.getContacts(); - Assert.assertEquals(3, Ebean.getBeanState(c).getLoadedProps().size()); + assertEquals(3, Ebean.getBeanState(c).getLoadedProps().size()); // now lazy load the contacts contacts2.size(); diff --git a/ebean-core/src/test/java/org/tests/query/TestRowCount.java b/ebean-core/src/test/java/org/tests/query/TestRowCount.java index d0c058a38..c37bcbaf5 100644 --- a/ebean-core/src/test/java/org/tests/query/TestRowCount.java +++ b/ebean-core/src/test/java/org/tests/query/TestRowCount.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -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; @@ -11,7 +11,7 @@ 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.jupiter.api.Assertions.assertEquals; public class TestRowCount extends BaseTestCase { @@ -37,13 +37,12 @@ public class TestRowCount extends BaseTestCase { order.getStatus(); } - assertEquals("same rc to ids.size() ", rc, ids.size()); - assertEquals("same rc to list.size()", rc, list.size()); + assertEquals(rc, ids.size()); + assertEquals(rc, list.size()); } @Test public void find_count_distinct_singleProperty() { - ResetBasicData.reset(); Query query = Ebean.find(Customer.class) diff --git a/ebean-core/src/test/java/org/tests/query/TestSubQuery.java b/ebean-core/src/test/java/org/tests/query/TestSubQuery.java index 7386f9bac..e917fdd4d 100644 --- a/ebean-core/src/test/java/org/tests/query/TestSubQuery.java +++ b/ebean-core/src/test/java/org/tests/query/TestSubQuery.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.*; import java.util.ArrayList; diff --git a/ebean-core/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java b/ebean-core/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java index 315a4263a..89f28425e 100644 --- a/ebean-core/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java +++ b/ebean-core/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.FetchConfig; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestThreeLevelQueryJoin extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/TestWhereIn.java b/ebean-core/src/test/java/org/tests/query/TestWhereIn.java index 410a24840..618b20363 100644 --- a/ebean-core/src/test/java/org/tests/query/TestWhereIn.java +++ b/ebean-core/src/test/java/org/tests/query/TestWhereIn.java @@ -3,7 +3,7 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/query/TestWhereRawClause.java b/ebean-core/src/test/java/org/tests/query/TestWhereRawClause.java index f98ff3d81..49f6219b5 100644 --- a/ebean-core/src/test/java/org/tests/query/TestWhereRawClause.java +++ b/ebean-core/src/test/java/org/tests/query/TestWhereRawClause.java @@ -8,7 +8,7 @@ import io.ebean.Query; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; 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.Order; import org.tests.model.basic.OrderDetail; diff --git a/ebean-core/src/test/java/org/tests/query/aggregation/TestAggregationCount.java b/ebean-core/src/test/java/org/tests/query/aggregation/TestAggregationCount.java index 261202696..71ce72841 100644 --- a/ebean-core/src/test/java/org/tests/query/aggregation/TestAggregationCount.java +++ b/ebean-core/src/test/java/org/tests/query/aggregation/TestAggregationCount.java @@ -5,8 +5,8 @@ import io.ebean.Ebean; import io.ebean.Query; import io.ebeantest.LoggedSql; import org.ebeantest.LoggedSqlCollector; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; @@ -22,7 +22,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class TestAggregationCount extends BaseTestCase { - @BeforeClass + @BeforeAll public static void setup() { TEventOne one = new TEventOne("first", TEventOne.Status.AA); one.getLogs().add(new TEventMany("all", 1, 10)); diff --git a/ebean-core/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java b/ebean-core/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java index 33804cfb3..2c0487e6b 100644 --- a/ebean-core/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java +++ b/ebean-core/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java @@ -3,8 +3,8 @@ package org.tests.query.autotune; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.ProfileLocation; -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.Address; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; @@ -16,7 +16,7 @@ import java.util.Random; public class TestAutoTuneProfiling extends BaseTestCase { - @Ignore + @Disabled @Test public void test() { diff --git a/ebean-core/src/test/java/org/tests/query/cache/TestDistinct.java b/ebean-core/src/test/java/org/tests/query/cache/TestDistinct.java index e67c2d0ea..b58ea42d6 100644 --- a/ebean-core/src/test/java/org/tests/query/cache/TestDistinct.java +++ b/ebean-core/src/test/java/org/tests/query/cache/TestDistinct.java @@ -3,7 +3,7 @@ package org.tests.query.cache; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.ExpressionList; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.UUID; diff --git a/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java b/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java index 5d51620c2..abf8f8d74 100644 --- a/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java +++ b/ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java @@ -12,8 +12,8 @@ import java.util.function.Function; import javax.persistence.PersistenceException; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; import io.ebean.BaseTestCase; @@ -69,7 +69,7 @@ public class SqlQueryCancelTest extends BaseTestCase { private final int timing = 20; - @BeforeClass + @BeforeAll public static void setupTestData() throws SQLException { for (int i = 0; i < 128; i++) { EBasic model = new EBasic("Basic " + i); diff --git a/ebean-core/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java b/ebean-core/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java index 263de866b..fefae450d 100644 --- a/ebean-core/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java +++ b/ebean-core/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java @@ -3,18 +3,16 @@ package org.tests.query.embedded; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.ExpressionList; -import org.hamcrest.core.Is; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.embedded.EEmbDatePeriod; import org.tests.model.embedded.EEmbInner; import org.tests.model.embedded.EEmbOuter; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Date; import java.util.List; +import static org.assertj.core.api.Assertions.assertThat; + /** * Test that selecting A and filtering on 'B.C=some_value' will correctly create join on table for B. * Model: @@ -23,53 +21,52 @@ import java.util.List; */ public class TestFilteringByEmbeddedInJoinedTable extends BaseTestCase { - private EEmbOuter createOuter(String nomeOuter, Date date1, Date date2) { - EEmbOuter outer1 = new EEmbOuter(); - outer1.setNomeOuter(nomeOuter); + private EEmbOuter createOuter(String nomeOuter, Date date1, Date date2) { + EEmbOuter outer1 = new EEmbOuter(); + outer1.setNomeOuter(nomeOuter); - EEmbDatePeriod eEmbDatePeriod = new EEmbDatePeriod(); - eEmbDatePeriod.setDate1(date1); - eEmbDatePeriod.setDate2(date2); - outer1.setDatePeriod(eEmbDatePeriod); + EEmbDatePeriod eEmbDatePeriod = new EEmbDatePeriod(); + eEmbDatePeriod.setDate1(date1); + eEmbDatePeriod.setDate2(date2); + outer1.setDatePeriod(eEmbDatePeriod); - Ebean.save(outer1); - return outer1; - } + Ebean.save(outer1); + return outer1; + } - @Test - public void testOuterTableJoined() { + @Test + public void testOuterTableJoined() { - EEmbOuter outer1 = createOuter("outer1", new Date(11111), new Date(12222)); - // Unused outer2 just to populate the DB - EEmbOuter outer2 = createOuter("outer2", new Date(21111), new Date(22222)); - assertThat(outer2).isNotNull(); + EEmbOuter outer1 = createOuter("outer1", new Date(11111), new Date(12222)); + // Unused outer2 just to populate the DB + EEmbOuter outer2 = createOuter("outer2", new Date(21111), new Date(22222)); + assertThat(outer2).isNotNull(); - EEmbOuter outer3 = createOuter("outer3", new Date(31111), new Date(32222)); + EEmbOuter outer3 = createOuter("outer3", new Date(31111), new Date(32222)); - EEmbInner inner1 = new EEmbInner(); - inner1.setOuter(outer1); - inner1.setNomeInner("inner1-1"); - Ebean.save(inner1); + EEmbInner inner1 = new EEmbInner(); + inner1.setOuter(outer1); + inner1.setNomeInner("inner1-1"); + Ebean.save(inner1); - EEmbInner inner2 = new EEmbInner(); - // Setting outer1 also here - inner2.setOuter(outer1); - inner2.setNomeInner("inner2-1"); - Ebean.save(inner2); + EEmbInner inner2 = new EEmbInner(); + // Setting outer1 also here + inner2.setOuter(outer1); + inner2.setNomeInner("inner2-1"); + Ebean.save(inner2); - EEmbInner inner3 = new EEmbInner(); - inner3.setOuter(outer3); - inner3.setNomeInner("inner3-3"); - Ebean.save(inner3); + EEmbInner inner3 = new EEmbInner(); + inner3.setOuter(outer3); + inner3.setNomeInner("inner3-3"); + Ebean.save(inner3); - ExpressionList el = Ebean.find(EEmbInner.class).where() - .eq("outer.datePeriod.date1", new Date(11111)); - List list = el.findList(); + ExpressionList el = Ebean.find(EEmbInner.class).where() + .eq("outer.datePeriod.date1", new Date(11111)); + List list = el.findList(); - Assert.assertThat(list.size(), Is.is(2)); - - } + assertThat(list).hasSize(2); + } } diff --git a/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java b/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java index 52fb10c60..481012c36 100644 --- a/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java +++ b/ebean-core/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java @@ -9,13 +9,13 @@ import io.ebean.cache.ServerCacheStatistics; import org.tests.model.embedded.EAddress; import org.tests.model.embedded.EInvoice; import org.tests.model.embedded.EInvoice.State; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Date; import static org.assertj.core.api.Assertions.assertThat; -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 TestMultipleEmbeddedLoading extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java index 04b0e755d..3bdff89b4 100644 --- a/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java +++ b/ebean-core/src/test/java/org/tests/query/finder/TestCustomerFinder.java @@ -11,7 +11,7 @@ import io.ebean.meta.QueryPlanRequest; import io.ebean.meta.ServerMetrics; import io.ebean.meta.SortMetric; 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.EBasic; import org.tests.model.basic.ResetBasicData; @@ -19,7 +19,7 @@ import org.tests.model.basic.ResetBasicData; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestCustomerFinder extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java b/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java index 5d895adbc..aef592d92 100644 --- a/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java +++ b/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Expr; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.basic.one2one.Wheel; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java b/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java index 5f88152f9..75aac4ac2 100644 --- a/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java +++ b/ebean-core/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java @@ -3,14 +3,13 @@ package org.tests.query.joins; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; import org.tests.model.basic.UUTwo; import java.util.List; -import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestDisjunctWhereOuterOnMany extends BaseTestCase { @@ -54,8 +53,8 @@ public class TestDisjunctWhereOuterOnMany extends BaseTestCase { // where (t0.name = ? or u1.name = ? ) ; // --bind(testDisjOuter_2_name,testDisjOuter_CHILD_1) - Assert.assertEquals(2, list.size()); - Assert.assertEquals(2, rowCount); + assertEquals(2, list.size()); + assertEquals(2, rowCount); if (isPostgres()) { String expectedSql = "select distinct on (t0.id) t0.id, t0.name, t0.description, t0.version from uuone t0 left join uutwo u1 on u1.master_id = t0.id where (t0.name = ? or u1.name = ?)"; diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java index fc2ac644f..1d1b04d00 100644 --- a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java +++ b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java @@ -2,19 +2,16 @@ package org.tests.query.joins; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import io.ebean.FetchConfig; import io.ebean.Query; +import org.ebeantest.LoggedSqlCollector; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.ebeantest.LoggedSqlCollector; -import org.junit.Assert; -import org.junit.Test; 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.*; public class TestQueryJoinManyNonRoot extends BaseTestCase { @@ -59,10 +56,7 @@ public class TestQueryJoinManyNonRoot extends BaseTestCase { for (Order o: list) { int withoutFetch = ordersById.get(o.getId()).getCustomer().getContacts().size(); int withFetch = o.getCustomer().getContacts().size(); - assertEquals(String.format("order.customer.contacts for order %d did not match. " + - "Items without fetch: %d, with fetch: %d", o.getId(), withoutFetch, withFetch), - withoutFetch, - withFetch); + assertEquals(withoutFetch, withFetch); } @@ -96,7 +90,7 @@ public class TestQueryJoinManyNonRoot extends BaseTestCase { assertTrue(sql.contains("left join o_order_detail ")); assertTrue(sql.contains("left join o_product ")); - Assert.assertFalse(sql.contains("left join contact")); + assertFalse(sql.contains("left join contact")); } @@ -123,8 +117,8 @@ public class TestQueryJoinManyNonRoot extends BaseTestCase { assertTrue(sql.contains("join o_customer t1 on t1.id ")); assertTrue(sql.contains("left join contact ")); - Assert.assertFalse(sql.contains("left join o_order_detail ")); - Assert.assertFalse(sql.contains("left join o_product ")); + assertFalse(sql.contains("left join o_order_detail ")); + assertFalse(sql.contains("left join o_product ")); } diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java index 73449c398..35af2fcf7 100644 --- a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java +++ b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java @@ -2,24 +2,23 @@ package org.tests.query.joins; import io.ebean.BaseTestCase; import io.ebean.Ebean; +import org.ebeantest.LoggedSqlCollector; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; import org.tests.model.family.ChildPerson; import org.tests.model.family.ParentPerson; -import org.ebeantest.LoggedSqlCollector; -import org.junit.Before; -import org.junit.Test; import java.sql.Date; import java.util.List; -import static org.assertj.core.api.Assertions.*; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestQueryJoinOnFormula extends BaseTestCase { - - @Before + @BeforeEach public void init() { ResetBasicData.reset(); } diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java index b24c07472..cc104af6b 100644 --- a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java +++ b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java @@ -9,11 +9,13 @@ import io.ebeaninternal.server.el.ElPropertyValue; import org.tests.model.basic.Contact; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestQueryJoinQueryNonRoot extends BaseTestCase { @Test @@ -23,7 +25,7 @@ public class TestQueryJoinQueryNonRoot extends BaseTestCase { BeanDescriptor d = server.getBeanDescriptor(Order.class); ElPropertyValue elGetValue = d.getElGetValue("customer.contacts"); - Assert.assertTrue(elGetValue.containsMany()); + assertTrue(elGetValue.containsMany()); ResetBasicData.reset(); @@ -33,8 +35,8 @@ public class TestQueryJoinQueryNonRoot extends BaseTestCase { .fetch("customer.contacts.group") .where().lt("id", 3).findList(); - Assert.assertNotNull(list); - Assert.assertTrue(!list.isEmpty()); + assertNotNull(list); + assertTrue(!list.isEmpty()); for (Order order : list) { List contacts = order.getCustomer().getContacts(); @@ -49,7 +51,7 @@ public class TestQueryJoinQueryNonRoot extends BaseTestCase { // q.setAutoTune(false); // List list2 = q.findList(); // - // Assert.assertTrue(list2.size() > 0); + // assertTrue(list2.size() > 0); } diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java b/ebean-core/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java index e7a07bb2d..9e3e821c1 100644 --- a/ebean-core/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java +++ b/ebean-core/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java @@ -5,8 +5,9 @@ import io.ebean.Ebean; import io.ebean.Query; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestQueryManyToOneWhereClauseJoin extends BaseTestCase { @@ -27,7 +28,7 @@ public class TestQueryManyToOneWhereClauseJoin extends BaseTestCase { //select t0.id c0, t0.status c1, t0.order_date c2, t0.ship_date c3, t1.name c4, t0.cretime c5, t0.updtime c6, t0.kcustomer_id c7 String expectedSql = "from o_order t0 join o_customer t1 on t1.id = t0.kcustomer_id where lower(t1.name) like "; - Assert.assertTrue(query.getGeneratedSql().contains(expectedSql)); + assertTrue(query.getGeneratedSql().contains(expectedSql)); // select t0.id c0, t0.status c1, t0.order_date c2, t0.ship_date c3, t1.name c4, t0.cretime c5, t0.updtime c6, t0.kcustomer_id c7 // from o_order t0 @@ -51,7 +52,7 @@ public class TestQueryManyToOneWhereClauseJoin extends BaseTestCase { //select t0.id c0, t0.status c1, t0.order_date c2, t0.ship_date c3, t1.name c4, t0.cretime c5, t0.updtime c6, t0.kcustomer_id c7 String expectedSql = "from o_order t0 join o_customer t1 on t1.id = t0.kcustomer_id where (lower(t1.name) like "; - Assert.assertTrue(query.getGeneratedSql().contains(expectedSql)); + assertTrue(query.getGeneratedSql().contains(expectedSql)); // select t0.id c0, t0.status c1, t0.order_date c2, t0.ship_date c3, t1.name c4, t0.cretime c5, t0.updtime c6, t0.kcustomer_id c7 // from o_order t0 @@ -78,9 +79,9 @@ public class TestQueryManyToOneWhereClauseJoin extends BaseTestCase { query.findList(); String generatedSql = query.getGeneratedSql(); - Assert.assertTrue(generatedSql.contains("from o_order t0 join o_customer t1 on t1.id = t0.kcustomer_id")); - Assert.assertTrue(generatedSql.contains("left join contact t2 on t2.customer_id = t1.id")); - Assert.assertTrue(generatedSql.contains("where lower(t1.name) like ")); + assertTrue(generatedSql.contains("from o_order t0 join o_customer t1 on t1.id = t0.kcustomer_id")); + assertTrue(generatedSql.contains("left join contact t2 on t2.customer_id = t1.id")); + assertTrue(generatedSql.contains("where lower(t1.name) like ")); // select t0.id c0, t0.status c1, t0.order_date c2, t0.ship_date c3, t1.name c4, t0.cretime c5, t0.updtime c6, // t1.id c7, t1.status c8, t1.name c9, t1.smallnote c10, t1.anniversary c11, t1.cretime c12, t1.updtime c13, t1.billing_address_id c14, t1.shipping_address_id c15, diff --git a/ebean-core/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java b/ebean-core/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java index e1d9afd02..8ff707e98 100644 --- a/ebean-core/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java +++ b/ebean-core/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java @@ -8,7 +8,7 @@ import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.Product; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByClear.java b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByClear.java index 371c4b128..ffe259a6f 100644 --- a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByClear.java +++ b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByClear.java @@ -6,10 +6,10 @@ import io.ebean.OrderBy; import io.ebean.Query; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestOrderByClear extends BaseTestCase { @@ -26,7 +26,7 @@ public class TestOrderByClear extends BaseTestCase { assertTrue(orderBy.containsProperty("orderDate")); orderBy.clear(); - Assert.assertFalse(orderBy.containsProperty("orderDate")); + assertFalse(orderBy.containsProperty("orderDate")); orderBy.asc("shipDate"); assertTrue(orderBy.containsProperty("shipDate")); diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java index 0e5ee65da..07c545590 100644 --- a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java +++ b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java @@ -3,14 +3,14 @@ package org.tests.query.orderby; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestOrderByOnComplex extends BaseTestCase { @@ -24,8 +24,7 @@ public class TestOrderByOnComplex extends BaseTestCase { query.findList(); String sql = query.getGeneratedSql(); - Assert.assertTrue(sql.contains("order by t0.kcustomer_id desc")); - + assertTrue(sql.contains("order by t0.kcustomer_id desc")); } @Test diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java index cf451eee2..44d5083dc 100644 --- a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java +++ b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java @@ -5,9 +5,7 @@ import io.ebean.Ebean; import io.ebean.Query; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; - -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; @@ -18,6 +16,7 @@ import java.util.List; import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestOrderByWithDistinct extends BaseTestCase { @@ -135,8 +134,8 @@ public class TestOrderByWithDistinct extends BaseTestCase { // where u1.role_name = ? // order by t1.name, t0.user_name; --bind(A) - Assert.assertEquals(1, list.size()); - Assert.assertEquals(user1, list.get(0)); + assertEquals(1, list.size()); + assertEquals(user1, list.get(0)); String generatedSql = query.getGeneratedSql(); if (isPostgres()) { assertThat(generatedSql).contains("select distinct on (t1.name, t0.user_name, t0.userid) t0.userid"); // using distinct @@ -161,8 +160,8 @@ public class TestOrderByWithDistinct extends BaseTestCase { .order("userType.name").query(); list = query.findList(); - Assert.assertEquals(1, list.size()); - Assert.assertEquals(user1, list.get(0)); + assertEquals(1, list.size()); + assertEquals(user1, list.get(0)); // select distinct t0.userid c0, t0.user_name c1, t1.id c2, t1.name c3 // from muser t0 diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java index 196001bab..e74129648 100644 --- a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java +++ b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java @@ -4,23 +4,21 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; import org.tests.model.basic.Customer; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestOrderByWithDistinctTake2 extends BaseTestCase { @Test public void testRegex() { - String test = "helloasc asc ASC desc DESC boodesc desc ASC"; test = test.replaceAll("(?i)\\b asc\\b|\\b desc\\b", ""); - Assert.assertEquals("helloasc boodesc", test); + assertEquals("helloasc boodesc", test); } - @Test public void test() { diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java index 70972ec28..68db9d12d 100644 --- a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java +++ b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java @@ -5,8 +5,9 @@ import io.ebean.Ebean; import io.ebean.Query; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestOrderByWithFunction extends BaseTestCase { @@ -18,12 +19,12 @@ public class TestOrderByWithFunction extends BaseTestCase { if (isSqlServer()) { length = "len"; } - + Query query = Ebean.find(Customer.class).order(length + "(name),name"); query.findList(); String sql = query.getGeneratedSql(); - Assert.assertTrue(sql.contains("order by " + length + "(t0.name)")); + assertTrue(sql.contains("order by " + length + "(t0.name)")); } } diff --git a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java index 7855fefcb..6e487eefa 100644 --- a/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java +++ b/ebean-core/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java @@ -7,11 +7,12 @@ import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; import org.ebeantest.LoggedSqlCollector; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestOrderByWithMany extends BaseTestCase { @Test @@ -47,12 +48,12 @@ public class TestOrderByWithMany extends BaseTestCase { // first one is the main query and others are lazy loading queries List loggedSql = LoggedSqlCollector.stop(); - Assert.assertTrue(loggedSql.size() > 1); + assertTrue(loggedSql.size() > 1); String lazyLoadSql = loggedSql.get(1); // contains the foreign key back to the parent bean (t0.order_id) - Assert.assertTrue(lazyLoadSql, trimSql(lazyLoadSql, 2).contains("select t0.order_id, t0.id")); - Assert.assertTrue(lazyLoadSql.contains("order by t0.order_id, t0.id, t0.order_qty, t0.cretime desc")); + assertTrue(trimSql(lazyLoadSql, 2).contains("select t0.order_id, t0.id")); + assertTrue(lazyLoadSql.contains("order by t0.order_id, t0.id, t0.order_qty, t0.cretime desc")); } @@ -63,7 +64,7 @@ public class TestOrderByWithMany extends BaseTestCase { String sql = query.getGeneratedSql(); - Assert.assertTrue(sql.contains("order by t0.id, t1.id asc, t1.order_qty asc, t1.cretime desc")); + assertTrue(sql.contains("order by t0.id, t1.id asc, t1.order_qty asc, t1.cretime desc")); } private void checkWithBuiltInMany() { @@ -75,8 +76,8 @@ public class TestOrderByWithMany extends BaseTestCase { String sql = query.getGeneratedSql(); // t0.id inserted into the middle of the order by - Assert.assertTrue(sql.contains("order by t1.name desc, t0.id, t2.id asc")); - Assert.assertTrue(sql.contains("t2.id asc, t2.order_qty asc, t2.cretime desc")); + assertTrue(sql.contains("order by t1.name desc, t0.id, t2.id asc")); + assertTrue(sql.contains("t2.id asc, t2.order_qty asc, t2.cretime desc")); } private void checkAppendId() { @@ -88,7 +89,7 @@ public class TestOrderByWithMany extends BaseTestCase { String sql = query.getGeneratedSql(); // append the id to ensure ordering of root level objects - Assert.assertTrue(sql.contains("order by t1.name desc, t0.id")); + assertTrue(sql.contains("order by t1.name desc, t0.id")); } private void checkNone() { @@ -101,8 +102,8 @@ public class TestOrderByWithMany extends BaseTestCase { // no need to append id to order by as there is no 'many' included in the // query - Assert.assertTrue(sql.contains("order by t1.name desc")); - Assert.assertTrue(!sql.contains("order by t1.name desc,")); + assertTrue(sql.contains("order by t1.name desc")); + assertTrue(!sql.contains("order by t1.name desc,")); } private void checkBoth() { @@ -114,7 +115,7 @@ public class TestOrderByWithMany extends BaseTestCase { String sql = query.getGeneratedSql(); // insert id into the middle of the order by - Assert.assertTrue(sql.contains("order by t1.name, t0.id, t2.ship_time desc")); + assertTrue(sql.contains("order by t1.name, t0.id, t2.ship_time desc")); } private void checkPrepend() { @@ -126,7 +127,7 @@ public class TestOrderByWithMany extends BaseTestCase { String sql = query.getGeneratedSql(); // prepend id in order by - Assert.assertTrue(sql.contains("order by t0.id, t1.ship_time desc")); + assertTrue(sql.contains("order by t0.id, t1.ship_time desc")); } private void checkAlreadyIncluded() { @@ -138,7 +139,7 @@ public class TestOrderByWithMany extends BaseTestCase { String sql = query.getGeneratedSql(); // prepend id in order by - Assert.assertTrue(sql.contains("order by t0.id, t1.ship_time desc")); + assertTrue(sql.contains("order by t0.id, t1.ship_time desc")); } private void checkAlreadyIncluded2() { @@ -150,6 +151,6 @@ public class TestOrderByWithMany extends BaseTestCase { String sql = query.getGeneratedSql(); // prepend id in order by - Assert.assertTrue(sql.contains("order by t0.order_date, t0.id, t1.ship_time desc")); + assertTrue(sql.contains("order by t0.order_date, t0.id, t1.ship_time desc")); } } diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFetchPreference.java b/ebean-core/src/test/java/org/tests/query/other/TestFetchPreference.java index 806d2200f..82b77cd85 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestFetchPreference.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestFetchPreference.java @@ -3,7 +3,7 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.converstation.Conversation; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java b/ebean-core/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java index 35f430b5b..5b2582375 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java @@ -4,11 +4,12 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.Truck; import org.tests.model.basic.Vehicle; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestFindIdsWithInheritance extends BaseTestCase { @Test @@ -20,10 +21,9 @@ public class TestFindIdsWithInheritance extends BaseTestCase { Ebean.save(truck); List ids = Ebean.find(Vehicle.class).findIds(); - Assert.assertNotNull(ids); + assertNotNull(ids); Ebean.delete(truck); - } } diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java b/ebean-core/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java index 3c395f3d6..d997dc556 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java @@ -3,10 +3,10 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.EbeanServer; +import org.junit.jupiter.api.Disabled; import org.tests.model.basic.EBasic; import com.sun.management.HotSpotDiagnosticMXBean; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.management.MBeanServer; import java.io.File; @@ -28,7 +28,7 @@ public class TestFindIterateHeapDump extends BaseTestCase { /** * Ignore this test generally - run it manually against MySQL specifically for Issue #56. */ - @Ignore + @Disabled @Test public void test() { diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java b/ebean-core/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java index ff9dcb89f..5dd124f7a 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java @@ -5,13 +5,13 @@ import io.ebean.BeanState; import io.ebean.Ebean; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Set; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestFindPartialWithConstructorSetFields extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java b/ebean-core/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java index 274b5eeb4..772719d90 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java @@ -2,7 +2,7 @@ package org.tests.query.other; import io.ebean.Ebean; import io.ebean.TransactionalTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.MNonEnum; import org.tests.model.basic.MNonUpdPropEntity; diff --git a/ebean-core/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java b/ebean-core/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java index b4d50582c..328ab92a8 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java @@ -6,11 +6,13 @@ import io.ebean.EbeanServer; import io.ebean.ExpressionList; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestFormulaWithFindCount extends BaseTestCase { @Test @@ -26,12 +28,12 @@ public class TestFormulaWithFindCount extends BaseTestCase { for (Order order : list) { Double amount = order.getTotalAmount(); - Assert.assertNotNull(amount); + assertNotNull(amount); } ExpressionList expressionList = server.find(Order.class).where().gt("totalAmount", 1d); int rowCount = expressionList.findCount(); - Assert.assertEquals(list.size(), rowCount); + assertEquals(list.size(), rowCount); } } diff --git a/ebean-core/src/test/java/org/tests/query/other/TestLikeEscaping.java b/ebean-core/src/test/java/org/tests/query/other/TestLikeEscaping.java index d5eb0e92c..f775c5944 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestLikeEscaping.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestLikeEscaping.java @@ -5,7 +5,7 @@ import io.ebean.TransactionalTestCase; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java b/ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java index 4070496c1..a265499fb 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java @@ -9,7 +9,7 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java b/ebean-core/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java index a3e331311..5779a39ba 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/query/other/TestOneToManyAsMap.java b/ebean-core/src/test/java/org/tests/query/other/TestOneToManyAsMap.java index 36da8bd82..71b49dc82 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestOneToManyAsMap.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestOneToManyAsMap.java @@ -2,7 +2,7 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.map.MpRole; import org.tests.model.map.MpUser; @@ -10,8 +10,8 @@ import java.util.LinkedHashMap; import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -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 TestOneToManyAsMap extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java b/ebean-core/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java index db528a536..e648754e5 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java @@ -4,13 +4,13 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.converstation.Conversation; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestQueryConversationRowCount extends BaseTestCase { @@ -63,7 +63,7 @@ public class TestQueryConversationRowCount extends BaseTestCase { // ); --bind(1,true,1,true) List loggedSql = LoggedSqlCollector.stop(); - Assert.assertEquals(1, loggedSql.size()); + assertEquals(1, loggedSql.size()); String countSql = trimSql(loggedSql.get(0), 0); assertThat(countSql).contains("select count(*) from ( select distinct t0.id from c_conversation t0 left join c_participation u1 on u1.conversation_id = t0.id where t0.group_id = ? and ((t0.isopen = ? and u1.user_id = ?) or t0.isopen = ?))"); diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQueryDistinct.java b/ebean-core/src/test/java/org/tests/query/other/TestQueryDistinct.java index 3a16940b0..927cbeb84 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestQueryDistinct.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestQueryDistinct.java @@ -7,14 +7,12 @@ import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; -import static junit.framework.TestCase.assertNull; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestQueryDistinct extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java b/ebean-core/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java index 55901a720..aef18b94e 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java @@ -6,7 +6,7 @@ import io.ebean.Query; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java b/ebean-core/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java index 44c8a78f0..6ef74b43a 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java @@ -4,14 +4,14 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; 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.jupiter.api.Assertions.assertEquals; public class TestQueryRowCountWithMany extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java index 989ae123d..264bc18b9 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java @@ -6,10 +6,10 @@ import io.ebean.CountedValue; import io.ebean.DB; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.tests.inherit.ChildA; import org.tests.inherit.Data; import org.tests.inherit.EUncle; @@ -478,7 +478,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { } @Test - @Ignore //don't know if ebean can handle this on many to many, as this means that the cartesian product is generated + @Disabled //don't know if ebean can handle this on many to many, as this means that the cartesian product is generated public void distinctFetchManyToManyInheritedBean() { ResetBasicData.reset(); @@ -758,7 +758,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { } } - @Before + @BeforeEach public void setup() { MainEntity e1 = new MainEntity(); e1.setId("1"); @@ -791,7 +791,7 @@ public class TestQuerySingleAttribute extends BaseTestCase { DB.save(rel); } - @After + @AfterEach public void cleanup() { Ebean.find(MainEntityRelation.class).delete(); Ebean.find(MainEntity.class).delete(); diff --git a/ebean-core/src/test/java/org/tests/query/other/TestSelfParent.java b/ebean-core/src/test/java/org/tests/query/other/TestSelfParent.java index ce15e7895..45ac3cb55 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestSelfParent.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestSelfParent.java @@ -3,11 +3,12 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.selfref.SelfParent; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestSelfParent extends BaseTestCase { @Test @@ -39,10 +40,9 @@ public class TestSelfParent extends BaseTestCase { List roots = Ebean.find(SelfParent.class).where().eq("parent", null).findList(); - Assert.assertEquals(1, roots.size()); + assertEquals(1, roots.size()); printNode(roots.get(0)); - } public static void printNode(SelfParent o) { diff --git a/ebean-core/src/test/java/org/tests/query/other/TestSubQueryBinding.java b/ebean-core/src/test/java/org/tests/query/other/TestSubQueryBinding.java index a2b1815d6..b8396593a 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestSubQueryBinding.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestSubQueryBinding.java @@ -6,7 +6,7 @@ import io.ebean.EbeanServer; import io.ebean.Expression; import io.ebean.Query; import org.tests.model.basic.Customer; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestSubQueryBinding extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/other/TestWhereAnnotation.java b/ebean-core/src/test/java/org/tests/query/other/TestWhereAnnotation.java index c3ad40ce6..341d553e5 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestWhereAnnotation.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestWhereAnnotation.java @@ -3,8 +3,7 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Assert; -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; @@ -12,6 +11,8 @@ import org.tests.model.basic.ResetBasicData; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestWhereAnnotation extends BaseTestCase { @@ -28,10 +29,10 @@ public class TestWhereAnnotation extends BaseTestCase { List loggedSql = LoggedSqlCollector.stop(); - Assert.assertEquals(1, loggedSql.size()); + assertEquals(1, loggedSql.size()); String sql = loggedSql.get(0); - Assert.assertTrue(sql.contains("t1.order_date is not null")); + assertTrue(sql.contains("t1.order_date is not null")); } @Test diff --git a/ebean-core/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java b/ebean-core/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java index c36cd28c8..0bd6ae56e 100644 --- a/ebean-core/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java +++ b/ebean-core/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java @@ -3,12 +3,12 @@ package org.tests.query.other; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestWhereLikeWithSlash extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java b/ebean-core/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java index e3fe57b18..293c4acaa 100644 --- a/ebean-core/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java +++ b/ebean-core/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java @@ -4,7 +4,7 @@ import io.ebean.Ebean; import io.ebean.PagedList; import io.ebean.TransactionalTestCase; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.onetoone.album.Cover; import java.util.ArrayList; diff --git a/ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java b/ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java index f16828ec5..0312b3282 100644 --- a/ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java +++ b/ebean-core/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java @@ -9,7 +9,7 @@ import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.meta.MetaTimedMetric; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; @@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class SqlQueryTests extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java b/ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java index bc96f4e46..e87a3a3d5 100644 --- a/ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java +++ b/ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.Query; import io.ebean.annotation.Platform; import io.ebean.plugin.SpiServer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java b/ebean-core/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java index caf230efc..e7ae20429 100644 --- a/ebean-core/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java +++ b/ebean-core/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java @@ -2,7 +2,7 @@ package org.tests.quotedidentifier; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.BWithQIdent; public class TestQuotedIdentifierQuery extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java b/ebean-core/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java index b8fdba507..f4c4c26b7 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java @@ -5,12 +5,12 @@ import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.Transaction; import io.ebeaninternal.api.SpiTransaction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.idkeys.db.AuditLog; import java.util.Arrays; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; public class TestInsertSqlLogging extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestOrderReportTotal.java b/ebean-core/src/test/java/org/tests/rawsql/TestOrderReportTotal.java index 589bf6591..538a950e8 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestOrderReportTotal.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestOrderReportTotal.java @@ -8,12 +8,12 @@ import io.ebean.RawSqlBuilder; import org.tests.model.basic.OrderAggregate; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; 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 TestOrderReportTotal extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java index 4e0fe97a1..50395973d 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java @@ -7,11 +7,12 @@ import io.ebean.RawSql; import io.ebean.RawSqlBuilder; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestRawSqlAsKeyword extends BaseTestCase { @Test @@ -39,8 +40,7 @@ public class TestRawSqlAsKeyword extends BaseTestCase { query.where().ilike("name", "r%"); List list = query.findList(); - Assert.assertNotNull(list); - + assertNotNull(list); // try valid query with no spaces rawSql = @@ -53,7 +53,7 @@ public class TestRawSqlAsKeyword extends BaseTestCase { query.where().ilike("name", "r%"); list = query.findList(); - Assert.assertNotNull(list); + assertNotNull(list); rawSql = RawSqlBuilder @@ -64,7 +64,7 @@ public class TestRawSqlAsKeyword extends BaseTestCase { query.where().ilike("name", "r%"); list = query.findList(); - Assert.assertNotNull(list); + assertNotNull(list); // this will barf - expecting the AS keyword now rawSql = @@ -76,6 +76,6 @@ public class TestRawSqlAsKeyword extends BaseTestCase { query.where().ilike("name", "r%"); list = query.findList(); - Assert.assertNotNull(list); + assertNotNull(list); } } diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java index 1de360045..f383d9f04 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java @@ -7,11 +7,12 @@ import io.ebean.RawSql; import io.ebean.RawSqlBuilder; import org.tests.model.basic.CustomerAggregate; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestRawSqlCustomerAggregate extends BaseTestCase { @Test @@ -29,6 +30,6 @@ public class TestRawSqlCustomerAggregate extends BaseTestCase { query.where().ge("customer.id", 1); List list = query.findList(); - Assert.assertNotNull(list); + assertNotNull(list); } } diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java index 359bf2ebe..0931ed28c 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java @@ -9,13 +9,13 @@ import org.tests.model.basic.EBasic; import org.tests.model.basic.Order; import org.tests.model.basic.OrderDetail; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Random; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestRawSqlMasterDetail extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java index 62f3f3002..38494aecc 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java @@ -13,13 +13,13 @@ import io.ebean.annotation.Platform; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.SQLException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestRawSqlNamedParams extends BaseTestCase { @@ -39,8 +39,7 @@ public class TestRawSqlNamedParams extends BaseTestCase { query.where().lt("id", 1000); List list = query.findList(); - - Assert.assertNotNull(list); + assertNotNull(list); } @Test diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java index bece172f6..4f59c0ce0 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java @@ -11,8 +11,7 @@ import io.ebean.RawSqlBuilder; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import org.ebeantest.LoggedSqlCollector; -import org.junit.Assert; -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; @@ -21,6 +20,8 @@ import java.util.List; import java.util.concurrent.ExecutionException; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestRawSqlOrmQuery extends BaseTestCase { @@ -41,7 +42,7 @@ public class TestRawSqlOrmQuery extends BaseTestCase { query.filterMany("contacts").gt("lastName", "b"); List list = query.findList(); - Assert.assertNotNull(list); + assertNotNull(list); // check also select count(*) LoggedSqlCollector.start(); @@ -64,7 +65,7 @@ public class TestRawSqlOrmQuery extends BaseTestCase { query.where().ilike("name", "r%"); List list = query.findList(); - Assert.assertNotNull(list); + assertNotNull(list); } @Test @@ -93,8 +94,8 @@ public class TestRawSqlOrmQuery extends BaseTestCase { int rowCount = query.findCount(); FutureRowCount futureRowCount = query.findFutureCount(); - Assert.assertEquals(initialRowCount, rowCount); - Assert.assertEquals(initialRowCount, futureRowCount.get().intValue()); + assertEquals(initialRowCount, rowCount); + assertEquals(initialRowCount, futureRowCount.get().intValue()); // check that lazy loading still executes for (Customer customer : list) { @@ -123,8 +124,8 @@ public class TestRawSqlOrmQuery extends BaseTestCase { List list = page.getList(); int rowCount = page.getTotalCount(); - Assert.assertEquals(2, list.size()); - Assert.assertEquals(initialRowCount, rowCount); + assertEquals(2, list.size()); + assertEquals(initialRowCount, rowCount); // check that lazy loading executes for (Customer customer : list) { diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java index 19c53d44d..3b89a8d1c 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java @@ -1,18 +1,14 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; -import io.ebean.Ebean; -import io.ebean.FetchConfig; -import io.ebean.Query; -import io.ebean.RawSql; -import io.ebean.RawSqlBuilder; +import io.ebean.*; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; 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 TestRawSqlOrmQueryDistinct extends BaseTestCase { @Test @@ -38,7 +34,7 @@ public class TestRawSqlOrmQueryDistinct extends BaseTestCase { query.filterMany("contacts").gt("lastName", "b"); List list = query.findList(); - Assert.assertNotNull(list); + assertNotNull(list); } } diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java index a012e5e5e..cbecd82fc 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java @@ -9,11 +9,12 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.OrderAggregate; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestRawSqlOrmWrapper extends BaseTestCase { @Test @@ -39,7 +40,7 @@ public class TestRawSqlOrmWrapper extends BaseTestCase { .where().gt("order.id", 0).having().gt("totalAmount", 20); List list = query.findList(); - Assert.assertNotNull(list); + assertNotNull(list); output(list); diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java index 94df85a74..2a7b288e1 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java @@ -9,11 +9,12 @@ import io.ebean.RawSqlBuilder; import org.tests.model.basic.Order; import org.tests.model.basic.OrderAggregate; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestRawSqlOrmWrapper2 extends BaseTestCase { @Test @@ -36,13 +37,12 @@ public class TestRawSqlOrmWrapper2 extends BaseTestCase { .order().desc("totalAmount").setMaxRows(10); List list = query.findList(); - Assert.assertNotNull(list); + assertNotNull(list); for (OrderAggregate oa : list) { oa.getTotalAmount(); Order order = oa.getOrder(); order.getId(); } - } } diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java index 3e3bc2e20..6fc475bd9 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java @@ -9,7 +9,7 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.OrderAggregate; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java index 75d678fd6..6444593e6 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java index 1e576f0b7..61942668e 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java index 300ecd524..c137f64d3 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java +++ b/ebean-core/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java @@ -8,7 +8,7 @@ import io.ebean.RawSqlBuilder; import io.ebean.Transaction; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java b/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java index 38dc54918..523f2f2c7 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java +++ b/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java @@ -7,14 +7,14 @@ import org.tests.inherit.ChildA; import org.tests.inherit.ChildB; import org.tests.inherit.Data; import org.tests.inherit.Parent; -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.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class ParentQueryTest extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java b/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java index e410bb9af..bf8f0c534 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java +++ b/ebean-core/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java @@ -2,11 +2,10 @@ package org.tests.rawsql.inherit; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import io.ebean.FetchConfig; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.tests.inherit.ChildA; import org.tests.inherit.ChildB; import org.tests.inherit.Data; @@ -17,13 +16,13 @@ import org.tests.inherit.ParentAggregate; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; -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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ParentRawSqlTest extends BaseTestCase { - @Before + @BeforeEach public void clearDb() { Ebean.deleteAll(Ebean.find(Data.class).findList()); Ebean.deleteAll(Ebean.find(Parent.class).findList()); diff --git a/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java b/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java index b127b249a..73acc39af 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java +++ b/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java @@ -4,7 +4,7 @@ import io.ebean.*; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; 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.Order; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java b/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java index 39f63c31b..5b5f82b8c 100644 --- a/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java +++ b/ebean-core/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.embedded.EAddress; import org.tests.model.embedded.EPerson; import org.tests.model.json.PlainBean; diff --git a/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java b/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java index 91ccb2b78..87ab6de65 100644 --- a/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java +++ b/ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java @@ -12,9 +12,9 @@ import io.ebean.event.readaudit.ReadAuditPrepare; import io.ebean.event.readaudit.ReadAuditQueryPlan; import io.ebean.event.readaudit.ReadEvent; import org.ebeantest.LoggedSqlCollector; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; import org.tests.model.basic.EBasicChangeLog; @@ -39,7 +39,7 @@ public class TestReadAudit extends BaseTestCase { Long id1; Long id2; - @Before + @BeforeEach public void setup() { server = createServer(); @@ -61,7 +61,7 @@ public class TestReadAudit extends BaseTestCase { server.save(ar); } - @After + @AfterEach public void shutdown() { server.shutdown(); } diff --git a/ebean-core/src/test/java/org/tests/refresh/TestRefreshWithMany.java b/ebean-core/src/test/java/org/tests/refresh/TestRefreshWithMany.java index 65ca483f8..19a489e9c 100644 --- a/ebean-core/src/test/java/org/tests/refresh/TestRefreshWithMany.java +++ b/ebean-core/src/test/java/org/tests/refresh/TestRefreshWithMany.java @@ -8,11 +8,11 @@ import io.ebean.TransactionalTestCase; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestRefreshWithMany extends TransactionalTestCase { diff --git a/ebean-core/src/test/java/org/tests/repository/TestBeanRepository.java b/ebean-core/src/test/java/org/tests/repository/TestBeanRepository.java index 6bb90a87d..f09823412 100644 --- a/ebean-core/src/test/java/org/tests/repository/TestBeanRepository.java +++ b/ebean-core/src/test/java/org/tests/repository/TestBeanRepository.java @@ -2,7 +2,7 @@ package org.tests.repository; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/saveassociation/TestSaveAssociation.java b/ebean-core/src/test/java/org/tests/saveassociation/TestSaveAssociation.java index 9724050fc..ff3d868e8 100644 --- a/ebean-core/src/test/java/org/tests/saveassociation/TestSaveAssociation.java +++ b/ebean-core/src/test/java/org/tests/saveassociation/TestSaveAssociation.java @@ -2,10 +2,11 @@ package org.tests.saveassociation; import io.ebean.BaseTestCase; import io.ebean.Ebean; +import org.junit.jupiter.api.Test; import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; -import org.junit.Assert; -import org.junit.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestSaveAssociation extends BaseTestCase { @@ -25,8 +26,7 @@ public class TestSaveAssociation extends BaseTestCase { TSMaster m0Check = Ebean.find(TSMaster.class).fetch("details").where().idEq(m0.getId()) .findOne(); - Assert.assertEquals(2, m0Check.getDetails().size()); - + assertEquals(2, m0Check.getDetails().size()); } } diff --git a/ebean-core/src/test/java/org/tests/saveassociation/TestSaveSamePK.java b/ebean-core/src/test/java/org/tests/saveassociation/TestSaveSamePK.java index e2a21562d..4229cbf65 100644 --- a/ebean-core/src/test/java/org/tests/saveassociation/TestSaveSamePK.java +++ b/ebean-core/src/test/java/org/tests/saveassociation/TestSaveSamePK.java @@ -2,11 +2,11 @@ package org.tests.saveassociation; import io.ebean.BaseTestCase; import io.ebean.DB; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestSaveSamePK extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java b/ebean-core/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java index 7c7d20a34..5f76c3fc9 100644 --- a/ebean-core/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java +++ b/ebean-core/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java @@ -8,11 +8,12 @@ import org.tests.singleTableInheritance.model.Warehouse; import org.tests.singleTableInheritance.model.Zone; import org.tests.singleTableInheritance.model.ZoneExternal; import org.tests.singleTableInheritance.model.ZoneInternal; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.*; + public class TestInheritQuery extends BaseTestCase { @Test @@ -33,13 +34,13 @@ public class TestInheritQuery extends BaseTestCase { // Ebean.find(PalletLocation.class).where().eq("zone.id", // zone.getId()).findList(); - Assert.assertNotNull(locations); - Assert.assertEquals(1, locations.size()); + assertNotNull(locations); + assertEquals(1, locations.size()); PalletLocation rereadLoc = locations.get(0); - Assert.assertTrue(rereadLoc instanceof PalletLocation); + assertTrue(rereadLoc instanceof PalletLocation); Zone rereadZone = rereadLoc.getZone(); - Assert.assertNotNull(rereadZone); - Assert.assertTrue(rereadZone instanceof ZoneExternal); + assertNotNull(rereadZone); + assertTrue(rereadZone instanceof ZoneExternal); } @SuppressWarnings("unlikely-arg-type") @@ -66,26 +67,26 @@ public class TestInheritQuery extends BaseTestCase { // query abstract class on attribute (root of heirarchy) List zones = Ebean.find(Zone.class).where().startsWith("attribute", "some zone").findList(); // select t0.type c0, t0.ID c1, t0.attribute c2, t0.attribute c3 from zones t0 where t0.attribute like ? ; --bind(some zone%) - Assert.assertEquals(2, zones.size()); - Assert.assertTrue(zones.contains(zoneInt)); - Assert.assertTrue(zones.contains(zoneExt)); + assertEquals(2, zones.size()); + assertTrue(zones.contains(zoneInt)); + assertTrue(zones.contains(zoneExt)); // query internal zones only // discriminator is in WHERE clause where it belongs List internalZones = Ebean.find(ZoneInternal.class).where().startsWith("attribute", "some zone").findList(); // select t0.type c0, t0.ID c1, t0.attribute c2 from zones t0 where t0.type = 'INT' and t0.attribute like ? ; --bind(some zone%) - Assert.assertEquals(1, internalZones.size()); - Assert.assertTrue(internalZones.contains(zoneInt)); - Assert.assertFalse(internalZones.contains(zoneExt)); - Assert.assertTrue(internalZones.get(0) instanceof ZoneInternal); + assertEquals(1, internalZones.size()); + assertTrue(internalZones.contains(zoneInt)); + assertFalse(internalZones.contains(zoneExt)); + assertTrue(internalZones.get(0) instanceof ZoneInternal); // query external zones only List externalZones = Ebean.find(ZoneExternal.class).where().startsWith("attribute", "some zone").findList(); // select t0.type c0, t0.ID c1, t0.attribute c2 from zones t0 where t0.type = 'EXT' and t0.attribute like ? ; --bind(some zone%) - Assert.assertEquals(1, externalZones.size()); - Assert.assertTrue(externalZones.contains(zoneExt)); - Assert.assertFalse(externalZones.contains(zoneInt)); - Assert.assertTrue(externalZones.get(0) instanceof ZoneExternal); + assertEquals(1, externalZones.size()); + assertTrue(externalZones.contains(zoneExt)); + assertFalse(externalZones.contains(zoneInt)); + assertTrue(externalZones.get(0) instanceof ZoneExternal); // parents with children of Zones and subclasses @@ -98,10 +99,10 @@ public class TestInheritQuery extends BaseTestCase { // parent with many-to-one, doesn't put in discriminator, why not, PK sufficient? // eager join Warehouse wh2 = Ebean.find(Warehouse.class, wh.getId()); - Assert.assertNotNull(wh2); - Assert.assertEquals(wh.getId(), wh2.getId()); - Assert.assertEquals(wh.getOfficeZone(), wh2.getOfficeZone()); - Assert.assertEquals(wh.getOfficeZone().getAttribute(), wh2.getOfficeZone().getAttribute()); + assertNotNull(wh2); + assertEquals(wh.getId(), wh2.getId()); + assertEquals(wh.getOfficeZone(), wh2.getOfficeZone()); + assertEquals(wh.getOfficeZone().getAttribute(), wh2.getOfficeZone().getAttribute()); // before the fix, next assertion runs this lazy query: @@ -114,8 +115,8 @@ public class TestInheritQuery extends BaseTestCase { // this works here because we have at least one shipping zone - Assert.assertEquals(1, wh2.getShippingZones().size()); - Assert.assertTrue(wh2.getShippingZones().contains(zoneExt)); + assertEquals(1, wh2.getShippingZones().size()); + assertTrue(wh2.getShippingZones().contains(zoneExt)); // set optional concrete to null to set stage for failure wh.setOfficeZone(null); @@ -126,7 +127,7 @@ public class TestInheritQuery extends BaseTestCase { .where().eq("id", wh.getId()) .findOne(); - Assert.assertNotNull(wh2); + assertNotNull(wh2); // discriminator is used here, should be in join // assuming this "manual" fetch is equivalent to autofetch (i.e., autofetch should work the same way) // before Daryl's fix @@ -138,24 +139,24 @@ public class TestInheritQuery extends BaseTestCase { .where().eq("id", wh.getId()) .findOne(); // key assertion #1 - fails due to left join with discriminator in WHERE - Assert.assertNotNull(wh2); + assertNotNull(wh2); // clear children to set the stage for left join failure wh.getShippingZones().clear(); Ebean.save(wh); wh2 = Ebean.find(Warehouse.class, wh.getId()); - Assert.assertNotNull(wh2); - Assert.assertEquals(wh.getId(), wh2.getId()); - Assert.assertEquals(0, wh.getShippingZones().size()); + assertNotNull(wh2); + assertEquals(wh.getId(), wh2.getId()); + assertEquals(0, wh.getShippingZones().size()); // query with lazy load of abstract children wh = Ebean.find(Warehouse.class) .where().eq("id", wh.getId()) .findOne(); - Assert.assertNotNull(wh); - Assert.assertEquals(wh.getId(), wh2.getId()); - Assert.assertEquals(0, wh.getShippingZones().size()); + assertNotNull(wh); + assertEquals(wh.getId(), wh2.getId()); + assertEquals(0, wh.getShippingZones().size()); // query with fetch of abstract children wh = Ebean.find(Warehouse.class) @@ -163,9 +164,9 @@ public class TestInheritQuery extends BaseTestCase { .where().eq("id", wh.getId()) .findOne(); // key assertion #2 - fails due to left join with discriminator in WHERE - Assert.assertNotNull(wh); - Assert.assertEquals(wh.getId(), wh2.getId()); - Assert.assertEquals(0, wh.getShippingZones().size()); + assertNotNull(wh); + assertEquals(wh.getId(), wh2.getId()); + assertEquals(0, wh.getShippingZones().size()); } diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java index 4f271f0f6..f3ce1f658 100644 --- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java +++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java @@ -7,7 +7,7 @@ import io.ebean.SqlQuery; import io.ebean.SqlRow; import io.ebean.Transaction; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.softdelete.EBasicNoSDChild; import org.tests.model.softdelete.EBasicSDChild; import org.tests.model.softdelete.EBasicSoftDelete; diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java index 68c2c7f69..a9cae80f8 100644 --- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java +++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.Query; import org.tests.model.softdelete.ESoftDelBook; import org.tests.model.softdelete.ESoftDelUser; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java index 918445e1e..06fd33447 100644 --- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java +++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import org.tests.model.softdelete.ESoftDelRole; import org.tests.model.softdelete.ESoftDelUser; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java index 8f730921a..99dcc20dd 100644 --- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java +++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java @@ -6,7 +6,7 @@ import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; import org.tests.model.softdelete.ESoftDelMid; import io.ebean.Finder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.softdelete.ESoftDelY; import org.tests.model.softdelete.ESoftDelZ; @@ -60,7 +60,7 @@ public class TestSoftDeleteOptionalRelationship extends BaseTestCase { final List sql = LoggedSqlCollector.stop(); assertThat(sql).hasSize(1); - if (isSqlServer()) { + if (isSqlServer() || isMySql() || isMariaDB()) { assertThat(sql.get(0)).contains("left join esoft_del_z t1 on t1.id = t0.organization_id and t1.deleted = 0 where"); } else { assertThat(sql.get(0)).contains("left join esoft_del_z t1 on t1.id = t0.organization_id and t1.deleted = false where"); diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java index d5eeefedc..ca0dfc089 100644 --- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java +++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java @@ -3,7 +3,7 @@ package org.tests.softdelete; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.softdelete.ESoftDelOneA; import org.tests.model.softdelete.ESoftDelOneB; diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java index ee8c1590a..616481f6c 100644 --- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java +++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java @@ -3,7 +3,7 @@ package org.tests.softdelete; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebeantest.LoggedSql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.softdelete.EsdDetail; import org.tests.model.softdelete.EsdMaster; diff --git a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java index 07388a367..8fd4862d0 100644 --- a/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java +++ b/ebean-core/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; import io.ebean.Transaction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.softdelete.ESoftDelMid; import org.tests.model.softdelete.ESoftDelTop; import org.tests.model.softdelete.ESoftDelUp; diff --git a/ebean-core/src/test/java/org/tests/sp/TestManyToManySaveTwice.java b/ebean-core/src/test/java/org/tests/sp/TestManyToManySaveTwice.java index a505a5d54..1d4a262d6 100644 --- a/ebean-core/src/test/java/org/tests/sp/TestManyToManySaveTwice.java +++ b/ebean-core/src/test/java/org/tests/sp/TestManyToManySaveTwice.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Ebean; import io.ebean.Transaction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.sp.model.car.Car; import org.tests.sp.model.car.Door; import org.tests.sp.model.car.Wheel; @@ -13,8 +13,8 @@ import java.util.LinkedList; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -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 TestManyToManySaveTwice extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java b/ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java index 670080584..19fb84364 100644 --- a/ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java +++ b/ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java @@ -6,15 +6,16 @@ import io.ebean.EbeanServer; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.InheritInfo; +import org.junit.jupiter.api.Test; import org.tests.model.inheritmany.IMRelated; import org.tests.model.inheritmany.IMRoot; import org.tests.model.inheritmany.IMRootOne; import org.tests.model.inheritmany.IMRootTwo; -import org.junit.Assert; -import org.junit.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestInheritWithMany extends BaseTestCase { @@ -23,12 +24,12 @@ public class TestInheritWithMany extends BaseTestCase { public void test() { EbeanServer server = Ebean.getServer(null); - Assert.assertNotNull(server); + assertNotNull(server); SpiEbeanServer spiServer = (SpiEbeanServer) server; BeanDescriptor beanDescriptor = spiServer.getBeanDescriptor(IMRoot.class); InheritInfo inheritInfo = beanDescriptor.getInheritInfo(); - Assert.assertNotNull(inheritInfo); + assertNotNull(inheritInfo); IMRootOne one = new IMRootOne(); diff --git a/ebean-core/src/test/java/org/tests/text/csv/TestCsvReader.java b/ebean-core/src/test/java/org/tests/text/csv/TestCsvReader.java index 57ac6755f..313f5017c 100644 --- a/ebean-core/src/test/java/org/tests/text/csv/TestCsvReader.java +++ b/ebean-core/src/test/java/org/tests/text/csv/TestCsvReader.java @@ -3,7 +3,7 @@ package org.tests.text.csv; import io.ebean.DB; import io.ebean.TransactionalTestCase; import io.ebean.text.csv.CsvReader; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java b/ebean-core/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java index 76127c8cb..ef6bfd8c7 100644 --- a/ebean-core/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java +++ b/ebean-core/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java @@ -4,7 +4,7 @@ import io.ebean.DB; import io.ebean.TransactionalTestCase; import io.ebean.text.csv.CsvReader; import io.ebean.text.csv.DefaultCsvCallback; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import java.io.File; diff --git a/ebean-core/src/test/java/org/tests/text/csv/TestTimeStringParser.java b/ebean-core/src/test/java/org/tests/text/csv/TestTimeStringParser.java index fac5e5095..3aea61ade 100644 --- a/ebean-core/src/test/java/org/tests/text/csv/TestTimeStringParser.java +++ b/ebean-core/src/test/java/org/tests/text/csv/TestTimeStringParser.java @@ -2,21 +2,22 @@ package org.tests.text.csv; import io.ebean.BaseTestCase; import io.ebean.text.TimeStringParser; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Time; +import static org.junit.jupiter.api.Assertions.*; + public class TestTimeStringParser extends BaseTestCase { @Test public void testSimple() { Time t = (Time) TimeStringParser.get().parse("12:00"); - Assert.assertNotNull(t); + assertNotNull(t); t = (Time) TimeStringParser.get().parse("12:00:12"); - Assert.assertNotNull(t); + assertNotNull(t); expectError("12"); expectError("12:"); @@ -29,9 +30,9 @@ public class TestTimeStringParser extends BaseTestCase { private void expectError(String value) { try { TimeStringParser.get().parse(value); - Assert.assertTrue(false); + fail(); } catch (IllegalArgumentException e) { - Assert.assertTrue(true); + assertTrue(true); } } } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java b/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java index eaf1825fc..dab45d3cb 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java @@ -8,24 +8,24 @@ import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.json.SpiJsonReader; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.text.json.ReadJson; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import java.io.IOException; import java.io.StringReader; import java.util.Set; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestJsonBeanDescriptorParse extends BaseTestCase { @Test public void test() throws IOException { - SpiEbeanServer server = (SpiEbeanServer) Ebean.getServer(null); BeanDescriptor descriptor = server.getBeanDescriptor(Customer.class); - StringReader reader = new StringReader("{\"id\":123,\"name\":\"Hello rob\"}"); JsonParser parser = server.json().createParser(reader); @@ -33,16 +33,15 @@ public class TestJsonBeanDescriptorParse extends BaseTestCase { Customer customer = descriptor.jsonRead(readJson, null); - Assert.assertEquals(Integer.valueOf(123), customer.getId()); - Assert.assertEquals("Hello rob", customer.getName()); + assertEquals(Integer.valueOf(123), customer.getId()); + assertEquals("Hello rob", customer.getName()); BeanState beanState = Ebean.getBeanState(customer); Set loadedProps = beanState.getLoadedProps(); - Assert.assertEquals(2, loadedProps.size()); - Assert.assertTrue(loadedProps.contains("id")); - Assert.assertTrue(loadedProps.contains("name")); - + assertEquals(2, loadedProps.size()); + assertTrue(loadedProps.contains("id")); + assertTrue(loadedProps.contains("name")); } } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java b/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java index 63630140f..17219fe5e 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java @@ -3,25 +3,24 @@ package org.tests.text.json; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.text.json.JsonContext; +import org.junit.jupiter.api.Test; import org.tests.model.basic.BeanWithTimeZone; -import org.junit.Assert; -import org.junit.Test; -import java.io.IOException; import java.util.TimeZone; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestJsonBeanWithTimeZone extends BaseTestCase { @Test - public void testSimple() throws IOException { - + public void testSimple() { TimeZone defaultTimeZone = TimeZone.getDefault(); TimeZone.getAvailableIDs(defaultTimeZone.getRawOffset()); String id = defaultTimeZone.getID(); TimeZone timeZone = TimeZone.getTimeZone(id); - Assert.assertEquals(defaultTimeZone, timeZone); + assertEquals(defaultTimeZone, timeZone); BeanWithTimeZone bean = new BeanWithTimeZone(); bean.setName("foo"); @@ -32,13 +31,12 @@ public class TestJsonBeanWithTimeZone extends BaseTestCase { BeanWithTimeZone bean2 = jsonContext.toBean(BeanWithTimeZone.class, jsonContent); - Assert.assertEquals(bean.getTimezone(), bean2.getTimezone()); + assertEquals(bean.getTimezone(), bean2.getTimezone()); Ebean.save(bean); BeanWithTimeZone bean3 = Ebean.find(BeanWithTimeZone.class, bean.getId()); - Assert.assertEquals(bean.getTimezone(), bean3.getTimezone()); - + assertEquals(bean.getTimezone(), bean3.getTimezone()); } } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java b/ebean-core/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java index 75402e4d9..7c0975d02 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java @@ -3,7 +3,7 @@ package org.tests.text.json; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.text.json.JsonContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Animal; import org.tests.model.basic.Cat; import org.tests.model.basic.Dog; @@ -11,7 +11,7 @@ import org.tests.model.basic.Dog; import java.sql.Date; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestJsonInheritanceDiscriminator extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonMap.java b/ebean-core/src/test/java/org/tests/text/json/TestJsonMap.java index 4237d5fd6..0495d4afb 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestJsonMap.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestJsonMap.java @@ -7,13 +7,13 @@ import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteOptions; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestJsonMap extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonSimple.java b/ebean-core/src/test/java/org/tests/text/json/TestJsonSimple.java index d64a4b702..a00e95829 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestJsonSimple.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestJsonSimple.java @@ -4,20 +4,15 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.text.json.EJson; import io.ebean.text.json.JsonContext; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.assertj.core.api.Assertions.assertThat; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.LineNumberReader; -import java.io.Reader; +import java.io.*; import java.util.LinkedHashMap; import java.util.Map; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.*; + public class TestJsonSimple extends BaseTestCase { @SuppressWarnings("unchecked") @@ -40,11 +35,11 @@ public class TestJsonSimple extends BaseTestCase { Object el = EJson.parse(jsonText); assertThat(el).isNotNull(); - + Map e2 = EJson.parseObject("{\"a\":12, \"name\":{\"first\":\"rob\", \"last\":\"byg\"}}"); - Assert.assertEquals(12L, e2.get("a")); - Assert.assertEquals("rob", ((Map) e2.get("name")).get("first")); + assertEquals(12L, e2.get("a")); + assertEquals("rob", ((Map) e2.get("name")).get("first")); Map m = new LinkedHashMap<>(); m.put("hello", "rob"); @@ -56,12 +51,11 @@ public class TestJsonSimple extends BaseTestCase { String s = "{\"parishId\":\"18\",\"contentId\":null,\"contentStatus\":null,\"contentType\":\"pg-hello\",\"content\":\"asd\"}"; Object jsonElement = EJson.parse(s); - Assert.assertNotNull(jsonElement); + assertNotNull(jsonElement); Map e3 = EJson.parseObject("{\"name\":\"\\u60a8\\u597d\"}"); - Assert.assertTrue(((String) e3.get("name")).length() == 2); - + assertTrue(((String) e3.get("name")).length() == 2); } } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java b/ebean-core/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java index be569ac77..0d0f84a21 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java @@ -3,17 +3,18 @@ package org.tests.text.json; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.text.json.JsonContext; +import org.junit.jupiter.api.Test; import org.tests.model.basic.SomeEnum; import org.tests.model.basic.SomeEnumBean; -import org.junit.Assert; -import org.junit.Test; import java.io.IOException; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestJsonSomeEnumWithToString extends BaseTestCase { @Test - public void testJsonConversion() throws IOException { + public void testJsonConversion() { SomeEnumBean bean = new SomeEnumBean(); bean.setId(100l); @@ -25,10 +26,9 @@ public class TestJsonSomeEnumWithToString extends BaseTestCase { SomeEnumBean bean2 = json.toBean(SomeEnumBean.class, jsonContent); - Assert.assertEquals(bean.getSomeEnum(), bean2.getSomeEnum()); - Assert.assertEquals(bean.getName(), bean2.getName()); - Assert.assertEquals(bean.getId(), bean2.getId()); - + assertEquals(bean.getSomeEnum(), bean2.getSomeEnum()); + assertEquals(bean.getName(), bean2.getName()); + assertEquals(bean.getId(), bean2.getId()); } } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java index 8ecef61fc..b67112308 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java @@ -3,15 +3,16 @@ package org.tests.text.json; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.text.json.JsonContext; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; import java.io.IOException; import java.io.StringReader; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestTextJsonBeanReadVisitor extends BaseTestCase { @Test @@ -36,7 +37,7 @@ public class TestTextJsonBeanReadVisitor extends BaseTestCase { StringReader reader = new StringReader(s); List mList2 = json.toList(Customer.class, reader); - Assert.assertEquals(mList.size(), mList2.size()); + assertEquals(mList.size(), mList2.size()); } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java index 8c39075a5..2ee1393f6 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java @@ -5,7 +5,7 @@ package org.tests.text.json; //import org.junit.Assert; import io.ebean.BaseTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; // //import com.avaje.ebean.Ebean; diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInheritance.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInheritance.java index 288a61cc5..6cf13502f 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInheritance.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInheritance.java @@ -1,7 +1,7 @@ package org.tests.text.json; import io.ebean.BaseTestCase; -import io.ebean.Ebean; +import io.ebean.DB; import io.ebean.text.json.JsonContext; import org.tests.model.basic.Car; import org.tests.model.basic.CarAccessory; @@ -10,12 +10,12 @@ import org.tests.model.basic.Trip; import org.tests.model.basic.Truck; import org.tests.model.basic.Vehicle; import org.tests.model.basic.VehicleDriver; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestTextJsonInheritance extends BaseTestCase { @@ -24,7 +24,7 @@ public class TestTextJsonInheritance extends BaseTestCase { String fom = "{\"id\":90,\"name\":\"Frank\",\"vehicle\":{\"id\":42,\"licenseNumber\":\"T100\",\"capacity\":99.0,\"dtype\":\"T\"}}"; - VehicleDriver driver1 = Ebean.json().toBean(VehicleDriver.class, fom); + VehicleDriver driver1 = DB.json().toBean(VehicleDriver.class, fom); assertThat(driver1.getVehicle()).isInstanceOf(Truck.class); assertThat(driver1.getVehicle().getLicenseNumber()).isEqualTo("T100"); } @@ -34,36 +34,33 @@ public class TestTextJsonInheritance extends BaseTestCase { setupData(); - List list = Ebean.find(Vehicle.class).setAutoTune(false).findList(); + List list = DB.find(Vehicle.class).setAutoTune(false).findList(); - Assert.assertEquals(2, list.size()); + assertEquals(2, list.size()); - JsonContext jsonContext = Ebean.json(); + JsonContext jsonContext = DB.json(); String jsonString = jsonContext.toJson(list); List rebuiltList = jsonContext.toList(Vehicle.class, jsonString); - Assert.assertEquals(2, rebuiltList.size()); - + assertEquals(2, rebuiltList.size()); } private void setupData() { - - Ebean.createUpdate(CarAccessory.class, "delete from CarAccessory").execute(); - Ebean.createUpdate(CarFuse.class, "delete from CarFuse").execute(); - Ebean.createUpdate(Trip.class, "delete from trip").execute(); - Ebean.createUpdate(VehicleDriver.class, "delete from vehicleDriver").execute(); - Ebean.createUpdate(Vehicle.class, "delete from vehicle").execute(); + DB.createUpdate(CarAccessory.class, "delete from CarAccessory").execute(); + DB.createUpdate(CarFuse.class, "delete from CarFuse").execute(); + DB.createUpdate(Trip.class, "delete from trip").execute(); + DB.createUpdate(VehicleDriver.class, "delete from vehicleDriver").execute(); + DB.createUpdate(Vehicle.class, "delete from vehicle").execute(); Car c = new Car(); c.setLicenseNumber("C6788"); c.setDriver("CarDriver"); - Ebean.save(c); + DB.save(c); Truck t = new Truck(); t.setLicenseNumber("T1098"); t.setCapacity(20D); - Ebean.save(t); - + DB.save(t); } } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java index d11aba2ee..d27d28098 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.text.json.JsonContext; import io.ebean.util.StringHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java index fa11fc3e4..345cd390a 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java @@ -4,24 +4,23 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteOptions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Before; -import org.junit.Test; import java.io.IOException; import java.util.List; public class TestTextJsonInvokeLazy extends BaseTestCase { - @Before + @BeforeEach public void clearBeanCache() { server().pluginApi().beanType(Customer.class).clearBeanCache(); } @Test public void test() throws IOException { - ResetBasicData.reset(); List list = Ebean.find(Customer.class).select("name").findList(); diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java index d7b7bf4e6..6fe78b3d1 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java @@ -5,18 +5,19 @@ import io.ebean.Ebean; import io.ebean.text.PathProperties; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteOptions; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; import java.io.IOException; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestTextJsonReadManyLazyLoad extends BaseTestCase { @Test - public void test_lazyLoadBoth() throws IOException { + public void test_lazyLoadBoth() { ResetBasicData.reset(); @@ -31,9 +32,8 @@ public class TestTextJsonReadManyLazyLoad extends BaseTestCase { o.setPathProperties(pp); String s = json.toJson(list, o); - Assert.assertTrue(s.contains("\"contacts\"")); - Assert.assertTrue(s.contains("\"name\"")); - + assertTrue(s.contains("\"contacts\"")); + assertTrue(s.contains("\"name\"")); } @Test @@ -52,13 +52,12 @@ public class TestTextJsonReadManyLazyLoad extends BaseTestCase { o.setPathProperties(pp); String s = json.toJson(list, o); - Assert.assertTrue(s.contains("\"contacts\"")); - Assert.assertTrue(s.contains("\"name\"")); - + assertTrue(s.contains("\"contacts\"")); + assertTrue(s.contains("\"name\"")); } @Test - public void test_lazyLoadContacts() throws IOException { + public void test_lazyLoadContacts() { ResetBasicData.reset(); @@ -74,9 +73,8 @@ public class TestTextJsonReadManyLazyLoad extends BaseTestCase { o.setPathProperties(pp); String s = json.toJson(list, o); - Assert.assertTrue(s.contains("\"contacts\"")); - Assert.assertTrue(s.contains("\"name\"")); - + assertTrue(s.contains("\"contacts\"")); + assertTrue(s.contains("\"name\"")); } } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java index d73f561ed..ce1734ce5 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java @@ -8,16 +8,17 @@ import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteOptions; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.Product; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; import java.io.IOException; import java.util.List; +import static org.junit.jupiter.api.Assertions.*; + public class TestTextJsonReferenceBean extends BaseTestCase { @Test @@ -46,16 +47,15 @@ public class TestTextJsonReferenceBean extends BaseTestCase { prodDesc.isReference(eb._ebean_getIntercept()); BeanState beanState = Ebean.getBeanState(refProd); - Assert.assertTrue(beanState.isNew()); + assertTrue(beanState.isNew()); String name = refProd.getName(); - Assert.assertNull(name); + assertNull(name); // Set to be 'loaded' to invoke lazy loading beanState.setLoaded(); String name2 = refProd.getName(); - Assert.assertNotNull(name2); - + assertNotNull(name2); } List orders = Ebean.find(Order.class) @@ -75,9 +75,7 @@ public class TestTextJsonReferenceBean extends BaseTestCase { BeanDescriptor custDesc = server.getBeanDescriptor(Customer.class); - Assert.assertTrue(custDesc.isReference(((EntityBean) customer)._ebean_getIntercept())); - - + assertTrue(custDesc.isReference(((EntityBean) customer)._ebean_getIntercept())); } } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSimple.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSimple.java index f77ff3fd8..5ea710bbc 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSimple.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSimple.java @@ -7,18 +7,17 @@ import io.ebean.text.PathProperties; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonReadBeanVisitor; import io.ebean.text.json.JsonReadOptions; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; import java.io.IOException; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.*; public class TestTextJsonSimple extends BaseTestCase { @@ -76,7 +75,7 @@ public class TestTextJsonSimple extends BaseTestCase { String jsonOutput = json.toJson(list); // check that transient fields are included by default in the JSON output - Assert.assertTrue(jsonOutput.contains("\"selected\":")); + assertTrue(jsonOutput.contains("\"selected\":")); List mList = json.toList(Customer.class, jsonOutput); assertEquals(list.size(), mList.size()); @@ -113,7 +112,7 @@ public class TestTextJsonSimple extends BaseTestCase { String jsonOutput = json.toJson(list); // check that transient fields are included by default in the JSON output - Assert.assertTrue(jsonOutput.contains("\"selected\":")); + assertTrue(jsonOutput.contains("\"selected\":")); List mList = json.toList(Customer.class, jsonOutput); assertEquals(list.size(), mList.size()); @@ -136,13 +135,13 @@ public class TestTextJsonSimple extends BaseTestCase { String jsonOutput = json.toJson(list, pathProperties); // check that transient fields are included by explicit pathProperties - Assert.assertTrue(jsonOutput.contains("\"selected\":")); + assertTrue(jsonOutput.contains("\"selected\":")); pathProperties = PathProperties.parse("(id,name)"); jsonOutput = json.toJson(list, pathProperties); // check that transient fields are NOT included when explicitly excluded by pathProperties - Assert.assertFalse(jsonOutput.contains("\"selected\":")); + assertFalse(jsonOutput.contains("\"selected\":")); } } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java index 59040b598..7e6b13f0f 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java @@ -4,14 +4,15 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.EbeanServer; import io.ebean.text.json.JsonContext; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; import java.io.IOException; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestTextJsonSuperSimple extends BaseTestCase { @Test @@ -31,7 +32,7 @@ public class TestTextJsonSuperSimple extends BaseTestCase { String s = json.toJson(customer); int statusPos = s.indexOf("status"); - Assert.assertEquals(-1, statusPos); + assertEquals(-1, statusPos); } } diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java index ff79d7fac..6569cae2b 100644 --- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java +++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java @@ -4,20 +4,15 @@ import io.ebean.Ebean; import io.ebean.EbeanServer; import io.ebean.TransactionalTestCase; import io.ebean.text.json.JsonContext; -import org.tests.model.basic.Customer; -import org.tests.model.basic.MRole; -import org.tests.model.basic.MUser; -import org.tests.model.basic.Order; +import org.junit.jupiter.api.Test; +import org.tests.model.basic.*; import org.tests.model.basic.Order.Status; -import org.tests.model.basic.OrderDetail; -import org.tests.model.basic.Product; -import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; import java.io.IOException; import java.util.List; +import static org.junit.jupiter.api.Assertions.*; + public class TestTextJsonUpdateCascade extends TransactionalTestCase { @Test @@ -28,12 +23,12 @@ public class TestTextJsonUpdateCascade extends TransactionalTestCase { Customer c2 = Ebean.getReference(Customer.class, c0.getId()); List orders = c2.getOrders(); - Assert.assertEquals(1, orders.size()); + assertEquals(1, orders.size()); Order order = orders.get(0); int size = order.getDetails().size(); - Assert.assertTrue(size >= 3); + assertTrue(size >= 3); Customer cref = Ebean.getReference(Customer.class, c0.getId()); order.setCustomer(cref); @@ -45,7 +40,7 @@ public class TestTextJsonUpdateCascade extends TransactionalTestCase { // remove one of the details... OrderDetail removedDetail = order.getDetails().remove(2); - Assert.assertNotNull(removedDetail); + assertNotNull(removedDetail); Product p = Ebean.getReference(Product.class, 1); OrderDetail newDetail = new OrderDetail(p, 899, 12.12d); diff --git a/ebean-core/src/test/java/org/tests/timezone/TimezoneTests.java b/ebean-core/src/test/java/org/tests/timezone/TimezoneTests.java index 7f144f77f..beef2fbc9 100644 --- a/ebean-core/src/test/java/org/tests/timezone/TimezoneTests.java +++ b/ebean-core/src/test/java/org/tests/timezone/TimezoneTests.java @@ -2,8 +2,8 @@ package org.tests.timezone; import io.ebean.Ebean; import io.ebean.Transaction; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.sql.Connection; import java.sql.PreparedStatement; @@ -23,7 +23,7 @@ public class TimezoneTests { public TimezoneTests() { } - @Ignore + @Disabled @Test public void rawJdbc() throws SQLException { diff --git a/ebean-core/src/test/java/org/tests/timezone/TzBeanTests.java b/ebean-core/src/test/java/org/tests/timezone/TzBeanTests.java index ff50ee5a5..c9d3c93d3 100644 --- a/ebean-core/src/test/java/org/tests/timezone/TzBeanTests.java +++ b/ebean-core/src/test/java/org/tests/timezone/TzBeanTests.java @@ -1,8 +1,8 @@ package org.tests.timezone; import io.ebean.Ebean; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; import java.util.List; @@ -35,7 +35,7 @@ public class TzBeanTests { /** * Run this 5 times with different modes. */ - @Ignore + @Disabled @Test public void insert_one_at_a_time() { @@ -65,7 +65,7 @@ public class TzBeanTests { /** * In separate JVM/execution fetch the beans with various timezones etc. */ - @Ignore + @Disabled @Test public void fetch_beans() { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestBatchModelFlush.java b/ebean-core/src/test/java/org/tests/transaction/TestBatchModelFlush.java index 0330a103b..05c64077a 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestBatchModelFlush.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestBatchModelFlush.java @@ -8,7 +8,7 @@ import io.ebean.annotation.Transactional; import io.ebean.config.dbplatform.IdType; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.m2m.MnyB; import org.tests.model.m2m.MnyTopic; import org.tests.model.m2m.Role; diff --git a/ebean-core/src/test/java/org/tests/transaction/TestBatchPersistCascade.java b/ebean-core/src/test/java/org/tests/transaction/TestBatchPersistCascade.java index 2849adcb5..3d86b9976 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestBatchPersistCascade.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestBatchPersistCascade.java @@ -7,7 +7,7 @@ import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; 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.UTDetail; @@ -15,7 +15,7 @@ import org.tests.model.basic.UTMaster; import java.util.List; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestBatchPersistCascade extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestBeanStateReset.java b/ebean-core/src/test/java/org/tests/transaction/TestBeanStateReset.java index a5432596e..754ed3359 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestBeanStateReset.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestBeanStateReset.java @@ -6,7 +6,7 @@ import io.ebean.Transaction; import org.tests.model.m2m.MnyB; import org.tests.model.m2m.MnyC; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -14,7 +14,7 @@ import javax.persistence.PersistenceException; 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 TestBeanStateReset extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java b/ebean-core/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java index eb61b7010..e70a636bc 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java @@ -4,39 +4,38 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Transaction; import io.ebean.annotation.TxIsolation; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.persistence.PersistenceException; import java.sql.Connection; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; public class TestBeginTransactionWithExisting extends BaseTestCase { @Test public void testTransactionIsoLevels() { - assertEquals(Transaction.READ_COMMITTED, Connection.TRANSACTION_READ_COMMITTED); assertEquals(Transaction.READ_UNCOMMITTED, Connection.TRANSACTION_READ_UNCOMMITTED); assertEquals(Transaction.REPEATABLE_READ, Connection.TRANSACTION_REPEATABLE_READ); assertEquals(Transaction.SERIALIZABLE, Connection.TRANSACTION_SERIALIZABLE); } - @Test(expected = PersistenceException.class) + @Test public void test() { assertEquals(Transaction.READ_COMMITTED, Connection.TRANSACTION_READ_COMMITTED); - - Transaction txn = Ebean.beginTransaction(); - try { - - try (Transaction txn2 = Ebean.beginTransaction(TxIsolation.READ_COMMITED)) { - fail("Expected persitenceException here"); + assertThrows(PersistenceException.class, () -> { + Transaction txn = Ebean.beginTransaction(); + try { + try (Transaction txn2 = Ebean.beginTransaction(TxIsolation.READ_COMMITED)) { + fail("Expected persitenceException here"); + } + } finally { + txn.end(); } - - } finally { - txn.end(); - } + }); } } diff --git a/ebean-core/src/test/java/org/tests/transaction/TestCommitAndContinue.java b/ebean-core/src/test/java/org/tests/transaction/TestCommitAndContinue.java index 157a20056..641adbcaf 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestCommitAndContinue.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestCommitAndContinue.java @@ -7,13 +7,13 @@ import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tests.model.m2m.MnyB; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestCommitAndContinue extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java b/ebean-core/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java index cc42c1c3a..6e5afa823 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java @@ -1,7 +1,7 @@ package org.tests.transaction; import io.ebean.BaseTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestCreateTransactionWithIsolation extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java b/ebean-core/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java index 93f1cbbfe..e3f6572af 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java @@ -5,11 +5,11 @@ import io.ebean.Ebean; import io.ebeaninternal.api.SpiTransaction; import org.tests.model.basic.EBasicVer; import org.tests.model.basic.ResetBasicData; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static junit.framework.TestCase.assertNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; public class TestDeleteFromPersistenceContext extends BaseTestCase { @@ -37,7 +37,7 @@ public class TestDeleteFromPersistenceContext extends BaseTestCase { Ebean.delete(bean2); Object bean5 = transaction.getPersistenceContext().get(EBasicVer.class, bean.getId()); - assertNull("Bean is deleted from PersistenceContext", bean5); + assertNull(bean5); Ebean.commitTransaction(); @@ -46,12 +46,11 @@ public class TestDeleteFromPersistenceContext extends BaseTestCase { } EBasicVer bean6 = Ebean.find(EBasicVer.class).where().eq("id", bean.getId()).findOne(); - assertNull("Bean where id eq is not found " + bean6, bean6); + assertNull(bean6); awaitL2Cache(); EBasicVer bean7 = Ebean.find(EBasicVer.class, bean.getId()); - assertNull("Bean is not expected to be found? " + bean7, bean7); - + assertNull(bean7); } } diff --git a/ebean-core/src/test/java/org/tests/transaction/TestExecuteComplete.java b/ebean-core/src/test/java/org/tests/transaction/TestExecuteComplete.java index 60b6e6e03..b24a87dda 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestExecuteComplete.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestExecuteComplete.java @@ -10,12 +10,12 @@ import io.ebean.annotation.PersistBatch; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; import io.ebeaninternal.api.SpiTransaction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; public class TestExecuteComplete extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestInsertManyAndRef.java b/ebean-core/src/test/java/org/tests/transaction/TestInsertManyAndRef.java index de123a74d..979794ced 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestInsertManyAndRef.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestInsertManyAndRef.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.BBookmark; import org.tests.model.basic.BBookmarkUser; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNested.java b/ebean-core/src/test/java/org/tests/transaction/TestNested.java index d2ba0423b..5fb05152b 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestNested.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestNested.java @@ -2,7 +2,7 @@ package org.tests.transaction; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.persistence.PersistenceException; import java.util.concurrent.Callable; diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequired.java b/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequired.java index ba8c3ecae..87487c305 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequired.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequired.java @@ -8,7 +8,7 @@ import io.ebean.TxScope; import org.tests.model.basic.Country; import org.tests.model.basic.Customer; import org.tests.model.basic.Product; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java b/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java index 55aa39bc0..89a50aca0 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java @@ -9,7 +9,7 @@ import org.tests.model.basic.Country; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasic; import org.tests.model.basic.Product; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java b/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java index 8666fcffd..5232b3e3a 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java @@ -8,7 +8,7 @@ import io.ebean.TxScope; import org.tests.model.basic.Country; import org.tests.model.basic.Customer; import org.tests.model.basic.Product; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java b/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java index f597ec347..4a44cecf5 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java @@ -8,7 +8,7 @@ import io.ebean.TxScope; import org.tests.model.basic.Country; import org.tests.model.basic.Customer; import org.tests.model.basic.Product; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedMandatory.java b/ebean-core/src/test/java/org/tests/transaction/TestNestedMandatory.java index de3184595..b290e8938 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestNestedMandatory.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestNestedMandatory.java @@ -6,7 +6,7 @@ import io.ebean.Transaction; import io.ebean.annotation.Transactional; import io.ebean.annotation.TxType; import io.ebean.meta.MetaTimedMetric; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedSubTransaction.java b/ebean-core/src/test/java/org/tests/transaction/TestNestedSubTransaction.java index 313019b5f..ca0da6828 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestNestedSubTransaction.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestNestedSubTransaction.java @@ -8,12 +8,12 @@ import io.ebean.Transaction; import io.ebean.TxScope; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestNestedSubTransaction extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestNestedTransaction.java b/ebean-core/src/test/java/org/tests/transaction/TestNestedTransaction.java index 57d61c82d..f52639c6f 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestNestedTransaction.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestNestedTransaction.java @@ -3,8 +3,8 @@ package org.tests.transaction; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Transaction; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tests.model.basic.EBasic; @@ -17,7 +17,7 @@ public class TestNestedTransaction extends BaseTestCase { private EBasic bean; - @Before + @BeforeEach public void init() { bean = new EBasic("new"); Ebean.save(bean); diff --git a/ebean-core/src/test/java/org/tests/transaction/TestPersistContextClear.java b/ebean-core/src/test/java/org/tests/transaction/TestPersistContextClear.java index 21a39af21..53b774231 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestPersistContextClear.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestPersistContextClear.java @@ -9,11 +9,12 @@ import io.ebeaninternal.api.SpiTransaction; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.*; + public class TestPersistContextClear extends BaseTestCase { @Test @@ -30,24 +31,23 @@ public class TestPersistContextClear extends BaseTestCase { PersistenceContext pc = spiTxn.getPersistenceContext(); // no orders or customers in the PC - Assert.assertEquals(0, pc.size(Order.class)); - Assert.assertEquals(0, pc.size(Customer.class)); - + assertEquals(0, pc.size(Order.class)); + assertEquals(0, pc.size(Customer.class)); EbeanServer server = Ebean.getServer(null); List list = server.find(Order.class).fetch("customer").fetch("details").findList(); int orderSize = list.size(); - Assert.assertTrue(orderSize > 1); + assertTrue(orderSize > 1); // keep a hold of one of them order0 = list.get(0); - Assert.assertEquals(orderSize, pc.size(Order.class)); + assertEquals(orderSize, pc.size(Order.class)); System.gc(); - Assert.assertEquals(orderSize, pc.size(Order.class)); - Assert.assertTrue(pc.size(Customer.class) > 0); + assertEquals(orderSize, pc.size(Order.class)); + assertTrue(pc.size(Customer.class) > 0); list = null; // System.gc(); @@ -55,8 +55,8 @@ public class TestPersistContextClear extends BaseTestCase { // transaction still holds PC ... // System.out.println("pc2:"+pc); // These asserts may not succeed depending on JVM - // Assert.assertEquals(pc.size(Order.class), 1); - // Assert.assertEquals(pc.size(Customer.class), 1); + // assertEquals(pc.size(Order.class), 1); + // assertEquals(pc.size(Customer.class), 1); } finally { t.end(); @@ -65,13 +65,13 @@ public class TestPersistContextClear extends BaseTestCase { System.gc(); // we still have the order - Assert.assertNotNull(order0); + assertNotNull(order0); // its likely the only one in the PC now // due to the System.gc(); but can't garuntee it // so removing these asserts... can put them back // to manually test. - // Assert.assertEquals(pc.size(Order.class), 1); - // Assert.assertEquals(pc.size(Customer.class), 1); + // assertEquals(pc.size(Order.class), 1); + // assertEquals(pc.size(Customer.class), 1); } diff --git a/ebean-core/src/test/java/org/tests/transaction/TestSavepoint.java b/ebean-core/src/test/java/org/tests/transaction/TestSavepoint.java index 5a159b333..9b2ea86ad 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestSavepoint.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestSavepoint.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.Transaction; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; import java.sql.Connection; diff --git a/ebean-core/src/test/java/org/tests/transaction/TestSqlServerBatch.java b/ebean-core/src/test/java/org/tests/transaction/TestSqlServerBatch.java index 019193413..d75ed5dc2 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestSqlServerBatch.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestSqlServerBatch.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.ESimple; /** diff --git a/ebean-core/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java b/ebean-core/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java index bb2222038..3d7629dc8 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java @@ -3,10 +3,10 @@ package org.tests.transaction; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.EBasic; -import org.junit.Test; +import org.junit.jupiter.api.Test; -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 TestStatelessUpdateClearPC extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionCallback.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionCallback.java index d926b8067..9481eb10f 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionCallback.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionCallback.java @@ -4,11 +4,12 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.TransactionCallbackAdapter; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.persistence.PersistenceException; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; public class TestTransactionCallback extends BaseTestCase { @@ -69,14 +70,14 @@ public class TestTransactionCallback extends BaseTestCase { assertEquals(1, countPostRollback); } - @Test(expected = PersistenceException.class) + @Test public void test_noActiveTransaction() { - DB.register(new MyCallback()); + assertThrows(PersistenceException.class, () -> DB.register(new MyCallback())); } - @Test(expected = PersistenceException.class) + @Test public void test_noActiveTransaction_withDatabase() { - DB.getDefault().register(new MyCallback()); + assertThrows(PersistenceException.class, () -> DB.getDefault().register(new MyCallback())); } class MyCallback extends TransactionCallbackAdapter { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionRollbackOnly.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionRollbackOnly.java index 787fb7653..305a878b5 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionRollbackOnly.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionRollbackOnly.java @@ -3,12 +3,12 @@ package org.tests.transaction; import io.ebean.Ebean; import io.ebean.Transaction; import io.ebean.annotation.Transactional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; 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 TestTransactionRollbackOnly { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionSkipCache.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionSkipCache.java index d02424c9d..3f2483138 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionSkipCache.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionSkipCache.java @@ -5,7 +5,7 @@ import io.ebean.CacheMode; import io.ebean.Ebean; import io.ebean.Transaction; 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; diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionTryResources.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionTryResources.java index f53640dfd..179c099cb 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionTryResources.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionTryResources.java @@ -6,7 +6,7 @@ import io.ebean.Ebean; import io.ebean.Transaction; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tests.model.draftable.Document; diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNever.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNever.java index e62aaae19..e633c216c 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNever.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNever.java @@ -5,12 +5,14 @@ import io.ebean.Ebean; import io.ebean.Transaction; import io.ebean.annotation.Transactional; import io.ebean.annotation.TxType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.persistence.PersistenceException; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class TestTransactionalNever extends BaseTestCase { private static final Logger log = LoggerFactory.getLogger(TestTransactionalNever.class); @@ -23,9 +25,9 @@ public class TestTransactionalNever extends BaseTestCase { new SomeTransactionalWithNever().doStuff(); } - @Test(expected = PersistenceException.class) + @Test public void testBarfOnExisting() { - doWithTransaction(); + assertThrows(PersistenceException.class, this::doWithTransaction); } class SomeTransactionalWithNever { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java index a13e73022..a5053881e 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java @@ -5,13 +5,13 @@ import io.ebean.Ebean; import io.ebean.Transaction; import io.ebean.annotation.Transactional; import io.ebean.annotation.TxType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; public class TestTransactionalNotSupports extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java index 28e0be699..2c8156ccb 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.Transactional; import io.ebean.meta.MetaTimedMetric; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequired.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequired.java index be62f7d66..920db0b69 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequired.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequired.java @@ -5,13 +5,13 @@ import io.ebean.Ebean; import io.ebean.Transaction; import io.ebean.annotation.Transactional; import io.ebean.annotation.TxType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; public class TestTransactionalRequired extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java index 7e0415575..cfdbeda77 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java @@ -7,17 +7,17 @@ import io.ebean.Transaction; import io.ebean.TxScope; import io.ebean.annotation.Transactional; import io.ebean.annotation.TxType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.sql.Connection; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; public class TestTransactionalRequiresNew extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalSupports.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalSupports.java index a67812243..1fa65483b 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalSupports.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalSupports.java @@ -5,14 +5,14 @@ import io.ebean.Ebean; import io.ebean.Transaction; import io.ebean.annotation.Transactional; import io.ebean.annotation.TxType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tests.model.basic.EBasic; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class TestTransactionalSupports extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalWhenThrow.java b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalWhenThrow.java index 057f76ada..0cbbba720 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestTransactionalWhenThrow.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestTransactionalWhenThrow.java @@ -2,7 +2,7 @@ package org.tests.transaction; import io.ebean.DB; import io.ebean.annotation.Transactional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tests.model.basic.EBasicVer; diff --git a/ebean-core/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java b/ebean-core/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java index eb693ca48..738f01f75 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java +++ b/ebean-core/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java @@ -2,7 +2,7 @@ package org.tests.transaction; import io.ebean.Ebean; import io.ebean.annotation.Transactional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -12,8 +12,9 @@ import javax.persistence.PersistenceException; import javax.persistence.Table; import java.util.List; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * It shows the issue that the user record does NOT rolback when there is an exception thrown @@ -31,7 +32,7 @@ public class TransactionNotTerminatedAfterRollback { } List users = Ebean.find(User.class).findList(); LOG.debug("users: {}", users); - assertTrue("users should be empty", users.isEmpty()); + assertThat(users).isEmpty(); } @Transactional(rollbackFor = PersistenceException.class) diff --git a/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java b/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java index 8a870f8ab..8251fa024 100644 --- a/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java +++ b/ebean-core/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java @@ -5,7 +5,7 @@ import io.ebean.annotation.*; import io.ebeaninternal.api.SpiBeanTypeManager; import io.ebeaninternal.api.SpiTransaction; import io.ebeantest.LoggedSql; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.tests.model.basic.Customer; import org.tests.model.basic.EBasicVer; diff --git a/ebean-core/src/test/java/org/tests/types/TestEncryptedString.java b/ebean-core/src/test/java/org/tests/types/TestEncryptedString.java index 3f510b4b3..a75b286b3 100644 --- a/ebean-core/src/test/java/org/tests/types/TestEncryptedString.java +++ b/ebean-core/src/test/java/org/tests/types/TestEncryptedString.java @@ -2,7 +2,7 @@ package org.tests.types; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; diff --git a/ebean-core/src/test/java/org/tests/types/TestFileType.java b/ebean-core/src/test/java/org/tests/types/TestFileType.java index 85d3d2173..8988c00bd 100644 --- a/ebean-core/src/test/java/org/tests/types/TestFileType.java +++ b/ebean-core/src/test/java/org/tests/types/TestFileType.java @@ -3,7 +3,7 @@ package org.tests.types; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Transaction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.types.SomeFileBean; import java.io.File; @@ -11,10 +11,10 @@ import java.io.IOException; import java.io.PrintStream; import java.net.URL; -import static org.junit.Assert.assertEquals; -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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestFileType extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java b/ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java index 365c4ae91..53289d93b 100644 --- a/ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java +++ b/ebean-core/src/test/java/org/tests/types/TestFileTypeFetching.java @@ -4,13 +4,13 @@ import io.ebean.BaseTestCase; import io.ebean.BeanState; import io.ebean.Ebean; import org.tests.model.types.SomeFileBean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.net.URL; import java.util.Set; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestFileTypeFetching extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/types/TestHstore.java b/ebean-core/src/test/java/org/tests/types/TestHstore.java index 946f256f4..3dd2da5f7 100644 --- a/ebean-core/src/test/java/org/tests/types/TestHstore.java +++ b/ebean-core/src/test/java/org/tests/types/TestHstore.java @@ -7,12 +7,12 @@ import io.ebean.annotation.Platform; import org.tests.model.json.EBasicHstore; import org.assertj.core.api.Assertions; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; 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 TestHstore extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/types/TestNewTypes.java b/ebean-core/src/test/java/org/tests/types/TestNewTypes.java index b55a37d0e..bc9e6bba6 100644 --- a/ebean-core/src/test/java/org/tests/types/TestNewTypes.java +++ b/ebean-core/src/test/java/org/tests/types/TestNewTypes.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.plugin.BeanType; import io.ebean.plugin.ExpressionPath; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.types.SomeNewTypesBean; import java.io.File; @@ -26,9 +26,9 @@ import java.time.ZonedDateTime; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -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.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestNewTypes extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/types/TestPeriodType.java b/ebean-core/src/test/java/org/tests/types/TestPeriodType.java index 7d7dc995a..5b4b4b2df 100644 --- a/ebean-core/src/test/java/org/tests/types/TestPeriodType.java +++ b/ebean-core/src/test/java/org/tests/types/TestPeriodType.java @@ -2,7 +2,7 @@ package org.tests.types; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.model.types.SomePeriodBean; import java.sql.Date; @@ -10,8 +10,8 @@ import java.time.LocalDate; import java.time.MonthDay; import java.util.List; -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 TestPeriodType extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/unidirectional/TestUniDirectional.java b/ebean-core/src/test/java/org/tests/unidirectional/TestUniDirectional.java index 244678cfd..1afe4dd76 100644 --- a/ebean-core/src/test/java/org/tests/unidirectional/TestUniDirectional.java +++ b/ebean-core/src/test/java/org/tests/unidirectional/TestUniDirectional.java @@ -4,11 +4,13 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.UTDetail; import org.tests.model.basic.UTMaster; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestUniDirectional extends BaseTestCase { @Test @@ -22,13 +24,13 @@ public class TestUniDirectional extends BaseTestCase { Ebean.save(m); - Assert.assertNotNull(m.getId()); - Assert.assertNotNull(m.getVersion()); + assertNotNull(m.getId()); + assertNotNull(m.getVersion()); List details = m.getDetails(); for (UTDetail utDetail : details) { - Assert.assertNotNull(utDetail.getId()); - Assert.assertNotNull(utDetail.getVersion()); + assertNotNull(utDetail.getId()); + assertNotNull(utDetail.getVersion()); } UTDetail d4 = new UTDetail("d14", 2, 3.0); @@ -36,15 +38,15 @@ public class TestUniDirectional extends BaseTestCase { Ebean.save(m); - Assert.assertNotNull(d4.getId()); + assertNotNull(d4.getId()); Integer d4ver = d4.getVersion(); - Assert.assertNotNull(d4ver); + assertNotNull(d4ver); d4.setName("d14Upd"); Ebean.save(d4); Integer d4ver2 = d4.getVersion(); - Assert.assertNotNull(d4ver2); - Assert.assertEquals((d4ver + 1), d4ver2.intValue()); + assertNotNull(d4ver2); + assertEquals((d4ver + 1), d4ver2.intValue()); Ebean.delete(d4); } diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestBasics.java b/ebean-core/src/test/java/org/tests/unitinternal/TestBasics.java index ae0c42370..b1a281eaf 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestBasics.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestBasics.java @@ -1,14 +1,12 @@ package org.tests.unitinternal; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestBasics { - private String parentPath(String path) { - int pos = path.lastIndexOf('.'); if (pos == -1) { return null; @@ -19,10 +17,8 @@ public class TestBasics { @Test public void testParentPath() { - - Assert.assertTrue((parentPath("banana") == null)); - Assert.assertTrue((parentPath("banana.apple").equals("banana"))); - Assert.assertTrue((parentPath("banana.apple.o").equals("banana.apple"))); - + assertTrue((parentPath("banana") == null)); + assertTrue((parentPath("banana.apple").equals("banana"))); + assertTrue((parentPath("banana.apple.o").equals("banana.apple"))); } } diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestEncodeB64.java b/ebean-core/src/test/java/org/tests/unitinternal/TestEncodeB64.java index 95124fcad..a9a5af80e 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestEncodeB64.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestEncodeB64.java @@ -1,9 +1,9 @@ package org.tests.unitinternal; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static io.ebean.util.EncodeB64.enc; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestEncodeB64 { diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java b/ebean-core/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java index b11b2626b..b85d21421 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java @@ -4,14 +4,15 @@ import io.ebean.BaseTestCase; import io.ebean.bean.EntityBean; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestEqualsOnEnhanced extends BaseTestCase { @Test public void test() { - Customer c = new Customer(); if (c instanceof EntityBean) { Order o = new Order(); @@ -21,21 +22,21 @@ public class TestEqualsOnEnhanced extends BaseTestCase { o.setId(1); - Assert.assertFalse(c.equals(o)); - Assert.assertFalse(c.equals(null)); - Assert.assertTrue(c.equals(c)); + assertFalse(c.equals(o)); + assertFalse(c.equals(null)); + assertTrue(c.equals(c)); Customer c2 = new Customer(); c2.setId(1); - Assert.assertTrue(c.equals(c2)); + assertTrue(c.equals(c2)); Customer c3 = new Customer(); // c2.setId(1); - Assert.assertFalse(c.equals(c3)); + assertFalse(c.equals(c3)); Customer c4 = new Customer(); c4.setId(2); - Assert.assertFalse(c.equals(c4)); + assertFalse(c.equals(c4)); } } diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestNamingConvention.java b/ebean-core/src/test/java/org/tests/unitinternal/TestNamingConvention.java index 4db75771e..48df8f825 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestNamingConvention.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestNamingConvention.java @@ -1,12 +1,13 @@ package org.tests.unitinternal; -import junit.framework.TestCase; +import org.junit.jupiter.api.Test; -public class TestNamingConvention extends TestCase { +public class TestNamingConvention { /** * Test dummy method to allow rest to be commented out. */ + @Test public void testDummy() { } diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java b/ebean-core/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java index 7e00c5978..ca2de36b3 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java @@ -5,33 +5,34 @@ import io.ebean.Ebean; import io.ebean.bean.BeanCollection; import org.tests.model.basic.ENullCollection; import org.tests.model.basic.ENullCollectionDetail; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestNullCollectionSet extends BaseTestCase { @Test public void test() { - ENullCollection c = new ENullCollection(); Ebean.save(c); ENullCollection c2 = Ebean.find(ENullCollection.class, c.getId()); - Assert.assertNotNull(c2); + assertNotNull(c2); List details = c2.getDetails(); - Assert.assertNotNull(details); + assertNotNull(details); - Assert.assertTrue("Is BeanCollection", details instanceof BeanCollection); + assertTrue(details instanceof BeanCollection); BeanCollection bc = (BeanCollection) details; - Assert.assertTrue(!bc.isPopulated()); - Assert.assertNotNull(bc.getOwnerBean()); - Assert.assertNotNull(bc.getPropertyName()); + assertTrue(!bc.isPopulated()); + assertNotNull(bc.getOwnerBean()); + assertNotNull(bc.getPropertyName()); } } diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestOrderByParse.java b/ebean-core/src/test/java/org/tests/unitinternal/TestOrderByParse.java index 11136a786..d1e338894 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestOrderByParse.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestOrderByParse.java @@ -2,14 +2,14 @@ package org.tests.unitinternal; import io.ebean.BaseTestCase; import io.ebean.OrderBy; -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.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotSame; -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.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test the OrderBy object and especially its parsing. diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestSimpleEncryptor.java b/ebean-core/src/test/java/org/tests/unitinternal/TestSimpleEncryptor.java index 439b68020..1bf1f45e2 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestSimpleEncryptor.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestSimpleEncryptor.java @@ -4,10 +4,10 @@ import io.ebean.BaseTestCase; import io.ebean.config.EncryptKey; import io.ebeaninternal.server.type.SimpleAesEncryptor; import org.tests.basic.encrypt.BasicEncryptKey; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.sql.Timestamp; @@ -25,7 +25,7 @@ public class TestSimpleEncryptor extends BaseTestCase { byte[] ecData = e.encrypt(data, key); byte[] deData = e.decrypt(ecData, key); - + assertThat(data).containsExactly(deData); Timestamp t = new Timestamp(System.currentTimeMillis()); @@ -33,7 +33,6 @@ public class TestSimpleEncryptor extends BaseTestCase { String tsFormat = e.decryptString(ecTimestamp, key); Timestamp t1 = Timestamp.valueOf(tsFormat); - Assert.assertEquals(t, t1); - + assertEquals(t, t1); } } diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java b/ebean-core/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java index 7be4ccc01..d598d1e03 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java @@ -6,13 +6,15 @@ import io.ebean.Transaction; import org.tests.model.basic.EBasicVer; import org.tests.model.basic.xtra.DummyDao; import org.tests.model.basic.xtra.OptimisticLockExceptionThrowingDao; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.persistence.OptimisticLockException; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.fail; + public class TestTxTypeOnTransactional extends BaseTestCase { Logger logger = LoggerFactory.getLogger(TestTxTypeOnTransactional.class); @@ -47,11 +49,10 @@ public class TestTxTypeOnTransactional extends BaseTestCase { try { dao.doSomething(v); // never get here - Assert.assertTrue(false); + fail(); } catch (OptimisticLockException e) { Transaction inMethodTransaction = dao.getInMethodTransaction(); - boolean active = inMethodTransaction.isActive(); - Assert.assertFalse(active); + assertFalse(inMethodTransaction.isActive()); } } diff --git a/ebean-core/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java b/ebean-core/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java index e445ef954..18991a4b6 100644 --- a/ebean-core/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java +++ b/ebean-core/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java @@ -5,11 +5,13 @@ import io.ebean.Ebean; import io.ebean.bean.BeanCollection; import org.tests.model.basic.EVanillaCollection; import org.tests.model.basic.EVanillaCollectionDetail; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestVanillaCollectionSet extends BaseTestCase { @Test @@ -21,17 +23,17 @@ public class TestVanillaCollectionSet extends BaseTestCase { EVanillaCollection c2 = Ebean.find(EVanillaCollection.class, c.getId()); - Assert.assertNotNull(c2); + assertNotNull(c2); List details = c2.getDetails(); - Assert.assertNotNull(details); + assertNotNull(details); - Assert.assertTrue("Is BeanCollection", details instanceof BeanCollection); + assertTrue(details instanceof BeanCollection); BeanCollection bc = (BeanCollection) details; - Assert.assertTrue(!bc.isPopulated()); - Assert.assertNotNull(bc.getOwnerBean()); - Assert.assertNotNull(bc.getPropertyName()); + assertTrue(!bc.isPopulated()); + assertNotNull(bc.getOwnerBean()); + assertNotNull(bc.getPropertyName()); } } diff --git a/ebean-core/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java b/ebean-core/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java index 97528f820..7f2dbd91a 100644 --- a/ebean-core/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java +++ b/ebean-core/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import org.tests.model.embedded.EEmbDatePeriod; import org.tests.model.embedded.EEmbInner; import org.tests.model.embedded.EEmbOuter; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Date; diff --git a/ebean-core/src/test/java/org/tests/update/TestJsonStatelessUpdate.java b/ebean-core/src/test/java/org/tests/update/TestJsonStatelessUpdate.java index f05b74f6d..d4b38366c 100644 --- a/ebean-core/src/test/java/org/tests/update/TestJsonStatelessUpdate.java +++ b/ebean-core/src/test/java/org/tests/update/TestJsonStatelessUpdate.java @@ -6,11 +6,12 @@ import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteOptions; import org.tests.model.basic.UUOne; import org.tests.model.basic.UUTwo; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestJsonStatelessUpdate extends BaseTestCase { @Test @@ -40,9 +41,9 @@ public class TestJsonStatelessUpdate extends BaseTestCase { UUTwo two2 = jsonContext.toBean(UUTwo.class, jsonString); - Assert.assertEquals(twoX.getId(), two2.getId()); - Assert.assertEquals("twoNameModified", two2.getName()); - Assert.assertEquals("oneNameModified", two2.getMaster().getName()); + assertEquals(twoX.getId(), two2.getId()); + assertEquals("twoNameModified", two2.getName()); + assertEquals("oneNameModified", two2.getMaster().getName()); // The update below cascades to also save "master" and that fails // as it thinks it should INSERT master rather than UPDATE master @@ -54,8 +55,8 @@ public class TestJsonStatelessUpdate extends BaseTestCase { // confirm the properties where updated as expected UUTwo twoConfirm = Ebean.find(UUTwo.class, two.getId()); - Assert.assertEquals("twoNameModified", twoConfirm.getName()); - Assert.assertEquals("oneNameModified", twoConfirm.getMaster().getName()); + assertEquals("twoNameModified", twoConfirm.getName()); + assertEquals("oneNameModified", twoConfirm.getMaster().getName()); } diff --git a/ebean-core/src/test/java/org/tests/update/TestMarkAsDirty.java b/ebean-core/src/test/java/org/tests/update/TestMarkAsDirty.java index f3da6422f..ef8f618df 100644 --- a/ebean-core/src/test/java/org/tests/update/TestMarkAsDirty.java +++ b/ebean-core/src/test/java/org/tests/update/TestMarkAsDirty.java @@ -3,11 +3,13 @@ package org.tests.update; import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.EBasicVer; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestMarkAsDirty extends BaseTestCase { @Test @@ -17,7 +19,7 @@ public class TestMarkAsDirty extends BaseTestCase { Ebean.save(bean); Timestamp lastUpdate = bean.getLastUpdate(); - Assert.assertNotNull(lastUpdate); + assertNotNull(lastUpdate); Thread.sleep(100); @@ -26,8 +28,8 @@ public class TestMarkAsDirty extends BaseTestCase { Ebean.save(bean); Timestamp lastUpdate2 = bean.getLastUpdate(); - Assert.assertNotNull(lastUpdate2); - Assert.assertNotEquals(lastUpdate, lastUpdate2); + assertNotNull(lastUpdate2); + assertNotEquals(lastUpdate, lastUpdate2); } diff --git a/ebean-core/src/test/java/org/tests/update/TestPostgresTruncate.java b/ebean-core/src/test/java/org/tests/update/TestPostgresTruncate.java index e8559bb0d..371336e36 100644 --- a/ebean-core/src/test/java/org/tests/update/TestPostgresTruncate.java +++ b/ebean-core/src/test/java/org/tests/update/TestPostgresTruncate.java @@ -1,15 +1,12 @@ package org.tests.update; import io.ebean.BaseTestCase; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestPostgresTruncate extends BaseTestCase { @Test public void test() { - - Assert.assertTrue(true); // EbeanServer server = Ebean.getServer(null); // // EBasic e = new EBasic(); diff --git a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateBatch.java b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateBatch.java index 1cc735fa0..cd06f3711 100644 --- a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateBatch.java +++ b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateBatch.java @@ -4,10 +4,10 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.Transaction; -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; /** * Testclass that ensures the correct behaviour of SqlUpdate in combination with batching. diff --git a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java index b81597eab..94dd7a2dc 100644 --- a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java +++ b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java @@ -5,13 +5,13 @@ import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.Transaction; import org.ebeantest.LoggedSqlCollector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestSqlUpdateBindMultipleLists extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateExceptions.java b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateExceptions.java index 8253f7c87..dfc78d1f3 100644 --- a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateExceptions.java +++ b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateExceptions.java @@ -5,11 +5,12 @@ import io.ebean.DB; import io.ebean.DuplicateKeyException; import io.ebean.SqlUpdate; import io.ebean.Transaction; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; public class TestSqlUpdateExceptions extends BaseTestCase { @@ -32,9 +33,8 @@ public class TestSqlUpdateExceptions extends BaseTestCase { assertThat(foundId).isEqualTo(id); } - @Test(expected = DuplicateKeyException.class) + @Test public void duplicateKey() { - UUID id = UUID.randomUUID(); SqlUpdate sqlUpdate = DB.sqlUpdate(sql); @@ -46,12 +46,11 @@ public class TestSqlUpdateExceptions extends BaseTestCase { sqlUpdate.setParameter(1, id); sqlUpdate.setParameter(2, "fail"); sqlUpdate.setParameter(3, 1); - sqlUpdate.execute(); + assertThrows(DuplicateKeyException.class, sqlUpdate::execute); } - @Test(expected = DuplicateKeyException.class) + @Test public void duplicateKey_executeNow() { - UUID id = UUID.randomUUID(); SqlUpdate sqlUpdate = DB.sqlUpdate(sql); @@ -63,51 +62,50 @@ public class TestSqlUpdateExceptions extends BaseTestCase { sqlUpdate.setParameter(1, id); sqlUpdate.setParameter(2, "fail"); sqlUpdate.setParameter(3, 1); - sqlUpdate.executeNow(); + assertThrows(DuplicateKeyException.class, sqlUpdate::executeNow); } - @Test(expected = DuplicateKeyException.class) + @Test public void duplicateKey_inBatch() { - UUID id = UUID.randomUUID(); + assertThrows(DuplicateKeyException.class, () -> { + try (Transaction transaction = DB.beginTransaction()) { - try (Transaction transaction = DB.beginTransaction()) { + SqlUpdate sqlUpdate = DB.sqlUpdate(sql); + sqlUpdate.setParameter(1, id); + sqlUpdate.setParameter(2, "hi in batch"); + sqlUpdate.setParameter(3, 1); + sqlUpdate.addBatch(); - SqlUpdate sqlUpdate = DB.sqlUpdate(sql); - sqlUpdate.setParameter(1, id); - sqlUpdate.setParameter(2, "hi in batch"); - sqlUpdate.setParameter(3, 1); - sqlUpdate.addBatch(); + sqlUpdate.setParameter(1, id); + sqlUpdate.setParameter(2, "fail in batch"); + sqlUpdate.setParameter(3, 1); + sqlUpdate.addBatch(); - sqlUpdate.setParameter(1, id); - sqlUpdate.setParameter(2, "fail in batch"); - sqlUpdate.setParameter(3, 1); - sqlUpdate.addBatch(); - - transaction.commit(); - } + transaction.commit(); + } + }); } - @Test(expected = DuplicateKeyException.class) + @Test public void duplicateKey_executeBatch() { - UUID id = UUID.randomUUID(); + assertThrows(DuplicateKeyException.class, () -> { + try (Transaction transaction = DB.beginTransaction()) { + SqlUpdate sqlUpdate = DB.sqlUpdate(sql); + sqlUpdate.setParameter(1, id); + sqlUpdate.setParameter(2, "hi in batch"); + sqlUpdate.setParameter(3, 1); + sqlUpdate.addBatch(); - try (Transaction transaction = DB.beginTransaction()) { + sqlUpdate.setParameter(1, id); + sqlUpdate.setParameter(2, "fail in batch"); + sqlUpdate.setParameter(3, 1); + sqlUpdate.addBatch(); - SqlUpdate sqlUpdate = DB.sqlUpdate(sql); - sqlUpdate.setParameter(1, id); - sqlUpdate.setParameter(2, "hi in batch"); - sqlUpdate.setParameter(3, 1); - sqlUpdate.addBatch(); - - sqlUpdate.setParameter(1, id); - sqlUpdate.setParameter(2, "fail in batch"); - sqlUpdate.setParameter(3, 1); - sqlUpdate.addBatch(); - - sqlUpdate.executeBatch(); - transaction.commit(); - } + sqlUpdate.executeBatch(); + transaction.commit(); + } + }); } } diff --git a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateInTxn.java b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateInTxn.java index c539beda8..f343e4ab0 100644 --- a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateInTxn.java +++ b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateInTxn.java @@ -6,13 +6,13 @@ import io.ebean.SqlUpdate; import io.ebean.Transaction; import io.ebean.meta.MetaTimedMetric; import org.ebeantest.LoggedSqlCollector; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.tests.idkeys.db.AuditLog; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestSqlUpdateInTxn extends BaseTestCase { @@ -143,7 +143,7 @@ public class TestSqlUpdateInTxn extends BaseTestCase { Ebean.save(log); AuditLog log2 = Ebean.find(AuditLog.class, log.getId()); - Assert.assertEquals("foo", log2.getDescription()); + assertEquals("foo", log2.getDescription()); final Long id = log2.getId(); final String updateDml = "update audit_log set description = :desc where id = :id"; @@ -159,8 +159,8 @@ public class TestSqlUpdateInTxn extends BaseTestCase { updateMod.execute(); AuditLog log3 = Ebean.find(AuditLog.class, log.getId()); - Assert.assertEquals("foo2", log3.getDescription()); - Assert.assertEquals("mod0", log3.getModifiedDescription()); + assertEquals("foo2", log3.getDescription()); + assertEquals("mod0", log3.getModifiedDescription()); Ebean.execute(() -> { SqlUpdate update = Ebean.createSqlUpdate(updateDml); @@ -174,8 +174,8 @@ public class TestSqlUpdateInTxn extends BaseTestCase { }); AuditLog log4 = Ebean.find(AuditLog.class, log.getId()); - Assert.assertEquals("foo3", log4.getDescription()); - Assert.assertEquals("mod1", log4.getModifiedDescription()); + assertEquals("foo3", log4.getDescription()); + assertEquals("mod1", log4.getModifiedDescription()); Ebean.beginTransaction(); @@ -194,8 +194,8 @@ public class TestSqlUpdateInTxn extends BaseTestCase { Ebean.endTransaction(); } AuditLog log5 = Ebean.find(AuditLog.class, log.getId()); - Assert.assertEquals("foo4", log5.getDescription()); - Assert.assertEquals("mod2", log5.getModifiedDescription()); + assertEquals("foo4", log5.getDescription()); + assertEquals("mod2", log5.getModifiedDescription()); } diff --git a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateUpsert.java b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateUpsert.java index 36b7c195b..ee7f10283 100644 --- a/ebean-core/src/test/java/org/tests/update/TestSqlUpdateUpsert.java +++ b/ebean-core/src/test/java/org/tests/update/TestSqlUpdateUpsert.java @@ -6,7 +6,7 @@ import io.ebean.Ebean; import io.ebean.SqlUpdate; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java b/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java index 02f17ffe5..2104b8c03 100644 --- a/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java +++ b/ebean-core/src/test/java/org/tests/update/TestStatelessUpdate.java @@ -1,9 +1,10 @@ package org.tests.update; import io.ebean.DB; +import io.ebean.DuplicateKeyException; import io.ebean.TransactionalTestCase; import io.ebeantest.LoggedSql; -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.EBasic; @@ -17,11 +18,7 @@ import java.util.List; 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.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestStatelessUpdate extends TransactionalTestCase { @@ -79,20 +76,18 @@ public class TestStatelessUpdate extends TransactionalTestCase { assertThat(sql.get(0)).contains("update e_basic set name=?, description=? where id=?; -- bind(updateWithNull,null,"); } - @Test(expected = EntityNotFoundException.class) + @Test public void update_NoRowsUpdated_expect_EntityNotFoundException() { - EBasic basic = new EBasic(); basic.setId(999999999); basic.setName("something"); basic.setStatus(Status.ACTIVE); - DB.update(basic); + assertThrows(EntityNotFoundException.class, () -> DB.update(basic)); } @Test public void delete_NoRowsDeleted_expect_false() { - EBasic basic = new EBasic(); basic.setId(999999999); basic.setName("something"); @@ -189,7 +184,7 @@ public class TestStatelessUpdate extends TransactionalTestCase { // assert null list was ignored (missing children not deleted) assertNotNull(result.getContacts()); - assertFalse("the contacts mustn't be deleted", result.getContacts().isEmpty()); + assertFalse(result.getContacts().isEmpty()); assertThat(sql).hasSize(1); assertThat(sql.get(0)).contains("update o_customer set name=?, updtime=? where id=?;"); } @@ -231,14 +226,13 @@ public class TestStatelessUpdate extends TransactionalTestCase { // assert empty bean list was ignore (missing children not deleted) assertNotNull(result.getContacts()); - assertFalse("the contacts mustn't be deleted", result.getContacts().isEmpty()); + assertFalse(result.getContacts().isEmpty()); assertThat(sql).hasSize(1); assertThat(sql.get(0)).contains("update o_customer set name=?, updtime=? where id=?;"); } @Test public void testStatelessUpdateDeleteChildrenForNonBeanCollection() { - // arrange Contact contact = new Contact(); contact.setFirstName("wobu :P"); diff --git a/ebean-core/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java b/ebean-core/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java index 38c33c206..9939fe905 100644 --- a/ebean-core/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java +++ b/ebean-core/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java @@ -5,14 +5,14 @@ import io.ebean.Ebean; import io.ebean.EbeanServer; import io.ebean.Transaction; 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.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestUpdateAllLoadedProperties extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/update/TestUpdateCircularSave.java b/ebean-core/src/test/java/org/tests/update/TestUpdateCircularSave.java index b32046435..7727d1a86 100644 --- a/ebean-core/src/test/java/org/tests/update/TestUpdateCircularSave.java +++ b/ebean-core/src/test/java/org/tests/update/TestUpdateCircularSave.java @@ -2,15 +2,15 @@ package org.tests.update; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.tests.update.objects.Child; import org.tests.update.objects.Parent; import org.tests.update.objects.SiblingA; import org.tests.update.objects.SiblingB; -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 TestUpdateCircularSave extends BaseTestCase { @@ -44,7 +44,7 @@ public class TestUpdateCircularSave extends BaseTestCase { return siblingA.getId(); } - @Ignore + @Disabled @Test public void testFetchChildModifyChildSaveParent() { diff --git a/ebean-core/src/test/java/org/tests/update/TestUpdatePartial.java b/ebean-core/src/test/java/org/tests/update/TestUpdatePartial.java index ac1085896..6c723d576 100644 --- a/ebean-core/src/test/java/org/tests/update/TestUpdatePartial.java +++ b/ebean-core/src/test/java/org/tests/update/TestUpdatePartial.java @@ -4,11 +4,11 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Ebean; import io.ebean.SqlRow; -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.jupiter.api.Assertions.assertEquals; public class TestUpdatePartial extends BaseTestCase { diff --git a/ebean-core/src/test/java/org/tests/update/TestUpdatePartialNoVer.java b/ebean-core/src/test/java/org/tests/update/TestUpdatePartialNoVer.java index 181b0ede0..af80300d4 100644 --- a/ebean-core/src/test/java/org/tests/update/TestUpdatePartialNoVer.java +++ b/ebean-core/src/test/java/org/tests/update/TestUpdatePartialNoVer.java @@ -4,7 +4,7 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import org.tests.model.basic.EBasic; import org.tests.model.basic.EBasic.Status; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestUpdatePartialNoVer extends BaseTestCase {