This is an automated email from the ASF dual-hosted git repository.

prhomberg pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 0fa1f9d  GEODE-2953: Expand wildcard imports in geode-cq:test (#1864)
0fa1f9d is described below

commit 0fa1f9d88d745953b251db244b56bdf1e95bf3e9
Author: Patrick Rhomberg <[email protected]>
AuthorDate: Thu Apr 26 11:12:23 2018 -0700

    GEODE-2953: Expand wildcard imports in geode-cq:test (#1864)
---
 .../apache/geode/cache/query/cq/CQJUnitTest.java   |  5 +++--
 .../cache/query/cq/dunit/CqDataDUnitTest.java      |  2 +-
 .../cq/dunit/CqDataOptimizedExecuteDUnitTest.java  |  2 --
 .../CqDataUsingPoolOptimizedExecuteDUnitTest.java  |  2 --
 .../cache/query/cq/dunit/CqPerfDUnitTest.java      |  4 +++-
 .../query/cq/dunit/CqPerfUsingPoolDUnitTest.java   |  4 +++-
 .../cache/query/cq/dunit/CqQueryDUnitTest.java     |  9 ++++++--
 .../cq/dunit/CqQueryOptimizedExecuteDUnitTest.java | 11 +++++++--
 .../query/cq/dunit/CqQueryUsingPoolDUnitTest.java  |  9 ++++++--
 .../CqQueryUsingPoolOptimizedExecuteDUnitTest.java |  2 --
 .../cq/dunit/CqResultSetUsingPoolDUnitTest.java    |  3 ++-
 ...esultSetUsingPoolOptimizedExecuteDUnitTest.java |  2 +-
 .../cache/query/cq/dunit/CqStateDUnitTest.java     |  8 +++++--
 .../cq/dunit/CqStatsOptimizedExecuteDUnitTest.java |  2 --
 .../dunit/PartitionedRegionCqQueryDUnitTest.java   |  9 ++++++--
 ...onedRegionCqQueryOptimizedExecuteDUnitTest.java | 10 +++++++--
 .../query/cq/dunit/PrCqUsingPoolDUnitTest.java     |  5 ++++-
 .../PrCqUsingPoolOptimizedExecuteDUnitTest.java    |  2 --
 .../cache/query/dunit/PdxQueryCQDUnitTest.java     |  4 ++--
 .../cache/query/dunit/PdxQueryCQTestBase.java      |  6 +++--
 .../cache/snapshot/ClientSnapshotDUnitTest.java    |  8 +++++--
 .../geode/internal/cache/PutAllCSDUnitTest.java    | 10 +++++++--
 .../internal/cache/ha/CQListGIIDUnitTest.java      |  8 +++++--
 .../internal/cache/ha/HADispatcherDUnitTest.java   | 26 +++++++++++++++++++---
 .../cache/tier/sockets/DurableClientTestCase.java  | 12 ++++++++--
 .../management/internal/pulse/TestCQDUnitTest.java |  3 ++-
 .../internal/pulse/TestClientsDUnitTest.java       |  3 ++-
 .../internal/pulse/TestServerDUnitTest.java        |  3 ++-
 .../security/ClientAuthorizationCQDUnitTest.java   |  4 ++--
 .../ClientCQPostAuthorizationDUnitTest.java        | 18 ++++++++++-----
 .../security/ClientPostAuthorizationDUnitTest.java |  5 +++--
 .../security/MultiUserDurableCQAuthzDUnitTest.java | 16 ++++++++-----
 32 files changed, 154 insertions(+), 63 deletions(-)

diff --git 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/CQJUnitTest.java 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/CQJUnitTest.java
index c3f0217..05751f0 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/CQJUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/CQJUnitTest.java
@@ -14,8 +14,9 @@
  */
 package org.apache.geode.cache.query.cq;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.fail;
 
 import java.util.Properties;
 
diff --git 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataDUnitTest.java
index bd5d003..359b94d 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataDUnitTest.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.cache.query.cq.dunit;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.fail;
 
 import java.util.HashSet;
 import java.util.concurrent.CountDownLatch;
diff --git 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
index 50410ff..0ec1052 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
@@ -14,8 +14,6 @@
  */
 package org.apache.geode.cache.query.cq.dunit;
 
-import static org.junit.Assert.*;
-
 import org.junit.experimental.categories.Category;
 
 import org.apache.geode.cache.query.internal.cq.CqServiceImpl;
diff --git 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
index b156e16..cd7109c 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
@@ -14,8 +14,6 @@
  */
 package org.apache.geode.cache.query.cq.dunit;
 
-import static org.junit.Assert.*;
-
 import org.junit.experimental.categories.Category;
 
 import org.apache.geode.cache.query.internal.cq.CqServiceImpl;
diff --git 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfDUnitTest.java
index 44396d9..bb1439c 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfDUnitTest.java
@@ -14,7 +14,9 @@
  */
 package org.apache.geode.cache.query.cq.dunit;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
index 6ec9848..c01e3a8 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
@@ -14,7 +14,9 @@
  */
 package org.apache.geode.cache.query.cq.dunit;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryDUnitTest.java
index 3e5b6ab..9d232e3 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryDUnitTest.java
@@ -14,8 +14,13 @@
  */
 package org.apache.geode.cache.query.cq.dunit;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+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;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
index ba04c59..ba5aad4 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.cache.query.cq.dunit;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -28,7 +29,13 @@ import org.apache.geode.cache30.CacheSerializableRunnable;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.internal.AvailablePortHelper;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.test.dunit.*;
+import org.apache.geode.test.dunit.Host;
+import org.apache.geode.test.dunit.Invoke;
+import org.apache.geode.test.dunit.LogWriterUtils;
+import org.apache.geode.test.dunit.NetworkUtils;
+import org.apache.geode.test.dunit.SerializableRunnable;
+import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.Wait;
 import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.apache.geode.test.junit.categories.DistributedTest;
 
diff --git 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
index ede247f..34c2270 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
@@ -14,8 +14,13 @@
  */
 package org.apache.geode.cache.query.cq.dunit;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import static org.apache.geode.test.dunit.Assert.assertFalse;
+import static org.apache.geode.test.dunit.Assert.assertNotNull;
+import static org.apache.geode.test.dunit.Assert.assertTrue;
+import static org.apache.geode.test.dunit.Assert.fail;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
index 0bdf722..d8f4dbc 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
@@ -14,8 +14,6 @@
  */
 package org.apache.geode.cache.query.cq.dunit;
 
-import static org.junit.Assert.*;
-
 import org.junit.experimental.categories.Category;
 
 import org.apache.geode.cache.query.internal.cq.CqServiceImpl;
diff --git 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
index 4d7b95b..dc4f7e1 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.cache.query.cq.dunit;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
index bab8803..5850b4d 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.cache.query.cq.dunit;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStateDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStateDUnitTest.java
index a45465e..d92885f 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStateDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStateDUnitTest.java
@@ -14,8 +14,12 @@
  */
 package org.apache.geode.cache.query.cq.dunit;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_CLIENT_ACCESSOR;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_CLIENT_ACCESSOR_PP;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_CLIENT_AUTHENTICATOR;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_CLIENT_AUTH_INIT;
+import static org.junit.Assert.assertTrue;
 
 import java.util.Properties;
 
diff --git 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
index 450cdac..9a8d937 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
@@ -14,8 +14,6 @@
  */
 package org.apache.geode.cache.query.cq.dunit;
 
-import static org.junit.Assert.*;
-
 import org.junit.experimental.categories.Category;
 
 import org.apache.geode.cache.query.internal.cq.CqServiceImpl;
diff --git 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
index 4f24b8a..445c038 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
@@ -14,8 +14,13 @@
  */
 package org.apache.geode.cache.query.cq.dunit;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import static org.apache.geode.test.dunit.Assert.assertFalse;
+import static org.apache.geode.test.dunit.Assert.assertNotNull;
+import static org.apache.geode.test.dunit.Assert.assertNull;
+import static org.apache.geode.test.dunit.Assert.assertTrue;
+import static org.apache.geode.test.dunit.Assert.fail;
 
 import java.io.IOException;
 import java.util.HashSet;
diff --git 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
index f6f8b73..09844ca 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.cache.query.cq.dunit;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -27,7 +28,12 @@ import 
org.apache.geode.cache.query.internal.cq.CqServiceProvider;
 import org.apache.geode.cache30.CacheSerializableRunnable;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.test.dunit.*;
+import org.apache.geode.test.dunit.Host;
+import org.apache.geode.test.dunit.Invoke;
+import org.apache.geode.test.dunit.LogWriterUtils;
+import org.apache.geode.test.dunit.NetworkUtils;
+import org.apache.geode.test.dunit.SerializableRunnable;
+import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.apache.geode.test.junit.categories.DistributedTest;
 
diff --git 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
index 9ee017e..50a6d37 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
@@ -14,7 +14,10 @@
  */
 package org.apache.geode.cache.query.cq.dunit;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
index 4383188..6b5ead8 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
@@ -14,8 +14,6 @@
  */
 package org.apache.geode.cache.query.cq.dunit;
 
-import static org.junit.Assert.*;
-
 import org.junit.experimental.categories.Category;
 
 import org.apache.geode.cache.query.internal.cq.CqServiceImpl;
diff --git 
a/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryCQDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryCQDUnitTest.java
index 07b72e2..4f90771 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryCQDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryCQDUnitTest.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.cache.query.dunit;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -36,7 +37,6 @@ import org.apache.geode.cache.query.QueryService;
 import org.apache.geode.cache.query.SelectResults;
 import org.apache.geode.cache.query.Struct;
 import org.apache.geode.cache.query.cq.dunit.CqQueryTestListener;
-import org.apache.geode.cache.query.dunit.PdxQueryCQTestBase.TestObject;
 import org.apache.geode.cache30.CacheSerializableRunnable;
 import org.apache.geode.cache30.ClientServerTestCase;
 import org.apache.geode.test.dunit.Assert;
diff --git 
a/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryCQTestBase.java
 
b/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryCQTestBase.java
index 30c23ed..f2d384f 100755
--- 
a/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryCQTestBase.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryCQTestBase.java
@@ -14,8 +14,10 @@
  */
 package org.apache.geode.cache.query.dunit;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
 
 import java.io.IOException;
 import java.util.Comparator;
diff --git 
a/geode-cq/src/test/java/org/apache/geode/cache/snapshot/ClientSnapshotDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/cache/snapshot/ClientSnapshotDUnitTest.java
index 6796700..efbed6c 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/cache/snapshot/ClientSnapshotDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/cache/snapshot/ClientSnapshotDUnitTest.java
@@ -14,8 +14,12 @@
  */
 package org.apache.geode.cache.snapshot;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+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;
 
 import java.io.File;
 import java.util.Properties;
diff --git 
a/geode-cq/src/test/java/org/apache/geode/internal/cache/PutAllCSDUnitTest.java 
b/geode-cq/src/test/java/org/apache/geode/internal/cache/PutAllCSDUnitTest.java
index 8e81624..5a82615 100755
--- 
a/geode-cq/src/test/java/org/apache/geode/internal/cache/PutAllCSDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/internal/cache/PutAllCSDUnitTest.java
@@ -14,8 +14,14 @@
  */
 package org.apache.geode.internal.cache;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import static org.apache.geode.test.dunit.Assert.assertFalse;
+import static org.apache.geode.test.dunit.Assert.assertNotNull;
+import static org.apache.geode.test.dunit.Assert.assertNull;
+import static org.apache.geode.test.dunit.Assert.assertTrue;
+import static org.apache.geode.test.dunit.Assert.fail;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git 
a/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/CQListGIIDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/CQListGIIDUnitTest.java
index 992f58b..b8ca0f8 100755
--- 
a/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/CQListGIIDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/CQListGIIDUnitTest.java
@@ -14,8 +14,12 @@
  */
 package org.apache.geode.internal.cache.ha;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import static org.apache.geode.test.dunit.Assert.assertNotNull;
+import static org.apache.geode.test.dunit.Assert.assertTrue;
+import static org.apache.geode.test.dunit.Assert.fail;
 
 import java.io.File;
 import java.io.IOException;
diff --git 
a/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/HADispatcherDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/HADispatcherDUnitTest.java
index af9e2ce..5a5c2a7 100755
--- 
a/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/HADispatcherDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/HADispatcherDUnitTest.java
@@ -18,7 +18,10 @@ import static 
org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
 import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.apache.geode.internal.AvailablePort.SOCKET;
 import static org.apache.geode.internal.AvailablePort.getRandomAvailablePort;
-import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import static org.apache.geode.test.dunit.Assert.assertNotNull;
+import static org.apache.geode.test.dunit.Assert.assertTrue;
+import static org.apache.geode.test.dunit.Assert.fail;
 import static org.apache.geode.test.dunit.Host.getHost;
 import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
 import static org.apache.geode.test.dunit.NetworkUtils.getServerHostName;
@@ -31,9 +34,26 @@ import java.util.Properties;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.AttributesFactory;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheException;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.CacheListener;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.Declarable;
+import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.cache.Scope;
 import org.apache.geode.cache.client.internal.PoolImpl;
-import org.apache.geode.cache.query.*;
+import org.apache.geode.cache.query.CqAttributes;
+import org.apache.geode.cache.query.CqAttributesFactory;
+import org.apache.geode.cache.query.CqException;
+import org.apache.geode.cache.query.CqExistsException;
+import org.apache.geode.cache.query.CqListener;
+import org.apache.geode.cache.query.CqQuery;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.RegionNotFoundException;
 import org.apache.geode.cache.query.cq.dunit.CqQueryTestListener;
 import org.apache.geode.cache.util.CacheListenerAdapter;
 import org.apache.geode.cache30.CacheSerializableRunnable;
diff --git 
a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientTestCase.java
 
b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientTestCase.java
index f897a9c..ea57f5c 100755
--- 
a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientTestCase.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientTestCase.java
@@ -14,8 +14,16 @@
  */
 package org.apache.geode.internal.cache.tier.sockets;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static 
org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_ID;
+import static 
org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_TIMEOUT;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+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;
+import static org.junit.Assert.fail;
 
 import java.util.Arrays;
 import java.util.Iterator;
diff --git 
a/geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestCQDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestCQDUnitTest.java
index 4fd2a95..b3a94cd 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestCQDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestCQDUnitTest.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.management.internal.pulse;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
diff --git 
a/geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestClientsDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestClientsDUnitTest.java
index 7b9001d..800898b 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestClientsDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestClientsDUnitTest.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.management.internal.pulse;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
diff --git 
a/geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestServerDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestServerDUnitTest.java
index b1844c1..02643bb 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestServerDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/management/internal/pulse/TestServerDUnitTest.java
@@ -14,7 +14,8 @@
  */
 package org.apache.geode.management.internal.pulse;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
diff --git 
a/geode-cq/src/test/java/org/apache/geode/security/ClientAuthorizationCQDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/security/ClientAuthorizationCQDUnitTest.java
index 8e980ef..b21d372 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/security/ClientAuthorizationCQDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/security/ClientAuthorizationCQDUnitTest.java
@@ -14,8 +14,8 @@
  */
 package org.apache.geode.security;
 
-import static org.apache.geode.security.SecurityTestUtils.*;
-import static org.apache.geode.test.dunit.IgnoredException.*;
+import static org.apache.geode.security.SecurityTestUtils.closeCache;
+import static org.apache.geode.test.dunit.IgnoredException.addIgnoredException;
 
 import java.util.Collection;
 import java.util.List;
diff --git 
a/geode-cq/src/test/java/org/apache/geode/security/ClientCQPostAuthorizationDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/security/ClientCQPostAuthorizationDUnitTest.java
index 17b85d9..719b018 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/security/ClientCQPostAuthorizationDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/security/ClientCQPostAuthorizationDUnitTest.java
@@ -14,12 +14,18 @@
  */
 package org.apache.geode.security;
 
-import static org.apache.geode.internal.AvailablePort.*;
-import static org.apache.geode.security.SecurityTestUtils.*;
-import static org.apache.geode.test.dunit.Assert.*;
-import static org.apache.geode.test.dunit.Invoke.*;
-import static org.apache.geode.test.dunit.LogWriterUtils.*;
-import static org.apache.geode.test.dunit.Wait.*;
+import static org.apache.geode.security.SecurityTestUtils.NO_EXCEPTION;
+import static org.apache.geode.security.SecurityTestUtils.REGION_NAME;
+import static org.apache.geode.security.SecurityTestUtils.closeCache;
+import static org.apache.geode.security.SecurityTestUtils.concatProperties;
+import static 
org.apache.geode.security.SecurityTestUtils.createCacheClientForMultiUserMode;
+import static org.apache.geode.security.SecurityTestUtils.getProxyCaches;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import static org.apache.geode.test.dunit.Assert.assertTrue;
+import static org.apache.geode.test.dunit.Assert.fail;
+import static org.apache.geode.test.dunit.Invoke.invokeInEveryVM;
+import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
+import static org.apache.geode.test.dunit.Wait.waitForCriterion;
 
 import java.util.Collection;
 import java.util.HashMap;
diff --git 
a/geode-cq/src/test/java/org/apache/geode/security/ClientPostAuthorizationDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/security/ClientPostAuthorizationDUnitTest.java
index ad430d7..5cff625 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/security/ClientPostAuthorizationDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/security/ClientPostAuthorizationDUnitTest.java
@@ -14,8 +14,9 @@
  */
 package org.apache.geode.security;
 
-import static org.apache.geode.security.SecurityTestUtils.*;
-import static org.apache.geode.test.dunit.LogWriterUtils.*;
+import static org.apache.geode.security.SecurityTestUtils.closeCache;
+import static org.apache.geode.security.SecurityTestUtils.getLocatorPort;
+import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git 
a/geode-cq/src/test/java/org/apache/geode/security/MultiUserDurableCQAuthzDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/security/MultiUserDurableCQAuthzDUnitTest.java
index 8b29059..a669a1c 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/security/MultiUserDurableCQAuthzDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/security/MultiUserDurableCQAuthzDUnitTest.java
@@ -14,11 +14,17 @@
  */
 package org.apache.geode.security;
 
-import static org.apache.geode.internal.AvailablePort.*;
-import static org.apache.geode.security.SecurityTestUtils.*;
-import static org.apache.geode.test.dunit.Assert.*;
-import static org.apache.geode.test.dunit.Invoke.*;
-import static org.apache.geode.test.dunit.LogWriterUtils.*;
+import static org.apache.geode.security.SecurityTestUtils.NO_EXCEPTION;
+import static org.apache.geode.security.SecurityTestUtils.closeCache;
+import static org.apache.geode.security.SecurityTestUtils.concatProperties;
+import static 
org.apache.geode.security.SecurityTestUtils.createCacheClientForMultiUserMode;
+import static org.apache.geode.security.SecurityTestUtils.createProxyCache;
+import static org.apache.geode.security.SecurityTestUtils.getProxyCaches;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import static org.apache.geode.test.dunit.Assert.assertTrue;
+import static org.apache.geode.test.dunit.Assert.fail;
+import static org.apache.geode.test.dunit.Invoke.invokeInEveryVM;
+import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
 
 import java.util.HashMap;
 import java.util.Map;

-- 
To stop receiving notification emails like this one, please contact
[email protected].

Reply via email to