You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/12/12 22:36:24 UTC
[21/46] geode git commit: GEODE-2121 add DLockTest and other
categories
GEODE-2121 add DLockTest and other categories
I need these test categories in order to run code-coverage analysis for
the components I usually work with. The categories should be added to
the appropriate unit tests.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/845139e0
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/845139e0
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/845139e0
Branch: refs/heads/feature/GEODE-1930
Commit: 845139e0f865cc28595b45c38f340eb2092bc0ec
Parents: cbff37e
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Fri Nov 18 11:58:23 2016 -0800
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Fri Nov 18 12:00:42 2016 -0800
----------------------------------------------------------------------
.../org/apache/geode/BundledJarsJUnitTest.java | 3 +-
.../internal/web/RestInterfaceJUnitTest.java | 3 +-
.../rest/internal/web/RestServersJUnitTest.java | 3 +-
.../internal/web/SwaggerVerificationTest.java | 4 +-
.../cache/ClientServerTimeSyncDUnitTest.java | 3 +-
.../cache/ConnectionPoolAndLoaderDUnitTest.java | 3 +-
.../cache/ConnectionPoolAutoDUnitTest.java | 3 +-
.../geode/cache/ConnectionPoolDUnitTest.java | 3 +-
.../cache/ConnectionPoolFactoryJUnitTest.java | 3 +-
...MembershipAttributesAreSerializableTest.java | 3 +-
.../geode/cache/PoolManagerJUnitTest.java | 3 +-
.../client/ClientCacheFactoryJUnitTest.java | 3 +-
.../client/ClientRegionFactoryJUnitTest.java | 3 +-
.../ClientServerRegisterInterestsDUnitTest.java | 31 +++++++-----
.../internal/AutoConnectionSourceDUnitTest.java | 2 +-
.../AutoConnectionSourceImplJUnitTest.java | 3 +-
.../CacheServerSSLConnectionDUnitTest.java | 3 +-
.../internal/ConnectionPoolImplJUnitTest.java | 3 +-
.../internal/LocatorLoadBalancingDUnitTest.java | 3 +-
.../internal/OpExecutorImplJUnitTest.java | 3 +-
.../client/internal/QueueManagerJUnitTest.java | 3 +-
.../internal/SSLNoClientAuthDUnitTest.java | 3 +-
.../internal/ServerBlackListJUnitTest.java | 3 +-
.../pooling/ConnectionManagerJUnitTest.java | 3 +-
.../mapInterface/PutAllGlobalLockJUnitTest.java | 39 +++++++--------
.../apache/geode/cache30/Bug38741DUnitTest.java | 3 +-
.../cache30/ClientMembershipDUnitTest.java | 3 +-
.../ClientMembershipSelectorDUnitTest.java | 3 +-
.../ClientRegisterInterestDUnitTest.java | 3 +-
...ClientRegisterInterestSelectorDUnitTest.java | 3 +-
.../geode/cache30/ClientServerCCEDUnitTest.java | 3 +-
.../geode/cache30/GlobalLockingDUnitTest.java | 3 +-
.../DistributedLockServiceDUnitTest.java | 4 +-
.../distributed/DistributedSystemDUnitTest.java | 3 +-
.../DistributedSystemIntegrationJUnitTest.java | 3 +-
.../distributed/DistributedSystemJUnitTest.java | 3 +-
.../distributed/HostedLocatorsDUnitTest.java | 3 +-
.../geode/distributed/LocatorDUnitTest.java | 2 +-
.../geode/distributed/LocatorJUnitTest.java | 3 +-
.../LocatorUDPSecurityDUnitTest.java | 3 ++
.../distributed/internal/Bug40751DUnitTest.java | 3 +-
.../internal/DistributionAdvisorDUnitTest.java | 3 +-
.../internal/DistributionConfigJUnitTest.java | 3 +-
.../internal/DistributionManagerDUnitTest.java | 3 +-
.../InternalDistributedSystemJUnitTest.java | 3 +-
.../internal/ProductUseLogDUnitTest.java | 3 +-
.../internal/ProductUseLogJUnitTest.java | 3 +-
.../internal/ServerLocatorJUnitTest.java | 3 +-
.../internal/StartupMessageDataJUnitTest.java | 3 +-
.../locks/DLockReentrantLockJUnitTest.java | 3 +-
.../membership/MembershipJUnitTest.java | 2 +-
.../internal/membership/NetViewJUnitTest.java | 3 +-
.../gms/fd/GMSHealthMonitorJUnitTest.java | 3 +-
.../locator/GMSLocatorRecoveryJUnitTest.java | 3 +-
.../gms/membership/GMSJoinLeaveJUnitTest.java | 3 +-
.../gms/membership/StatRecorderJUnitTest.java | 3 +-
.../gms/messenger/GMSEncryptJUnitTest.java | 3 +-
.../messenger/GMSQuorumCheckerJUnitTest.java | 4 +-
.../messenger/JGroupsMessengerJUnitTest.java | 3 +-
.../gms/mgr/GMSMembershipManagerJUnitTest.java | 3 +-
.../TcpServerBackwardCompatDUnitTest.java | 3 +-
.../internal/tcpserver/TcpServerJUnitTest.java | 3 +-
.../geode/internal/cache/Bug41957DUnitTest.java | 3 +-
.../cache/ClientServerGetAllDUnitTest.java | 3 +-
...ServerInvalidAndDestroyedEntryDUnitTest.java | 3 +-
.../PartitionedRegionSingleHopDUnitTest.java | 3 +-
...RegionSingleHopWithServerGroupDUnitTest.java | 3 +-
.../ClientServerFunctionExecutionDUnitTest.java | 3 +-
...unctionServiceClientAccessorPRDUnitTest.java | 16 +------
...lientAccessorPRMultipleMembersDUnitTest.java | 17 +------
...essorPRMultipleMembersMultihopDUnitTest.java | 4 +-
...nServiceClientMultipleOnServerDUnitTest.java | 14 +-----
.../FunctionServiceClientOnServerDUnitTest.java | 3 +-
...ntServerFunctionExecutionNoAckDUnitTest.java | 3 +-
...tServerRegionFunctionExecutionDUnitTest.java | 3 +-
...egionFunctionExecutionFailoverDUnitTest.java | 3 +-
...onFunctionExecutionNoSingleHopDUnitTest.java | 3 +-
...onExecutionSelectorNoSingleHopDUnitTest.java | 50 ++++++++++----------
...gionFunctionExecutionSingleHopDUnitTest.java | 3 +-
.../ha/BlockingHARQAddOperationJUnitTest.java | 3 +-
.../cache/ha/BlockingHARQStatsJUnitTest.java | 3 +-
.../cache/ha/BlockingHARegionJUnitTest.java | 3 +-
.../ha/BlockingHARegionQueueJUnitTest.java | 3 +-
.../cache/ha/Bug36853EventsExpiryDUnitTest.java | 3 +-
.../internal/cache/ha/Bug48571DUnitTest.java | 3 +-
.../internal/cache/ha/Bug48879DUnitTest.java | 3 +-
.../cache/ha/EventIdOptimizationDUnitTest.java | 3 +-
.../cache/ha/EventIdOptimizationJUnitTest.java | 3 +-
.../internal/cache/ha/FailoverDUnitTest.java | 3 +-
.../internal/cache/ha/HABugInPutDUnitTest.java | 3 +-
.../internal/cache/ha/HAClearDUnitTest.java | 3 +-
.../cache/ha/HAConflationDUnitTest.java | 3 +-
.../internal/cache/ha/HADuplicateDUnitTest.java | 3 +-
.../cache/ha/HAEventIdPropagationDUnitTest.java | 3 +-
.../internal/cache/ha/HAExpiryDUnitTest.java | 3 +-
.../internal/cache/ha/HAGIIBugDUnitTest.java | 3 +-
.../geode/internal/cache/ha/HAGIIDUnitTest.java | 3 +-
.../cache/ha/HARQAddOperationJUnitTest.java | 3 +-
.../cache/ha/HARQueueNewImplDUnitTest.java | 3 +-
.../internal/cache/ha/HARegionDUnitTest.java | 3 +-
.../internal/cache/ha/HARegionJUnitTest.java | 3 +-
.../cache/ha/HARegionQueueDUnitTest.java | 3 +-
.../cache/ha/HARegionQueueJUnitTest.java | 3 +-
.../ha/HARegionQueueStartStopJUnitTest.java | 3 +-
.../cache/ha/HARegionQueueStatsJUnitTest.java | 3 +-
.../cache/ha/HASlowReceiverDUnitTest.java | 3 +-
.../ha/OperationsPropagationDUnitTest.java | 3 +-
.../internal/cache/ha/PutAllDUnitTest.java | 3 +-
.../internal/cache/ha/StatsBugDUnitTest.java | 3 +-
.../cache/ha/ThreadIdentifierJUnitTest.java | 3 +-
.../cache/locks/TXLockServiceDUnitTest.java | 3 +-
.../internal/cache/tier/Bug40396DUnitTest.java | 3 +-
.../tier/sockets/AcceptorImplJUnitTest.java | 3 +-
...mpatibilityHigherVersionClientDUnitTest.java | 3 +-
.../cache/tier/sockets/Bug36269DUnitTest.java | 3 +-
.../cache/tier/sockets/Bug36457DUnitTest.java | 3 +-
.../cache/tier/sockets/Bug36805DUnitTest.java | 3 +-
.../cache/tier/sockets/Bug36829DUnitTest.java | 3 +-
.../cache/tier/sockets/Bug36995DUnitTest.java | 3 +-
.../cache/tier/sockets/Bug37210DUnitTest.java | 3 +-
.../cache/tier/sockets/Bug37805DUnitTest.java | 3 +-
.../CacheServerMaxConnectionsJUnitTest.java | 3 +-
...heServerSelectorMaxConnectionsJUnitTest.java | 3 +-
.../CacheServerTransactionsDUnitTest.java | 3 +-
...acheServerTransactionsSelectorDUnitTest.java | 3 +-
.../tier/sockets/ClearPropagationDUnitTest.java | 3 +-
.../tier/sockets/ClientConflationDUnitTest.java | 3 +-
.../sockets/ClientHealthMonitorJUnitTest.java | 3 +-
.../ClientHealthMonitorSelectorJUnitTest.java | 3 +-
.../sockets/ClientInterestNotifyDUnitTest.java | 3 +-
.../ClientServerForceInvalidateDUnitTest.java | 3 +-
.../tier/sockets/ClientServerMiscDUnitTest.java | 3 +-
.../ClientServerMiscSelectorDUnitTest.java | 3 +-
.../cache/tier/sockets/ConflationDUnitTest.java | 3 +-
.../tier/sockets/ConnectionProxyJUnitTest.java | 3 +-
.../DataSerializerPropogationDUnitTest.java | 3 +-
.../DestroyEntryPropagationDUnitTest.java | 3 +-
.../sockets/DurableClientBug39997DUnitTest.java | 3 +-
.../DurableClientQueueSizeDUnitTest.java | 3 +-
.../DurableClientReconnectAutoDUnitTest.java | 3 +-
.../DurableClientReconnectDUnitTest.java | 3 +-
.../sockets/DurableClientStatsDUnitTest.java | 3 +-
.../sockets/DurableRegistrationDUnitTest.java | 3 +-
.../sockets/DurableResponseMatrixDUnitTest.java | 3 +-
.../sockets/EventIDVerificationDUnitTest.java | 3 +-
.../EventIDVerificationInP2PDUnitTest.java | 3 +-
.../FilterProfileIntegrationJUnitTest.java | 14 +++---
.../tier/sockets/FilterProfileJUnitTest.java | 28 ++++++-----
.../ForceInvalidateEvictionDUnitTest.java | 3 +-
...ForceInvalidateOffHeapEvictionDUnitTest.java | 3 +-
.../cache/tier/sockets/HABug36738DUnitTest.java | 3 +-
.../tier/sockets/HAInterestPart1DUnitTest.java | 3 +-
.../tier/sockets/HAInterestPart2DUnitTest.java | 3 +-
.../sockets/HAStartupAndFailoverDUnitTest.java | 3 +-
.../InstantiatorPropagationDUnitTest.java | 3 +-
.../tier/sockets/InterestListDUnitTest.java | 3 +-
.../sockets/InterestListEndpointDUnitTest.java | 3 +-
.../InterestListEndpointPRDUnitTest.java | 3 +-
.../InterestListEndpointSelectorDUnitTest.java | 3 +-
.../sockets/InterestListFailoverDUnitTest.java | 3 +-
.../sockets/InterestListRecoveryDUnitTest.java | 3 +-
.../sockets/InterestRegrListenerDUnitTest.java | 3 +-
.../sockets/InterestResultPolicyDUnitTest.java | 3 +-
.../cache/tier/sockets/MessageJUnitTest.java | 3 +-
.../sockets/NewRegionAttributesDUnitTest.java | 3 +-
.../tier/sockets/ObjectPartListJUnitTest.java | 3 +-
.../tier/sockets/RedundancyLevelJUnitTest.java | 3 +-
.../sockets/RedundancyLevelPart1DUnitTest.java | 3 +-
.../sockets/RedundancyLevelPart2DUnitTest.java | 3 +-
.../sockets/RedundancyLevelPart3DUnitTest.java | 3 +-
.../tier/sockets/RegionCloseDUnitTest.java | 3 +-
...erInterestBeforeRegionCreationDUnitTest.java | 3 +-
.../sockets/RegisterInterestKeysDUnitTest.java | 3 +-
.../RegisterInterestKeysPRDUnitTest.java | 3 +-
.../sockets/ReliableMessagingDUnitTest.java | 3 +-
.../sockets/UnregisterInterestDUnitTest.java | 3 +-
.../sockets/UpdatePropagationDUnitTest.java | 3 +-
.../VerifyEventIDGenerationInP2PDUnitTest.java | 3 +-
...UpdatesFromNonInterestEndPointDUnitTest.java | 3 +-
.../net/ClientSocketFactoryIntegrationTest.java | 3 +-
.../net/SSLConfigurationFactoryJUnitTest.java | 3 +-
.../internal/net/SSLSocketIntegrationTest.java | 3 +-
.../geode/internal/tcp/ConnectionJUnitTest.java | 3 +-
.../geode/pdx/AutoSerializableJUnitTest.java | 3 +-
.../apache/geode/pdx/ByteSourceJUnitTest.java | 4 +-
.../ClientsWithVersioningRetryDUnitTest.java | 3 +-
.../geode/pdx/JSONFormatterJUnitTest.java | 3 +-
.../geode/pdx/PDXAsyncEventQueueDUnitTest.java | 3 +-
.../geode/pdx/PdxAttributesJUnitTest.java | 3 +-
.../geode/pdx/PdxClientServerDUnitTest.java | 3 +-
.../geode/pdx/PdxDeserializationDUnitTest.java | 3 +-
.../geode/pdx/PdxInstanceFactoryJUnitTest.java | 3 +-
.../apache/geode/pdx/PdxInstanceJUnitTest.java | 3 +-
.../geode/pdx/PdxSerializableDUnitTest.java | 3 +-
.../geode/pdx/PdxSerializableJUnitTest.java | 3 +-
.../apache/geode/pdx/PdxStringJUnitTest.java | 3 +-
.../geode/pdx/PdxTypeExportDUnitTest.java | 3 +-
.../cache/query/dunit/PdxQueryCQDUnitTest.java | 4 +-
.../dunit/QueryIndexUpdateRIDUnitTest.java | 3 +-
.../query/dunit/QueryMonitorDUnitTest.java | 3 +-
.../cache/snapshot/ClientSnapshotDUnitTest.java | 3 +-
.../cache/PRDeltaPropagationDUnitTest.java | 4 +-
.../geode/internal/cache/PutAllCSDUnitTest.java | 4 +-
.../cache/RemoteCQTransactionDUnitTest.java | 24 ++++++----
.../internal/cache/ha/CQListGIIDUnitTest.java | 3 +-
.../cache/ha/HADispatcherDUnitTest.java | 3 +-
.../sockets/ClientToServerDeltaDUnitTest.java | 27 ++++++-----
.../DeltaPropagationWithCQDUnitTest.java | 22 +++++----
...ToRegionRelationCQRegistrationDUnitTest.java | 24 ++++++----
.../sockets/DurableClientCrashDUnitTest.java | 8 ++--
.../sockets/DurableClientNetDownDUnitTest.java | 6 +--
.../sockets/DurableClientSimpleDUnitTest.java | 3 +-
.../test/junit/categories/ClientServerTest.java | 21 ++++++++
.../categories/ClientSubscriptionTest.java | 21 ++++++++
.../geode/test/junit/categories/DLockTest.java | 21 ++++++++
.../test/junit/categories/MembershipTest.java | 21 ++++++++
.../test/junit/categories/RestAPITest.java | 21 ++++++++
.../junit/categories/SerializationTest.java | 21 ++++++++
gradle/test.gradle | 49 +++++++++++++++++++
219 files changed, 728 insertions(+), 366 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java
index 8c228f2..53f49cd 100644
--- a/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java
@@ -29,6 +29,7 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.apache.geode.test.junit.categories.RestAPITest;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -37,7 +38,7 @@ import org.apache.geode.internal.FileUtil;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.test.TestUtil;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, RestAPITest.class})
public class BundledJarsJUnitTest {
private static final String VERSION_PATTERN = "[0-9-_.v]{3,}.*\\.jar$";
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java
index 932119d..324284e 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java
@@ -50,6 +50,7 @@ import org.apache.geode.pdx.PdxSerializable;
import org.apache.geode.pdx.PdxWriter;
import org.apache.geode.pdx.ReflectionBasedAutoSerializer;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.RestAPITest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -85,7 +86,7 @@ import org.springframework.web.client.RestTemplate;
// @RunWith(SpringJUnit4ClassRunner.class)
// @ContextConfiguration
@SuppressWarnings("unused")
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, RestAPITest.class})
public class RestInterfaceJUnitTest {
protected static int DEFAULT_HTTP_SERVICE_PORT = 8189;
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java
index b49e6ca..10ce515 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java
@@ -21,6 +21,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.START_DEV_RES
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.http.HttpResponse;
import org.json.JSONArray;
import org.junit.BeforeClass;
@@ -30,7 +31,7 @@ import org.junit.experimental.categories.Category;
import java.util.Properties;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, RestAPITest.class})
public class RestServersJUnitTest {
private static int defaultPort = 7070;
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
index e706b0e..975ccde 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
@@ -27,6 +27,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.test.dunit.rules.ServerStarterRule;
import org.apache.geode.security.templates.SimpleSecurityManager;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.http.HttpResponse;
import org.json.JSONObject;
import org.junit.ClassRule;
@@ -35,8 +36,7 @@ import org.junit.experimental.categories.Category;
import java.util.Properties;
-@Category(IntegrationTest.class)
-
+@Category({IntegrationTest.class, RestAPITest.class})
public class SwaggerVerificationTest {
private static int restPort = AvailablePortHelper.getRandomAvailableTCPPort();
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/ClientServerTimeSyncDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ClientServerTimeSyncDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/ClientServerTimeSyncDUnitTest.java
index 6d5e840..61e7c3a 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/ClientServerTimeSyncDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ClientServerTimeSyncDUnitTest.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.cache;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.experimental.categories.Category;
import org.junit.Test;
@@ -36,7 +37,7 @@ import java.util.Properties;
import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class ClientServerTimeSyncDUnitTest extends JUnit4CacheTestCase {
public ClientServerTimeSyncDUnitTest() {
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAndLoaderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAndLoaderDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAndLoaderDUnitTest.java
index 8c02589..e9cf762 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAndLoaderDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAndLoaderDUnitTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.*;
import java.io.IOException;
import java.util.Properties;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -39,7 +40,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This tests cases where we have both a connection pool and a bridge loader.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class ConnectionPoolAndLoaderDUnitTest extends JUnit4CacheTestCase {
private static int bridgeServerPort;
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAutoDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAutoDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAutoDUnitTest.java
index 68269e3..542475a 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAutoDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAutoDUnitTest.java
@@ -17,6 +17,7 @@ package org.apache.geode.cache;
import org.apache.geode.cache30.ClientServerTestCase;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import static org.junit.runners.MethodSorters.*;
@@ -24,7 +25,7 @@ import org.junit.FixMethodOrder;
import org.junit.experimental.categories.Category;
@FixMethodOrder(NAME_ASCENDING)
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class ConnectionPoolAutoDUnitTest extends ConnectionPoolDUnitTest {
@Override
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
index 8bff8be..2d5a71b 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
@@ -27,6 +27,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.FixMethodOrder;
import org.junit.Ignore;
import org.junit.Test;
@@ -81,7 +82,7 @@ import org.apache.geode.test.junit.categories.FlakyTest;
*
* Test uses Groboutils TestRunnable objects to achieve multi threading behavior in the test.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
@FixMethodOrder(NAME_ASCENDING)
public class ConnectionPoolDUnitTest extends JUnit4CacheTestCase {
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java
index b2be14a..18af019 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java
@@ -19,6 +19,7 @@ import org.apache.geode.cache.client.PoolFactory;
import org.apache.geode.cache.client.PoolManager;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.PoolFactoryImpl;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
@@ -31,7 +32,7 @@ import java.util.Properties;
import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class ConnectionPoolFactoryJUnitTest {
private Cache cache;
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableTest.java b/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableTest.java
index 93d702b..d1d4d32 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableTest.java
@@ -21,6 +21,7 @@ import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -29,7 +30,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests MembershipAttributes and SubscriptionAttributes to make sure they are Serializable
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class MembershipAttributesAreSerializableTest {
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/PoolManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/PoolManagerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/PoolManagerJUnitTest.java
index 23d8d98..7b97f1b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/PoolManagerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/PoolManagerJUnitTest.java
@@ -19,6 +19,7 @@ import org.apache.geode.cache.client.PoolFactory;
import org.apache.geode.cache.client.PoolManager;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.PoolFactoryImpl;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
@@ -37,7 +38,7 @@ import static org.junit.Assert.assertNotNull;
*
* @since GemFire 5.7
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class PoolManagerJUnitTest {
private DistributedSystem ds;
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
index a2339e2..f881d38 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
@@ -31,6 +31,7 @@ import org.apache.geode.internal.VersionedDataInputStream;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.pdx.ReflectionBasedAutoSerializer;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.jgroups.util.UUID;
import org.junit.After;
@@ -60,7 +61,7 @@ import static org.junit.runners.MethodSorters.NAME_ASCENDING;
* @since GemFire 6.5
*/
@FixMethodOrder(NAME_ASCENDING)
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class ClientCacheFactoryJUnitTest {
private ClientCache cc;
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/client/ClientRegionFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/ClientRegionFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/ClientRegionFactoryJUnitTest.java
index d099b06..433e76c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/ClientRegionFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/ClientRegionFactoryJUnitTest.java
@@ -22,6 +22,7 @@ import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Rule;
@@ -43,7 +44,7 @@ import static org.junit.Assert.*;
*
* @since GemFire 6.5
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class ClientRegionFactoryJUnitTest {
@Rule
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java
index 9c8044d..1f001b0 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java
@@ -14,17 +14,15 @@
*/
package org.apache.geode.cache.client;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.net.UnknownHostException;
-import java.util.Stack;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_ID;
+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.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.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -43,7 +41,16 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.IOException;
+import java.net.UnknownHostException;
+import java.util.Stack;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* The ClientServerRegisterInterestsDUnitTest class is a test suite of test cases testing the
@@ -51,7 +58,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 8.0
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class ClientServerRegisterInterestsDUnitTest extends JUnit4DistributedTestCase {
protected static final long WAIT_TIME_MILLISECONDS = TimeUnit.SECONDS.toMillis(5);
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java
index f0fd7a6..387984c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java
@@ -38,7 +38,7 @@ import org.apache.geode.test.junit.categories.*;
* Tests cases that are particular for the auto connection source - dynamically discovering servers,
* locators, handling locator disappearance, etc.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
protected static final Object BRIDGE_LISTENER = "BRIDGE_LISTENER";
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
index fdde35c..737c583 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
@@ -37,6 +37,7 @@ import org.apache.geode.internal.cache.tier.sockets.HandShake;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.management.membership.ClientMembershipEvent;
import org.apache.geode.management.membership.ClientMembershipListener;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
@@ -68,7 +69,7 @@ import com.jayway.awaitility.Awaitility;
*
*/
@SuppressWarnings("deprecation")
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class AutoConnectionSourceImplJUnitTest {
private Cache cache;
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/CacheServerSSLConnectionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
index d3c4e3c..3597152 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
@@ -38,6 +38,7 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.util.test.TestUtil;
import org.junit.Test;
@@ -47,7 +48,7 @@ import org.junit.experimental.categories.Category;
* Tests cacheserver ssl support added. See https://svn.gemstone.com/trac/gemfire/ticket/48995 for
* details
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class CacheServerSSLConnectionDUnitTest extends JUnit4DistributedTestCase {
private static final String TRUSTED_STORE = "trusted.keystore";
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java
index a9eb672..272580d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java
@@ -25,6 +25,7 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
@@ -42,7 +43,7 @@ import static org.junit.Assert.*;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class ConnectionPoolImplJUnitTest {
private static final String expectedRedundantErrorMsg =
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java
index f468e93..fffc09b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.cache.client.internal;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.experimental.categories.Category;
import org.junit.Test;
@@ -65,7 +66,7 @@ import java.util.concurrent.TimeUnit;
/**
*
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java
index 37511cf..9b1b6e9 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java
@@ -28,6 +28,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ScheduledExecutorService;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -46,7 +47,7 @@ import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.internal.logging.LocalLogWriter;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class OpExecutorImplJUnitTest {
DummyManager manager;
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
index 812ce16..0ec69aa 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
@@ -28,6 +28,7 @@ import org.apache.geode.internal.cache.tier.sockets.ServerQueueStatus;
import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.internal.logging.LocalLogWriter;
import org.apache.geode.internal.util.StopWatch;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
@@ -50,7 +51,7 @@ import static org.junit.Assert.*;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class QueueManagerJUnitTest {
private static final String expectedRedundantErrorMsg =
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/client/internal/SSLNoClientAuthDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/SSLNoClientAuthDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/SSLNoClientAuthDUnitTest.java
index bba6d54..87a915e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/SSLNoClientAuthDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/SSLNoClientAuthDUnitTest.java
@@ -22,6 +22,7 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Properties;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -45,7 +46,7 @@ import org.apache.geode.util.test.TestUtil;
/**
* Test for GEODE-396
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, MembershipTest.class})
public class SSLNoClientAuthDUnitTest extends JUnit4DistributedTestCase {
private Cache cache;
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java
index eccbefd..47bf9ad 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java
@@ -21,6 +21,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -32,7 +33,7 @@ import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.util.StopWatch;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class ServerBlackListJUnitTest {
private ScheduledExecutorService background;
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
index 0f632b8..f3afe6e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
@@ -29,6 +29,7 @@ import org.apache.geode.internal.logging.LocalLogWriter;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Assert;
@@ -53,7 +54,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.junit.Assert.fail;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class ConnectionManagerJUnitTest {
private static final long TIMEOUT = 30 * 1000;
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/mapInterface/PutAllGlobalLockJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/mapInterface/PutAllGlobalLockJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/mapInterface/PutAllGlobalLockJUnitTest.java
index bc88b7a..fb9d7b7 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/mapInterface/PutAllGlobalLockJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/mapInterface/PutAllGlobalLockJUnitTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.*;
import java.util.Properties;
import java.util.TreeMap;
+import org.apache.geode.test.junit.categories.DLockTest;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -36,7 +37,7 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, DLockTest.class})
public class PutAllGlobalLockJUnitTest { // TODO: reformat
Region testRegion = null;
@@ -46,36 +47,28 @@ public class PutAllGlobalLockJUnitTest { // TODO: reformat
@Before
public void setUp() throws Exception {
- try {
- Properties properties = new Properties();
- properties.setProperty(MCAST_PORT, "0");
- properties.setProperty(LOCATORS, "");
- DistributedSystem distributedSystem = DistributedSystem.connect(properties);
- Cache cache = CacheFactory.create(distributedSystem);
- AttributesFactory factory = new AttributesFactory();
- factory.setScope(Scope.GLOBAL);
- factory.setCacheListener(new Listener());
- RegionAttributes regionAttributes = factory.create();
- testRegion = cache.createRegion("TestRegion", regionAttributes);
- } catch (Exception e) {
- throw new AssertionError("test failed to create a distributed system/cache", e);
- }
+ Properties properties = new Properties();
+ properties.setProperty(MCAST_PORT, "0");
+ properties.setProperty(LOCATORS, "");
+ DistributedSystem distributedSystem = DistributedSystem.connect(properties);
+ Cache cache = CacheFactory.create(distributedSystem);
+ AttributesFactory factory = new AttributesFactory();
+ factory.setScope(Scope.GLOBAL);
+ factory.setCacheListener(new Listener());
+ RegionAttributes regionAttributes = factory.create();
+ testRegion = cache.createRegion("TestRegion", regionAttributes);
}
@Test
- public void testPutAllGlobalLock() {
+ public void testPutAllGlobalLock() throws Exception {
TreeMap trialMap = new TreeMap();
for (long i = 0; i < 1000; i++) {
trialMap.put(new Long(i), new Long(i));
}
- try {
- testRegion.putAll(trialMap);
- ThreadUtils.join(this.thread, 30 * 1000);
- assertTrue(this.testOK);
- } catch (Exception e) {
- throw new AssertionError("Test has failed due to ", e);
- }
+ testRegion.putAll(trialMap);
+ ThreadUtils.join(this.thread, 30 * 1000);
+ assertTrue(this.testOK);
}
protected class Listener extends CacheListenerAdapter {
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache30/Bug38741DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/Bug38741DUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/Bug38741DUnitTest.java
index 2c8b0f7..c9c3b37 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/Bug38741DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/Bug38741DUnitTest.java
@@ -25,6 +25,7 @@ import java.util.Properties;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -64,7 +65,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* @since GemFire bugfix5.7
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class Bug38741DUnitTest extends ClientServerTestCase {
protected RegionAttributes getRegionAttributes() {
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
----------------------------------------------------------------------
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 67b1e9e..3756163 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
@@ -35,6 +35,7 @@ import java.util.concurrent.TimeUnit;
import com.jayway.awaitility.Awaitility;
import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -72,7 +73,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 4.2.1
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class ClientMembershipDUnitTest extends ClientServerTestCase {
protected static final boolean CLIENT = true;
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipSelectorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipSelectorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipSelectorDUnitTest.java
index c066bcc..e34db9c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipSelectorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipSelectorDUnitTest.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.cache30;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.DistributedTest;
@@ -23,7 +24,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 5.1
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class ClientMembershipSelectorDUnitTest extends ClientMembershipDUnitTest {
@Override
protected int getMaxThreads() {
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestDUnitTest.java
----------------------------------------------------------------------
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 447cca6..8af26e3 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
@@ -20,6 +20,7 @@ import static org.apache.geode.test.dunit.Assert.*;
import java.io.IOException;
import java.util.Properties;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -44,7 +45,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 4.2.3
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class ClientRegisterInterestDUnitTest extends ClientServerTestCase {
protected static int bridgeServerPort;
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestSelectorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestSelectorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestSelectorDUnitTest.java
index 3c0dddf..a049464 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestSelectorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestSelectorDUnitTest.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.cache30;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.DistributedTest;
@@ -23,7 +24,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 5.1
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class ClientRegisterInterestSelectorDUnitTest extends ClientRegisterInterestDUnitTest {
@Override
protected int getMaxThreads() {
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java
----------------------------------------------------------------------
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 19e9ea6..9780563 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
@@ -33,6 +33,7 @@ import org.apache.geode.cache.AttributesMutator;
import org.apache.geode.cache.ExpirationAction;
import org.apache.geode.cache.ExpirationAttributes;
import org.apache.geode.test.dunit.IgnoredException;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -73,7 +74,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
*
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class ClientServerCCEDUnitTest extends JUnit4CacheTestCase {
public static LocalRegion TestRegion;
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
----------------------------------------------------------------------
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 93229a4..8b6a7e8 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,6 +14,7 @@
*/
package org.apache.geode.cache30;
+import org.apache.geode.test.junit.categories.DLockTest;
import org.junit.experimental.categories.Category;
import org.junit.Test;
@@ -42,7 +43,7 @@ import org.apache.geode.test.dunit.VM;
/**
* This class tests distributed locking of global region entries.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, DLockTest.class})
public class GlobalLockingDUnitTest extends JUnit4CacheTestCase {
public static Region region_testBug32356;
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/DistributedLockServiceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/DistributedLockServiceDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/DistributedLockServiceDUnitTest.java
index dcbca7e..277c604 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/DistributedLockServiceDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/DistributedLockServiceDUnitTest.java
@@ -25,6 +25,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.geode.test.junit.categories.DLockTest;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -60,7 +61,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This class tests distributed ownership via the DistributedLockService api.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, DLockTest.class})
public class DistributedLockServiceDUnitTest extends JUnit4DistributedTestCase {
private static DistributedSystem dlstSystem;
@@ -1455,7 +1456,6 @@ public class DistributedLockServiceDUnitTest extends JUnit4DistributedTestCase {
* Test that suspend locking behaves under various usage patterns. This ensures that suspend and
* regular locks behave as ReadWriteLocks and processing occurs in order.
*/
- @Ignore
@Test
public void testSuspendLockingBehaves() throws Exception {
try {
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemDUnitTest.java
----------------------------------------------------------------------
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 4111d8c..c57ad17 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
@@ -34,6 +34,7 @@ import org.apache.geode.test.dunit.*;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.*;
import org.junit.experimental.categories.Category;
@@ -55,7 +56,7 @@ import static org.junit.Assert.*;
* @see InternalDistributedSystemJUnitTest
*
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, MembershipTest.class})
public class DistributedSystemDUnitTest extends JUnit4DistributedTestCase {
public void postSetUp() throws Exception {
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemIntegrationJUnitTest.java
----------------------------------------------------------------------
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 e802eb1..5d82ee0 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
@@ -21,6 +21,7 @@ import java.io.FileWriter;
import java.net.URL;
import java.util.Properties;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
@@ -33,7 +34,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Integration tests for DistributedSystem class. These tests require file system I/O.
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, MembershipTest.class})
public class DistributedSystemIntegrationJUnitTest {
@Rule
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java
----------------------------------------------------------------------
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 1da0a52..548d107 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
@@ -16,6 +16,7 @@ package org.apache.geode.distributed;
import static org.assertj.core.api.Assertions.*;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
@@ -26,7 +27,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for DistributedSystem class.
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class DistributedSystemJUnitTest {
@Rule
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/HostedLocatorsDUnitTest.java
----------------------------------------------------------------------
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 7a30652..1eeef07 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
@@ -28,6 +28,7 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -49,7 +50,7 @@ import static org.apache.geode.test.dunit.Host.getHost;
*
* @since GemFire 8.0
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class HostedLocatorsDUnitTest extends JUnit4DistributedTestCase {
protected static final int TIMEOUT_MILLISECONDS = 5 * 60 * 1000; // 5 minutes
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
index 83098d9..128f970 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
@@ -73,7 +73,7 @@ import org.apache.geode.util.test.TestUtil;
*
* @since GemFire 4.0
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, MembershipTest.class})
public class LocatorDUnitTest extends JUnit4DistributedTestCase {
static volatile InternalDistributedSystem system = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java
index d3f5139..d1e56c4 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java
@@ -30,6 +30,7 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.management.internal.JmxManagerAdvisor.JmxManagerProfile;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
import org.junit.After;
import org.junit.Before;
@@ -51,7 +52,7 @@ import static org.apache.geode.internal.AvailablePort.SOCKET;
import static org.apache.geode.internal.AvailablePort.getRandomAvailablePort;
import static org.junit.Assert.*;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, MembershipTest.class})
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class LocatorJUnitTest {
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java
index 3b1ac06..3246f85 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java
@@ -18,6 +18,8 @@ import java.io.File;
import java.io.IOException;
import java.util.Properties;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Assert;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -38,6 +40,7 @@ import org.apache.geode.test.junit.categories.FlakyTest;
import static org.apache.geode.distributed.ConfigurationProperties.*;
+@Category({DistributedTest.class, MembershipTest.class})
public class LocatorUDPSecurityDUnitTest extends LocatorDUnitTest {
public LocatorUDPSecurityDUnitTest() {}
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java
index c512a36..b9a601d 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java
@@ -22,6 +22,7 @@ import java.io.DataOutput;
import java.io.IOException;
import java.util.Properties;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -40,7 +41,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, MembershipTest.class})
public class Bug40751DUnitTest extends JUnit4CacheTestCase {
@Override
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java
----------------------------------------------------------------------
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 2747031..37e0140 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
@@ -22,6 +22,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -33,7 +34,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, MembershipTest.class})
public class DistributionAdvisorDUnitTest extends JUnit4DistributedTestCase {
private transient DistributionAdvisor.Profile profiles[];
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java
index 155ac65..2ae62aa 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java
@@ -33,12 +33,13 @@ import org.apache.geode.UnmodifiableException;
import org.apache.geode.internal.ConfigSource;
import org.apache.geode.security.templates.SamplePostProcessor;
import org.apache.geode.security.templates.SampleSecurityManager;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class DistributionConfigJUnitTest {
private Map<Class<?>, Class<?>> classMap;
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java
index b1478e2..b38a769 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java
@@ -21,6 +21,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Properties;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Ignore;
@@ -64,7 +65,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This class tests the functionality of the {@link DistributionManager} class.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, MembershipTest.class})
public class DistributionManagerDUnitTest extends JUnit4DistributedTestCase {
private static final Logger logger = LogService.getLogger();
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java
index 408e004..49e8fa6 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java
@@ -30,6 +30,7 @@ import java.util.Enumeration;
import java.util.Properties;
import java.util.logging.Level;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.After;
import org.junit.Assert;
import org.junit.Ignore;
@@ -54,7 +55,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
* @since GemFire 2.1
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, MembershipTest.class})
public class InternalDistributedSystemJUnitTest {
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogDUnitTest.java
----------------------------------------------------------------------
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 e80cf6b..b354a76 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
@@ -23,6 +23,7 @@ import java.io.FileReader;
import java.io.IOException;
import java.util.Properties;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -43,7 +44,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, MembershipTest.class})
public class ProductUseLogDUnitTest extends JUnit4CacheTestCase {
@Override
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java
----------------------------------------------------------------------
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 3562303..4374e85 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
@@ -20,6 +20,7 @@ import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -30,7 +31,7 @@ import org.junit.rules.TestName;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class) // Fails on Windows -- see GEODE-373
+@Category({UnitTest.class, MembershipTest.class}) // Fails on Windows -- see GEODE-373
public class ProductUseLogJUnitTest {
private long oldMax;
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java
----------------------------------------------------------------------
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 c744aee..af8475b 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
@@ -18,6 +18,7 @@ import static org.junit.Assert.*;
import java.io.IOException;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -40,7 +41,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* @see org.junit.Test
* @since GemFire 7.0
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class ServerLocatorJUnitTest {
@Test
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java
----------------------------------------------------------------------
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 f191aaf..9d63050 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
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.Properties;
import java.util.StringTokenizer;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -38,7 +39,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 7.0
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class StartupMessageDataJUnitTest {
@Test
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockReentrantLockJUnitTest.java
----------------------------------------------------------------------
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 57451b4..937cc1b 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
@@ -15,6 +15,7 @@
package org.apache.geode.distributed.internal.locks;
import org.apache.geode.cache.*;
+import org.apache.geode.test.junit.categories.DLockTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Assert;
@@ -28,7 +29,7 @@ import java.util.concurrent.locks.Lock;
import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, DLockTest.class})
public class DLockReentrantLockJUnitTest {
final long id = 1213L;
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/MembershipJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/MembershipJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/MembershipJUnitTest.java
index b565290..e367450 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/MembershipJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/MembershipJUnitTest.java
@@ -65,7 +65,7 @@ import static org.junit.Assert.*;
import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, MembershipJUnitTest.class})
public class MembershipJUnitTest {
static Level baseLogLevel;
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java
----------------------------------------------------------------------
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 f8cbfa1..715da47 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
@@ -23,6 +23,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -31,7 +32,7 @@ import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class NetViewJUnitTest {
private List<InternalDistributedMember> members;
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
----------------------------------------------------------------------
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 505c010..ebf87be 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
@@ -34,6 +34,7 @@ import org.apache.geode.internal.Version;
import org.apache.geode.internal.net.SocketCreatorFactory;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.jgroups.util.UUID;
import org.junit.After;
import org.junit.Assert;
@@ -59,7 +60,7 @@ import static org.mockito.Matchers.any;
import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, MembershipTest.class})
public class GMSHealthMonitorJUnitTest {
private Services services;
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
index ad0faf2..489d4b8 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
@@ -27,6 +27,7 @@ import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -42,7 +43,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
import static org.mockito.Mockito.mock;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, MembershipTest.class})
public class GMSLocatorRecoveryJUnitTest {
File tempStateFile = null;
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
index 4fa6f07..453e894 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
@@ -37,6 +37,7 @@ import org.apache.geode.internal.Version;
import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
@@ -56,7 +57,7 @@ import static org.mockito.Matchers.any;
import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, MembershipTest.class})
public class GMSJoinLeaveJUnitTest {
private Services services;
private ServiceConfig mockConfig;
http://git-wip-us.apache.org/repos/asf/geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
----------------------------------------------------------------------
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 f11d834..c0d9aa5 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
@@ -23,6 +23,7 @@ import org.apache.geode.distributed.internal.membership.gms.interfaces.Manager;
import org.apache.geode.distributed.internal.membership.gms.messenger.JGroupsMessenger;
import org.apache.geode.distributed.internal.membership.gms.messenger.StatRecorder;
import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
import org.jgroups.Event;
import org.jgroups.Message;
@@ -47,7 +48,7 @@ import static org.mockito.Mockito.*;
/**
* This class tests the GMS StatRecorder class, which records JGroups messaging statistics
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class StatRecorderJUnitTest {
private Protocol mockDownProtocol;