diff --git a/pom.xml b/pom.xml index 04788e1fb..2f73402dc 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ io.ebean ebean - 11.45.2-SNAPSHOT + 12.1.1-SNAPSHOT jar ebean @@ -301,10 +301,9 @@ org.avaje.composite - avaje-composite-testing + junit 1.1 test - pom diff --git a/src/test/java/io/ebean/ColumnTest.java b/src/test/java/io/ebean/ColumnTest.java index c8889896e..9c8c1c50d 100644 --- a/src/test/java/io/ebean/ColumnTest.java +++ b/src/test/java/io/ebean/ColumnTest.java @@ -4,7 +4,7 @@ package io.ebean; import io.ebeaninternal.server.rawsql.SpiRawSql; import org.junit.Test; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class ColumnTest { diff --git a/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java b/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java index b5ea52414..ee051fca4 100644 --- a/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java +++ b/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java @@ -11,7 +11,7 @@ import org.junit.Test; import org.tests.model.basic.EBasicVer; import org.tests.model.draftable.BasicDraftableBean; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class PlatformNoGeneratedKeysTest { diff --git a/src/test/java/io/ebean/plugin/PropertyTest.java b/src/test/java/io/ebean/plugin/PropertyTest.java index 953293d7e..581d5a647 100644 --- a/src/test/java/io/ebean/plugin/PropertyTest.java +++ b/src/test/java/io/ebean/plugin/PropertyTest.java @@ -6,7 +6,7 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.Order; import org.junit.Test; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; /** */ diff --git a/src/test/java/io/ebean/text/json/JsonContextTest.java b/src/test/java/io/ebean/text/json/JsonContextTest.java index 4c1de729b..c8d32d269 100644 --- a/src/test/java/io/ebean/text/json/JsonContextTest.java +++ b/src/test/java/io/ebean/text/json/JsonContextTest.java @@ -14,7 +14,7 @@ import java.io.StringWriter; import java.util.List; import java.util.Map; -import static org.assertj.core.api.StrictAssertions.assertThat; +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; diff --git a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java index 58b3a82bf..23d034685 100644 --- a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java +++ b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java @@ -15,7 +15,7 @@ import java.util.Arrays; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.StrictAssertions.assertThatThrownBy; +import static org.assertj.core.api.Assertions.assertThatThrownBy; /** diff --git a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbNameNormaliseTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbNameNormaliseTest.java index 01fe26553..d2c8e855c 100644 --- a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbNameNormaliseTest.java +++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbNameNormaliseTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.dbmigration.ddlgeneration.platform; import io.ebean.config.DbConstraintNormalise; import org.junit.Test; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class DbNameNormaliseTest { diff --git a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java index f424ddd8b..baa1ec914 100644 --- a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java +++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java @@ -11,7 +11,7 @@ import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.core.PlatformDdlBuilder; import org.junit.Test; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class H2HistoryDdlTest { diff --git a/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java index 1a80bdc87..df9657e5d 100644 --- a/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java +++ b/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java @@ -5,7 +5,7 @@ import io.ebeaninternal.dbmigration.migration.ChangeSet; import io.ebeaninternal.dbmigration.migration.DropColumn; import org.junit.Test; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class EntryTest { diff --git a/src/test/java/io/ebeaninternal/dbmigration/model/MigrationVersionTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/MigrationVersionTest.java index 84101bfe7..87a4fecd9 100644 --- a/src/test/java/io/ebeaninternal/dbmigration/model/MigrationVersionTest.java +++ b/src/test/java/io/ebeaninternal/dbmigration/model/MigrationVersionTest.java @@ -8,7 +8,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; // FIXME: this test should be moved to ebean-migration artifact public class MigrationVersionTest { diff --git a/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java b/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java index 83792a6af..06b12c047 100644 --- a/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java +++ b/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheManagerTest.java @@ -8,7 +8,7 @@ import org.junit.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertTrue; public class DefaultServerCacheManagerTest { diff --git a/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java b/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java index 66b8ed660..f87405087 100644 --- a/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java +++ b/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java @@ -10,7 +10,7 @@ import org.junit.Test; import java.io.StringWriter; import java.util.List; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class ChangeJsonBuilderTest extends BaseTestCase { diff --git a/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java index d8c8c8d55..d26a46b01 100644 --- a/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java @@ -5,7 +5,7 @@ import org.junit.Test; import java.util.LinkedHashMap; import java.util.Map; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class AllEqualsExpressionTest extends BaseExpressionTest { diff --git a/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java index d1b01da21..c11ed25b5 100644 --- a/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java @@ -10,7 +10,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public abstract class BaseExpressionTest extends BaseTestCase { diff --git a/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java index 950c492dd..10b529aac 100644 --- a/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/BetweenExpressionTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.expression; import io.ebeaninternal.api.SpiExpression; import org.junit.Test; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class BetweenExpressionTest extends BaseExpressionTest { diff --git a/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java index a7ab9e343..4685f1290 100644 --- a/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/BetweenPropertyExpressionTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.expression; import org.junit.Test; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class BetweenPropertyExpressionTest extends BaseExpressionTest { diff --git a/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java index 4e1423cda..75f033ced 100644 --- a/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.expression; import org.junit.Test; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class CaseInsensitiveEqualExpressionTest extends BaseExpressionTest { diff --git a/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java b/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java index 2a81b11bd..227f11b3f 100644 --- a/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java @@ -4,7 +4,7 @@ import io.ebean.Expression; import io.ebeaninternal.api.SpiExpression; import org.junit.Test; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class DefaultExpressionFactoryTest { diff --git a/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java b/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java index 9357e06e6..89e2dcd39 100644 --- a/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.expression; import io.ebean.ExpressionList; import org.junit.Test; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class DefaultExpressionListTest extends BaseExpressionTest { diff --git a/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java index 970ac45a5..ee2f37c44 100644 --- a/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java @@ -4,7 +4,7 @@ import org.junit.Test; import java.util.Arrays; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class ExistsQueryExpressionTest extends BaseExpressionTest { diff --git a/src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java index 45ab71780..247ac62c2 100644 --- a/src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/IdExpressionTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.expression; import org.junit.Test; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class IdExpressionTest extends BaseExpressionTest { diff --git a/src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java index 207ca6500..45fa3858a 100644 --- a/src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/IdInExpressionTest.java @@ -4,7 +4,7 @@ import org.junit.Test; import java.util.Arrays; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class IdInExpressionTest extends BaseExpressionTest { diff --git a/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java index 4b238562d..11ff0eae6 100644 --- a/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class InExpressionTest extends BaseExpressionTest { diff --git a/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java index 7b88ef37f..1b6345846 100644 --- a/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java @@ -4,7 +4,7 @@ import org.junit.Test; import java.util.Arrays; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class InQueryExpressionTest extends BaseExpressionTest { diff --git a/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java index 759ac0fc1..b3d607728 100644 --- a/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/InRangeExpressionTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.expression; import io.ebeaninternal.api.SpiExpression; import org.junit.Test; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class InRangeExpressionTest extends BaseExpressionTest { diff --git a/src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java index 05ed59c7d..1a4f82dd5 100644 --- a/src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/JsonPathExpressionTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.expression; import org.junit.Test; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class JsonPathExpressionTest extends BaseExpressionTest { diff --git a/src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java index 945d8aa7d..51f0eeaae 100644 --- a/src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/LikeExpressionTest.java @@ -3,7 +3,7 @@ package io.ebeaninternal.server.expression; import io.ebean.LikeType; import org.junit.Test; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class LikeExpressionTest extends BaseExpressionTest { diff --git a/src/test/java/io/ebeaninternal/server/expression/NotExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/NotExpressionTest.java index 17ba46220..a65b81c97 100644 --- a/src/test/java/io/ebeaninternal/server/expression/NotExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/NotExpressionTest.java @@ -5,7 +5,7 @@ import io.ebean.Expression; import org.junit.Test; import static io.ebean.Expr.eq; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class NotExpressionTest extends BaseExpressionTest { diff --git a/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java index 853a6a2c8..1953f2959 100644 --- a/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/RawExpressionTest.java @@ -2,7 +2,7 @@ package io.ebeaninternal.server.expression; import org.junit.Test; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class RawExpressionTest extends BaseExpressionTest { diff --git a/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java b/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java index 527c1cf93..86ec1cadd 100644 --- a/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java +++ b/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java @@ -4,7 +4,7 @@ import org.junit.Test; import java.util.Arrays; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class ColumnMappingTest { diff --git a/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java b/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java index 0b8fae135..294a5f94b 100644 --- a/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java +++ b/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java @@ -10,7 +10,6 @@ import io.ebean.SqlRow; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebeaninternal.server.rawsql.SpiRawSql.Sql; -import org.assertj.core.api.StrictAssertions; import org.junit.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; @@ -30,7 +29,7 @@ public class TestRawSqlBuilder extends BaseTestCase { @Test public void testDeriveProperty() { - StrictAssertions.assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName("item_total", "some_other")).isEqualTo("itemTotal"); + assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName("item_total", "some_other")).isEqualTo("itemTotal"); assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName(null, "some_other")).isEqualTo("someOther"); assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName(null, "alias.some_other")).isEqualTo("someOther"); assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName(null, "alias.someOther")).isEqualTo("someOther"); diff --git a/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java b/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java index f7504e493..2fc86649b 100644 --- a/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java +++ b/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java @@ -7,7 +7,7 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.Vehicle; import org.junit.Test; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class DefaultPersistenceContextTest { diff --git a/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java b/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java index a3f95c8ed..1f8677385 100644 --- a/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java +++ b/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java @@ -15,7 +15,7 @@ import org.tests.model.basic.EBasicVer; import org.tests.model.basic.UTDetail; import org.tests.model.basic.UTMaster; -import static org.assertj.core.api.StrictAssertions.assertThat; +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; diff --git a/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java b/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java index 0484ef0ba..79e3f1ef4 100644 --- a/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java +++ b/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java @@ -5,7 +5,7 @@ import org.junit.Test; import java.time.Instant; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class IsoJsonDateTimeParserTest { diff --git a/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java b/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java index 5cc23d0dd..3c0a9bdf9 100644 --- a/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java @@ -11,7 +11,6 @@ import java.io.ObjectOutputStream; import java.util.HashMap; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.StrictAssertions.assertThat; public class ModifyAwareMapTest { diff --git a/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java b/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java index 8198505cb..abb8a4e2e 100644 --- a/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java @@ -12,7 +12,6 @@ import java.util.Arrays; import java.util.HashSet; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.StrictAssertions.assertThat; public class ModifyAwareSetTest { diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java index 1b4616902..e69a4ce2c 100644 --- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java @@ -6,7 +6,7 @@ import org.junit.Test; import java.io.IOException; import java.sql.Date; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; public class ScalarTypeDateTest { diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java index f4621e79c..b76c5cad3 100644 --- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java @@ -7,7 +7,7 @@ import java.io.IOException; import java.sql.Date; import java.time.LocalDate; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java index 9661dd768..ba12fcd05 100644 --- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java @@ -6,7 +6,7 @@ import org.junit.Test; import java.sql.Timestamp; import java.time.OffsetDateTime; -import static org.assertj.core.api.StrictAssertions.assertThat; +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; diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java index e5ff5d50a..b2fb2599e 100644 --- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java @@ -5,7 +5,7 @@ import org.junit.Test; import java.sql.Timestamp; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class ScalarTypeTimestampTest { diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java index 26e5b4511..b39e8d347 100644 --- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java @@ -6,7 +6,7 @@ import org.junit.Test; import java.io.IOException; import java.util.Date; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class ScalarTypeUtilDateTest { diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java index cf3b28aff..ea501b273 100644 --- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java @@ -6,7 +6,7 @@ import org.junit.Test; import java.sql.Timestamp; import java.time.ZonedDateTime; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.*; public class ScalarTypeZonedDateTimeTest { diff --git a/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java b/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java index b60040078..9381188cf 100644 --- a/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java +++ b/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java @@ -6,15 +6,16 @@ import io.ebean.EbeanServer; import io.ebean.plugin.BeanDocType; import io.ebean.plugin.BeanType; import io.ebeanservice.docstore.api.DocStoreUpdates; -import org.tests.model.basic.Order; -import org.assertj.core.api.StrictAssertions; import org.junit.Test; import org.mockito.Mockito; +import org.tests.model.basic.Order; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; public class DocStoreDeleteEventTest { @@ -44,7 +45,7 @@ public class DocStoreDeleteEventTest { } @Test - public void addToQueue() throws Exception { + public void addToQueue() { DocStoreDeleteEvent event = new DocStoreDeleteEvent(orderType(), 42); @@ -55,9 +56,9 @@ public class DocStoreDeleteEventTest { assertThat(queueEntries).hasSize(1); DocStoreQueueEntry entry = queueEntries.get(0); - StrictAssertions.assertThat(entry.getBeanId()).isEqualTo(42); - StrictAssertions.assertThat(entry.getQueueId()).isEqualTo("order"); - StrictAssertions.assertThat(entry.getPath()).isNull(); + assertThat(entry.getBeanId()).isEqualTo(42); + assertThat(entry.getQueueId()).isEqualTo("order"); + assertThat(entry.getPath()).isNull(); assertThat(entry.getType()).isEqualTo(DocStoreQueueEntry.Action.DELETE); } } diff --git a/src/test/java/org/tests/basic/TestInEmpty.java b/src/test/java/org/tests/basic/TestInEmpty.java index 8de09baf6..50bc39703 100644 --- a/src/test/java/org/tests/basic/TestInEmpty.java +++ b/src/test/java/org/tests/basic/TestInEmpty.java @@ -8,7 +8,7 @@ import org.junit.Test; import java.util.List; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; public class TestInEmpty extends BaseTestCase { diff --git a/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java b/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java index 92bf36a70..20eff9e4d 100644 --- a/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java +++ b/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java @@ -9,7 +9,7 @@ import org.tests.model.basic.Contact; import org.tests.model.basic.EBasicVer; import org.tests.model.converstation.Group; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class TestDeleteWithoutOptimisticLocking extends BaseTestCase { diff --git a/src/test/java/org/tests/draftable/DocLinkTest.java b/src/test/java/org/tests/draftable/DocLinkTest.java index 48b5c6213..5c698098e 100644 --- a/src/test/java/org/tests/draftable/DocLinkTest.java +++ b/src/test/java/org/tests/draftable/DocLinkTest.java @@ -4,11 +4,10 @@ import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.EbeanServer; import io.ebean.Query; -import org.tests.model.draftable.Doc; -import org.tests.model.draftable.Link; -import org.assertj.core.api.StrictAssertions; import org.ebeantest.LoggedSqlCollector; import org.junit.Test; +import org.tests.model.draftable.Doc; +import org.tests.model.draftable.Link; import javax.persistence.PersistenceException; import java.sql.Timestamp; @@ -48,10 +47,10 @@ public class DocLinkTest extends BaseTestCase { public void testUpdate_whenNotPublished() { Link link1 = new Link("update"); - StrictAssertions.assertThat(link1.isDraft()).isFalse(); + assertThat(link1.isDraft()).isFalse(); link1.save(); - StrictAssertions.assertThat(link1.isDraft()).isTrue(); + assertThat(link1.isDraft()).isTrue(); // perform stateless update Link linkUpdate = new Link(); @@ -71,10 +70,10 @@ public class DocLinkTest extends BaseTestCase { public void testDelete_whenNotPublished() { Link link1 = new Link("Ld1"); - StrictAssertions.assertThat(link1.isDraft()).isFalse(); + assertThat(link1.isDraft()).isFalse(); link1.save(); - StrictAssertions.assertThat(link1.isDraft()).isTrue(); + assertThat(link1.isDraft()).isTrue(); link1.setComment("some change"); link1.save(); @@ -120,15 +119,15 @@ public class DocLinkTest extends BaseTestCase { server.publish(Link.class, link1.getId()); link1 = Ebean.find(Link.class).setId(link1.getId()).asDraft().findOne(); - StrictAssertions.assertThat(link1.isDraft()).isTrue(); + assertThat(link1.isDraft()).isTrue(); // this is a soft delete (no automatic publish here, only updates draft) link1.delete(); Link live = Ebean.find(Link.class).setId(link1.getId()).findOne(); assertThat(live).isNotNull(); - StrictAssertions.assertThat(live.isDraft()).isFalse(); - StrictAssertions.assertThat(live.isDeleted()).isFalse(); // soft delete state not published yet + assertThat(live.isDraft()).isFalse(); + assertThat(live.isDeleted()).isFalse(); // soft delete state not published yet // this is a permanent delete (effectively has automatic publish) server.deletePermanent(link1); @@ -169,19 +168,18 @@ public class DocLinkTest extends BaseTestCase { link1.save(); Link draft1 = Ebean.find(Link.class).setId(link1.getId()).asDraft().findOne(); - StrictAssertions.assertThat(draft1.isDirty()).isTrue(); + assertThat(draft1.isDirty()).isTrue(); EbeanServer server = Ebean.getDefaultServer(); Link linkLive = server.publish(Link.class, link1.getId(), null); - StrictAssertions.assertThat(linkLive.getComment()).isEqualTo(comment); - StrictAssertions.assertThat(linkLive.getWhenPublish()).isEqualToIgnoringMillis(when); + assertThat(linkLive.getComment()).isEqualTo(comment); + assertThat(linkLive.getWhenPublish()).isEqualToIgnoringMillis(when); Link draft1b = Ebean.find(Link.class).setId(link1.getId()).asDraft().findOne(); - StrictAssertions.assertThat(draft1b.isDirty()).isFalse(); - StrictAssertions.assertThat(draft1b.getComment()).isNull(); - StrictAssertions.assertThat(draft1b.getWhenPublish()).isNull(); - + assertThat(draft1b.isDirty()).isFalse(); + assertThat(draft1b.getComment()).isNull(); + assertThat(draft1b.getWhenPublish()).isNull(); } @Test @@ -245,7 +243,7 @@ public class DocLinkTest extends BaseTestCase { EbeanServer server = Ebean.getDefaultServer(); Link live = server.publish(Link.class, link1.getId(), null); - StrictAssertions.assertThat(live.isDraft()).isFalse(); + assertThat(live.isDraft()).isFalse(); Link draftLink = Ebean.find(Link.class) .setId(link1.getId()) @@ -262,8 +260,7 @@ public class DocLinkTest extends BaseTestCase { .asDraft() .findOne(); - StrictAssertions.assertThat(draftLink.getLocation()).isEqualTo("firstLocation"); - + assertThat(draftLink.getLocation()).isEqualTo("firstLocation"); } @Test @@ -291,9 +288,8 @@ public class DocLinkTest extends BaseTestCase { List links = server.draftRestore(query); assertThat(links).hasSize(1); - StrictAssertions.assertThat(links.get(0).getLocation()).isEqualTo("firstLocation"); - StrictAssertions.assertThat(links.get(0).isDirty()).isEqualTo(false); - StrictAssertions.assertThat(links.get(0).getComment()).isNull(); - + assertThat(links.get(0).getLocation()).isEqualTo("firstLocation"); + assertThat(links.get(0).isDirty()).isEqualTo(false); + assertThat(links.get(0).getComment()).isNull(); } } diff --git a/src/test/java/org/tests/draftable/OrganisationTest.java b/src/test/java/org/tests/draftable/OrganisationTest.java index 4a3e20d7a..3d2dd4b2c 100644 --- a/src/test/java/org/tests/draftable/OrganisationTest.java +++ b/src/test/java/org/tests/draftable/OrganisationTest.java @@ -2,11 +2,10 @@ package org.tests.draftable; import io.ebean.Ebean; import io.ebean.EbeanServer; +import org.junit.Test; import org.tests.model.draftable.Document; import org.tests.model.draftable.DocumentMedia; import org.tests.model.draftable.Organisation; -import org.assertj.core.api.StrictAssertions; -import org.junit.Test; import java.util.List; @@ -99,8 +98,8 @@ public class OrganisationTest { // publish will perform an insert, update and delete on child DocumentMedia // during the publish below with media1 being deleted Document liveBean = server.publish(Document.class, doc.getId(), null); - StrictAssertions.assertThat(liveBean.getBody()).isEqualTo("Body2"); - StrictAssertions.assertThat(liveBean.getMedia().size()).isEqualTo(2); + assertThat(liveBean.getBody()).isEqualTo("Body2"); + assertThat(liveBean.getMedia().size()).isEqualTo(2); assertThat(liveBean.getMedia()).extracting("name").contains("media2", "media3"); } diff --git a/src/test/java/org/tests/generated/TestGeneratedProperties.java b/src/test/java/org/tests/generated/TestGeneratedProperties.java index 293501ec6..da9aa3ceb 100644 --- a/src/test/java/org/tests/generated/TestGeneratedProperties.java +++ b/src/test/java/org/tests/generated/TestGeneratedProperties.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import org.tests.model.EGenProps; import org.junit.Test; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertNotNull; public class TestGeneratedProperties extends BaseTestCase { diff --git a/src/test/java/org/tests/inheritance/TestInheritInsert.java b/src/test/java/org/tests/inheritance/TestInheritInsert.java index 35d01d1d9..bafd638ad 100644 --- a/src/test/java/org/tests/inheritance/TestInheritInsert.java +++ b/src/test/java/org/tests/inheritance/TestInheritInsert.java @@ -13,7 +13,7 @@ import org.junit.Test; import java.util.List; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.*; public class TestInheritInsert extends BaseTestCase { diff --git a/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java b/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java index fe388f74e..f4161d79e 100644 --- a/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java +++ b/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java @@ -7,7 +7,7 @@ import org.tests.model.basic.cache.CInhOne; import org.tests.model.basic.cache.CInhRoot; import org.junit.Test; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class TestInheritanceCache extends BaseTestCase { diff --git a/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java b/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java index 85a2a1455..f10e67ece 100644 --- a/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java +++ b/src/test/java/org/tests/json/include/TestJsonExcludeTransientEmptyList.java @@ -10,7 +10,7 @@ import org.junit.Test; import java.util.ArrayList; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; public class TestJsonExcludeTransientEmptyList { diff --git a/src/test/java/org/tests/json/transientproperties/TestModelAJson.java b/src/test/java/org/tests/json/transientproperties/TestModelAJson.java index 9e621fb03..e81acc734 100644 --- a/src/test/java/org/tests/json/transientproperties/TestModelAJson.java +++ b/src/test/java/org/tests/json/transientproperties/TestModelAJson.java @@ -6,7 +6,7 @@ import org.junit.Test; import java.util.ArrayList; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class TestModelAJson { diff --git a/src/test/java/org/tests/query/TestFindOneOrEmpty.java b/src/test/java/org/tests/query/TestFindOneOrEmpty.java index 3c7ac3aa0..d9952c8c0 100644 --- a/src/test/java/org/tests/query/TestFindOneOrEmpty.java +++ b/src/test/java/org/tests/query/TestFindOneOrEmpty.java @@ -8,7 +8,7 @@ import org.tests.model.basic.ResetBasicData; import java.util.Optional; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class TestFindOneOrEmpty extends BaseTestCase { diff --git a/src/test/java/org/tests/query/TestQueryOrderById.java b/src/test/java/org/tests/query/TestQueryOrderById.java index 854f1b5eb..e063f0196 100644 --- a/src/test/java/org/tests/query/TestQueryOrderById.java +++ b/src/test/java/org/tests/query/TestQueryOrderById.java @@ -6,7 +6,7 @@ import io.ebean.Query; import org.junit.Test; import org.tests.model.basic.Customer; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class TestQueryOrderById extends BaseTestCase { diff --git a/src/test/java/org/tests/query/TestSubQuery.java b/src/test/java/org/tests/query/TestSubQuery.java index dd44ed881..db9eb7cbd 100644 --- a/src/test/java/org/tests/query/TestSubQuery.java +++ b/src/test/java/org/tests/query/TestSubQuery.java @@ -13,7 +13,7 @@ import org.tests.model.basic.VehicleDriver; import java.util.ArrayList; import java.util.List; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class TestSubQuery extends BaseTestCase { diff --git a/src/test/java/org/tests/query/other/TestFetchPreference.java b/src/test/java/org/tests/query/other/TestFetchPreference.java index 2601e63fd..7f3e99155 100644 --- a/src/test/java/org/tests/query/other/TestFetchPreference.java +++ b/src/test/java/org/tests/query/other/TestFetchPreference.java @@ -6,7 +6,7 @@ import io.ebean.Query; import org.junit.Test; import org.tests.model.converstation.Conversation; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class TestFetchPreference extends BaseTestCase { diff --git a/src/test/java/org/tests/rawsql/TestOrderReportTotal.java b/src/test/java/org/tests/rawsql/TestOrderReportTotal.java index 7d917c4d3..589bf6591 100644 --- a/src/test/java/org/tests/rawsql/TestOrderReportTotal.java +++ b/src/test/java/org/tests/rawsql/TestOrderReportTotal.java @@ -12,7 +12,7 @@ import org.junit.Test; import java.util.List; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertNotNull; public class TestOrderReportTotal extends BaseTestCase { diff --git a/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java b/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java index 9f0dd28c8..fc925f62c 100644 --- a/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java +++ b/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java @@ -5,7 +5,7 @@ import io.ebean.Ebean; import org.tests.model.softdelete.ESoftDelMid; import org.junit.Test; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class TestSoftDeleteOptionalRelationship extends BaseTestCase { diff --git a/src/test/java/org/tests/transaction/TestExecuteComplete.java b/src/test/java/org/tests/transaction/TestExecuteComplete.java index 4847265f4..6632816a5 100644 --- a/src/test/java/org/tests/transaction/TestExecuteComplete.java +++ b/src/test/java/org/tests/transaction/TestExecuteComplete.java @@ -14,7 +14,7 @@ import org.junit.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; public class TestExecuteComplete extends BaseTestCase { diff --git a/src/test/java/org/tests/types/TestHstore.java b/src/test/java/org/tests/types/TestHstore.java index d276d92b0..d4bc30774 100644 --- a/src/test/java/org/tests/types/TestHstore.java +++ b/src/test/java/org/tests/types/TestHstore.java @@ -9,7 +9,7 @@ import org.junit.Test; import java.util.List; -import static org.assertj.core.api.StrictAssertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; public class TestHstore extends BaseTestCase { diff --git a/src/test/java/org/tests/update/TestSqlUpdateUpsert.java b/src/test/java/org/tests/update/TestSqlUpdateUpsert.java index 7136541d2..702cfc520 100644 --- a/src/test/java/org/tests/update/TestSqlUpdateUpsert.java +++ b/src/test/java/org/tests/update/TestSqlUpdateUpsert.java @@ -47,7 +47,7 @@ public class TestSqlUpdateUpsert extends BaseTestCase { assertThat(found2.getId()).isEqualTo(key); assertThat(found2.getEmail()).isEqualTo(email); assertThat(found2.isOnlineStatus()).isFalse(); - assertThat(found2.getWhenUpdated()).isGreaterThan(found.getWhenUpdated()); // otherwise this test fails on my machine + assertThat(found2.getWhenUpdated()).isAfter(found.getWhenUpdated()); // otherwise this test fails on my machine } @ForPlatform(Platform.POSTGRES) @@ -84,7 +84,7 @@ public class TestSqlUpdateUpsert extends BaseTestCase { assertThat(found2.getId()).isEqualTo(key); assertThat(found2.getEmail()).isEqualTo("foo@one.com"); assertThat(found2.isOnlineStatus()).isFalse(); - assertThat(found2.getWhenUpdated()).isGreaterThan(found.getWhenUpdated()); + assertThat(found2.getWhenUpdated()).isAfter(found.getWhenUpdated()); }