You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2014/11/04 18:25:40 UTC
[10/12] git commit: Optimize Imports in cayenne-client module
Optimize Imports in cayenne-client module
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/e2a965ff
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/e2a965ff
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/e2a965ff
Branch: refs/heads/master
Commit: e2a965ff040cc1ec91fea258b702398b5f1ff068
Parents: b62c9d0
Author: Savva Kolbechev <s....@gmail.com>
Authored: Tue Nov 4 14:06:25 2014 +0300
Committer: Savva Kolbechev <s....@gmail.com>
Committed: Tue Nov 4 14:06:25 2014 +0300
----------------------------------------------------------------------
.../org/apache/cayenne/CayenneContextCayenneIT.java | 2 --
.../cayenne/CayenneContextClientChannelEventsIT.java | 2 --
.../test/java/org/apache/cayenne/CayenneContextIT.java | 2 +-
.../org/apache/cayenne/CayenneContextInheritanceIT.java | 2 +-
.../apache/cayenne/CayenneContextMapRelationshipIT.java | 2 +-
.../apache/cayenne/CayenneContextMergeHandlerIT.java | 2 +-
.../cayenne/CayenneContextNamedQueryCachingIT.java | 2 +-
.../cayenne/CayenneContextPaginatedListCachingIT.java | 2 +-
.../org/apache/cayenne/CayenneContextPrimitiveIT.java | 2 +-
.../apache/cayenne/CayenneContextRefreshQueryIT.java | 2 +-
.../apache/cayenne/CayenneContextRelationshipsIT.java | 2 --
.../org/apache/cayenne/CayenneContextSQLTemplateIT.java | 3 ---
.../org/apache/cayenne/CayenneContextServerDiffsIT.java | 2 +-
.../org/apache/cayenne/CayenneContextValidationIT.java | 2 --
.../apache/cayenne/CayenneContextWithDataContextIT.java | 8 --------
.../org/apache/cayenne/PersistentObjectInContextIT.java | 2 +-
.../apache/cayenne/access/ClientServerChannelIT.java | 2 +-
.../cayenne/access/ClientServerChannelQueryIT.java | 2 +-
.../org/apache/cayenne/map/ClientEntityResolverIT.java | 2 +-
.../org/apache/cayenne/query/ClientExpressionIT.java | 2 +-
.../cayenne/query/ClientSelectQueryExpressionIT.java | 2 +-
.../java/org/apache/cayenne/query/SQLTemplateTest.java | 12 ++++++------
.../java/org/apache/cayenne/query/SelectByIdTest.java | 8 ++++----
.../cayenne/query/SelectQueryAbstractEntityIT.java | 2 +-
.../apache/cayenne/unit/di/client/ClientCaseSelfIT.java | 2 +-
.../apache/cayenne/util/ObjectDetachOperationIT.java | 2 --
.../cayenne/util/ShallowMergeOperation_ClientIT.java | 2 +-
27 files changed, 28 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/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 43869eb..8f3cdbe 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextCayenneIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextCayenneIT.java
@@ -26,8 +26,6 @@ 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.*;
-
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextCayenneIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/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 f1caca7..1e2e6cd 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextClientChannelEventsIT.java
@@ -34,8 +34,6 @@ 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.*;
-
/**
* Tests peer context synchronization via ClientChannel events.
*/
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/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 c005543..d8c8911 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextIT.java
@@ -50,7 +50,7 @@ import java.util.List;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;import static org.junit.Assert.*;
+import static org.mockito.Mockito.when;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/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 b9fbb2b..fc65b4c 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextInheritanceIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextInheritanceIT.java
@@ -30,7 +30,7 @@ import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.junit.Test;
import java.sql.Types;
-import java.util.List;import static org.junit.Assert.*;
+import java.util.List;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextInheritanceIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/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 e080def..869ac6f 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMapRelationshipIT.java
@@ -30,7 +30,7 @@ import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.junit.Test;
-import java.util.Map;import static org.junit.Assert.*;
+import java.util.Map;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextMapRelationshipIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/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 7fd1c0d..ea06418 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextMergeHandlerIT.java
@@ -26,7 +26,7 @@ import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.junit.Test;
-import static org.mockito.Mockito.mock;import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextMergeHandlerIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/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 ade7590..4205221 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextNamedQueryCachingIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextNamedQueryCachingIT.java
@@ -30,7 +30,7 @@ import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.junit.Test;
import java.util.Collections;
-import java.util.List;import static org.junit.Assert.*;
+import java.util.List;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextNamedQueryCachingIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/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 3a90802..ee50cb4 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPaginatedListCachingIT.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.junit.Test;
-import java.util.List;import static org.junit.Assert.*;
+import java.util.List;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextPaginatedListCachingIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/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 fd3b795..ee948b0 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPrimitiveIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextPrimitiveIT.java
@@ -31,7 +31,7 @@ import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.junit.Test;
import java.sql.Types;
-import java.util.List;import static org.junit.Assert.*;
+import java.util.List;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextPrimitiveIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/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 908abe7..5583605 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRefreshQueryIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRefreshQueryIT.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.test.jdbc.TableHelper;
import org.apache.cayenne.testdo.mt.ClientMtTable1;
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.*;
+import org.junit.Test;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextRefreshQueryIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/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 458b58b..10dccbc 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRelationshipsIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextRelationshipsIT.java
@@ -30,8 +30,6 @@ 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.*;
-
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextRelationshipsIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/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 555dbce..9eff4c3 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextSQLTemplateIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextSQLTemplateIT.java
@@ -26,9 +26,6 @@ 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/e2a965ff/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 a0cfaa2..ae0b006 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextServerDiffsIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextServerDiffsIT.java
@@ -28,7 +28,7 @@ import org.apache.cayenne.testdo.mt.ClientMtTable2;
import org.apache.cayenne.testdo.mt.MtTable1;
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.*;
+import org.junit.Test;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextServerDiffsIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/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 37ff005..68f3b8f 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextValidationIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextValidationIT.java
@@ -28,8 +28,6 @@ import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.apache.cayenne.validation.ValidationException;
import org.junit.Test;
-import static org.junit.Assert.*;
-
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class CayenneContextValidationIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/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 ed19ebe..5ef8b5b 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextWithDataContextIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/CayenneContextWithDataContextIT.java
@@ -48,14 +48,6 @@ 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/e2a965ff/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 da6cac9..df94fe1 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/PersistentObjectInContextIT.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/PersistentObjectInContextIT.java
@@ -32,7 +32,7 @@ import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.apache.cayenne.util.PersistentObjectHolder;
import org.junit.Test;
-import java.util.List;import static org.junit.Assert.*;
+import java.util.List;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class PersistentObjectInContextIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/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 140f6e2..f2dab9b 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
@@ -50,7 +50,7 @@ import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.apache.cayenne.util.EqualsBuilder;
import org.junit.Test;
-import java.util.List;import static org.junit.Assert.*;
+import java.util.List;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class ClientServerChannelIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/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 d4da266..2fc7386 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
@@ -38,7 +38,7 @@ import org.apache.cayenne.util.PersistentObjectList;
import org.junit.Test;
import java.util.Collections;
-import java.util.List;import static org.junit.Assert.*;
+import java.util.List;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class ClientServerChannelQueryIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/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 b0add33..9ff9666 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
@@ -25,7 +25,7 @@ import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.junit.Test;
import java.util.Collection;
-import java.util.Collections;import static org.junit.Assert.*;
+import java.util.Collections;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class ClientEntityResolverIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/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 2c2f006..d6685d2 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
@@ -36,7 +36,7 @@ import org.junit.Test;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.List;import static org.junit.Assert.*;
+import java.util.List;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class ClientExpressionIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/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 a706de1..213da28 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
@@ -29,7 +29,7 @@ import org.apache.cayenne.unit.di.client.ClientCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.junit.Test;
-import java.util.List;import static org.junit.Assert.*;
+import java.util.List;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class ClientSelectQueryExpressionIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/cayenne-client/src/test/java/org/apache/cayenne/query/SQLTemplateTest.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/query/SQLTemplateTest.java b/cayenne-client/src/test/java/org/apache/cayenne/query/SQLTemplateTest.java
index d432fe1..9e6e4bd 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/query/SQLTemplateTest.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/query/SQLTemplateTest.java
@@ -18,16 +18,16 @@
****************************************************************/
package org.apache.cayenne.query;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Collections;
-
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.remote.hessian.service.HessianUtil;
import org.junit.Test;
+import java.util.Collections;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+
public class SQLTemplateTest {
@Test
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/cayenne-client/src/test/java/org/apache/cayenne/query/SelectByIdTest.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/test/java/org/apache/cayenne/query/SelectByIdTest.java b/cayenne-client/src/test/java/org/apache/cayenne/query/SelectByIdTest.java
index 84b2e06..087c84c 100644
--- a/cayenne-client/src/test/java/org/apache/cayenne/query/SelectByIdTest.java
+++ b/cayenne-client/src/test/java/org/apache/cayenne/query/SelectByIdTest.java
@@ -18,15 +18,15 @@
****************************************************************/
package org.apache.cayenne.query;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
-
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.remote.hessian.service.HessianUtil;
import org.apache.cayenne.testdo.testmap.Artist;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+
public class SelectByIdTest {
@Test
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/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 72f505d..fcc55e5 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
@@ -30,7 +30,7 @@ import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.junit.Test;
-import java.util.List;import static org.junit.Assert.*;
+import java.util.List;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class SelectQueryAbstractEntityIT extends ServerCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/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 a0f77bc..b8e31ae 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
@@ -22,7 +22,7 @@ import org.apache.cayenne.configuration.server.ServerRuntime;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Provider;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
-import org.junit.Test;import static org.junit.Assert.*;
+import org.junit.Test;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class ClientCaseSelfIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/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 4dc37ef..4857c5f 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,8 +32,6 @@ 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.*;
-
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class ObjectDetachOperationIT extends ClientCase {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e2a965ff/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 bbb9f4b..3a22a38 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
@@ -34,7 +34,7 @@ import org.apache.cayenne.unit.di.DataChannelInterceptor;
import org.apache.cayenne.unit.di.UnitTestClosure;
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.*;
+import org.junit.Test;
@UseServerRuntime(ClientCase.MULTI_TIER_PROJECT)
public class ShallowMergeOperation_ClientIT extends ClientCase {