This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new 7823a8701 Replace deprecated JUnit method assertThat()
7823a8701 is described below
commit 7823a87012a36ee8c0e3a844530a91977e499a6e
Author: Nikita Timofeev <[email protected]>
AuthorDate: Wed Jul 13 16:26:19 2022 +0300
Replace deprecated JUnit method assertThat()
---
.../java/org/apache/cayenne/di/spi/DefaultInjectorInjectionTest.java | 2 --
cayenne-server/src/test/java/org/apache/cayenne/LazyAttributesIT.java | 2 +-
.../apache/cayenne/access/DataContextDisjointByIdPrefetch_ExtrasIT.java | 1 +
.../apache/cayenne/access/flush/DefaultDataDomainFlushActionTest.java | 2 +-
.../java/org/apache/cayenne/access/sqlbuilder/DeleteBuilderTest.java | 2 +-
.../java/org/apache/cayenne/access/sqlbuilder/InsertBuilderTest.java | 2 +-
.../java/org/apache/cayenne/access/sqlbuilder/SelectBuilderTest.java | 2 +-
.../java/org/apache/cayenne/access/sqlbuilder/UpdateBuilderTest.java | 2 +-
.../cayenne/access/translator/select/CustomColumnSetExtractorTest.java | 1 +
.../cayenne/access/translator/select/DbEntityColumnExtractorTest.java | 1 +
.../cayenne/access/translator/select/DescriptorColumnExtractorTest.java | 1 +
.../org/apache/cayenne/access/translator/select/GroupByStageTest.java | 1 +
.../cayenne/access/translator/select/HavingTranslationStageTest.java | 2 +-
.../apache/cayenne/access/translator/select/IdColumnExtractorTest.java | 1 +
.../apache/cayenne/access/translator/select/LimitOffsetStageTest.java | 1 +
.../org/apache/cayenne/access/translator/select/OrderingStageTest.java | 1 +
.../cayenne/access/translator/select/QualifierTranslationStageTest.java | 2 +-
.../cayenne/access/translator/select/QualifierTranslatorTest.java | 1 +
.../org/apache/cayenne/access/types/ValueObjectTypeFactoryTest.java | 2 +-
.../apache/cayenne/configuration/server/ServerRuntimeBuilderTest.java | 2 +-
.../src/test/java/org/apache/cayenne/exp/parser/ASTDbIdPathTest.java | 1 +
.../src/test/java/org/apache/cayenne/exp/property/IdPropertyIT.java | 2 +-
.../src/test/java/org/apache/cayenne/query/ColumnSelectIT.java | 1 +
.../src/test/java/org/apache/cayenne/query/MappedQueryIT.java | 1 +
.../src/test/java/org/apache/cayenne/query/ObjectSelect_RunIT.java | 2 +-
cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectIT.java | 1 +
.../src/test/java/org/apache/cayenne/query/SQLSelectTest.java | 1 +
.../src/test/java/org/apache/cayenne/query/SQLTemplateIT.java | 1 +
.../src/test/java/org/apache/cayenne/query/SelectById_RunIT.java | 1 +
.../java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java | 1 +
30 files changed, 29 insertions(+), 14 deletions(-)
diff --git
a/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorInjectionTest.java
b/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorInjectionTest.java
index 50abc1279..79741c607 100644
---
a/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorInjectionTest.java
+++
b/cayenne-di/src/test/java/org/apache/cayenne/di/spi/DefaultInjectorInjectionTest.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.cayenne.di.spi;
-import org.apache.cayenne.di.DIRuntimeException;
import org.apache.cayenne.di.Key;
import org.apache.cayenne.di.Module;
import org.apache.cayenne.di.mock.MockImplementation1;
@@ -50,7 +49,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Map;
-import static org.hamcrest.CoreMatchers.instanceOf;
import static org.junit.Assert.*;
public class DefaultInjectorInjectionTest {
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/LazyAttributesIT.java
b/cayenne-server/src/test/java/org/apache/cayenne/LazyAttributesIT.java
index 22fe42972..afdf6494c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/LazyAttributesIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/LazyAttributesIT.java
@@ -33,9 +33,9 @@ import org.junit.Before;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
/**
* @since 4.2
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetch_ExtrasIT.java
b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetch_ExtrasIT.java
index 1124ee0bd..416c17911 100644
---
a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetch_ExtrasIT.java
+++
b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetch_ExtrasIT.java
@@ -41,6 +41,7 @@ import java.util.Arrays;
import java.util.List;
import static org.hamcrest.CoreMatchers.hasItems;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.*;
@UseServerRuntime(CayenneProjects.THINGS_PROJECT)
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/access/flush/DefaultDataDomainFlushActionTest.java
b/cayenne-server/src/test/java/org/apache/cayenne/access/flush/DefaultDataDomainFlushActionTest.java
index 6fe5781eb..8f08fc02d 100644
---
a/cayenne-server/src/test/java/org/apache/cayenne/access/flush/DefaultDataDomainFlushActionTest.java
+++
b/cayenne-server/src/test/java/org/apache/cayenne/access/flush/DefaultDataDomainFlushActionTest.java
@@ -27,7 +27,6 @@ import java.util.List;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.Persistent;
-import org.apache.cayenne.access.flush.DefaultDataDomainFlushAction;
import org.apache.cayenne.access.flush.operation.BaseDbRowOp;
import org.apache.cayenne.access.flush.operation.DbRowOp;
import org.apache.cayenne.access.flush.operation.DeleteDbRowOp;
@@ -41,6 +40,7 @@ import org.apache.cayenne.query.Query;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.*;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/access/sqlbuilder/DeleteBuilderTest.java
b/cayenne-server/src/test/java/org/apache/cayenne/access/sqlbuilder/DeleteBuilderTest.java
index f6bd129da..94362956f 100644
---
a/cayenne-server/src/test/java/org/apache/cayenne/access/sqlbuilder/DeleteBuilderTest.java
+++
b/cayenne-server/src/test/java/org/apache/cayenne/access/sqlbuilder/DeleteBuilderTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
import static org.apache.cayenne.access.sqlbuilder.SQLBuilder.*;
import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
public class DeleteBuilderTest extends BaseSqlBuilderTest {
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/access/sqlbuilder/InsertBuilderTest.java
b/cayenne-server/src/test/java/org/apache/cayenne/access/sqlbuilder/InsertBuilderTest.java
index 501525d39..b2a7477fd 100644
---
a/cayenne-server/src/test/java/org/apache/cayenne/access/sqlbuilder/InsertBuilderTest.java
+++
b/cayenne-server/src/test/java/org/apache/cayenne/access/sqlbuilder/InsertBuilderTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
import static org.apache.cayenne.access.sqlbuilder.SQLBuilder.*;
import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
public class InsertBuilderTest extends BaseSqlBuilderTest {
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/access/sqlbuilder/SelectBuilderTest.java
b/cayenne-server/src/test/java/org/apache/cayenne/access/sqlbuilder/SelectBuilderTest.java
index 2631944a0..2c6ca9dc9 100644
---
a/cayenne-server/src/test/java/org/apache/cayenne/access/sqlbuilder/SelectBuilderTest.java
+++
b/cayenne-server/src/test/java/org/apache/cayenne/access/sqlbuilder/SelectBuilderTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
import static org.apache.cayenne.access.sqlbuilder.SQLBuilder.*;
import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
/**
* @since 4.2
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/access/sqlbuilder/UpdateBuilderTest.java
b/cayenne-server/src/test/java/org/apache/cayenne/access/sqlbuilder/UpdateBuilderTest.java
index 4c627f4cc..3602630d8 100644
---
a/cayenne-server/src/test/java/org/apache/cayenne/access/sqlbuilder/UpdateBuilderTest.java
+++
b/cayenne-server/src/test/java/org/apache/cayenne/access/sqlbuilder/UpdateBuilderTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
import static org.apache.cayenne.access.sqlbuilder.SQLBuilder.*;
import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
/**
* @since 4.2
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/CustomColumnSetExtractorTest.java
b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/CustomColumnSetExtractorTest.java
index 13c5f8e35..922ce8df3 100644
---
a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/CustomColumnSetExtractorTest.java
+++
b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/CustomColumnSetExtractorTest.java
@@ -36,6 +36,7 @@ import org.apache.cayenne.map.ObjEntity;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.*;
/**
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/DbEntityColumnExtractorTest.java
b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/DbEntityColumnExtractorTest.java
index f703f2f2e..04de89cca 100644
---
a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/DbEntityColumnExtractorTest.java
+++
b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/DbEntityColumnExtractorTest.java
@@ -29,6 +29,7 @@ import org.junit.Test;
import java.sql.Types;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.*;
public class DbEntityColumnExtractorTest extends BaseColumnExtractorTest {
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/DescriptorColumnExtractorTest.java
b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/DescriptorColumnExtractorTest.java
index a6ad6c117..eb7c1882a 100644
---
a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/DescriptorColumnExtractorTest.java
+++
b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/DescriptorColumnExtractorTest.java
@@ -34,6 +34,7 @@ import
org.apache.cayenne.reflect.generic.DefaultValueComparisonStrategyFactory;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.*;
import static org.mockito.Mockito.mock;
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/GroupByStageTest.java
b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/GroupByStageTest.java
index c319969b0..474c8cb36 100644
---
a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/GroupByStageTest.java
+++
b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/GroupByStageTest.java
@@ -28,6 +28,7 @@ import org.junit.Before;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.*;
/**
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/HavingTranslationStageTest.java
b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/HavingTranslationStageTest.java
index 9d4fc5053..7badfca44 100644
---
a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/HavingTranslationStageTest.java
+++
b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/HavingTranslationStageTest.java
@@ -31,8 +31,8 @@ import org.junit.Before;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
/**
* @since 4.2
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/IdColumnExtractorTest.java
b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/IdColumnExtractorTest.java
index dbbd68215..79213e870 100644
---
a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/IdColumnExtractorTest.java
+++
b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/IdColumnExtractorTest.java
@@ -30,6 +30,7 @@ import org.junit.Test;
import java.sql.Types;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.*;
public class IdColumnExtractorTest extends BaseColumnExtractorTest {
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/LimitOffsetStageTest.java
b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/LimitOffsetStageTest.java
index f7f0a1944..5dcb9d6c1 100644
---
a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/LimitOffsetStageTest.java
+++
b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/LimitOffsetStageTest.java
@@ -26,6 +26,7 @@ import org.junit.Before;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.*;
/**
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/OrderingStageTest.java
b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/OrderingStageTest.java
index 557628fe3..188cf68e2 100644
---
a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/OrderingStageTest.java
+++
b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/OrderingStageTest.java
@@ -36,6 +36,7 @@ import org.junit.Before;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.*;
/**
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslationStageTest.java
b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslationStageTest.java
index 182ce58b3..b26379864 100644
---
a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslationStageTest.java
+++
b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslationStageTest.java
@@ -23,7 +23,6 @@ import
org.apache.cayenne.access.sqlbuilder.sqltree.ColumnNode;
import org.apache.cayenne.access.sqlbuilder.sqltree.Node;
import org.apache.cayenne.access.sqlbuilder.sqltree.OpExpressionNode;
import org.apache.cayenne.access.sqlbuilder.sqltree.ValueNode;
-import org.apache.cayenne.access.sqlbuilder.sqltree.WhereNode;
import org.apache.cayenne.exp.ExpressionFactory;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
@@ -31,6 +30,7 @@ import org.junit.Before;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.*;
/**
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorTest.java
b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorTest.java
index aa8aeb7c4..cf2054e1c 100644
---
a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorTest.java
+++
b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorTest.java
@@ -35,6 +35,7 @@ import org.junit.Test;
import java.util.Arrays;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.*;
/**
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/access/types/ValueObjectTypeFactoryTest.java
b/cayenne-server/src/test/java/org/apache/cayenne/access/types/ValueObjectTypeFactoryTest.java
index 3ea6d9c04..492300bb1 100644
---
a/cayenne-server/src/test/java/org/apache/cayenne/access/types/ValueObjectTypeFactoryTest.java
+++
b/cayenne-server/src/test/java/org/apache/cayenne/access/types/ValueObjectTypeFactoryTest.java
@@ -27,9 +27,9 @@ import java.util.List;
import java.util.UUID;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilderTest.java
b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilderTest.java
index a2583807c..d0368582b 100644
---
a/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilderTest.java
+++
b/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilderTest.java
@@ -29,10 +29,10 @@ import java.util.Collection;
import java.util.List;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.*;
import static org.mockito.Mockito.mock;
-@SuppressWarnings("deprecation")
public class ServerRuntimeBuilderTest {
private ServerRuntime runtime;
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTDbIdPathTest.java
b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTDbIdPathTest.java
index b45d78278..fbc10a377 100644
---
a/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTDbIdPathTest.java
+++
b/cayenne-server/src/test/java/org/apache/cayenne/exp/parser/ASTDbIdPathTest.java
@@ -26,6 +26,7 @@ import org.apache.cayenne.exp.ExpressionFactory;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.*;
/**
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/exp/property/IdPropertyIT.java
b/cayenne-server/src/test/java/org/apache/cayenne/exp/property/IdPropertyIT.java
index 9749c42a8..22014fdbc 100644
---
a/cayenne-server/src/test/java/org/apache/cayenne/exp/property/IdPropertyIT.java
+++
b/cayenne-server/src/test/java/org/apache/cayenne/exp/property/IdPropertyIT.java
@@ -40,9 +40,9 @@ import org.junit.Before;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
/**
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/query/ColumnSelectIT.java
b/cayenne-server/src/test/java/org/apache/cayenne/query/ColumnSelectIT.java
index eb79b6f4d..448ac88f8 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/ColumnSelectIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/ColumnSelectIT.java
@@ -60,6 +60,7 @@ import org.junit.Ignore;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.*;
/**
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/query/MappedQueryIT.java
b/cayenne-server/src/test/java/org/apache/cayenne/query/MappedQueryIT.java
index 2ed16ddbd..03f95a545 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/MappedQueryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/MappedQueryIT.java
@@ -39,6 +39,7 @@ import java.math.BigDecimal;
import java.util.List;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.*;
@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT)
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectSelect_RunIT.java
b/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectSelect_RunIT.java
index 025428f53..fe6e25aa1 100644
---
a/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectSelect_RunIT.java
+++
b/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectSelect_RunIT.java
@@ -37,10 +37,10 @@ import org.junit.Before;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT)
public class ObjectSelect_RunIT extends ServerCase {
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectIT.java
b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectIT.java
index 7c0128c83..a3c0b4a74 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectIT.java
@@ -43,6 +43,7 @@ import org.junit.Ignore;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.*;
@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT)
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectTest.java
b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectTest.java
index 021d8a46b..bf544da0a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectTest.java
@@ -19,6 +19,7 @@
package org.apache.cayenne.query;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.*;
import static org.mockito.Mockito.mock;
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java
b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java
index f767083d4..f1b44a0c0 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java
@@ -45,6 +45,7 @@ import java.time.LocalDateTime;
import java.util.List;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.*;
@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT)
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectById_RunIT.java
b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectById_RunIT.java
index 74dd0f450..c6c68fc53 100644
---
a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectById_RunIT.java
+++
b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectById_RunIT.java
@@ -42,6 +42,7 @@ import org.junit.Test;
import static java.util.Collections.singletonMap;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.*;
@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT)
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java
b/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java
index 325c147e9..e71a9db3f 100644
---
a/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java
+++
b/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java
@@ -31,6 +31,7 @@ import org.apache.cayenne.unit.di.server.PeopleProjectCase;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.*;
public class DeepMergeOperationInheritanceIT extends PeopleProjectCase {
