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 3dfe615 GEODE-2953: Expand wildcard imports in geode-core:test.cache30. (#1906) 3dfe615 is described below commit 3dfe6152b93fd7ba01efbd3f723f24254d13cf31 Author: Patrick Rhomberg <prhomb...@pivotal.io> AuthorDate: Fri May 4 09:47:21 2018 -0700 GEODE-2953: Expand wildcard imports in geode-core:test.cache30. (#1906) --- .../apache/geode/cache30/CacheCloseDUnitTest.java | 3 +- .../geode/cache30/CacheListenerTestCase.java | 6 ++- .../apache/geode/cache30/CacheLoaderTestCase.java | 6 ++- .../apache/geode/cache30/CacheMapTxnDUnitTest.java | 3 +- .../CacheRegionsReliablityStatsCheckDUnitTest.java | 5 ++- .../geode/cache30/CacheStatisticsDUnitTest.java | 5 ++- .../apache/geode/cache30/CacheWriterTestCase.java | 16 ++++++- .../geode/cache30/CacheXmlGeode10DUnitTest.java | 8 +++- .../org/apache/geode/cache30/CacheXmlTestCase.java | 6 ++- .../geode/cache30/CachedAllEventsDUnitTest.java | 2 +- .../apache/geode/cache30/CallbackArgDUnitTest.java | 2 +- .../cache30/CertifiableTestCacheListener.java | 6 ++- .../geode/cache30/ClearMultiVmCallBkDUnitTest.java | 3 +- .../geode/cache30/ClearMultiVmDUnitTest.java | 4 +- .../geode/cache30/ClientMembershipDUnitTest.java | 16 +++++-- .../cache30/ClientRegisterInterestDUnitTest.java | 8 +++- .../geode/cache30/ClientServerCCEDUnitTest.java | 8 +++- .../apache/geode/cache30/ClientServerTestCase.java | 4 +- .../cache30/ConcurrentLeaveDuringGIIDUnitTest.java | 3 +- ...stributedNoAckAsyncOverflowRegionDUnitTest.java | 4 +- .../DiskDistributedNoAckAsyncRegionDUnitTest.java | 9 ++-- .../apache/geode/cache30/DiskRegionTestImpl.java | 5 ++- .../geode/cache30/DistAckMapMethodsDUnitTest.java | 4 +- .../DistributedAckOverflowRegionCCEDUnitTest.java | 2 - ...ibutedAckOverflowRegionCCEOffHeapDUnitTest.java | 2 +- ...utedAckPersistentRegionCCEOffHeapDUnitTest.java | 2 +- .../cache30/DistributedAckRegionCCEDUnitTest.java | 10 +++-- .../DistributedAckRegionCCEOffHeapDUnitTest.java | 2 +- .../cache30/DistributedAckRegionDUnitTest.java | 5 ++- .../DistributedAckRegionOffHeapDUnitTest.java | 2 +- .../DistributedMulticastRegionDUnitTest.java | 12 ++++- .../DistributedNoAckRegionCCEDUnitTest.java | 7 ++- .../DistributedNoAckRegionCCEOffHeapDUnitTest.java | 2 +- .../cache30/DistributedNoAckRegionDUnitTest.java | 5 ++- .../DistributedNoAckRegionOffHeapDUnitTest.java | 2 +- .../geode/cache30/DynamicRegionDUnitTest.java | 3 +- .../geode/cache30/GlobalLockingDUnitTest.java | 4 +- .../geode/cache30/GlobalRegionCCEDUnitTest.java | 6 ++- .../cache30/GlobalRegionCCEOffHeapDUnitTest.java | 2 +- .../geode/cache30/GlobalRegionDUnitTest.java | 7 ++- .../cache30/GlobalRegionOffHeapDUnitTest.java | 2 +- .../cache30/LRUEvictionControllerDUnitTest.java | 6 ++- .../apache/geode/cache30/LocalRegionDUnitTest.java | 5 ++- .../cache30/MemLRUEvictionControllerDUnitTest.java | 4 +- .../geode/cache30/MultiVMRegionTestCase.java | 14 ++++-- .../OffHeapLRUEvictionControllerDUnitTest.java | 2 +- .../PartitionedRegionCompressionDUnitTest.java | 2 - .../geode/cache30/PartitionedRegionDUnitTest.java | 5 ++- ...rtitionedRegionMembershipListenerDUnitTest.java | 4 +- .../cache30/PartitionedRegionOffHeapDUnitTest.java | 2 +- .../org/apache/geode/cache30/ProxyDUnitTest.java | 4 +- .../cache30/PutAllCallBkRemoteVMDUnitTest.java | 3 +- .../cache30/PutAllCallBkSingleVMDUnitTest.java | 3 +- .../geode/cache30/PutAllMultiVmDUnitTest.java | 3 +- .../apache/geode/cache30/QueueMsgDUnitTest.java | 5 ++- .../apache/geode/cache30/ReconnectDUnitTest.java | 52 ++++++++++++++++++++-- .../cache30/ReconnectWithUDPSecurityDUnitTest.java | 2 +- .../cache30/ReconnectedCacheServerDUnitTest.java | 4 +- .../geode/cache30/RegionAttributesTestCase.java | 20 ++++++++- .../cache30/RegionMembershipListenerDUnitTest.java | 11 +++-- .../cache30/RegionReliabilityDistAckDUnitTest.java | 4 +- .../RegionReliabilityDistNoAckDUnitTest.java | 4 +- .../cache30/RegionReliabilityGlobalDUnitTest.java | 4 +- .../RegionReliabilityListenerDUnitTest.java | 6 ++- .../geode/cache30/RegionReliabilityTestCase.java | 8 +++- .../org/apache/geode/cache30/RegionTestCase.java | 8 +++- .../apache/geode/cache30/ReliabilityTestCase.java | 4 +- .../geode/cache30/RemoveAllMultiVmDUnitTest.java | 2 +- .../geode/cache30/RequiredRolesDUnitTest.java | 8 +++- .../geode/cache30/SearchAndLoadDUnitTest.java | 6 ++- .../org/apache/geode/cache30/SlowRecDUnitTest.java | 10 ++++- .../geode/cache30/TXDistributedDUnitTest.java | 10 ++++- .../org/apache/geode/cache30/TXOrderDUnitTest.java | 7 ++- .../geode/cache30/TXRestrictionsDUnitTest.java | 2 +- .../apache/geode/cache30/TestCacheCallback.java | 2 +- .../apache/geode/cache30/TestCacheListener.java | 9 +++- .../org/apache/geode/cache30/TestCacheLoader.java | 4 +- .../org/apache/geode/cache30/TestCacheWriter.java | 5 ++- .../java/org/apache/geode/cache30/TestHeapLRU.java | 7 ++- .../geode/cache30/TestTransactionListener.java | 3 +- 80 files changed, 354 insertions(+), 123 deletions(-) diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheCloseDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheCloseDUnitTest.java index b74bb1a..3aff0f8 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/CacheCloseDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheCloseDUnitTest.java @@ -14,7 +14,8 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.util.ArrayList; import java.util.Iterator; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheListenerTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheListenerTestCase.java index 23092d3..d313bb8 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/CacheListenerTestCase.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheListenerTestCase.java @@ -14,7 +14,11 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +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 org.junit.Test; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheLoaderTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheLoaderTestCase.java index 3235bcc..a67d15b 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/CacheLoaderTestCase.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheLoaderTestCase.java @@ -14,7 +14,11 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +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; import org.junit.Test; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheMapTxnDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheMapTxnDUnitTest.java index 1ac1e32..bdb7386 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/CacheMapTxnDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheMapTxnDUnitTest.java @@ -20,7 +20,8 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.util.Properties; import java.util.Set; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java index 9053df7..1749d6c 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java @@ -14,8 +14,9 @@ */ package org.apache.geode.cache30; -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.distributed.ConfigurationProperties.ROLES; +import static org.apache.geode.test.dunit.Assert.assertEquals; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheStatisticsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheStatisticsDUnitTest.java index d5e97d8..895a3fd 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/CacheStatisticsDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheStatisticsDUnitTest.java @@ -14,7 +14,10 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheWriterTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheWriterTestCase.java index 73f741b..e7f810f 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/CacheWriterTestCase.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheWriterTestCase.java @@ -14,11 +14,23 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +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; +import static org.junit.Assert.fail; import org.junit.Test; -import org.apache.geode.cache.*; +import org.apache.geode.cache.AttributesFactory; +import org.apache.geode.cache.CacheException; +import org.apache.geode.cache.CacheWriter; +import org.apache.geode.cache.CacheWriterException; +import org.apache.geode.cache.EntryEvent; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.RegionEvent; /** * An abstract class whose test methods test the functionality of {@link CacheWriter}s that are diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheXmlGeode10DUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheXmlGeode10DUnitTest.java index 89d0589..c189b9b 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/CacheXmlGeode10DUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheXmlGeode10DUnitTest.java @@ -14,8 +14,12 @@ */ package org.apache.geode.cache30; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.junit.Assert.*; +import static org.apache.geode.distributed.ConfigurationProperties.OFF_HEAP_MEMORY_SIZE; +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.util.List; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheXmlTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/CacheXmlTestCase.java index fcef23e..c21d3e1 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/CacheXmlTestCase.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheXmlTestCase.java @@ -14,8 +14,10 @@ */ package org.apache.geode.cache30; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.apache.geode.test.dunit.Assert.*; +import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE; +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.fail; import java.io.File; import java.io.FileWriter; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CachedAllEventsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/CachedAllEventsDUnitTest.java index 172e354..b638987 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/CachedAllEventsDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/CachedAllEventsDUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.cache30; -import static org.apache.geode.test.dunit.Assert.*; +import static org.apache.geode.test.dunit.Assert.assertEquals; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CallbackArgDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/CallbackArgDUnitTest.java index e45f251..75e3bff 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/CallbackArgDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/CallbackArgDUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.Arrays; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CertifiableTestCacheListener.java b/geode-core/src/test/java/org/apache/geode/cache30/CertifiableTestCacheListener.java index 5c283fc..0da9ec7 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/CertifiableTestCacheListener.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/CertifiableTestCacheListener.java @@ -19,7 +19,11 @@ */ package org.apache.geode.cache30; -import java.util.*; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Properties; +import java.util.Set; import org.apache.geode.LogWriter; import org.apache.geode.cache.EntryEvent; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClearMultiVmCallBkDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ClearMultiVmCallBkDUnitTest.java index a06b87c..362689b 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/ClearMultiVmCallBkDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/ClearMultiVmCallBkDUnitTest.java @@ -20,7 +20,8 @@ */ package org.apache.geode.cache30; -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.fail; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClearMultiVmDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ClearMultiVmDUnitTest.java index 4d00134..6e51f5e 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/ClearMultiVmDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/ClearMultiVmDUnitTest.java @@ -20,7 +20,9 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.fail; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java index 9758153..de3cfcd 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java @@ -14,8 +14,15 @@ */ package org.apache.geode.cache30; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.apache.geode.test.dunit.Assert.*; +import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_NETWORK_PARTITION_DETECTION; +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.IOException; import java.net.InetAddress; @@ -46,7 +53,10 @@ import org.apache.geode.cache.Scope; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.client.Pool; import org.apache.geode.cache.client.PoolManager; -import org.apache.geode.distributed.*; +import org.apache.geode.distributed.ConfigurationProperties; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.DistributedSystem; +import org.apache.geode.distributed.DurableClientAttributes; import org.apache.geode.distributed.internal.ServerLocation; import org.apache.geode.internal.cache.tier.InternalClientMembership; import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestDUnitTest.java index 1692a3d..f35a552 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestDUnitTest.java @@ -14,8 +14,12 @@ */ package org.apache.geode.cache30; -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.IOException; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java index 62a96ae..eeaf0f3 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java @@ -15,8 +15,12 @@ package org.apache.geode.cache30; import static java.util.concurrent.TimeUnit.SECONDS; -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.LOG_LEVEL; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.Collection; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientServerTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/ClientServerTestCase.java index 60abfcc..4164e26 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/ClientServerTestCase.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/ClientServerTestCase.java @@ -14,7 +14,9 @@ */ package org.apache.geode.cache30; -import static org.apache.geode.test.dunit.Assert.*; +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.fail; import java.io.IOException; import java.util.Iterator; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ConcurrentLeaveDuringGIIDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ConcurrentLeaveDuringGIIDUnitTest.java index 56d05c9..9d8d39e 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/ConcurrentLeaveDuringGIIDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/ConcurrentLeaveDuringGIIDUnitTest.java @@ -14,7 +14,8 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import org.junit.Ignore; import org.junit.Test; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java index e0fc412..fb935cc 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java @@ -14,12 +14,10 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; - import org.junit.experimental.categories.Category; -import org.apache.geode.cache.*; import org.apache.geode.cache.AttributesFactory; +import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.EvictionAction; import org.apache.geode.cache.EvictionAttributes; import org.apache.geode.cache.RegionAttributes; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java index a915115..aa39e4c 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncRegionDUnitTest.java @@ -14,13 +14,14 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; - -import java.io.*; +import java.io.File; import org.junit.experimental.categories.Category; -import org.apache.geode.cache.*; +import org.apache.geode.cache.AttributesFactory; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.Scope; import org.apache.geode.internal.OSProcess; import org.apache.geode.test.junit.categories.DistributedTest; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DiskRegionTestImpl.java b/geode-core/src/test/java/org/apache/geode/cache30/DiskRegionTestImpl.java index d29dfec..05389b7 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/DiskRegionTestImpl.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/DiskRegionTestImpl.java @@ -14,7 +14,10 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import java.io.Serializable; import java.util.Arrays; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistAckMapMethodsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistAckMapMethodsDUnitTest.java index 749161c..18cef86 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/DistAckMapMethodsDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/DistAckMapMethodsDUnitTest.java @@ -20,7 +20,9 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; import java.util.HashSet; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEDUnitTest.java index b93115f..7c74a949 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEDUnitTest.java @@ -14,8 +14,6 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; - import org.junit.experimental.categories.Category; import org.apache.geode.cache.AttributesFactory; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java index 4d2d594..831842f 100755 --- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.cache30; -import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.OFF_HEAP_MEMORY_SIZE; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java index 8967896..e4cf009 100755 --- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.cache30; -import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.OFF_HEAP_MEMORY_SIZE; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java index f73e8d8..5f77233 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java @@ -15,9 +15,13 @@ package org.apache.geode.cache30; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.junit.Assert.*; -import static org.junit.Assume.*; +import static org.apache.geode.distributed.ConfigurationProperties.CONSERVE_SOCKETS; +import static org.apache.geode.distributed.ConfigurationProperties.DISTRIBUTED_SYSTEM_ID; +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 static org.junit.Assume.assumeTrue; import java.net.UnknownHostException; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java index 212a8cf..246e5b5 100755 --- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.cache30; -import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.OFF_HEAP_MEMORY_SIZE; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionDUnitTest.java index 8a99dae..31f9386 100755 --- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionDUnitTest.java @@ -14,8 +14,9 @@ */ package org.apache.geode.cache30; -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.STATISTIC_SAMPLING_ENABLED; +import static org.junit.Assert.fail; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionOffHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionOffHeapDUnitTest.java index 8680f68..4a58977 100755 --- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionOffHeapDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionOffHeapDUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.cache30; -import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.OFF_HEAP_MEMORY_SIZE; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedMulticastRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedMulticastRegionDUnitTest.java index 736c326..eaf32f9 100755 --- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedMulticastRegionDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedMulticastRegionDUnitTest.java @@ -14,8 +14,16 @@ */ package org.apache.geode.cache30; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.junit.Assert.*; +import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_TIME_STATISTICS; +import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS; +import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL; +import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT; +import static org.apache.geode.distributed.ConfigurationProperties.MCAST_TTL; +import static org.apache.geode.distributed.ConfigurationProperties.NAME; +import static org.apache.geode.distributed.ConfigurationProperties.STATISTIC_ARCHIVE_FILE; +import static org.apache.geode.distributed.ConfigurationProperties.STATISTIC_SAMPLING_ENABLED; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.File; import java.io.IOException; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionCCEDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionCCEDUnitTest.java index 0928128..05587c3 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionCCEDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionCCEDUnitTest.java @@ -14,8 +14,11 @@ */ package org.apache.geode.cache30; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.junit.Assert.*; +import static org.apache.geode.distributed.ConfigurationProperties.CONSERVE_SOCKETS; +import static org.apache.geode.distributed.ConfigurationProperties.DISTRIBUTED_SYSTEM_ID; +import static org.apache.geode.distributed.ConfigurationProperties.SOCKET_BUFFER_SIZE; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; import java.util.Map; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java index 7f7ca81..763d98b 100755 --- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.cache30; -import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.OFF_HEAP_MEMORY_SIZE; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionDUnitTest.java index 543474c..320751c 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionDUnitTest.java @@ -14,7 +14,10 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; +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.Set; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionOffHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionOffHeapDUnitTest.java index ce26e12..0b929dd 100755 --- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionOffHeapDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedNoAckRegionOffHeapDUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.cache30; -import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.OFF_HEAP_MEMORY_SIZE; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DynamicRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DynamicRegionDUnitTest.java index 370fbf2..15b28cb 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/DynamicRegionDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/DynamicRegionDUnitTest.java @@ -14,7 +14,8 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; import java.io.File; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java index 48a944e..69be5ee 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java @@ -14,7 +14,9 @@ */ package org.apache.geode.cache30; -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.concurrent.locks.Lock; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEDUnitTest.java index 84e3a2b..0082397 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEDUnitTest.java @@ -15,8 +15,10 @@ package org.apache.geode.cache30; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.junit.Assert.*; +import static org.apache.geode.distributed.ConfigurationProperties.CONSERVE_SOCKETS; +import static org.apache.geode.distributed.ConfigurationProperties.DISTRIBUTED_SYSTEM_ID; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEOffHeapDUnitTest.java index 1f9f84a..8b17e3b 100755 --- a/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEOffHeapDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEOffHeapDUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.cache30; -import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.OFF_HEAP_MEMORY_SIZE; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionDUnitTest.java index 1234c70..42a9572 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionDUnitTest.java @@ -14,7 +14,12 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +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; +import static org.junit.Assert.fail; import java.util.Random; import java.util.concurrent.TimeUnit; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionOffHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionOffHeapDUnitTest.java index 91117c2..c0e40d9 100755 --- a/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionOffHeapDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionOffHeapDUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.cache30; -import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.OFF_HEAP_MEMORY_SIZE; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/LRUEvictionControllerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/LRUEvictionControllerDUnitTest.java index fb73c17..6937faa 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/LRUEvictionControllerDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/LRUEvictionControllerDUnitTest.java @@ -14,7 +14,11 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +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-core/src/test/java/org/apache/geode/cache30/LocalRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/LocalRegionDUnitTest.java index a314e72..4b10291 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/LocalRegionDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/LocalRegionDUnitTest.java @@ -14,7 +14,10 @@ */ package org.apache.geode.cache30; -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 org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/MemLRUEvictionControllerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/MemLRUEvictionControllerDUnitTest.java index 262598f..70ae73b 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/MemLRUEvictionControllerDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/MemLRUEvictionControllerDUnitTest.java @@ -14,7 +14,9 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import java.util.Properties; import java.util.Random; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java index 6b44bde..962ef34 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java @@ -14,9 +14,17 @@ */ package org.apache.geode.cache30; -import static org.apache.geode.internal.lang.ThrowableUtils.*; -import static org.apache.geode.test.dunit.Assert.*; -import static org.junit.Assume.*; +import static org.apache.geode.internal.lang.ThrowableUtils.hasCauseMessage; +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.assertNotSame; +import static org.apache.geode.test.dunit.Assert.assertNull; +import static org.apache.geode.test.dunit.Assert.assertSame; +import static org.apache.geode.test.dunit.Assert.assertTrue; +import static org.apache.geode.test.dunit.Assert.fail; +import static org.junit.Assume.assumeFalse; +import static org.junit.Assume.assumeTrue; import java.io.ByteArrayInputStream; import java.io.DataInput; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/OffHeapLRUEvictionControllerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/OffHeapLRUEvictionControllerDUnitTest.java index e1dd9aa..4e17be7 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/OffHeapLRUEvictionControllerDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/OffHeapLRUEvictionControllerDUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.cache30; -import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.OFF_HEAP_MEMORY_SIZE; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionCompressionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionCompressionDUnitTest.java index 77f6e7d..78b3dd8 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionCompressionDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionCompressionDUnitTest.java @@ -14,8 +14,6 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; - import org.junit.experimental.categories.Category; import org.apache.geode.cache.AttributesFactory; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionDUnitTest.java index b02ffe6..7de7fa6 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionDUnitTest.java @@ -15,7 +15,10 @@ package org.apache.geode.cache30; import static org.apache.geode.distributed.ConfigurationProperties.SERIALIZABLE_OBJECT_FILTER; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.Serializable; import java.util.Collection; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionMembershipListenerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionMembershipListenerDUnitTest.java index 8521cd9..93006f7 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionMembershipListenerDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionMembershipListenerDUnitTest.java @@ -18,7 +18,8 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.util.List; @@ -30,7 +31,6 @@ import org.apache.geode.cache.CacheListener; import org.apache.geode.cache.PartitionAttributesFactory; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionAttributes; -import org.apache.geode.cache30.RegionMembershipListenerDUnitTest.MyRML; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.test.dunit.VM; import org.apache.geode.test.junit.categories.DistributedTest; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionOffHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionOffHeapDUnitTest.java index ab3bae6..0a8f0cd 100755 --- a/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionOffHeapDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/PartitionedRegionOffHeapDUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.cache30; -import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.OFF_HEAP_MEMORY_SIZE; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ProxyDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ProxyDUnitTest.java index 07ed2cb..e580208 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/ProxyDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/ProxyDUnitTest.java @@ -14,7 +14,9 @@ */ package org.apache.geode.cache30; -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.HashMap; import java.util.Map; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/PutAllCallBkRemoteVMDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/PutAllCallBkRemoteVMDUnitTest.java index 3739887..71741e9 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/PutAllCallBkRemoteVMDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/PutAllCallBkRemoteVMDUnitTest.java @@ -20,7 +20,8 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; import java.util.HashMap; import java.util.Map; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/PutAllCallBkSingleVMDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/PutAllCallBkSingleVMDUnitTest.java index 0497da6..9cd9f73 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/PutAllCallBkSingleVMDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/PutAllCallBkSingleVMDUnitTest.java @@ -20,7 +20,8 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; import java.util.HashMap; import java.util.Map; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/PutAllMultiVmDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/PutAllMultiVmDUnitTest.java index 2aedb56..b9dbf61 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/PutAllMultiVmDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/PutAllMultiVmDUnitTest.java @@ -20,7 +20,8 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; import java.util.HashMap; import java.util.Map; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/QueueMsgDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/QueueMsgDUnitTest.java index 6c97040..1bdc509 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/QueueMsgDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/QueueMsgDUnitTest.java @@ -14,8 +14,9 @@ */ package org.apache.geode.cache30; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.junit.Assert.*; +import static org.apache.geode.distributed.ConfigurationProperties.ROLES; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; import java.util.List; import java.util.Map; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java index 9f9e62d..5bd916d 100755 --- a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java @@ -14,9 +14,27 @@ */ package org.apache.geode.cache30; -import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE; +import static org.apache.geode.distributed.ConfigurationProperties.DISABLE_AUTO_RECONNECT; +import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION; +import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_NETWORK_PARTITION_DETECTION; +import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS; +import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL; +import static org.apache.geode.distributed.ConfigurationProperties.MAX_NUM_RECONNECT_TRIES; +import static org.apache.geode.distributed.ConfigurationProperties.MAX_WAIT_TIME_RECONNECT; +import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT; +import static org.apache.geode.distributed.ConfigurationProperties.MEMBER_TIMEOUT; +import static org.apache.geode.distributed.ConfigurationProperties.ROLES; +import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER; +import static org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR; import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.*; +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; +import static org.junit.Assert.fail; import java.io.File; import java.io.FileWriter; @@ -34,7 +52,21 @@ import org.junit.experimental.categories.Category; import org.apache.geode.CancelException; import org.apache.geode.SystemFailure; -import org.apache.geode.cache.*; +import org.apache.geode.cache.AttributesFactory; +import org.apache.geode.cache.CacheException; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.Declarable; +import org.apache.geode.cache.LossAction; +import org.apache.geode.cache.MembershipAttributes; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.RegionDestroyedException; +import org.apache.geode.cache.RegionEvent; +import org.apache.geode.cache.RegionExistsException; +import org.apache.geode.cache.ResumptionAction; +import org.apache.geode.cache.Scope; +import org.apache.geode.cache.TimeoutException; import org.apache.geode.cache.util.CacheListenerAdapter; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.distributed.DistributedSystem; @@ -52,7 +84,19 @@ import org.apache.geode.internal.AvailablePortHelper; import org.apache.geode.internal.cache.GemFireCacheImpl; import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator; -import org.apache.geode.test.dunit.*; +import org.apache.geode.test.dunit.Assert; +import org.apache.geode.test.dunit.AsyncInvocation; +import org.apache.geode.test.dunit.DistributedTestUtils; +import org.apache.geode.test.dunit.Host; +import org.apache.geode.test.dunit.IgnoredException; +import org.apache.geode.test.dunit.Invoke; +import org.apache.geode.test.dunit.LogWriterUtils; +import org.apache.geode.test.dunit.SerializableCallable; +import org.apache.geode.test.dunit.SerializableRunnable; +import org.apache.geode.test.dunit.ThreadUtils; +import org.apache.geode.test.dunit.VM; +import org.apache.geode.test.dunit.Wait; +import org.apache.geode.test.dunit.WaitCriterion; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; import org.apache.geode.test.junit.categories.DistributedTest; import org.apache.geode.test.junit.categories.MembershipTest; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectWithUDPSecurityDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ReconnectWithUDPSecurityDUnitTest.java index aa39086..d5e9c3f 100755 --- a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectWithUDPSecurityDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/ReconnectWithUDPSecurityDUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.cache30; -import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_UDP_DHALGO; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectedCacheServerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ReconnectedCacheServerDUnitTest.java index 6ba098f..ed59d35 100755 --- a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectedCacheServerDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/ReconnectedCacheServerDUnitTest.java @@ -14,7 +14,9 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionAttributesTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/RegionAttributesTestCase.java index 4ac686a..88804ef 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/RegionAttributesTestCase.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/RegionAttributesTestCase.java @@ -14,7 +14,10 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.IOException; import java.io.OutputStream; @@ -23,8 +26,21 @@ import java.util.Properties; import org.junit.Test; -import org.apache.geode.cache.*; +import org.apache.geode.cache.AttributesFactory; +import org.apache.geode.cache.AttributesMutator; +import org.apache.geode.cache.CacheException; +import org.apache.geode.cache.CacheListener; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheWriter; +import org.apache.geode.cache.CustomExpiry; +import org.apache.geode.cache.Declarable; +import org.apache.geode.cache.ExpirationAction; +import org.apache.geode.cache.ExpirationAttributes; +import org.apache.geode.cache.LoaderHelper; +import org.apache.geode.cache.Region; import org.apache.geode.cache.Region.Entry; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.Scope; /** * An abstract class whose test methods test the functionality of a {@link RegionAttributes}, diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java index 58d05a2..7297c67 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/RegionMembershipListenerDUnitTest.java @@ -14,9 +14,13 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Properties; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -31,7 +35,8 @@ import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.RegionEvent; import org.apache.geode.cache.RegionMembershipListener; import org.apache.geode.cache.util.RegionMembershipListenerAdapter; -import org.apache.geode.distributed.*; +import org.apache.geode.distributed.ConfigurationProperties; +import org.apache.geode.distributed.DistributedMember; import org.apache.geode.distributed.internal.DistributionAdvisor.Profile; import org.apache.geode.distributed.internal.membership.gms.MembershipManagerHelper; import org.apache.geode.internal.cache.CacheDistributionAdvisor.CacheProfile; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityDistAckDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityDistAckDUnitTest.java index c0c6683..c63f29c 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityDistAckDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityDistAckDUnitTest.java @@ -14,11 +14,9 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; - import org.junit.experimental.categories.Category; -import org.apache.geode.cache.*; +import org.apache.geode.cache.Scope; import org.apache.geode.test.junit.categories.DistributedTest; /** diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityDistNoAckDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityDistNoAckDUnitTest.java index ecc1292..a3b7c24 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityDistNoAckDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityDistNoAckDUnitTest.java @@ -14,11 +14,9 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; - import org.junit.experimental.categories.Category; -import org.apache.geode.cache.*; +import org.apache.geode.cache.Scope; import org.apache.geode.test.junit.categories.DistributedTest; /** diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityGlobalDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityGlobalDUnitTest.java index 41ae046..5d43a57 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityGlobalDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityGlobalDUnitTest.java @@ -14,11 +14,9 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; - import org.junit.experimental.categories.Category; -import org.apache.geode.cache.*; +import org.apache.geode.cache.Scope; import org.apache.geode.test.junit.categories.DistributedTest; /** diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityListenerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityListenerDUnitTest.java index 3aba62d..6458c26 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityListenerDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityListenerDUnitTest.java @@ -14,8 +14,10 @@ */ package org.apache.geode.cache30; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.junit.Assert.*; +import static org.apache.geode.distributed.ConfigurationProperties.ROLES; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import java.util.Properties; import java.util.Set; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityTestCase.java index ffb544b..8c1abc8 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityTestCase.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityTestCase.java @@ -14,8 +14,12 @@ */ package org.apache.geode.cache30; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.junit.Assert.*; +import static org.apache.geode.distributed.ConfigurationProperties.ROLES; +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.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java index 588dda3..dc96626 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java @@ -14,7 +14,13 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.File; import java.io.FileInputStream; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ReliabilityTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/ReliabilityTestCase.java index 97c9424..eaea23b 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/ReliabilityTestCase.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/ReliabilityTestCase.java @@ -14,7 +14,9 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import java.util.Iterator; import java.util.Set; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RemoveAllMultiVmDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/RemoveAllMultiVmDUnitTest.java index 93f9c03..c447db0 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/RemoveAllMultiVmDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/RemoveAllMultiVmDUnitTest.java @@ -20,7 +20,7 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.util.Arrays; import java.util.Collections; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RequiredRolesDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/RequiredRolesDUnitTest.java index e39b7fc..6132644 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/RequiredRolesDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/RequiredRolesDUnitTest.java @@ -14,8 +14,12 @@ */ package org.apache.geode.cache30; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.junit.Assert.*; +import static org.apache.geode.distributed.ConfigurationProperties.ROLES; +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.util.HashSet; import java.util.Iterator; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/SearchAndLoadDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/SearchAndLoadDUnitTest.java index eb45a85..7f5b161 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/SearchAndLoadDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/SearchAndLoadDUnitTest.java @@ -14,7 +14,11 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/SlowRecDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/SlowRecDUnitTest.java index 41eb60e..054feba 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/SlowRecDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/SlowRecDUnitTest.java @@ -14,8 +14,14 @@ */ package org.apache.geode.cache30; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.junit.Assert.*; +import static org.apache.geode.distributed.ConfigurationProperties.ASYNC_DISTRIBUTION_TIMEOUT; +import static org.apache.geode.distributed.ConfigurationProperties.ASYNC_MAX_QUEUE_SIZE; +import static org.apache.geode.distributed.ConfigurationProperties.ASYNC_QUEUE_TIMEOUT; +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.Serializable; import java.util.Iterator; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TXDistributedDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/TXDistributedDUnitTest.java index b636580..7de4e43 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/TXDistributedDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/TXDistributedDUnitTest.java @@ -24,8 +24,14 @@ */ package org.apache.geode.cache30; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.junit.Assert.*; +import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_NETWORK_PARTITION_DETECTION; +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.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.IOException; import java.io.Serializable; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TXOrderDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/TXOrderDUnitTest.java index 4862ff9..9c088e3 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/TXOrderDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/TXOrderDUnitTest.java @@ -14,7 +14,12 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +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; +import static org.junit.Assert.fail; import java.util.ArrayList; import java.util.Arrays; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TXRestrictionsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/TXRestrictionsDUnitTest.java index a9d9149..6721ff9 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/TXRestrictionsDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/TXRestrictionsDUnitTest.java @@ -24,7 +24,7 @@ */ package org.apache.geode.cache30; -import static org.junit.Assert.*; +import static org.junit.Assert.fail; import java.io.File; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheCallback.java b/geode-core/src/test/java/org/apache/geode/cache30/TestCacheCallback.java index 4d014b1..c9cb4e8 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheCallback.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/TestCacheCallback.java @@ -14,7 +14,7 @@ */ package org.apache.geode.cache30; -import org.apache.geode.cache.*; +import org.apache.geode.cache.CacheCallback; import org.apache.geode.test.dunit.Wait; import org.apache.geode.test.dunit.WaitCriterion; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheListener.java b/geode-core/src/test/java/org/apache/geode/cache30/TestCacheListener.java index ee9299f..282a969 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheListener.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/TestCacheListener.java @@ -14,10 +14,15 @@ */ package org.apache.geode.cache30; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; import org.apache.geode.SystemFailure; -import org.apache.geode.cache.*; +import org.apache.geode.cache.CacheEvent; +import org.apache.geode.cache.CacheListener; +import org.apache.geode.cache.EntryEvent; +import org.apache.geode.cache.RegionEvent; /** * A <code>CacheListener</code> used in testing. Its callback methods are implemented to thrown diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheLoader.java b/geode-core/src/test/java/org/apache/geode/cache30/TestCacheLoader.java index 8f91515..e7634ea 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheLoader.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/TestCacheLoader.java @@ -14,7 +14,9 @@ */ package org.apache.geode.cache30; -import org.apache.geode.cache.*; +import org.apache.geode.cache.CacheLoader; +import org.apache.geode.cache.CacheLoaderException; +import org.apache.geode.cache.LoaderHelper; /** * A <code>CacheLoader</code> used in testing. Users should override the "2" method. diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheWriter.java b/geode-core/src/test/java/org/apache/geode/cache30/TestCacheWriter.java index 5375689..3b0be59 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheWriter.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/TestCacheWriter.java @@ -14,7 +14,10 @@ */ package org.apache.geode.cache30; -import org.apache.geode.cache.*; +import org.apache.geode.cache.CacheWriter; +import org.apache.geode.cache.CacheWriterException; +import org.apache.geode.cache.EntryEvent; +import org.apache.geode.cache.RegionEvent; /** * A <code>CacheWriter</code> used in testing. Its callback methods are implemented to thrown diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TestHeapLRU.java b/geode-core/src/test/java/org/apache/geode/cache30/TestHeapLRU.java index 9e11200..a4de6e3 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/TestHeapLRU.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/TestHeapLRU.java @@ -14,7 +14,12 @@ */ package org.apache.geode.cache30; -import org.apache.geode.cache.*; +import org.apache.geode.cache.AttributesFactory; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.EvictionAction; +import org.apache.geode.cache.EvictionAttributes; +import org.apache.geode.cache.Region; import org.apache.geode.distributed.DistributedSystem; import org.apache.geode.internal.logging.LoggingThreadGroup; diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TestTransactionListener.java b/geode-core/src/test/java/org/apache/geode/cache30/TestTransactionListener.java index d29cb3c..e7f7c8f 100644 --- a/geode-core/src/test/java/org/apache/geode/cache30/TestTransactionListener.java +++ b/geode-core/src/test/java/org/apache/geode/cache30/TestTransactionListener.java @@ -15,7 +15,8 @@ package org.apache.geode.cache30; import org.apache.geode.SystemFailure; -import org.apache.geode.cache.*; +import org.apache.geode.cache.TransactionEvent; +import org.apache.geode.cache.TransactionListener; /** * A <code>TransactionListener</code> used in testing. Its callback methods are implemented to throw -- To stop receiving notification emails like this one, please contact prhomb...@apache.org.