cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject [4/4] git commit: Organize Assert Imports
Date Wed, 05 Nov 2014 16:59:07 GMT
Organize Assert Imports


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/49dd1041
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/49dd1041
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/49dd1041

Branch: refs/heads/master
Commit: 49dd104101b00e9d113326efb8217c437504b6bc
Parents: 8990e65
Author: Savva Kolbechev <s.kolbachev@gmail.com>
Authored: Wed Nov 5 13:55:13 2014 +0300
Committer: Savva Kolbechev <s.kolbachev@gmail.com>
Committed: Wed Nov 5 13:55:13 2014 +0300

----------------------------------------------------------------------
 .../apache/cayenne/CayenneContextCayenneIT.java |  3 +
 .../CayenneContextClientChannelEventsIT.java    |  7 ++
 .../cayenne/CayenneContextDeleteRulesIT.java    |  6 ++
 .../apache/cayenne/CayenneContextEJBQLIT.java   |  3 +
 .../CayenneContextGraphDiffCompressorIT.java    |  2 +
 .../org/apache/cayenne/CayenneContextIT.java    |  7 ++
 .../cayenne/CayenneContextInheritanceIT.java    |  2 +
 .../CayenneContextMapRelationshipIT.java        |  5 ++
 .../cayenne/CayenneContextMergeHandlerIT.java   |  4 +
 .../CayenneContextNamedQueryCachingIT.java      |  4 +
 .../CayenneContextPaginatedListCachingIT.java   |  2 +
 .../cayenne/CayenneContextPrimitiveIT.java      |  4 +
 .../cayenne/CayenneContextRefreshQueryIT.java   |  2 +
 .../cayenne/CayenneContextRelationshipsIT.java  |  3 +
 .../cayenne/CayenneContextSQLTemplateIT.java    |  3 +
 .../cayenne/CayenneContextServerDiffsIT.java    |  4 +
 .../cayenne/CayenneContextValidationIT.java     |  4 +
 .../CayenneContextWithDataContextIT.java        |  8 ++
 .../apache/cayenne/NestedCayenneContextIT.java  | 16 ++--
 .../cayenne/PersistentObjectInContextIT.java    |  6 ++
 .../cayenne/access/ClientServerChannelIT.java   |  6 ++
 .../access/ClientServerChannelQueryIT.java      |  5 ++
 .../cayenne/map/ClientEntityResolverIT.java     |  5 ++
 .../cayenne/query/ClientExpressionIT.java       |  4 +
 .../query/ClientSelectQueryExpressionIT.java    |  2 +
 .../query/SelectQueryAbstractEntityIT.java      |  2 +
 .../remote/CayenneContextDeletionIT.java        |  2 +
 .../remote/ClientChannelServerDiffsIT.java      |  6 ++
 .../cayenne/remote/LightSuperClassIT.java       |  2 +
 .../remote/NestedObjectContextLocalIT.java      |  3 +
 .../NestedObjectContextParentEventsIT.java      |  5 ++
 .../remote/NestedObjectContextPeerEventsIT.java |  5 ++
 .../remote/NestedObjectContextRollbackIT.java   |  3 +
 .../cayenne/remote/ROPPrefetchToManyMapIT.java  |  2 +
 .../cayenne/remote/RelationshipChangeIT.java    |  2 +
 .../cayenne/remote/RemoteCallbacksIT.java       |  2 +
 .../remote/RemoteIncrementalFaultListIT.java    | 14 ++-
 .../apache/cayenne/remote/RemoteRollbackIT.java |  3 +
 .../apache/cayenne/remote/ValueInjectorIT.java  |  2 +
 .../unit/di/client/ClientCaseSelfIT.java        |  4 +
 .../cayenne/util/ObjectDetachOperationIT.java   |  6 ++
 .../util/ShallowMergeOperation_ClientIT.java    |  4 +
 .../cayenne/CDOCollectionRelationshipIT.java    |  7 ++
 .../java/org/apache/cayenne/CDOMany2OneIT.java  |  6 ++
 .../org/apache/cayenne/CDOMany2OneNoRevIT.java  |  4 +
 .../apache/cayenne/CDOMapRelationshipIT.java    |  7 ++
 .../java/org/apache/cayenne/CDOOne2ManyIT.java  |  4 +
 .../org/apache/cayenne/CDOOne2OneDepIT.java     |  6 ++
 .../org/apache/cayenne/CDOOneDep2OneIT.java     |  6 ++
 .../org/apache/cayenne/CDOOneToManyFKIT.java    |  4 +
 .../org/apache/cayenne/CDOOneToOneFKIT.java     |  6 ++
 .../apache/cayenne/CDOQualifiedEntitiesIT.java  |  3 +
 .../apache/cayenne/CDOSetRelationshipIT.java    |  7 ++
 .../CayenneDataObjectFlattenedRelIT.java        |  6 ++
 .../org/apache/cayenne/CayenneDataObjectIT.java |  4 +
 .../cayenne/CayenneDataObjectInContextIT.java   |  8 ++
 .../CayenneDataObjectRelationshipsIT.java       |  8 ++
 .../cayenne/CayenneDataObjectValidationIT.java  |  4 +
 .../test/java/org/apache/cayenne/CayenneIT.java |  7 ++
 .../org/apache/cayenne/CompoundPkChangeIT.java  |  2 +
 .../cayenne/DataContextMaxIdQualifierIT.java    |  2 +
 .../cayenne/DataObjectSerializationIT.java      |  6 ++
 .../cayenne/FlattenedRelationshipsIT.java       |  5 ++
 .../org/apache/cayenne/GenericMappingIT.java    |  4 +
 .../java/org/apache/cayenne/MeaningfulFKIT.java |  4 +
 .../apache/cayenne/OneWayRelationshipsIT.java   |  5 ++
 .../cayenne/PersistenceByReachabilityIT.java    |  3 +
 .../org/apache/cayenne/PersistentObjectIT.java  |  3 +
 .../org/apache/cayenne/PregeneratedPKIT.java    |  3 +
 .../cayenne/access/DataContextBinaryPKIT.java   |  3 +
 .../cayenne/access/DataContextBlobIT.java       |  3 +
 .../cayenne/access/DataContextCallbacksIT.java  |  6 ++
 .../cayenne/access/DataContextCharPKIT.java     |  3 +
 .../cayenne/access/DataContextCharTypeIT.java   |  2 +
 .../cayenne/access/DataContextClobIT.java       |  3 +
 .../cayenne/access/DataContextCommitIT.java     |  6 ++
 .../access/DataContextCompoundRelIT.java        |  2 +
 .../access/DataContextDataChannelEventsIT.java  |  3 +
 .../access/DataContextDecoratedStackIT.java     |  4 +
 .../cayenne/access/DataContextDelegateIT.java   |  5 ++
 .../DataContextDelegateSharedCacheIT.java       |  6 ++
 .../access/DataContextDeleteRulesIT.java        |  6 ++
 .../DataContextDisjointByIdPrefetchIT.java      |  5 ++
 ...ataContextDisjointByIdPrefetch_ExtrasIT.java |  4 +
 .../access/DataContextEJBQLArrayResultIT.java   |  3 +
 .../access/DataContextEJBQLConditionsIT.java    |  6 ++
 .../DataContextEJBQLConditionsPeopleIT.java     |  3 +
 .../access/DataContextEJBQLDeleteIT.java        |  4 +
 .../access/DataContextEJBQLFetchJoinIT.java     |  5 ++
 ...ataContextEJBQLFlattenedRelationshipsIT.java |  5 ++
 .../DataContextEJBQLFunctionalExpressions.java  |  3 +
 .../access/DataContextEJBQLGroupByHavingIT.java |  5 ++
 .../access/DataContextEJBQLInheritanceIT.java   |  2 +
 .../access/DataContextEJBQLIsNullIT.java        |  2 +
 .../cayenne/access/DataContextEJBQLJoinsIT.java |  3 +
 .../access/DataContextEJBQLOrderByIT.java       |  2 +
 .../cayenne/access/DataContextEJBQLQueryIT.java |  4 +
 .../access/DataContextEJBQLSubqueryIT.java      |  3 +
 .../access/DataContextEJBQLUpdateIT.java        |  3 +
 .../DataContextEntityWithMeaningfulPKIT.java    |  5 ++
 .../DataContextExtendedTypeOperationsIT.java    |  2 +
 .../cayenne/access/DataContextExtrasIT.java     |  9 ++
 .../DataContextFlattenedAttributesIT.java       |  5 ++
 .../apache/cayenne/access/DataContextIT.java    |  7 ++
 .../access/DataContextJoinAliasesIT.java        |  2 +
 .../access/DataContextLocalObjectIT.java        |  6 ++
 .../cayenne/access/DataContextNoPkIT.java       |  5 ++
 .../access/DataContextObjectIdQueryIT.java      |  4 +
 .../access/DataContextObjectTrackingIT.java     |  5 ++
 .../cayenne/access/DataContextOrderingIT.java   |  3 +
 .../cayenne/access/DataContextOuterJoinsIT.java |  2 +
 .../access/DataContextPaginatedQueryIT.java     |  3 +
 .../access/DataContextPerformQueryAPIIT.java    |  3 +
 .../access/DataContextPrefetchExtras1IT.java    |  3 +
 .../access/DataContextPrefetchExtrasIT.java     |  6 ++
 .../cayenne/access/DataContextPrefetchIT.java   |  7 ++
 .../access/DataContextPrefetchMultistepIT.java  |  6 ++
 .../DataContextPrefetchQualifierOverlapIT.java  |  2 +
 .../access/DataContextProcedureQueryIT.java     |  5 ++
 .../access/DataContextQualifiedEntityIT.java    |  2 +
 .../access/DataContextQueryCachingIT.java       |  5 ++
 .../cayenne/access/DataContextQueryChainIT.java |  3 +
 .../access/DataContextRefreshQueryIT.java       |  7 ++
 .../cayenne/access/DataContextRefreshingIT.java |  5 ++
 .../access/DataContextRelationshipQueryIT.java  |  3 +
 .../cayenne/access/DataContextRollbackIT.java   |  4 +
 .../access/DataContextSQLTemplateIT.java        |  4 +
 .../DataContextSelectQuerySplitAliasesIT.java   |  2 +
 .../access/DataContextSerializationIT.java      |  7 ++
 .../access/DataContextSharedCacheEmpiricIT.java |  4 +
 .../access/DataContextSharedCacheIT.java        |  8 ++
 .../cayenne/access/DataContextValidationIT.java |  4 +
 .../cayenne/access/DataDomainCallbacksIT.java   |  6 ++
 .../cayenne/access/DataDomainFiltersIT.java     |  4 +
 .../org/apache/cayenne/access/DataDomainIT.java |  8 ++
 .../cayenne/access/DataDomainQueryActionIT.java |  2 +
 .../org/apache/cayenne/access/DataNodeIT.java   |  4 +
 .../cayenne/access/DataNodeQueriesIT.java       |  3 +
 .../apache/cayenne/access/DataRowStoreIT.java   |  5 ++
 .../apache/cayenne/access/DataRowUtilsIT.java   |  5 ++
 .../apache/cayenne/access/DateTimeTypesIT.java  |  4 +
 .../apache/cayenne/access/DbGeneratorIT.java    |  5 ++
 .../org/apache/cayenne/access/DbLoaderIT.java   |  6 ++
 .../cayenne/access/DbLoaderPartialIT.java       |  3 +
 .../apache/cayenne/access/DeleteObjectIT.java   |  3 +
 .../apache/cayenne/access/DeleteRulesIT.java    |  6 ++
 .../org/apache/cayenne/access/EmbeddingIT.java  |  3 +
 .../java/org/apache/cayenne/access/EnumIT.java  |  3 +
 .../cayenne/access/FlattenedArcKeyIT.java       |  4 +
 .../cayenne/access/FlattenedPrefetchIT.java     |  5 ++
 .../FlattenedRelationshipInContextIT.java       |  4 +
 .../cayenne/access/IdentityColumnsIT.java       |  5 ++
 .../cayenne/access/IncrementalFaultListIT.java  |  3 +
 .../apache/cayenne/access/JointPrefetchIT.java  |  6 ++
 .../org/apache/cayenne/access/MiscTypesIT.java  |  4 +
 .../access/NestedDataContextLocalCacheIT.java   |  3 +
 .../access/NestedDataContextParentEventsIT.java |  5 ++
 .../NestedDataContextParentPeerEventsIT.java    |  6 ++
 .../access/NestedDataContextPeerEventsIT.java   |  5 ++
 .../cayenne/access/NestedDataContextReadIT.java |  8 ++
 .../access/NestedDataContextRollbackIT.java     |  3 +
 .../access/NestedDataContextValidationIT.java   |  4 +
 .../access/NestedDataContextWriteIT.java        |  6 ++
 .../access/NestedDataContext_DeadlockIT.java    |  2 +
 .../apache/cayenne/access/NumericTypesIT.java   |  5 ++
 .../access/ObjectStoreDiffRetainingIT.java      |  3 +
 .../apache/cayenne/access/ObjectStoreGCIT.java  |  2 +
 .../apache/cayenne/access/ObjectStoreIT.java    |  5 ++
 .../cayenne/access/OptimisticLockingIT.java     |  5 ++
 .../access/PrefetchProcessorTreeBuilderIT.java  |  6 ++
 .../cayenne/access/QuotedIdentifiersIT.java     |  2 +
 .../cayenne/access/ReturnTypesMappingIT.java    |  4 +
 .../SimpleIdIncrementalFaultListDataRowsIT.java |  4 +
 .../access/SimpleIdIncrementalFaultListIT.java  |  6 ++
 .../SimpleIdIncrementalFaultListPrefetchIT.java |  5 ++
 .../access/SingleTableInheritance1IT.java       |  2 +
 .../access/SingleTableInheritanceIT.java        |  5 ++
 .../org/apache/cayenne/access/ToManyListIT.java |  4 +
 .../cayenne/access/TransactionThreadIT.java     |  3 +
 .../java/org/apache/cayenne/access/UUIDIT.java  |  3 +
 .../cayenne/access/UserTransactionIT.java       |  2 +
 .../cayenne/access/VerticalInheritanceIT.java   |  5 ++
 .../access/dbsync/SchemaUpdateStrategyIT.java   |  3 +
 .../ThrowOnPartialOrCreateSchemaStrategyIT.java | 85 ++++++++++++++++++
 ...hrowOnPartialOrCreateSchemaStrategyTest.java | 82 -----------------
 .../dbsync/ThrowOnPartialSchemaStrategyIT.java  | 93 ++++++++++++++++++++
 .../ThrowOnPartialSchemaStrategyTest.java       | 89 -------------------
 .../cayenne/access/jdbc/BatchActionIT.java      |  2 +
 .../access/jdbc/BatchActionLockingIT.java       |  2 +
 .../access/jdbc/SQLTemplateActionIT.java        |  5 ++
 .../cayenne/access/jdbc/SelectActionIT.java     |  3 +
 .../batch/DefaultBatchTranslatorIT.java         |  2 +
 .../batch/DeleteBatchTranslatorIT.java          |  3 +
 .../batch/InsertBatchTranslatorIT.java          |  3 +
 .../batch/SoftDeleteBatchTranslatorIT.java      |  3 +
 .../batch/UpdateBatchTranslatorIT.java          |  3 +
 .../ejbql/EJBQLSelectTranslatorIT.java          |  3 +
 .../translator/select/OrderingTranslatorIT.java |  2 +
 .../select/QualifierTranslatorIT.java           |  4 +
 .../translator/select/QueryAssemblerIT.java     |  3 +
 .../translator/select/SelectTranslatorIT.java   |  5 ++
 .../access/util/DefaultOperationObserverIT.java |  3 +
 .../cayenne/ashwood/AshwoodEntitySorterIT.java  |  2 +
 .../org/apache/cayenne/cache/QueryCacheIT.java  |  2 +
 .../server/JNDIDataSourceFactoryIT.java         |  3 +
 .../ServerRuntimeBuilder_InAction_IT.java       |  2 +
 .../org/apache/cayenne/conn/PoolManagerIT.java  |  2 +
 .../org/apache/cayenne/dba/AutoAdapterIT.java   |  3 +
 .../cayenne/dba/ConcurrentPkGeneratorIT.java    |  3 +
 .../org/apache/cayenne/dba/JdbcAdapterIT.java   |  3 +
 .../apache/cayenne/dba/JdbcPkGeneratorIT.java   |  2 +
 .../org/apache/cayenne/dba/PkGeneratorIT.java   |  4 +
 .../org/apache/cayenne/dba/TypesMappingIT.java  |  3 +
 .../cayenne/dba/hsqldb/HSQLDBAdapterIT.java     |  3 +
 .../cayenne/dba/mysql/MySQLAdapterIT.java       |  2 +
 .../cayenne/dba/oracle/Oracle8AdapterIT.java    |  4 +
 .../cayenne/dba/oracle/OracleAdapterIT.java     |  5 ++
 .../cayenne/dba/oracle/OraclePkGeneratorIT.java |  2 +
 .../cayenne/dba/postgres/PostgresAdapterIT.java |  3 +
 .../dba/sqlserver/SQLServerAdapterIT.java       |  3 +
 .../dba/sqlserver/SQLServerSnifferIT.java       |  3 +
 .../ejbql/EJBQLCompiledExpressionIT.java        |  4 +
 .../exp/ExpressionFactory_InContextIT.java      |  6 ++
 .../cayenne/exp/Expression_InContextIT.java     |  7 ++
 .../cayenne/exp/ParsedExpQualifierCompatIT.java |  2 +
 .../parser/ExpressionEvaluateInMemoryIT.java    |  4 +
 .../cayenne/map/ClientEntityResolverIT.java     |  5 ++
 .../java/org/apache/cayenne/map/DbEntityIT.java |  7 ++
 .../apache/cayenne/map/DbRelationshipIT.java    |  5 ++
 .../java/org/apache/cayenne/map/EntityIT.java   |  8 ++
 .../map/EntityResolverClassDescriptorIT.java    |  5 ++
 .../map/EntityResolverGenericStackIT.java       |  5 ++
 .../apache/cayenne/map/EntityResolverIT.java    |  6 ++
 .../map/EntityResolverInheritanceIT.java        |  5 ++
 .../org/apache/cayenne/map/ObjEntityIT.java     |  8 ++
 .../apache/cayenne/map/ObjRelationshipIT.java   |  8 ++
 .../cayenne/merge/AddColumnToModelIT.java       |  5 ++
 .../cayenne/merge/CreateTableToModelIT.java     |  6 ++
 .../cayenne/merge/DropColumnToModelIT.java      |  7 ++
 .../merge/DropRelationshipToModelIT.java        |  6 ++
 .../cayenne/merge/DropTableToModelIT.java       |  5 ++
 .../org/apache/cayenne/merge/MergeCase.java     | 16 ++--
 .../apache/cayenne/merge/MergerFactoryIT.java   |  4 +
 .../cayenne/merge/SetAllowNullToDbIT.java       |  2 +
 .../apache/cayenne/merge/SetNotNullToDbIT.java  |  2 +
 .../apache/cayenne/merge/ValueForNullIT.java    |  4 +
 .../org/apache/cayenne/query/EJBQLQueryIT.java  |  7 ++
 .../cayenne/query/ProcedureQueryCacheKeyIT.java |  4 +
 .../org/apache/cayenne/query/QueryChainIT.java  |  4 +
 .../org/apache/cayenne/query/SQLSelectIT.java   |  4 +
 .../cayenne/query/SQLTemplateCacheKeyIT.java    |  5 ++
 .../org/apache/cayenne/query/SQLTemplateIT.java |  4 +
 .../org/apache/cayenne/query/SelectByIdIT.java  |  4 +
 .../cayenne/query/SelectQueryCacheKeyIT.java    |  5 ++
 .../query/SelectQueryFetchLimitOrderingIT.java  |  2 +
 .../org/apache/cayenne/query/SelectQueryIT.java |  7 ++
 .../SelectQueryPrefetchRouterActionIT.java      |  3 +
 ...ryPrefetchRouterActionQualifiedEntityIT.java |  3 +
 .../cayenne/query/StatementFetchSizeIT.java     |  2 +
 .../reflect/LifecycleCallbackRegistryIT.java    |  2 +
 ...LifecycleCallbackRegistry_InheritanceIT.java |  2 +
 .../reflect/MixedPersistenceStrategyIT.java     |  3 +
 .../generic/DataObjectDescriptorFactoryIT.java  |  3 +
 .../cayenne/tx/DefaultTransactionManagerIT.java |  2 +
 .../java/org/apache/cayenne/unit/di/DICase.java |  3 +-
 .../apache/cayenne/unit/di/DICaseSelfIT.java    |  4 +
 .../unit/di/server/ServerCaseSelfIT.java        |  5 ++
 .../org/apache/cayenne/unit/jira/CAY_115IT.java |  2 +
 .../org/apache/cayenne/unit/jira/CAY_191IT.java |  3 +
 .../org/apache/cayenne/unit/jira/CAY_194IT.java |  3 +
 .../cayenne/util/DeepMergeOperationIT.java      |  4 +
 .../util/DeepMergeOperationInheritanceIT.java   |  5 ++
 .../cayenne/util/EntityMergeSupportIT.java      |  5 ++
 .../cayenne/util/ShallowMergeOperationIT.java   |  4 +
 .../cayenne/velocity/BindDirectiveIT.java       |  4 +
 .../cayenne/velocity/ResultDirectiveIT.java     |  3 +
 276 files changed, 1310 insertions(+), 189 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextCayenneIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextCayenneIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextCayenneIT.java
index 8f3cdbe..1063f56 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextCayenneIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextCayenneIT.java
@@ -26,6 +26,9 @@ import org.apache.cayenne.unit.di.client.ClientCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 public class CayenneContextCayenneIT extends ClientCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsIT.java
index 1e2e6cd..71f0114 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsIT.java
@@ -34,6 +34,13 @@ import org.apache.cayenne.unit.di.client.ClientRuntimeProperty;
 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.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 /**
  * Tests peer context synchronization via ClientChannel events.
  */

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextDeleteRulesIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextDeleteRulesIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextDeleteRulesIT.java
index 1c581ab..c4d6bc5 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextDeleteRulesIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextDeleteRulesIT.java
@@ -28,6 +28,12 @@ import org.apache.cayenne.unit.di.client.ClientCase;
 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.assertTrue;
+import static org.junit.Assert.fail;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 public class CayenneContextDeleteRulesIT extends ClientCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextEJBQLIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextEJBQLIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextEJBQLIT.java
index dd83141..e1e1351 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextEJBQLIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextEJBQLIT.java
@@ -29,6 +29,9 @@ import org.junit.Test;
 
 import java.util.List;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 public class CayenneContextEJBQLIT extends ClientCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextGraphDiffCompressorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextGraphDiffCompressorIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextGraphDiffCompressorIT.java
index a3d67d8..487d03f 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextGraphDiffCompressorIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextGraphDiffCompressorIT.java
@@ -28,6 +28,8 @@ import org.apache.cayenne.unit.di.client.ClientCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 public class CayenneContextGraphDiffCompressorIT extends ClientCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextIT.java
index d8c8911..268a2cc 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextIT.java
@@ -48,6 +48,13 @@ import java.util.Collection;
 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.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextInheritanceIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextInheritanceIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextInheritanceIT.java
index fc65b4c..55ab00d 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextInheritanceIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextInheritanceIT.java
@@ -32,6 +32,8 @@ import org.junit.Test;
 import java.sql.Types;
 import java.util.List;
 
+import static org.junit.Assert.assertEquals;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 public class CayenneContextInheritanceIT extends ClientCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipIT.java
index 869ac6f..46fd918 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipIT.java
@@ -32,6 +32,11 @@ 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;
+import static org.junit.Assert.assertTrue;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 public class CayenneContextMapRelationshipIT extends ClientCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerIT.java
index ea06418..31b5c80 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerIT.java
@@ -26,6 +26,10 @@ import org.apache.cayenne.unit.di.client.ClientCase;
 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.assertTrue;
 import static org.mockito.Mockito.mock;
 
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextNamedQueryCachingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextNamedQueryCachingIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextNamedQueryCachingIT.java
index 4205221..1aeae13 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextNamedQueryCachingIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextNamedQueryCachingIT.java
@@ -32,6 +32,10 @@ import org.junit.Test;
 import java.util.Collections;
 import java.util.List;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 public class CayenneContextNamedQueryCachingIT extends ClientCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingIT.java
index ee50cb4..a0a4efe 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingIT.java
@@ -31,6 +31,8 @@ import org.junit.Test;
 
 import java.util.List;
 
+import static org.junit.Assert.assertEquals;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 public class CayenneContextPaginatedListCachingIT extends ClientCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPrimitiveIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPrimitiveIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPrimitiveIT.java
index ee948b0..f75111c 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPrimitiveIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPrimitiveIT.java
@@ -33,6 +33,10 @@ 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.assertTrue;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 public class CayenneContextPrimitiveIT extends ClientCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRefreshQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRefreshQueryIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRefreshQueryIT.java
index 5583605..2db0812 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRefreshQueryIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRefreshQueryIT.java
@@ -27,6 +27,8 @@ import org.apache.cayenne.unit.di.client.ClientCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 public class CayenneContextRefreshQueryIT extends ClientCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRelationshipsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRelationshipsIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRelationshipsIT.java
index 10dccbc..8ae8850 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRelationshipsIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRelationshipsIT.java
@@ -30,6 +30,9 @@ import org.apache.cayenne.unit.di.client.ClientCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.junit.Test;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 public class CayenneContextRelationshipsIT extends ClientCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextSQLTemplateIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextSQLTemplateIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextSQLTemplateIT.java
index 9eff4c3..555dbce 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextSQLTemplateIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextSQLTemplateIT.java
@@ -26,6 +26,9 @@ import org.apache.cayenne.unit.di.client.ClientCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.junit.Test;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 public class CayenneContextSQLTemplateIT extends ClientCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextServerDiffsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextServerDiffsIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextServerDiffsIT.java
index ae0b006..7031d24 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextServerDiffsIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextServerDiffsIT.java
@@ -30,6 +30,10 @@ import org.apache.cayenne.unit.di.client.ClientCase;
 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;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 public class CayenneContextServerDiffsIT extends ClientCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextValidationIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextValidationIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextValidationIT.java
index 68f3b8f..299adef 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextValidationIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextValidationIT.java
@@ -28,6 +28,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(ClientCase.MULTI_TIER_PROJECT)
 public class CayenneContextValidationIT extends ClientCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextWithDataContextIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextWithDataContextIT.java b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextWithDataContextIT.java
index 5ef8b5b..ed19ebe 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextWithDataContextIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextWithDataContextIT.java
@@ -48,6 +48,14 @@ import java.sql.Types;
 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.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 public class CayenneContextWithDataContextIT extends ClientCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/NestedCayenneContextIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/NestedCayenneContextIT.java b/cayenne-client/src/test/java/org/apache/cayenne/NestedCayenneContextIT.java
index d40ed76..20b7a5d 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/NestedCayenneContextIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/NestedCayenneContextIT.java
@@ -18,11 +18,6 @@
  ****************************************************************/
 package org.apache.cayenne;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
 import org.apache.cayenne.configuration.rop.client.ClientRuntime;
 import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.graph.GraphChangeHandler;
@@ -45,6 +40,17 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
+import java.util.Arrays;
+import java.util.Collection;
+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.assertSame;
+import static org.junit.Assert.assertTrue;
+
 /**
  * Tests nested object contexts
  */

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/PersistentObjectInContextIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/PersistentObjectInContextIT.java b/cayenne-client/src/test/java/org/apache/cayenne/PersistentObjectInContextIT.java
index df94fe1..b903d1c 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/PersistentObjectInContextIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/PersistentObjectInContextIT.java
@@ -34,6 +34,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;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 public class PersistentObjectInContextIT extends ClientCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelIT.java b/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelIT.java
index f2dab9b..dff353f 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelIT.java
@@ -52,6 +52,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.assertNull;
+import static org.junit.Assert.assertTrue;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 public class ClientServerChannelIT extends ClientCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryIT.java b/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryIT.java
index 2fc7386..110f39c 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/access/ClientServerChannelQueryIT.java
@@ -40,6 +40,11 @@ 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;
+import static org.junit.Assert.assertTrue;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 public class ClientServerChannelQueryIT extends ClientCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java b/cayenne-client/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java
index 9ff9666..c87060c 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/map/ClientEntityResolverIT.java
@@ -27,6 +27,11 @@ import org.junit.Test;
 import java.util.Collection;
 import java.util.Collections;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 public class ClientEntityResolverIT extends ClientCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/query/ClientExpressionIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/query/ClientExpressionIT.java b/cayenne-client/src/test/java/org/apache/cayenne/query/ClientExpressionIT.java
index d6685d2..ad3874d 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/query/ClientExpressionIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/query/ClientExpressionIT.java
@@ -38,6 +38,10 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 public class ClientExpressionIT extends ClientCase {
     

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/query/ClientSelectQueryExpressionIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/query/ClientSelectQueryExpressionIT.java b/cayenne-client/src/test/java/org/apache/cayenne/query/ClientSelectQueryExpressionIT.java
index 213da28..b484f34 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/query/ClientSelectQueryExpressionIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/query/ClientSelectQueryExpressionIT.java
@@ -31,6 +31,8 @@ import org.junit.Test;
 
 import java.util.List;
 
+import static org.junit.Assert.assertEquals;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 public class ClientSelectQueryExpressionIT extends ClientCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/query/SelectQueryAbstractEntityIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/query/SelectQueryAbstractEntityIT.java b/cayenne-client/src/test/java/org/apache/cayenne/query/SelectQueryAbstractEntityIT.java
index fcc55e5..7bd8a55 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/query/SelectQueryAbstractEntityIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/query/SelectQueryAbstractEntityIT.java
@@ -32,6 +32,8 @@ import org.junit.Test;
 
 import java.util.List;
 
+import static org.junit.Assert.assertNotNull;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 public class SelectQueryAbstractEntityIT extends ServerCase {
     

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionIT.java
index 686b9ae..98f89df 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/CayenneContextDeletionIT.java
@@ -30,6 +30,8 @@ import org.junit.runners.Parameterized.Parameters;
 import java.util.Arrays;
 import java.util.Collection;
 
+import static org.junit.Assert.assertNull;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 @RunWith(value=Parameterized.class)
 public class CayenneContextDeletionIT extends RemoteCayenneCase {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/remote/ClientChannelServerDiffsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/ClientChannelServerDiffsIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/ClientChannelServerDiffsIT.java
index 2fa875b..805f730 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/ClientChannelServerDiffsIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/ClientChannelServerDiffsIT.java
@@ -38,6 +38,12 @@ 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.assertNull;
+import static org.junit.Assert.assertTrue;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 public class ClientChannelServerDiffsIT extends ClientCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/remote/LightSuperClassIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/LightSuperClassIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/LightSuperClassIT.java
index b0b600d..3ffeb20 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/LightSuperClassIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/LightSuperClassIT.java
@@ -36,6 +36,8 @@ import org.junit.runners.Parameterized.Parameters;
 import java.util.Arrays;
 import java.util.Collection;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  * Test for entites that are implemented in same class on client and server
  */

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextLocalIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextLocalIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextLocalIT.java
index 418841a..aae5787 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextLocalIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextLocalIT.java
@@ -36,6 +36,9 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 @RunWith(value=Parameterized.class)
 public class NestedObjectContextLocalIT extends RemoteCayenneCase {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextParentEventsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextParentEventsIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextParentEventsIT.java
index 53ed7ac..b9d701b 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextParentEventsIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextParentEventsIT.java
@@ -35,6 +35,11 @@ import org.junit.runners.Parameterized.Parameters;
 import java.util.Arrays;
 import java.util.Collection;
 
+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(ClientCase.MULTI_TIER_PROJECT)
 @RunWith(value=Parameterized.class)
 public class NestedObjectContextParentEventsIT extends RemoteCayenneCase {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextPeerEventsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextPeerEventsIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextPeerEventsIT.java
index bc86734..b6974ba 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextPeerEventsIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextPeerEventsIT.java
@@ -37,6 +37,11 @@ import org.junit.runners.Parameterized.Parameters;
 import java.util.Arrays;
 import java.util.Collection;
 
+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(ClientCase.MULTI_TIER_PROJECT)
 @RunWith(value=Parameterized.class)
 public class NestedObjectContextPeerEventsIT extends RemoteCayenneCase {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextRollbackIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextRollbackIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextRollbackIT.java
index 9f7df82..7b35148 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextRollbackIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/NestedObjectContextRollbackIT.java
@@ -33,6 +33,9 @@ import org.junit.runners.Parameterized.Parameters;
 import java.util.Arrays;
 import java.util.Collection;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 @RunWith(value=Parameterized.class)
 public class NestedObjectContextRollbackIT extends RemoteCayenneCase {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/remote/ROPPrefetchToManyMapIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/ROPPrefetchToManyMapIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/ROPPrefetchToManyMapIT.java
index 07cefec..6e456f3 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/ROPPrefetchToManyMapIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/ROPPrefetchToManyMapIT.java
@@ -38,6 +38,8 @@ import org.junit.runners.Parameterized.Parameters;
 import java.util.Arrays;
 import java.util.Collection;
 
+import static org.junit.Assert.assertEquals;
+
 @UseServerRuntime("cayenne-multi-tier.xml")
 @RunWith(value=Parameterized.class)
 public class ROPPrefetchToManyMapIT extends RemoteCayenneCase {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/remote/RelationshipChangeIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/RelationshipChangeIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/RelationshipChangeIT.java
index ad88348..3fba2bf 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/RelationshipChangeIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/RelationshipChangeIT.java
@@ -31,6 +31,8 @@ import org.junit.runners.Parameterized.Parameters;
 import java.util.Arrays;
 import java.util.Collection;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  * This is a test primarily for CAY-1118
  */

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteCallbacksIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteCallbacksIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteCallbacksIT.java
index 17c3973..d7bf475 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteCallbacksIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteCallbacksIT.java
@@ -32,6 +32,8 @@ import org.junit.runners.Parameterized.Parameters;
 import java.util.Arrays;
 import java.util.Collection;
 
+import static org.junit.Assert.assertEquals;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 @RunWith(value=Parameterized.class)
 public class RemoteCallbacksIT extends RemoteCayenneCase implements LifecycleListener {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteIncrementalFaultListIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteIncrementalFaultListIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteIncrementalFaultListIT.java
index 77f15f4..be2f520 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteIncrementalFaultListIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteIncrementalFaultListIT.java
@@ -19,10 +19,6 @@
 
 package org.apache.cayenne.remote;
 
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-
 import org.apache.cayenne.CayenneContext;
 import org.apache.cayenne.Persistent;
 import org.apache.cayenne.di.Inject;
@@ -38,6 +34,16 @@ import org.apache.cayenne.unit.di.client.ClientCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.junit.Test;
 
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 public class RemoteIncrementalFaultListIT extends ClientCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteRollbackIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteRollbackIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteRollbackIT.java
index aeff54a..8c90da4 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteRollbackIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/RemoteRollbackIT.java
@@ -32,6 +32,9 @@ import org.junit.runners.Parameterized.Parameters;
 import java.util.Arrays;
 import java.util.Collection;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
 /**
  * This is a test primarily for CAY-1103
  */

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/remote/ValueInjectorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/remote/ValueInjectorIT.java b/cayenne-client/src/test/java/org/apache/cayenne/remote/ValueInjectorIT.java
index 0503ffc..4b7dc76 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/remote/ValueInjectorIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/remote/ValueInjectorIT.java
@@ -37,6 +37,8 @@ import org.junit.runners.Parameterized.Parameters;
 import java.util.Arrays;
 import java.util.Collection;
 
+import static org.junit.Assert.assertEquals;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 @RunWith(value=Parameterized.class)
 public class ValueInjectorIT extends RemoteCayenneCase {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/unit/di/client/ClientCaseSelfIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/unit/di/client/ClientCaseSelfIT.java b/cayenne-client/src/test/java/org/apache/cayenne/unit/di/client/ClientCaseSelfIT.java
index b8e31ae..32fb280 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/unit/di/client/ClientCaseSelfIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/unit/di/client/ClientCaseSelfIT.java
@@ -24,6 +24,10 @@ import org.apache.cayenne.di.Provider;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.junit.Test;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 public class ClientCaseSelfIT extends ClientCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/util/ObjectDetachOperationIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/util/ObjectDetachOperationIT.java b/cayenne-client/src/test/java/org/apache/cayenne/util/ObjectDetachOperationIT.java
index 4857c5f..236e06a 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/util/ObjectDetachOperationIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/util/ObjectDetachOperationIT.java
@@ -32,6 +32,12 @@ import org.apache.cayenne.unit.di.client.ClientCase;
 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.assertNull;
+import static org.junit.Assert.assertTrue;
+
 @UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
 public class ObjectDetachOperationIT extends ClientCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-client/src/test/java/org/apache/cayenne/util/ShallowMergeOperation_ClientIT.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/util/ShallowMergeOperation_ClientIT.java b/cayenne-client/src/test/java/org/apache/cayenne/util/ShallowMergeOperation_ClientIT.java
index 3a22a38..398467b 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/util/ShallowMergeOperation_ClientIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/util/ShallowMergeOperation_ClientIT.java
@@ -36,6 +36,10 @@ import org.apache.cayenne.unit.di.client.ClientCase;
 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(ClientCase.MULTI_TIER_PROJECT)
 public class ShallowMergeOperation_ClientIT extends ClientCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/CDOCollectionRelationshipIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOCollectionRelationshipIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOCollectionRelationshipIT.java
index 8e7ade5..8983e01 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOCollectionRelationshipIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOCollectionRelationshipIT.java
@@ -32,6 +32,13 @@ import org.junit.Test;
 
 import java.util.Collection;
 
+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.RELATIONSHIPS_PROJECT)
 public class CDOCollectionRelationshipIT extends ServerCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneIT.java
index 3af42e8..fefc3b3 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneIT.java
@@ -40,6 +40,12 @@ import java.sql.Types;
 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.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class CDOMany2OneIT extends ServerCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneNoRevIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneNoRevIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneNoRevIT.java
index baa83aa..232e685 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneNoRevIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOMany2OneNoRevIT.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.assertNotNull;
+import static org.junit.Assert.assertSame;
+
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class CDOMany2OneNoRevIT extends ServerCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/CDOMapRelationshipIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOMapRelationshipIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOMapRelationshipIT.java
index 95b3985..988af5c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOMapRelationshipIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOMapRelationshipIT.java
@@ -33,6 +33,13 @@ import org.junit.Test;
 
 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.RELATIONSHIPS_PROJECT)
 public class CDOMapRelationshipIT extends ServerCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/CDOOne2ManyIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOOne2ManyIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOOne2ManyIT.java
index 1182010..b8a09c3 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOOne2ManyIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOOne2ManyIT.java
@@ -38,6 +38,10 @@ import org.junit.Test;
 import java.util.Date;
 import java.util.List;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class CDOOne2ManyIT extends ServerCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/CDOOne2OneDepIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOOne2OneDepIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOOne2OneDepIT.java
index 96278e5..470d298 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOOne2OneDepIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOOne2OneDepIT.java
@@ -27,6 +27,12 @@ import org.apache.cayenne.testdo.testmap.PaintingInfo;
 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.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
 @UseServerRuntime("cayenne-small-testmap.xml")
 public class CDOOne2OneDepIT extends CayenneDOTestBase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/CDOOneDep2OneIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOOneDep2OneIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOOneDep2OneIT.java
index 7056d6a..b93d1cc 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOOneDep2OneIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOOneDep2OneIT.java
@@ -32,6 +32,12 @@ import org.junit.Test;
 
 import java.sql.Timestamp;
 
+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 CDOOneDep2OneIT extends CayenneDOTestBase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToManyFKIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToManyFKIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToManyFKIT.java
index 8c21b8d..a3270bf 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToManyFKIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToManyFKIT.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.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+
 // TODO: this mapping scenario is really unsupported ... this is just an attempt at
 // partial solution
 @UseServerRuntime(ServerCase.RELATIONSHIPS_PROJECT)

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToOneFKIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToOneFKIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToOneFKIT.java
index e06eddf..ff61bab 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToOneFKIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOOneToOneFKIT.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.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
 /**
  * Tests the behavior of one-to-one relationship where to-one is pointing to an FK.
  */

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesIT.java
index f2c9531..45962d0 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOQualifiedEntitiesIT.java
@@ -32,6 +32,9 @@ import org.junit.Test;
 import java.sql.Types;
 import java.util.List;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
 @UseServerRuntime(ServerCase.DEFAULT_PROJECT)
 public class CDOQualifiedEntitiesIT extends ServerCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/CDOSetRelationshipIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CDOSetRelationshipIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CDOSetRelationshipIT.java
index 114a2a5..ed688e7 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CDOSetRelationshipIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CDOSetRelationshipIT.java
@@ -32,6 +32,13 @@ import org.junit.Test;
 
 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.assertSame;
+import static org.junit.Assert.assertTrue;
+
 @UseServerRuntime(ServerCase.RELATIONSHIPS_PROJECT)
 public class CDOSetRelationshipIT extends ServerCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelIT.java
index bd4857c..b32f188 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectFlattenedRelIT.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.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class CayenneDataObjectFlattenedRelIT extends ServerCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectIT.java
index 37c4927..964766c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectIT.java
@@ -33,6 +33,10 @@ 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;
+
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class CayenneDataObjectIT extends ServerCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectInContextIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectInContextIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectInContextIT.java
index df37ac2..752efa7 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectInContextIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectInContextIT.java
@@ -33,6 +33,14 @@ 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.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 CayenneDataObjectInContextIT extends ServerCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectRelationshipsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectRelationshipsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectRelationshipsIT.java
index ff44ba7..725ce81 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectRelationshipsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectRelationshipsIT.java
@@ -35,6 +35,14 @@ 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.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 CayenneDataObjectRelationshipsIT extends ServerCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectValidationIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectValidationIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectValidationIT.java
index fda101f..d65b3c4 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectValidationIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CayenneDataObjectValidationIT.java
@@ -34,6 +34,10 @@ import org.junit.Test;
 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.assertTrue;
+
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class CayenneDataObjectValidationIT extends ServerCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/CayenneIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CayenneIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CayenneIT.java
index 0ee8ac8..d2ac438 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CayenneIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CayenneIT.java
@@ -45,6 +45,13 @@ import java.util.HashMap;
 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.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 CayenneIT extends ServerCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/CompoundPkChangeIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/CompoundPkChangeIT.java b/cayenne-server/src/test/java/org/apache/cayenne/CompoundPkChangeIT.java
index 6acbd18..f0035b0 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/CompoundPkChangeIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/CompoundPkChangeIT.java
@@ -27,6 +27,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 CompoundPkChangeIT extends ServerCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierIT.java b/cayenne-server/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierIT.java
index 4a2f07f..9e57d0b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierIT.java
@@ -38,6 +38,8 @@ import java.sql.Types;
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.junit.Assert.assertEquals;
+
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class DataContextMaxIdQualifierIT extends ServerCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/DataObjectSerializationIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/DataObjectSerializationIT.java b/cayenne-server/src/test/java/org/apache/cayenne/DataObjectSerializationIT.java
index d34016d..2e1c441 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/DataObjectSerializationIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/DataObjectSerializationIT.java
@@ -29,6 +29,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.assertNull;
+import static org.junit.Assert.assertTrue;
+
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class DataObjectSerializationIT extends ServerCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/FlattenedRelationshipsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/FlattenedRelationshipsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/FlattenedRelationshipsIT.java
index 7246c62..b6af41a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/FlattenedRelationshipsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/FlattenedRelationshipsIT.java
@@ -38,6 +38,11 @@ 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.assertSame;
+import static org.junit.Assert.assertTrue;
+
 /**
  * Test case for objects with flattened relationships.
  */

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/GenericMappingIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/GenericMappingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/GenericMappingIT.java
index 73468d1..95381ce 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/GenericMappingIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/GenericMappingIT.java
@@ -32,6 +32,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.DEFAULT_PROJECT)
 public class GenericMappingIT extends ServerCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/MeaningfulFKIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/MeaningfulFKIT.java b/cayenne-server/src/test/java/org/apache/cayenne/MeaningfulFKIT.java
index 65ed9a4..2cc7ef9 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/MeaningfulFKIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/MeaningfulFKIT.java
@@ -28,6 +28,10 @@ import org.apache.cayenne.unit.di.server.UseServerRuntime;
 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.RELATIONSHIPS_PROJECT)
 public class MeaningfulFKIT extends ServerCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java
index bc47ae0..4b99f55 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java
@@ -33,6 +33,11 @@ import org.junit.Test;
 import java.sql.SQLException;
 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.ONEWAY_PROJECT)
 public class OneWayRelationshipsIT extends ServerCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/PersistenceByReachabilityIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/PersistenceByReachabilityIT.java b/cayenne-server/src/test/java/org/apache/cayenne/PersistenceByReachabilityIT.java
index 24d880f..65fb933 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/PersistenceByReachabilityIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/PersistenceByReachabilityIT.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.assertEquals;
+import static org.junit.Assert.fail;
+
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class PersistenceByReachabilityIT extends ServerCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/PersistentObjectIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/PersistentObjectIT.java b/cayenne-server/src/test/java/org/apache/cayenne/PersistentObjectIT.java
index baba75a..c6a1146 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/PersistentObjectIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/PersistentObjectIT.java
@@ -23,6 +23,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.assertNull;
+import static org.junit.Assert.assertSame;
 import static org.mockito.Mockito.mock;
 
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/PregeneratedPKIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/PregeneratedPKIT.java b/cayenne-server/src/test/java/org/apache/cayenne/PregeneratedPKIT.java
index 05ce2ab..4059622 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/PregeneratedPKIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/PregeneratedPKIT.java
@@ -29,6 +29,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.assertNotNull;
+
 /**
  * This test case ensures that PK pre-generated for the entity manually before commit is
  * used during commit as well.

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBinaryPKIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBinaryPKIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBinaryPKIT.java
index f7fbddb..de99905 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBinaryPKIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBinaryPKIT.java
@@ -30,6 +30,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.assertNotNull;
+
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class DataContextBinaryPKIT extends ServerCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBlobIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBlobIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBlobIT.java
index 80b355a..6552b73 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBlobIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextBlobIT.java
@@ -31,6 +31,9 @@ import org.junit.Test;
 
 import java.util.List;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class DataContextBlobIT extends ServerCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCallbacksIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCallbacksIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCallbacksIT.java
index fdb98d7..1b89bd2 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCallbacksIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCallbacksIT.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.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 DataContextCallbacksIT extends ServerCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharPKIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharPKIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharPKIT.java
index 5e0ac6a..569b216 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharPKIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharPKIT.java
@@ -30,6 +30,9 @@ import org.junit.Test;
 
 import java.util.List;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class DataContextCharPKIT extends ServerCase {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharTypeIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharTypeIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharTypeIT.java
index 1b920f0..9c3779a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharTypeIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCharTypeIT.java
@@ -32,6 +32,8 @@ import org.junit.Test;
 
 import java.util.List;
 
+import static org.junit.Assert.assertTrue;
+
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class DataContextCharTypeIT extends ServerCase {
     

http://git-wip-us.apache.org/repos/asf/cayenne/blob/49dd1041/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextClobIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextClobIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextClobIT.java
index 1ee5119..4cd56eb 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextClobIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextClobIT.java
@@ -30,6 +30,9 @@ import org.junit.Test;
 
 import java.util.List;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
 @UseServerRuntime(ServerCase.TESTMAP_PROJECT)
 public class DataContextClobIT extends ServerCase {
 


Mime
View raw message