http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCommitIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCommitIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCommitIT.java index d0510a1..2e9a795 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCommitIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCommitIT.java @@ -30,6 +30,12 @@ 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.assertSame; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextCommitIT extends ServerCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCompoundRelIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCompoundRelIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCompoundRelIT.java index c1d8496..c9f4262 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCompoundRelIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCompoundRelIT.java @@ -32,6 +32,8 @@ import org.junit.Test; import java.util.List; +import static org.junit.Assert.assertEquals; + /** * Testing relationships with compound keys. */ http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDataChannelEventsIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDataChannelEventsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDataChannelEventsIT.java index ca04495..6a74e2e 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDataChannelEventsIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDataChannelEventsIT.java @@ -32,6 +32,9 @@ import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.apache.cayenne.util.EventUtil; import org.junit.Test; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + /** * Tests that DataContext sends DataChannel events. */ http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackIT.java index 0c6c807..969a54c 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDecoratedStackIT.java @@ -39,6 +39,10 @@ import org.junit.Test; import java.util.Map; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextDecoratedStackIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateIT.java index 38cc1c6..46d1231 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateIT.java @@ -33,6 +33,11 @@ import org.junit.Test; import java.util.ArrayList; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * Tests various DataContextDelegate methods invocation and consequences on DataContext * behavior. http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheIT.java index 5f4fc80..18b07e4 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDelegateSharedCacheIT.java @@ -31,6 +31,12 @@ import org.junit.Test; import java.util.Date; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextDelegateSharedCacheIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesIT.java index e870521..3ae0c34 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDeleteRulesIT.java @@ -37,6 +37,12 @@ import org.junit.Test; import java.sql.Types; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + // TODO: redefine all test cases in terms of entities in "relationships" map // and merge this test case with DeleteRulesTst that inherits // from RelationshipTestCase. http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchIT.java index cebf478..272e61f 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchIT.java @@ -40,6 +40,11 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextDisjointByIdPrefetchIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetch_ExtrasIT.java ---------------------------------------------------------------------- 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 c46197c..9b84973 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 @@ -45,6 +45,10 @@ import java.util.Collection; import java.util.List; import static org.apache.cayenne.exp.ExpressionFactory.matchExp; +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.TESTMAP_PROJECT) public class DataContextDisjointByIdPrefetch_ExtrasIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLArrayResultIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLArrayResultIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLArrayResultIT.java index fbd80c2..d0955c9 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLArrayResultIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLArrayResultIT.java @@ -32,6 +32,9 @@ import java.math.BigDecimal; import java.sql.Types; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextEJBQLArrayResultIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsIT.java index 09e35fd..b283614 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsIT.java @@ -40,6 +40,12 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextEJBQLConditionsIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java index b1b59ef..7c62217 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java @@ -36,6 +36,9 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.PEOPLE_PROJECT) public class DataContextEJBQLConditionsPeopleIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteIT.java index 1b21506..b364ea7 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeleteIT.java @@ -34,6 +34,10 @@ import org.junit.Test; import java.sql.Types; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextEJBQLDeleteIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinIT.java index 8141130..1ed6d89 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinIT.java @@ -42,6 +42,11 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextEJBQLFetchJoinIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsIT.java index 1e48da4..7260cf1 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsIT.java @@ -35,6 +35,11 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.RELATIONSHIPS_PROJECT) public class DataContextEJBQLFlattenedRelationshipsIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressions.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressions.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressions.java index 60ffb8f..9c4ae2e 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressions.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLFunctionalExpressions.java @@ -40,6 +40,9 @@ import java.math.BigInteger; import java.util.Calendar; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + // TODO: renamed as it fails on DB's like Derby. See CAY-1480. @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextEJBQLFunctionalExpressions extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java index 268fb1e..30fc0db 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java @@ -37,6 +37,11 @@ import java.util.Arrays; import java.util.HashSet; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextEJBQLGroupByHavingIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java index fd9ab47..f67632b 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java @@ -33,6 +33,8 @@ import org.junit.Test; import java.sql.Types; import java.util.List; +import static org.junit.Assert.assertEquals; + @UseServerRuntime(ServerCase.PEOPLE_PROJECT) public class DataContextEJBQLInheritanceIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullIT.java index 8df591f..24ca818 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullIT.java @@ -33,6 +33,8 @@ import org.junit.Test; import java.sql.Types; import java.util.List; +import static org.junit.Assert.assertEquals; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextEJBQLIsNullIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsIT.java index 59acfd6..4f587de 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsIT.java @@ -35,6 +35,9 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextEJBQLJoinsIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLOrderByIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLOrderByIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLOrderByIT.java index 3450b71..133aa10 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLOrderByIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLOrderByIT.java @@ -32,6 +32,8 @@ import org.junit.Test; import java.sql.Types; import java.util.List; +import static org.junit.Assert.assertEquals; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextEJBQLOrderByIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java index 7c7d812..6e32995 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java @@ -46,6 +46,10 @@ import java.util.List; import java.util.Map; import java.util.Set; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextEJBQLQueryIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryIT.java index 7b42a27..3b4ccbe 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryIT.java @@ -37,6 +37,9 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextEJBQLSubqueryIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateIT.java index d16eb51..3de1db8 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateIT.java @@ -36,6 +36,9 @@ import java.sql.Types; import java.util.HashMap; import java.util.Map; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextEJBQLUpdateIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKIT.java index 6ee1311..7b8483d 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEntityWithMeaningfulPKIT.java @@ -36,6 +36,11 @@ import org.junit.Test; import java.util.List; import java.util.Map; +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 DataContextEntityWithMeaningfulPKIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtendedTypeOperationsIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtendedTypeOperationsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtendedTypeOperationsIT.java index 05a8ece..24fa4e4 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtendedTypeOperationsIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtendedTypeOperationsIT.java @@ -34,6 +34,8 @@ import org.junit.Test; import java.util.Arrays; +import static org.junit.Assert.assertEquals; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextExtendedTypeOperationsIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java index f8b2ba4..f5f32c4 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java @@ -47,6 +47,15 @@ import java.sql.Types; import java.util.Date; 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.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextExtrasIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java index 3357d28..0837d07 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java @@ -41,6 +41,11 @@ import java.sql.Types; import java.util.Iterator; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextFlattenedAttributesIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextIT.java index fcc66db..ee63afa 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextIT.java @@ -65,6 +65,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +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; +import static org.junit.Assert.fail; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isNull; http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesIT.java index a3ec14f..911b42b 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesIT.java @@ -34,6 +34,8 @@ import org.junit.Test; import java.sql.Timestamp; import java.util.List; +import static org.junit.Assert.assertEquals; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextJoinAliasesIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextLocalObjectIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextLocalObjectIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextLocalObjectIT.java index 5bccd04..4102669 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextLocalObjectIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextLocalObjectIT.java @@ -33,6 +33,12 @@ 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.assertNotSame; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.fail; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextLocalObjectIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextNoPkIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextNoPkIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextNoPkIT.java index 3719e69..9da593e 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextNoPkIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextNoPkIT.java @@ -33,6 +33,11 @@ import org.junit.Test; import java.util.List; import java.util.Map; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextNoPkIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectIdQueryIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectIdQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectIdQueryIT.java index fbbec3c..cdace4b 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectIdQueryIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectIdQueryIT.java @@ -32,6 +32,10 @@ import org.junit.Test; import java.util.Collections; import java.util.Date; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextObjectIdQueryIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingIT.java index 8b5b1c0..15ea9b7 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingIT.java @@ -37,6 +37,11 @@ import java.sql.Types; import java.util.Collections; import java.util.Date; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; + /** * Tests objects registration in DataContext, transferring objects between contexts and * such. http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOrderingIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOrderingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOrderingIT.java index 9d9471e..1134f4d 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOrderingIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOrderingIT.java @@ -33,6 +33,9 @@ import java.math.BigDecimal; import java.util.Calendar; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextOrderingIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsIT.java index 0b8fd4e..a322082 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOuterJoinsIT.java @@ -36,6 +36,8 @@ import org.junit.Test; import java.sql.Types; import java.util.List; +import static org.junit.Assert.assertEquals; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextOuterJoinsIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPaginatedQueryIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPaginatedQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPaginatedQueryIT.java index cd22677..5178517 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPaginatedQueryIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPaginatedQueryIT.java @@ -30,6 +30,9 @@ import org.junit.Test; import java.util.List; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextPaginatedQueryIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java index ac06353..20f0f58 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java @@ -44,6 +44,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; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextPerformQueryAPIIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java index 0534635..9995660 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java @@ -32,6 +32,9 @@ import org.junit.Test; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + /** * A test case for CAY-788. */ http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasIT.java index 524251d..12454bb 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasIT.java @@ -41,6 +41,12 @@ 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.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + /** * Test prefetching of various obscure cases. */ http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java index ec04fb0..315bd8a 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java @@ -52,6 +52,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +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 DataContextPrefetchIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepIT.java index 82dfb55..2bcd1d6 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepIT.java @@ -44,6 +44,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextPrefetchMultistepIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapIT.java index 7c3915e..401af58 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapIT.java @@ -32,6 +32,8 @@ import org.junit.Test; import java.util.List; +import static org.junit.Assert.assertEquals; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextPrefetchQualifierOverlapIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java index 8660d20..75eb08e 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java @@ -43,6 +43,11 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +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.TESTMAP_PROJECT) public class DataContextProcedureQueryIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java index 7f692f5..7e7c16e 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java @@ -35,6 +35,8 @@ import org.junit.Test; import java.sql.Types; import java.util.List; +import static org.junit.Assert.assertEquals; + /** */ @UseServerRuntime(ServerCase.PEOPLE_PROJECT) http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryCachingIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryCachingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryCachingIT.java index 54137ac..e82441f 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryCachingIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryCachingIT.java @@ -37,6 +37,11 @@ import org.junit.Test; import java.util.ArrayList; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextQueryCachingIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryChainIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryChainIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryChainIT.java index 4e190f9..db95860 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryChainIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQueryChainIT.java @@ -31,6 +31,9 @@ import org.junit.Test; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextQueryChainIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryIT.java index cdac918..7ca4d20 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryIT.java @@ -38,6 +38,13 @@ import org.junit.Test; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextRefreshQueryIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshingIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshingIT.java index 620507d..6086b6c 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshingIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRefreshingIT.java @@ -37,6 +37,11 @@ import java.sql.Types; import java.util.Date; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; + /** * Test suite covering possible scenarios of refreshing updated objects. This includes * refreshing relationships and attributes changed outside of Cayenne with and without http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java index 68067b3..e5c9dc8 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java @@ -31,6 +31,9 @@ import org.junit.Test; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextRelationshipQueryIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRollbackIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRollbackIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRollbackIT.java index 1ba7e74..0c67109 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRollbackIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextRollbackIT.java @@ -34,6 +34,10 @@ import org.junit.Test; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextRollbackIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateIT.java index 04c253f..a88f2d4 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateIT.java @@ -48,6 +48,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextSQLTemplateIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSelectQuerySplitAliasesIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSelectQuerySplitAliasesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSelectQuerySplitAliasesIT.java index 763e28e..a71bcb0 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSelectQuerySplitAliasesIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSelectQuerySplitAliasesIT.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 DataContextSelectQuerySplitAliasesIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSerializationIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSerializationIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSerializationIT.java index bb6970e..e677d04 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSerializationIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSerializationIT.java @@ -39,6 +39,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextSerializationIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricIT.java index 3103f9c..9f98d4f 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricIT.java @@ -36,6 +36,10 @@ import org.junit.Test; 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; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataContextSharedCacheEmpiricIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheIT.java index b29e55d..7b69abe 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextSharedCacheIT.java @@ -42,6 +42,14 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + /** * Test suite for testing behavior of multiple DataContexts that share the same underlying * DataDomain. http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextValidationIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextValidationIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextValidationIT.java index d208844..6005077 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextValidationIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextValidationIT.java @@ -30,6 +30,10 @@ import org.apache.cayenne.unit.util.ValidationDelegate; import org.apache.cayenne.validation.ValidationResult; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + /** */ @UseServerRuntime(ServerCase.TESTMAP_PROJECT) http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainCallbacksIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainCallbacksIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainCallbacksIT.java index f0fdb46..c670b5a 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainCallbacksIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainCallbacksIT.java @@ -35,6 +35,12 @@ 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.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataDomainCallbacksIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainFiltersIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainFiltersIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainFiltersIT.java index a0be7ac..8e8a877 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainFiltersIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainFiltersIT.java @@ -37,6 +37,10 @@ import org.junit.Test; import java.util.ArrayList; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataDomainFiltersIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainIT.java index 0e7779b..5607bb1 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainIT.java @@ -42,6 +42,14 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; +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; +import static org.junit.Assert.fail; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataDomainIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainQueryActionIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainQueryActionIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainQueryActionIT.java index 4e4323e..373dcc5 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainQueryActionIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataDomainQueryActionIT.java @@ -36,6 +36,8 @@ import org.junit.Test; import java.io.Serializable; import java.util.List; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataDomainQueryActionIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeIT.java index f41af3d..9584e22 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeIT.java @@ -26,6 +26,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.assertNull; +import static org.junit.Assert.assertSame; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataNodeIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeQueriesIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeQueriesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeQueriesIT.java index f6e70ba..99ccb2c 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeQueriesIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataNodeQueriesIT.java @@ -37,6 +37,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; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataNodeQueriesIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowStoreIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowStoreIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowStoreIT.java index 0496f5c..f5470bd 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowStoreIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowStoreIT.java @@ -31,6 +31,11 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataRowStoreIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowUtilsIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowUtilsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowUtilsIT.java index e61a4c7..3d942b3 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowUtilsIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataRowUtilsIT.java @@ -36,6 +36,11 @@ 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.assertNotSame; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DataRowUtilsIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DateTimeTypesIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DateTimeTypesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DateTimeTypesIT.java index f5f8dc4..f6a5ba2 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DateTimeTypesIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DateTimeTypesIT.java @@ -34,6 +34,10 @@ import java.sql.Time; import java.util.Calendar; import java.util.Date; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * Tests Date handling in Cayenne. */ http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DbGeneratorIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DbGeneratorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DbGeneratorIT.java index ab177f3..9a003c3 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DbGeneratorIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DbGeneratorIT.java @@ -29,6 +29,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.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DbGeneratorIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderIT.java index 8ca7676..8bad0d2 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderIT.java @@ -39,6 +39,12 @@ import java.sql.Types; import java.util.Collection; 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.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DbLoaderIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderPartialIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderPartialIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderPartialIT.java index 18ce6d5..4b0a9cd 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderPartialIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DbLoaderPartialIT.java @@ -31,6 +31,9 @@ import org.junit.Test; import java.util.Collection; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DbLoaderPartialIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteObjectIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteObjectIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteObjectIT.java index bddf3bf..6bb7cd3 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteObjectIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteObjectIT.java @@ -37,6 +37,9 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class DeleteObjectIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteRulesIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteRulesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteRulesIT.java index 8dda83f..3b27c80 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteRulesIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DeleteRulesIT.java @@ -41,6 +41,12 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + @UseServerRuntime(ServerCase.RELATIONSHIPS_PROJECT) public class DeleteRulesIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/EmbeddingIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/EmbeddingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/EmbeddingIT.java index 8f8be6d..4b9422d 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/EmbeddingIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/EmbeddingIT.java @@ -35,6 +35,9 @@ import org.junit.Test; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + @UseServerRuntime(ServerCase.DEFAULT_PROJECT) public class EmbeddingIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/EnumIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/EnumIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/EnumIT.java index c2a3b9f..b25267c 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/EnumIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/EnumIT.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.assertNotNull; +import static org.junit.Assert.assertSame; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class EnumIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedArcKeyIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedArcKeyIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedArcKeyIT.java index 3d60f01..9b655f2 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedArcKeyIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedArcKeyIT.java @@ -29,6 +29,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.assertFalse; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.RELATIONSHIPS_PROJECT) public class FlattenedArcKeyIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedPrefetchIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedPrefetchIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedPrefetchIT.java index aa4d9ff..ce8dd83 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedPrefetchIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedPrefetchIT.java @@ -41,6 +41,11 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class FlattenedPrefetchIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextIT.java index 7f81b24..9745581 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextIT.java @@ -34,6 +34,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.RELATIONSHIPS_PROJECT) public class FlattenedRelationshipInContextIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/IdentityColumnsIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/IdentityColumnsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/IdentityColumnsIT.java index 22adb11..bbd3787 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/IdentityColumnsIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/IdentityColumnsIT.java @@ -43,6 +43,11 @@ 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.assertNotNull; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class IdentityColumnsIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/IncrementalFaultListIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/IncrementalFaultListIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/IncrementalFaultListIT.java index 6c954b2..5faf72b 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/IncrementalFaultListIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/IncrementalFaultListIT.java @@ -26,6 +26,9 @@ import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.apache.cayenne.util.Util; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class IncrementalFaultListIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java index c4a0216..8779b3f 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java @@ -54,6 +54,12 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + /** * Tests joint prefetch handling by Cayenne access stack. */ http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/MiscTypesIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/MiscTypesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/MiscTypesIT.java index 731d8c8..d1da777 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/MiscTypesIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/MiscTypesIT.java @@ -33,6 +33,10 @@ import org.junit.Test; import java.lang.reflect.Array; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class MiscTypesIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextLocalCacheIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextLocalCacheIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextLocalCacheIT.java index c492165..74c2b41 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextLocalCacheIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextLocalCacheIT.java @@ -32,6 +32,9 @@ import org.junit.Test; import java.util.List; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class NestedDataContextLocalCacheIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentEventsIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentEventsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentEventsIT.java index 6665160..f3309db 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentEventsIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentEventsIT.java @@ -28,6 +28,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.TESTMAP_PROJECT) public class NestedDataContextParentEventsIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java index 5273235..9f8a866 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextParentPeerEventsIT.java @@ -29,6 +29,12 @@ 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.assertNotSame; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.RELATIONSHIPS_PROJECT) public class NestedDataContextParentPeerEventsIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextPeerEventsIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextPeerEventsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextPeerEventsIT.java index 3da5090..2b3c306 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextPeerEventsIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextPeerEventsIT.java @@ -30,6 +30,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.assertSame; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class NestedDataContextPeerEventsIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java index 73d564a..6f87de4 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java @@ -46,6 +46,14 @@ import java.util.Date; import java.util.Iterator; 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.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class NestedDataContextReadIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextRollbackIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextRollbackIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextRollbackIT.java index 63b5ea0..5adc512 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextRollbackIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextRollbackIT.java @@ -26,6 +26,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.assertFalse; +import static org.junit.Assert.assertTrue; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class NestedDataContextRollbackIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextValidationIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextValidationIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextValidationIT.java index 2ac6652..af65367 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextValidationIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextValidationIT.java @@ -29,6 +29,10 @@ import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.apache.cayenne.validation.ValidationException; import org.junit.Test; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class NestedDataContextValidationIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java index ed319c8..1f46ecb 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java @@ -46,6 +46,12 @@ import java.util.Collection; import java.util.HashMap; import java.util.List; +import static org.junit.Assert.assertEquals; +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("cayenne-small-testmap.xml") public class NestedDataContextWriteIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java index 2d05ff3..c19a875 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java @@ -33,6 +33,8 @@ import org.junit.Test; import java.util.List; import java.util.Random; +import static org.junit.Assert.assertFalse; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class NestedDataContext_DeadlockIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/NumericTypesIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/NumericTypesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/NumericTypesIT.java index 2ce5d42..e18f218 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/NumericTypesIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/NumericTypesIT.java @@ -44,6 +44,11 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.util.List; +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) http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingIT.java index 67eeb7a..cf60725 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreDiffRetainingIT.java @@ -31,6 +31,9 @@ import org.junit.Test; import java.sql.Types; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + @UseServerRuntime(ServerCase.TESTMAP_PROJECT) public class ObjectStoreDiffRetainingIT extends ServerCase { http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreGCIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreGCIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreGCIT.java index 81abf7f..d5ccbc6 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreGCIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/ObjectStoreGCIT.java @@ -29,6 +29,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 ObjectStoreGCIT extends ServerCase {