Repository: cayenne Updated Branches: refs/heads/master 8990e6554 -> 49dd10410
http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/query/QueryChainIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/QueryChainIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/QueryChainIT.java index 2348b45..1567aea 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/query/QueryChainIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/query/QueryChainIT.java @@ -25,6 +25,10 @@ import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class QueryChainIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectIT.java ---------------------------------------------------------------------- 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 b7bfdd6..dd5882f 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 @@ -30,6 +30,10 @@ import org.junit.Test; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class SQLSelectIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateCacheKeyIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateCacheKeyIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateCacheKeyIT.java index f223657..781d969 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateCacheKeyIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateCacheKeyIT.java @@ -25,6 +25,11 @@ import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class SQLTemplateCacheKeyIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java ---------------------------------------------------------------------- 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 b71b70e..244c8d5 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 @@ -35,6 +35,10 @@ import java.sql.SQLException; import java.sql.Types; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class SQLTemplateIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/query/SelectByIdIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectByIdIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectByIdIT.java index efeaed1..f4e8ef8 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectByIdIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectByIdIT.java @@ -33,6 +33,10 @@ import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; import static java.util.Collections.singletonMap; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class SelectByIdIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryCacheKeyIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryCacheKeyIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryCacheKeyIT.java index 664b67e..7917c54 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryCacheKeyIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryCacheKeyIT.java @@ -27,6 +27,11 @@ import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class SelectQueryCacheKeyIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryFetchLimitOrderingIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryFetchLimitOrderingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryFetchLimitOrderingIT.java index cb25202..b701a42 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryFetchLimitOrderingIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryFetchLimitOrderingIT.java @@ -30,6 +30,8 @@ import org.junit.Test; import java.util.List; +import static org.junit.Assert.assertEquals; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class SelectQueryFetchLimitOrderingIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryIT.java index c78f522..87782a7 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryIT.java @@ -55,6 +55,13 @@ import java.util.Arrays; import java.util.Collections; 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.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class SelectQueryIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionIT.java index 0189800..e050928 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionIT.java @@ -31,6 +31,9 @@ import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class SelectQueryPrefetchRouterActionIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionQualifiedEntityIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionQualifiedEntityIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionQualifiedEntityIT.java index ce42359..fa9010e 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionQualifiedEntityIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionQualifiedEntityIT.java @@ -31,6 +31,9 @@ import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + @UseServerRuntime(ServerCase.PEOPLE_PROJECT) public class SelectQueryPrefetchRouterActionQualifiedEntityIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/query/StatementFetchSizeIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/StatementFetchSizeIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/StatementFetchSizeIT.java index 22bd81f..4961111 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/query/StatementFetchSizeIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/query/StatementFetchSizeIT.java @@ -26,6 +26,8 @@ import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; +import static org.junit.Assert.assertEquals; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class StatementFetchSizeIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistryIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistryIT.java index ffbe753..089b959 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistryIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistryIT.java @@ -32,6 +32,8 @@ import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; +import static org.junit.Assert.assertEquals; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class LifecycleCallbackRegistryIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry_InheritanceIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry_InheritanceIT.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry_InheritanceIT.java index 53531c4..8f5fa32 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry_InheritanceIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry_InheritanceIT.java @@ -32,6 +32,8 @@ import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; +import static org.junit.Assert.assertEquals; + @UseServerRuntime(ServerCase.INHERTITANCE_SINGLE_TABLE1_PROJECT) public class LifecycleCallbackRegistry_InheritanceIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/reflect/MixedPersistenceStrategyIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/MixedPersistenceStrategyIT.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/MixedPersistenceStrategyIT.java index e320095..590c170 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/MixedPersistenceStrategyIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/MixedPersistenceStrategyIT.java @@ -31,6 +31,9 @@ import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + /** * Tests conflicts between field and map-based persistence. */ http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactoryIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactoryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactoryIT.java index a1cf9f2..97b3ec6 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactoryIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactoryIT.java @@ -33,6 +33,9 @@ import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataObjectDescriptorFactoryIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/tx/DefaultTransactionManagerIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/tx/DefaultTransactionManagerIT.java b/cayenne-server/src/test/java/org/apache/cayenne/tx/DefaultTransactionManagerIT.java index 57f0739..56d6f40 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/tx/DefaultTransactionManagerIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/tx/DefaultTransactionManagerIT.java @@ -23,6 +23,8 @@ import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICase.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICase.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICase.java index f01f957..74fdd75 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICase.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICase.java @@ -20,14 +20,13 @@ package org.apache.cayenne.unit.di; import org.apache.cayenne.di.Injector; import org.junit.After; -import org.junit.Assert; import org.junit.Before; /** * A unit test superclass that supports injection of members based on the standard unit * test container. */ -public abstract class DICase extends Assert { +public abstract class DICase { protected abstract Injector getUnitTestInjector(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICaseSelfIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICaseSelfIT.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICaseSelfIT.java index d6fe535..5381f85 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICaseSelfIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/DICaseSelfIT.java @@ -27,6 +27,10 @@ import org.apache.cayenne.di.Module; import org.apache.cayenne.di.spi.DefaultScope; import org.junit.Test; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertSame; + public class DICaseSelfIT extends DICase { private static final Injector injector; http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseSelfIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseSelfIT.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseSelfIT.java index 2c60da2..64b6bda 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseSelfIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseSelfIT.java @@ -23,6 +23,11 @@ import org.apache.cayenne.di.Inject; import org.apache.cayenne.di.Provider; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertSame; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class ServerCaseSelfIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_115IT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_115IT.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_115IT.java index 2e47ceb..03f695f 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_115IT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_115IT.java @@ -34,6 +34,8 @@ import org.junit.Test; import java.util.List; +import static org.junit.Assert.assertEquals; + /** */ @UseServerRuntime(ServerCase.RELATIONSHIPS_PROJECT) http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_191IT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_191IT.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_191IT.java index bc5acbe..1c51d15 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_191IT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_191IT.java @@ -31,6 +31,9 @@ import org.junit.Test; import java.sql.Types; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + @UseServerRuntime(ServerCase.RELATIONSHIPS_PROJECT) public class CAY_191IT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_194IT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_194IT.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_194IT.java index 51f1dd1..caa711d 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_194IT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_194IT.java @@ -34,6 +34,9 @@ import org.junit.Test; import java.sql.Types; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + /** * Testing qualifier translator correctness on reflexive relationships. */ http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationIT.java b/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationIT.java index c58ed54..91d2368 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationIT.java @@ -30,6 +30,10 @@ import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DeepMergeOperationIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java ---------------------------------------------------------------------- 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 04813da..d6d9a30 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 @@ -32,6 +32,11 @@ import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.PEOPLE_PROJECT) public class DeepMergeOperationInheritanceIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/util/EntityMergeSupportIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/util/EntityMergeSupportIT.java b/cayenne-server/src/test/java/org/apache/cayenne/util/EntityMergeSupportIT.java index c5e59f9..83c4f53 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/util/EntityMergeSupportIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/util/EntityMergeSupportIT.java @@ -32,6 +32,11 @@ import org.junit.Test; import java.sql.Types; import java.util.Arrays; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class EntityMergeSupportIT extends MergeCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/util/ShallowMergeOperationIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/util/ShallowMergeOperationIT.java b/cayenne-server/src/test/java/org/apache/cayenne/util/ShallowMergeOperationIT.java index fe4623b..b29f0ad 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/util/ShallowMergeOperationIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/util/ShallowMergeOperationIT.java @@ -37,6 +37,10 @@ import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class ShallowMergeOperationIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/velocity/BindDirectiveIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/velocity/BindDirectiveIT.java b/cayenne-server/src/test/java/org/apache/cayenne/velocity/BindDirectiveIT.java index d94fa17..b8945fe 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/velocity/BindDirectiveIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/velocity/BindDirectiveIT.java @@ -48,6 +48,10 @@ import java.util.List; import java.util.Map; import java.util.Set; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + /** * Tests BindDirective for passed null parameters and for not passed parameters */ http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/velocity/ResultDirectiveIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/velocity/ResultDirectiveIT.java b/cayenne-server/src/test/java/org/apache/cayenne/velocity/ResultDirectiveIT.java index 5c40bc9..8915ab2 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/velocity/ResultDirectiveIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/velocity/ResultDirectiveIT.java @@ -40,6 +40,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + /** * Test for Result directive to check if we could use ResultDitrective * optionally.