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 b357d37 GEODE-2953: Expand wildcard imports in geode-core:test.distributed. (#1905) b357d37 is described below commit b357d37b8e76062549aa988668655bfbe8381a09 Author: Patrick Rhomberg <prhomb...@pivotal.io> AuthorDate: Fri May 4 09:44:02 2018 -0700 GEODE-2953: Expand wildcard imports in geode-core:test.distributed. (#1905) --- .../distributed/DistributedMemberDUnitTest.java | 21 ++++++++++++-- .../distributed/DistributedSystemDUnitTest.java | 26 ++++++++++++++---- .../DistributedSystemIntegrationJUnitTest.java | 2 +- .../distributed/DistributedSystemJUnitTest.java | 2 +- .../geode/distributed/HostedLocatorsDUnitTest.java | 5 +++- .../apache/geode/distributed/RoleDUnitTest.java | 7 +++-- .../geode/distributed/SystemAdminDUnitTest.java | 4 ++- .../AtomicLongWithTerminalStateJUnitTest.java | 2 +- .../geode/distributed/internal/DateMessage.java | 9 ++++-- .../internal/DistributionAdvisorDUnitTest.java | 2 +- .../org/apache/geode/distributed/internal/LDM.java | 2 +- .../LocatorLoadSnapshotIntegrationTest.java | 3 +- .../internal/LocatorLoadSnapshotJUnitTest.java | 6 +++- .../internal/ProductUseLogDUnitTest.java | 5 ++-- .../internal/ProductUseLogJUnitTest.java | 2 +- .../internal/ServerLocatorJUnitTest.java | 2 +- .../internal/StartupMessageDataJUnitTest.java | 5 +++- .../deadlock/DeadlockDetectorIntegrationTest.java | 2 +- .../internal/deadlock/DeadlockDetectorTest.java | 3 +- .../deadlock/DependencyGraphJUnitTest.java | 2 +- .../deadlock/UnsafeThreadLocalJUnitTest.java | 2 +- .../internal/locks/DLockGrantorHelper.java | 2 +- .../locks/DLockReentrantLockJUnitTest.java | 6 +++- .../internal/membership/NetViewJUnitTest.java | 5 +++- .../membership/gms/GMSMemberJUnitTest.java | 9 ++++-- .../GMSAuthenticatorWithAuthenticatorTest.java | 6 ++-- .../GMSAuthenticatorWithSecurityManagerTest.java | 9 ++++-- .../gms/fd/GMSHealthMonitorJUnitTest.java | 32 ++++++++++++++++++---- .../gms/membership/StatRecorderJUnitTest.java | 6 +++- .../gms/messenger/GMSQuorumCheckerJUnitTest.java | 7 +++-- .../gms/messenger/JGroupsMessengerJUnitTest.java | 29 +++++++++++++++++--- .../gms/mgr/GMSMembershipManagerJUnitTest.java | 23 ++++++++++++++-- .../streaming/StreamingOperationManyDUnitTest.java | 2 +- .../streaming/StreamingOperationOneDUnitTest.java | 2 +- .../TcpServerBackwardCompatDUnitTest.java | 6 ++-- .../geode/disttx/CacheMapDistTXDUnitTest.java | 4 +-- .../apache/geode/disttx/DistTXDebugDUnitTest.java | 3 +- .../org/apache/geode/disttx/DistTXJUnitTest.java | 5 ++-- .../geode/disttx/DistTXManagerImplJUnitTest.java | 5 ++-- .../apache/geode/disttx/DistTXOrderDUnitTest.java | 2 +- .../disttx/DistTXPersistentDebugDUnitTest.java | 2 +- .../geode/disttx/DistTXRestrictionsDUnitTest.java | 2 +- .../geode/disttx/DistTXWithDeltaDUnitTest.java | 2 +- .../apache/geode/disttx/DistTXWriterJUnitTest.java | 4 +-- .../geode/disttx/DistTXWriterOOMEJUnitTest.java | 4 +-- .../disttx/DistributedTransactionDUnitTest.java | 6 +++- .../org/apache/geode/disttx/PRDistTXDUnitTest.java | 2 +- .../org/apache/geode/disttx/PRDistTXJUnitTest.java | 4 +-- .../disttx/PRDistTXWithVersionsDUnitTest.java | 2 +- ...istentPartitionedRegionWithDistTXDUnitTest.java | 2 +- 50 files changed, 225 insertions(+), 82 deletions(-) diff --git a/geode-core/src/test/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java index b851ec5..d39082b 100755 --- a/geode-core/src/test/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java @@ -14,12 +14,27 @@ */ package org.apache.geode.distributed; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.apache.geode.test.dunit.Assert.*; +import static org.apache.geode.distributed.ConfigurationProperties.GROUPS; +import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS; +import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT; +import static org.apache.geode.distributed.ConfigurationProperties.NAME; +import static org.apache.geode.distributed.ConfigurationProperties.ROLES; +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.net.InetAddress; import java.net.UnknownHostException; -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Properties; +import java.util.Set; import java.util.concurrent.TimeUnit; import org.awaitility.Awaitility; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemDUnitTest.java index c30b33b..812a32e 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemDUnitTest.java @@ -16,16 +16,30 @@ package org.apache.geode.distributed; import static java.lang.Integer.parseInt; import static java.net.NetworkInterface.getNetworkInterfaces; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.apache.geode.distributed.internal.ClusterDistributionManager.*; -import static org.apache.geode.distributed.internal.DistributionConfig.*; -import static org.apache.geode.internal.AvailablePort.*; -import static org.apache.geode.internal.AvailablePortHelper.*; +import static org.apache.geode.distributed.ConfigurationProperties.ACK_WAIT_THRESHOLD; +import static org.apache.geode.distributed.ConfigurationProperties.BIND_ADDRESS; +import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE; +import static org.apache.geode.distributed.ConfigurationProperties.DISABLE_TCP; +import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS; +import static org.apache.geode.distributed.ConfigurationProperties.MCAST_ADDRESS; +import static org.apache.geode.distributed.ConfigurationProperties.MCAST_FLOW_CONTROL; +import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT; +import static org.apache.geode.distributed.ConfigurationProperties.MEMBERSHIP_PORT_RANGE; +import static org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR; +import static org.apache.geode.distributed.ConfigurationProperties.TCP_PORT; +import static org.apache.geode.distributed.internal.ClusterDistributionManager.NORMAL_DM_TYPE; +import static org.apache.geode.distributed.internal.ClusterDistributionManager.SERIAL_EXECUTOR; +import static org.apache.geode.distributed.internal.DistributionConfig.DEFAULT_ACK_WAIT_THRESHOLD; +import static org.apache.geode.internal.AvailablePort.MULTICAST; +import static org.apache.geode.internal.AvailablePort.SOCKET; +import static org.apache.geode.internal.AvailablePort.getRandomAvailablePort; +import static org.apache.geode.internal.AvailablePortHelper.getRandomAvailableTCPPortRange; import static org.apache.geode.internal.net.SocketCreator.getLocalHost; import static org.apache.geode.test.dunit.DistributedTestUtils.getDUnitLocatorPort; import static org.apache.geode.test.dunit.Host.getHost; import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter; -import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.net.Inet4Address; import java.net.Inet6Address; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemIntegrationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemIntegrationJUnitTest.java index 5957471..badd4df 100755 --- a/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemIntegrationJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemIntegrationJUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.distributed; -import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; import java.io.File; import java.io.FileWriter; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java index a9178e8..c623147 100755 --- a/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.distributed; -import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Rule; import org.junit.Test; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/HostedLocatorsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/HostedLocatorsDUnitTest.java index ae64992..cdf7871 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/HostedLocatorsDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/HostedLocatorsDUnitTest.java @@ -16,7 +16,10 @@ package org.apache.geode.distributed; import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT; import static org.apache.geode.internal.AvailablePortHelper.getRandomAvailableTCPPorts; -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.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.Host.getHost; import java.io.File; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/RoleDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/RoleDUnitTest.java index ecaec26..beb6b47 100755 --- a/geode-core/src/test/java/org/apache/geode/distributed/RoleDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/RoleDUnitTest.java @@ -14,8 +14,11 @@ */ package org.apache.geode.distributed; -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.LOG_LEVEL; +import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT; +import static org.apache.geode.distributed.ConfigurationProperties.ROLES; +import static org.junit.Assert.assertEquals; import java.util.Iterator; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/SystemAdminDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/SystemAdminDUnitTest.java index bef53c9..fb7960d 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/SystemAdminDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/SystemAdminDUnitTest.java @@ -14,7 +14,9 @@ */ package org.apache.geode.distributed; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.BufferedReader; import java.io.File; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalStateJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalStateJUnitTest.java index 98cb4ee..68d34f3 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalStateJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/AtomicLongWithTerminalStateJUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.distributed.internal; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DateMessage.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DateMessage.java index a72c4a3..142822b 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/DateMessage.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DateMessage.java @@ -14,9 +14,12 @@ */ package org.apache.geode.distributed.internal; -import java.io.*; -import java.text.*; -import java.util.*; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; import org.apache.geode.DataSerializer; import org.apache.geode.internal.Assert; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java index bc33dcc..d773537 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.distributed.internal; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.HashSet; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/LDM.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/LDM.java index 35b5b31..30686e5 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/LDM.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/LDM.java @@ -14,7 +14,7 @@ */ package org.apache.geode.distributed.internal; -import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotIntegrationTest.java index b4bfeb3..3df8c79 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotIntegrationTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotIntegrationTest.java @@ -14,7 +14,8 @@ */ package org.apache.geode.distributed.internal; -import static org.junit.Assert.*; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.util.Collections; import java.util.HashMap; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java index 9eb338b..0c15d4f 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotJUnitTest.java @@ -14,7 +14,11 @@ */ package org.apache.geode.distributed.internal; -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 java.util.Arrays; import java.util.Collections; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogDUnitTest.java index c2e843d..c1ba4ab 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogDUnitTest.java @@ -14,8 +14,9 @@ */ package org.apache.geode.distributed.internal; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.junit.Assert.*; +import static org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR; +import static org.apache.geode.distributed.ConfigurationProperties.USE_CLUSTER_CONFIGURATION; +import static org.junit.Assert.assertTrue; import java.io.BufferedReader; import java.io.File; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java index 0282271..5b80788 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.distributed.internal; -import static org.junit.Assert.*; +import static org.junit.Assert.assertTrue; import java.io.BufferedReader; import java.io.File; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java index 0791163..8207f6a 100755 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.distributed.internal; -import static org.junit.Assert.*; +import static org.junit.Assert.assertTrue; import java.io.IOException; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java index 7a411ac..4fbf808 100755 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java @@ -14,7 +14,10 @@ */ package org.apache.geode.distributed.internal; -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.DataInput; import java.io.DataOutputStream; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorIntegrationTest.java index 3517f1e..8f4211b 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorIntegrationTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorIntegrationTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.distributed.internal.deadlock; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.io.Serializable; import java.util.Collections; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorTest.java index 22ce4f8..ef1b8a5 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetectorTest.java @@ -14,7 +14,8 @@ */ package org.apache.geode.distributed.internal.deadlock; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; import java.io.Serializable; import java.util.Collections; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/DependencyGraphJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/DependencyGraphJUnitTest.java index 96a78cb..ee962b5 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/DependencyGraphJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/DependencyGraphJUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.distributed.internal.deadlock; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.util.HashSet; import java.util.Set; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocalJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocalJUnitTest.java index 0dbe3f4..a548f72 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocalJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocalJUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.distributed.internal.deadlock; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.util.concurrent.CountDownLatch; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockGrantorHelper.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockGrantorHelper.java index 0969696..fe7f9c9 100755 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockGrantorHelper.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockGrantorHelper.java @@ -15,7 +15,7 @@ package org.apache.geode.distributed.internal.locks; import org.apache.geode.distributed.DistributedLockService; -import org.apache.geode.distributed.internal.membership.*; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; /** * DLockGrantorHelper provides testing operations that are not normally exposed in the DLockGrantor. diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockReentrantLockJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockReentrantLockJUnitTest.java index 55256c7..65f9dcb 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockReentrantLockJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockReentrantLockJUnitTest.java @@ -26,7 +26,11 @@ import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.apache.geode.cache.*; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionFactory; +import org.apache.geode.cache.Scope; import org.apache.geode.test.junit.categories.DLockTest; import org.apache.geode.test.junit.categories.IntegrationTest; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java index a16edb5..2547bec 100755 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java @@ -14,7 +14,10 @@ */ package org.apache.geode.distributed.internal.membership; -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 java.util.ArrayList; import java.util.Collection; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java index 4f3f02a..a703652 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java @@ -14,8 +14,13 @@ */ package org.apache.geode.distributed.internal.membership.gms; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; +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.mockito.Mockito.mock; +import static org.mockito.Mockito.when; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithAuthenticatorTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithAuthenticatorTest.java index eb0fddb..081c83c 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithAuthenticatorTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithAuthenticatorTest.java @@ -14,8 +14,10 @@ */ package org.apache.geode.distributed.internal.membership.gms.auth; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.assertj.core.api.Assertions.*; +import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_PEER_AUTHENTICATOR; +import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_PEER_AUTH_INIT; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.Locale; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java index 0ef8c2b..dd1a4ba 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticatorWithSecurityManagerTest.java @@ -14,9 +14,12 @@ */ package org.apache.geode.distributed.internal.membership.gms.auth; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.assertj.core.api.Assertions.*; -import static org.mockito.Mockito.*; +import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER; +import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_PEER_AUTH_INIT; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.when; import java.util.Locale; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java index f82abd9..4ca4e13 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java @@ -14,16 +14,33 @@ */ package org.apache.geode.distributed.internal.membership.gms.fd; -import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.ACK_SEVERE_ALERT_THRESHOLD; +import static org.apache.geode.distributed.ConfigurationProperties.ACK_WAIT_THRESHOLD; +import static org.apache.geode.distributed.ConfigurationProperties.DISABLE_TCP; +import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS; +import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE; +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.MEMBER_TIMEOUT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; import static org.mockito.Matchers.isA; -import static org.mockito.Mockito.*; - -import java.io.*; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.InputStream; import java.net.InetAddress; import java.net.ServerSocket; import java.net.Socket; @@ -44,7 +61,12 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.apache.geode.DataSerializer; -import org.apache.geode.distributed.internal.*; +import org.apache.geode.distributed.internal.ClusterDistributionManager; +import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.distributed.internal.DistributionConfigImpl; +import org.apache.geode.distributed.internal.DistributionManager; +import org.apache.geode.distributed.internal.DistributionStats; +import org.apache.geode.distributed.internal.InternalDistributedSystem; import org.apache.geode.distributed.internal.membership.InternalDistributedMember; import org.apache.geode.distributed.internal.membership.NetView; import org.apache.geode.distributed.internal.membership.gms.GMSMember; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java index ee7ede4..ceb3f37 100755 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java @@ -20,7 +20,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; import static org.mockito.Matchers.isA; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.util.Properties; import java.util.concurrent.RejectedExecutionException; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumCheckerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumCheckerJUnitTest.java index 4f07455..63119be 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumCheckerJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumCheckerJUnitTest.java @@ -14,9 +14,12 @@ */ package org.apache.geode.distributed.internal.membership.gms.messenger; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; import java.io.IOException; import java.util.HashSet; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java index 28b0588..60684f9 100755 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java @@ -14,10 +14,31 @@ */ package org.apache.geode.distributed.internal.membership.gms.messenger; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.junit.Assert.*; -import static org.mockito.ArgumentMatchers.*; -import static org.mockito.Mockito.*; +import static org.apache.geode.distributed.ConfigurationProperties.ACK_WAIT_THRESHOLD; +import static org.apache.geode.distributed.ConfigurationProperties.DISABLE_TCP; +import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS; +import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE; +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.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 static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.isA; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.doCallRealMethod; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.reset; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.io.ByteArrayInputStream; import java.io.DataInputStream; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java index c3c4858..2e97e67 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java @@ -14,12 +14,29 @@ */ package org.apache.geode.distributed.internal.membership.gms.mgr; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.junit.Assert.*; +import static org.apache.geode.distributed.ConfigurationProperties.ACK_SEVERE_ALERT_THRESHOLD; +import static org.apache.geode.distributed.ConfigurationProperties.ACK_WAIT_THRESHOLD; +import static org.apache.geode.distributed.ConfigurationProperties.DISABLE_TCP; +import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS; +import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE; +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.MEMBER_TIMEOUT; +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.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.isA; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.anyLong; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.reset; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.Arrays; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationManyDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationManyDUnitTest.java index 6d1b493..e1eaa34 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationManyDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationManyDUnitTest.java @@ -18,7 +18,7 @@ // package org.apache.geode.distributed.internal.streaming; -import static org.junit.Assert.*; +import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.HashSet; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationOneDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationOneDUnitTest.java index 310087e..dbfd550 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationOneDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/streaming/StreamingOperationOneDUnitTest.java @@ -18,7 +18,7 @@ // package org.apache.geode.distributed.internal.streaming; -import static org.junit.Assert.*; +import static org.junit.Assert.assertTrue; import java.io.Serializable; import java.util.ArrayList; diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java index 9daaca5..1b56e56 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java @@ -14,8 +14,10 @@ */ package org.apache.geode.distributed.internal.tcpserver; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.junit.Assert.*; +import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION; +import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS; +import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.assertNotNull; import java.io.File; import java.io.IOException; diff --git a/geode-core/src/test/java/org/apache/geode/disttx/CacheMapDistTXDUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/CacheMapDistTXDUnitTest.java index f2aee6e..f9c723e 100644 --- a/geode-core/src/test/java/org/apache/geode/disttx/CacheMapDistTXDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/disttx/CacheMapDistTXDUnitTest.java @@ -14,8 +14,8 @@ */ package org.apache.geode.disttx; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.junit.Assert.*; +import static org.apache.geode.distributed.ConfigurationProperties.DISTRIBUTED_TRANSACTIONS; +import static org.junit.Assert.assertTrue; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistTXDebugDUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/DistTXDebugDUnitTest.java index d3c2c78..0649792 100644 --- a/geode-core/src/test/java/org/apache/geode/disttx/DistTXDebugDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/disttx/DistTXDebugDUnitTest.java @@ -14,7 +14,8 @@ */ package org.apache.geode.disttx; -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 java.io.DataInput; import java.io.DataOutput; diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistTXJUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/DistTXJUnitTest.java index 754b554..b2d3e25 100644 --- a/geode-core/src/test/java/org/apache/geode/disttx/DistTXJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/disttx/DistTXJUnitTest.java @@ -14,8 +14,9 @@ */ package org.apache.geode.disttx; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.junit.Assert.*; +import static org.apache.geode.distributed.ConfigurationProperties.DISTRIBUTED_TRANSACTIONS; +import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.assertTrue; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistTXManagerImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/DistTXManagerImplJUnitTest.java index fc500f9..344f68b 100644 --- a/geode-core/src/test/java/org/apache/geode/disttx/DistTXManagerImplJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/disttx/DistTXManagerImplJUnitTest.java @@ -14,8 +14,9 @@ */ package org.apache.geode.disttx; -import static junit.framework.TestCase.*; -import static org.apache.geode.distributed.ConfigurationProperties.*; +import static junit.framework.TestCase.assertTrue; +import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS; +import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistTXOrderDUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/DistTXOrderDUnitTest.java index 17f337e..e857561 100644 --- a/geode-core/src/test/java/org/apache/geode/disttx/DistTXOrderDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/disttx/DistTXOrderDUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.disttx; -import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.DISTRIBUTED_TRANSACTIONS; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistTXPersistentDebugDUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/DistTXPersistentDebugDUnitTest.java index d999da9..a0a57cd 100644 --- a/geode-core/src/test/java/org/apache/geode/disttx/DistTXPersistentDebugDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/disttx/DistTXPersistentDebugDUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.disttx; -import static org.apache.geode.test.dunit.Assert.*; +import static org.apache.geode.test.dunit.Assert.assertNotNull; import org.junit.Test; import org.junit.experimental.categories.Category; diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistTXRestrictionsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/DistTXRestrictionsDUnitTest.java index 0f996e2..5d7e430 100644 --- a/geode-core/src/test/java/org/apache/geode/disttx/DistTXRestrictionsDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/disttx/DistTXRestrictionsDUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.disttx; -import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.DISTRIBUTED_TRANSACTIONS; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistTXWithDeltaDUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/DistTXWithDeltaDUnitTest.java index 85507f6..8a46859 100644 --- a/geode-core/src/test/java/org/apache/geode/disttx/DistTXWithDeltaDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/disttx/DistTXWithDeltaDUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.disttx; -import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.DISTRIBUTED_TRANSACTIONS; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistTXWriterJUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/DistTXWriterJUnitTest.java index dec2f88..d47c9e1 100644 --- a/geode-core/src/test/java/org/apache/geode/disttx/DistTXWriterJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/disttx/DistTXWriterJUnitTest.java @@ -14,8 +14,8 @@ */ package org.apache.geode.disttx; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.junit.Assert.*; +import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.assertTrue; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistTXWriterOOMEJUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/DistTXWriterOOMEJUnitTest.java index 896530d..4559632 100644 --- a/geode-core/src/test/java/org/apache/geode/disttx/DistTXWriterOOMEJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/disttx/DistTXWriterOOMEJUnitTest.java @@ -14,8 +14,8 @@ */ package org.apache.geode.disttx; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.junit.Assert.*; +import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.assertTrue; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java index f27008f..f365185 100644 --- a/geode-core/src/test/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/disttx/DistributedTransactionDUnitTest.java @@ -14,7 +14,11 @@ */ package org.apache.geode.disttx; -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.HashMap; import java.util.Map; diff --git a/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXDUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXDUnitTest.java index a4f64ae..c6cecb2 100644 --- a/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXDUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.disttx; -import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.DISTRIBUTED_TRANSACTIONS; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXJUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXJUnitTest.java index 268a733..1046fbf 100644 --- a/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXJUnitTest.java @@ -14,8 +14,8 @@ */ package org.apache.geode.disttx; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.junit.Assert.*; +import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT; +import static org.junit.Assert.assertTrue; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXWithVersionsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXWithVersionsDUnitTest.java index 1d92649..9d9e598 100644 --- a/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXWithVersionsDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXWithVersionsDUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.disttx; -import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.DISTRIBUTED_TRANSACTIONS; import java.util.Properties; diff --git a/geode-core/src/test/java/org/apache/geode/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java b/geode-core/src/test/java/org/apache/geode/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java index adbf5f3..60744bd 100644 --- a/geode-core/src/test/java/org/apache/geode/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java @@ -14,7 +14,7 @@ */ package org.apache.geode.disttx; -import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.DISTRIBUTED_TRANSACTIONS; import java.util.Properties; -- To stop receiving notification emails like this one, please contact prhomb...@apache.org.