geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bschucha...@apache.org
Subject [2/4] incubator-geode git commit: GEODE-2121 add DLockTest and other categories
Date Fri, 18 Nov 2016 20:01:02 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug37210DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug37210DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug37210DUnitTest.java
index 38f88ec..1401611 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug37210DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug37210DUnitTest.java
@@ -21,6 +21,7 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
 
+import org.apache.geode.test.junit.categories.ClientServerTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -50,7 +51,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
  * This tests the fix for bug 73210. Reason for the bug was that HARegionQueue's destroy was not
  * being called on CacheClientProxy's closure. As a result, stats were left open.
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
 public class Bug37210DUnitTest extends JUnit4DistributedTestCase {
 
   /** the cache server */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug37805DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug37805DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug37805DUnitTest.java
index c3ee7aa..58f1b1c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug37805DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug37805DUnitTest.java
@@ -21,6 +21,7 @@ import java.util.Iterator;
 import java.util.Properties;
 import java.util.Set;
 
+import org.apache.geode.test.junit.categories.ClientServerTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -42,7 +43,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
  * The test is written to verify that the rootRegion() in GemfireCache.java doesn't return any
  * metaRegions or HA Regions.
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
 public class Bug37805DUnitTest extends JUnit4DistributedTestCase {
 
   private VM server1VM;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
index a9dc015..f0334e1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.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.After;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -46,7 +47,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
 /**
  * Make sure max-connections on cache server is enforced
  */
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
 public class CacheServerMaxConnectionsJUnitTest {
 
   private static final int MAX_CNXS = 100;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerSelectorMaxConnectionsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerSelectorMaxConnectionsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerSelectorMaxConnectionsJUnitTest.java
index 63b5963..8734af0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerSelectorMaxConnectionsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerSelectorMaxConnectionsJUnitTest.java
@@ -14,6 +14,7 @@
  */
 package org.apache.geode.internal.cache.tier.sockets;
 
+import org.apache.geode.test.junit.categories.ClientServerTest;
 import org.junit.experimental.categories.Category;
 
 import org.apache.geode.test.junit.categories.IntegrationTest;
@@ -23,7 +24,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
  * 
  * 
  */
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
 public class CacheServerSelectorMaxConnectionsJUnitTest extends CacheServerMaxConnectionsJUnitTest {
   protected int getMaxThreads() {
     return 2;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
index 05bbca5..d7841dd 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
+import org.apache.geode.test.junit.categories.ClientServerTest;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -54,7 +55,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
 /**
  * Tests behaviour of transactions in client server model
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
 public class CacheServerTransactionsDUnitTest extends JUnit4DistributedTestCase {
 
   private static final int PAUSE = 5 * 1000;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsSelectorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsSelectorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsSelectorDUnitTest.java
index 9e121f4..e882b70 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsSelectorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTransactionsSelectorDUnitTest.java
@@ -14,6 +14,7 @@
  */
 package org.apache.geode.internal.cache.tier.sockets;
 
+import org.apache.geode.test.junit.categories.ClientServerTest;
 import org.junit.experimental.categories.Category;
 import org.junit.Test;
 
@@ -27,7 +28,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
  * Just like CacheServerTransactionsDUnitTest but configures bridge server with thread pool (i.e.
  * selector).
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
 public class CacheServerTransactionsSelectorDUnitTest extends CacheServerTransactionsDUnitTest {
   /** constructor */
   public CacheServerTransactionsSelectorDUnitTest() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClearPropagationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
index f36a4b4..c53028b 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
+import org.apache.geode.test.junit.categories.ClientServerTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -59,7 +60,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
  * This is the DUnit Test to verify clear and DestroyRegion operation in Client-Server
  * Configuration.
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
 public class ClearPropagationDUnitTest extends JUnit4DistributedTestCase {
 
   VM server1 = null;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientConflationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientConflationDUnitTest.java
index 34736bd..31f67aa 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientConflationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientConflationDUnitTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.*;
 import java.util.Iterator;
 import java.util.Properties;
 
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -59,7 +60,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
  *
  * @since GemFire 5.7
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class ClientConflationDUnitTest extends JUnit4DistributedTestCase {
 
   VM vm0 = null; // server

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
index ce1f04c..93b62d9 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
@@ -32,6 +32,7 @@ import org.apache.geode.internal.AvailablePort;
 import org.apache.geode.internal.cache.EventID;
 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.Test;
@@ -49,7 +50,7 @@ import static org.junit.Assert.fail;
  * 
  * 
  */
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
 public class ClientHealthMonitorJUnitTest {
   /**
    * Default to 0; override in sub tests to add thread pool

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorSelectorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorSelectorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorSelectorJUnitTest.java
index 7953446..ef4f099 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorSelectorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitorSelectorJUnitTest.java
@@ -14,6 +14,7 @@
  */
 package org.apache.geode.internal.cache.tier.sockets;
 
+import org.apache.geode.test.junit.categories.ClientServerTest;
 import org.junit.experimental.categories.Category;
 
 import org.apache.geode.test.junit.categories.IntegrationTest;
@@ -23,7 +24,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
  * 
  * 
  */
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
 public class ClientHealthMonitorSelectorJUnitTest extends ClientHealthMonitorJUnitTest {
   protected int getMaxThreads() {
     return 2;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
index b8602de..f31fd70 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
@@ -21,6 +21,7 @@ import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
 import com.jayway.awaitility.Awaitility;
+import org.apache.geode.test.junit.categories.ClientServerTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -62,7 +63,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.*;
  *
  * @since GemFire 6.0.3
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
 public class ClientInterestNotifyDUnitTest extends JUnit4DistributedTestCase {
 
   class EventListener extends CacheListenerAdapter {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
index 6379b8b..375279d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
@@ -22,6 +22,7 @@ import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.geode.test.junit.categories.ClientServerTest;
 import org.apache.logging.log4j.Logger;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -58,7 +59,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
 /**
  * Tests client server FORCE_INVALIDATE
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
 public class ClientServerForceInvalidateDUnitTest extends JUnit4CacheTestCase {
 
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
index 9c75cd3..82f30bf 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
@@ -21,6 +21,7 @@ import java.util.Iterator;
 import java.util.Properties;
 import java.util.Set;
 
+import org.apache.geode.test.junit.categories.ClientServerTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -62,7 +63,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
 /**
  * Tests client server corner cases between Region and Pool
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
 public class ClientServerMiscDUnitTest extends JUnit4CacheTestCase {
 
   protected static PoolImpl pool = null;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscSelectorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscSelectorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscSelectorDUnitTest.java
index be215f2..e177b79 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscSelectorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscSelectorDUnitTest.java
@@ -14,6 +14,7 @@
  */
 package org.apache.geode.internal.cache.tier.sockets;
 
+import org.apache.geode.test.junit.categories.ClientServerTest;
 import org.junit.experimental.categories.Category;
 import org.junit.Test;
 
@@ -29,7 +30,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
  *
  *
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
 public class ClientServerMiscSelectorDUnitTest extends ClientServerMiscDUnitTest {
   public ClientServerMiscSelectorDUnitTest() {
     super();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java
index 54af251..b1e16ee 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java
@@ -21,6 +21,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Properties;
 
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -65,7 +66,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
  * The test has two regions. In one scenario they share a common bridgewriter and in the second
  * scenario, each has a unique bridgewriter.
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class ConflationDUnitTest extends JUnit4DistributedTestCase {
 
   VM vm0 = null;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
index f746e27..6c19c13 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
@@ -34,6 +34,7 @@ import org.apache.geode.internal.cache.EventID;
 import org.apache.geode.internal.cache.ha.ThreadIdentifier;
 import org.apache.geode.test.dunit.Wait;
 import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.junit.After;
 import org.junit.Before;
@@ -52,7 +53,7 @@ import static org.junit.Assert.*;
  *
  * Tests the functionality of operations of AbstractConnectionProxy & its derived classes.
  */
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientSubscriptionTest.class})
 public class ConnectionProxyJUnitTest {
   private static final String expectedRedundantErrorMsg =
       "Could not find any server to create redundant client queue on.";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
index 248e2b1..f86b39f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
@@ -22,6 +22,7 @@ import java.io.DataOutput;
 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;
 
@@ -59,7 +60,7 @@ import org.apache.geode.test.dunit.WaitCriterion;
 import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
 import org.apache.geode.test.junit.categories.DistributedTest;
 
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
 public class DataSerializerPropogationDUnitTest extends JUnit4DistributedTestCase {
 
   private static Cache cache = null;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
index bab1d80..f902c71 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
@@ -22,6 +22,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -61,7 +62,7 @@ import org.apache.geode.test.junit.categories.FlakyTest;
 /**
  * Tests propagation of destroy entry operation across the vms
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class DestroyEntryPropagationDUnitTest extends JUnit4DistributedTestCase {
 
   private static final String REGION_NAME =

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java
index 196ac84..2186c01 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.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.ClientSubscriptionTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -42,7 +43,7 @@ import org.apache.geode.test.dunit.WaitCriterion;
 import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
 import org.apache.geode.test.junit.categories.DistributedTest;
 
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class DurableClientBug39997DUnitTest extends JUnit4CacheTestCase {
 
   public final void postTearDownCacheTestCase() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
index 7699c6e..472e79b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.*;
 import java.util.Iterator;
 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;
@@ -46,7 +47,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, ClientSubscriptionTest.class})
 @SuppressWarnings("serial")
 public class DurableClientQueueSizeDUnitTest extends JUnit4DistributedTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java
index 0d06d6e..cc0e658 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java
@@ -14,6 +14,7 @@
  */
 package org.apache.geode.internal.cache.tier.sockets;
 
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -31,7 +32,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
  *
  * @since GemFire 5.7
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class DurableClientReconnectAutoDUnitTest extends DurableClientReconnectDUnitTest {
 
   @BeforeClass

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
index 4479199..c1be930 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
@@ -27,6 +27,7 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Set;
 
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -64,7 +65,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
  * 
  * @since GemFire 5.2
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class DurableClientReconnectDUnitTest extends JUnit4DistributedTestCase {
 
   private static Cache cache = null;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
index 464f206..8286afe 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
 import java.util.Properties;
 import java.util.concurrent.RejectedExecutionException;
 
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -52,7 +53,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
  * In the given test DurableClient comes up and goes down discreetly with different
  * DurableClientTimeouts so as to increment the counts
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class DurableClientStatsDUnitTest extends JUnit4DistributedTestCase {
 
   private VM server1VM;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
index 3194a9e..fbd1815 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
@@ -51,6 +51,7 @@ import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.Wait;
 import org.apache.geode.test.dunit.WaitCriterion;
 import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.apache.geode.test.junit.categories.DistributedTest;
 import org.apache.geode.test.junit.categories.FlakyTest;
 import org.junit.Test;
@@ -75,7 +76,7 @@ import org.junit.experimental.categories.Category;
  * (Here K1, K3) // Step 12: Modify values on the server for all the Keys // Step 13: Check the
  * values for the ones not unregistered and the Unregistered Keys' Values should be null
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class DurableRegistrationDUnitTest extends JUnit4DistributedTestCase {
 
   private VM server1VM;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
index 983f881..3e4c7ad 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
@@ -19,6 +19,7 @@ import static org.junit.Assert.*;
 
 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;
@@ -54,7 +55,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
  * 
  * @since GemFire 5.1
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class DurableResponseMatrixDUnitTest extends JUnit4DistributedTestCase {
 
   protected static Cache cache = null;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
index 648ada5..08ca06f 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
@@ -19,6 +19,7 @@ import static org.junit.Assert.*;
 
 import java.util.Properties;
 
+import org.apache.geode.test.junit.categories.ClientServerTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -57,7 +58,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
  * create, update, remove and destroy operations.It also checks that peer nodes also get the same
  * EventID.
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
 public class EventIDVerificationDUnitTest extends JUnit4DistributedTestCase {
 
   private static Cache cache = null;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java
index 93df4cf..655519a 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java
@@ -18,6 +18,7 @@ import static org.junit.Assert.*;
 
 import java.util.Properties;
 
+import org.apache.geode.test.junit.categories.ClientServerTest;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -47,7 +48,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
  * P2P for a propagation of given operation. In case of NO-ACK EventIDs should be
  * different.Currently this test is commented because of a bug.
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
 public class EventIDVerificationInP2PDUnitTest extends JUnit4DistributedTestCase {
 
   private static Cache cache = null;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileIntegrationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileIntegrationJUnitTest.java
index 37bb70b..965f60e 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileIntegrationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileIntegrationJUnitTest.java
@@ -14,12 +14,6 @@
  */
 package org.apache.geode.internal.cache.tier.sockets;
 
-import java.text.ParseException;
-import java.util.concurrent.CountDownLatch;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
 import org.apache.geode.cache.AttributesFactory;
 import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.DataPolicy;
@@ -29,9 +23,15 @@ import org.apache.geode.cache.query.CacheUtils;
 import org.apache.geode.internal.cache.FilterProfile;
 import org.apache.geode.internal.cache.LocalRegion;
 import org.apache.geode.internal.cache.tier.InterestType;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.text.ParseException;
+import java.util.concurrent.CountDownLatch;
 
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientSubscriptionTest.class})
 public class FilterProfileIntegrationJUnitTest {
 
   private static String regionName = "test";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileJUnitTest.java
index 571126f..5d6b36e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/FilterProfileJUnitTest.java
@@ -14,25 +14,29 @@
  */
 package org.apache.geode.internal.cache.tier.sockets;
 
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.apache.geode.internal.cache.FilterProfile;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
 import org.apache.geode.internal.cache.LocalRegion;
 import org.apache.geode.internal.cache.tier.InterestType;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
 
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientSubscriptionTest.class})
 public class FilterProfileJUnitTest {
 
   private LocalRegion mockRegion;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java
index ba8d25c..2a36630 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java
@@ -14,6 +14,7 @@
  */
 package org.apache.geode.internal.cache.tier.sockets;
 
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.junit.experimental.categories.Category;
 import org.junit.Test;
 
@@ -61,7 +62,7 @@ import org.apache.geode.test.dunit.WaitCriterion;
 /**
  *
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class ForceInvalidateEvictionDUnitTest extends JUnit4CacheTestCase {
 
   private static final long serialVersionUID = -11364213547039967L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
index 8e2194d..9781c34 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
@@ -18,6 +18,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.junit.experimental.categories.Category;
 
 import org.apache.geode.internal.cache.OffHeapTestUtil;
@@ -30,7 +31,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
  * 
  * @since Geode 1.0
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class ForceInvalidateOffHeapEvictionDUnitTest extends ForceInvalidateEvictionDUnitTest {
 
   public ForceInvalidateOffHeapEvictionDUnitTest() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HABug36738DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HABug36738DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HABug36738DUnitTest.java
index c59dfec..c4032cb 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HABug36738DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HABug36738DUnitTest.java
@@ -19,6 +19,7 @@ import static com.jayway.awaitility.Awaitility.*;
 import static com.jayway.awaitility.Duration.*;
 import static org.junit.Assert.*;
 
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -47,7 +48,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
  * HARegion with the value as ClientUpdateMessage. 3. Create server2 and HARegion in it so that GII
  * will happen. 4. Perform get operations from server2.
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class HABug36738DUnitTest extends JUnit4DistributedTestCase {
 
   private static final String REGION_NAME = "HABug36738DUnitTest_Region";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java
index 6957319..cb1169c 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java
@@ -14,6 +14,7 @@
  */
 package org.apache.geode.internal.cache.tier.sockets;
 
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.junit.experimental.categories.Category;
 import org.junit.Test;
 
@@ -28,7 +29,7 @@ import org.apache.geode.test.dunit.NetworkUtils;
 import org.apache.geode.test.dunit.VM;
 
 @SuppressWarnings("serial")
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class HAInterestPart1DUnitTest extends HAInterestTestCase {
 
   public HAInterestPart1DUnitTest() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
index b0df124..346fe23 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
@@ -14,6 +14,7 @@
  */
 package org.apache.geode.internal.cache.tier.sockets;
 
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.junit.experimental.categories.Category;
 import org.junit.Test;
 
@@ -33,7 +34,7 @@ import org.apache.geode.test.dunit.Wait;
 import org.apache.geode.test.dunit.WaitCriterion;
 
 @SuppressWarnings({"rawtypes", "serial"})
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class HAInterestPart2DUnitTest extends HAInterestTestCase {
 
   public HAInterestPart2DUnitTest() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
index c65f37e..391c906 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
@@ -23,6 +23,7 @@ import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
 import com.jayway.awaitility.Awaitility;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -58,7 +59,7 @@ import org.apache.geode.test.junit.categories.FlakyTest;
 /**
  * Test to verify Startup. and failover during startup.
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class HAStartupAndFailoverDUnitTest extends JUnit4DistributedTestCase {
 
   private static final String REGION_NAME =

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
index 0614180..1fcb06a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.util.Properties;
 import java.util.Random;
 
+import org.apache.geode.test.junit.categories.ClientServerTest;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -60,7 +61,7 @@ import org.apache.geode.test.dunit.WaitCriterion;
 import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
 import org.apache.geode.test.junit.categories.DistributedTest;
 
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
 public class InstantiatorPropagationDUnitTest extends JUnit4DistributedTestCase {
 
   private static Cache cache = null;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java
index cc59055..e5fb5fc 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListDUnitTest.java
@@ -23,6 +23,7 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -89,7 +90,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
  * client connects to the server c1 register(k1,k2,k3) and c2 register (k4,k5) then verify that
  * updates has occurred as a result of interest registration.
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class InterestListDUnitTest extends JUnit4DistributedTestCase {
 
   private static final String REGION_NAME = "InterestListDUnitTest_region";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
index f3c03f6..c3053b2 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
@@ -21,6 +21,7 @@ import java.io.IOException;
 import java.util.Iterator;
 import java.util.Properties;
 
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -54,7 +55,7 @@ import org.apache.geode.test.dunit.WaitCriterion;
 import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
 import org.apache.geode.test.junit.categories.DistributedTest;
 
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class InterestListEndpointDUnitTest extends JUnit4DistributedTestCase {
 
   VM server1 = null;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointPRDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointPRDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointPRDUnitTest.java
index 2e83898..5a04c47 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointPRDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointPRDUnitTest.java
@@ -14,6 +14,7 @@
  */
 package org.apache.geode.internal.cache.tier.sockets;
 
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.junit.experimental.categories.Category;
 import org.junit.Test;
 
@@ -29,7 +30,7 @@ import org.apache.geode.cache.*;
  * subclass of InterestListEndpointDUnitTest to exercise partitioned regions
  *
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class InterestListEndpointPRDUnitTest extends InterestListEndpointDUnitTest {
 
   public InterestListEndpointPRDUnitTest() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointSelectorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointSelectorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointSelectorDUnitTest.java
index 93ae6f0..0f3a5ec 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointSelectorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListEndpointSelectorDUnitTest.java
@@ -14,6 +14,7 @@
  */
 package org.apache.geode.internal.cache.tier.sockets;
 
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.junit.experimental.categories.Category;
 import org.junit.Test;
 
@@ -27,7 +28,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
  * Just like InterestListEndpointDUnitTest but uses thread pool (i.e. selector) in bridge servers
  *
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class InterestListEndpointSelectorDUnitTest extends InterestListEndpointDUnitTest {
   public InterestListEndpointSelectorDUnitTest() {
     super();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
index a1fd9e9..f9c7371 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
@@ -18,6 +18,7 @@ import static org.junit.Assert.*;
 
 import java.util.Iterator;
 
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -46,7 +47,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
  * (k1 -> vm2-key-1) and (k6 -> vm2-key-6) c1 : validate (r.getEntry("key-1").getValue() ==
  * "vm2-key-1") (r.getEntry("key-6").getValue() == "key-6") // as it is not registered *
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class InterestListFailoverDUnitTest extends JUnit4DistributedTestCase {
 
   private static final String REGION_NAME =

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
index 4bb9d6f..041cd38 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
@@ -24,6 +24,7 @@ import java.util.Iterator;
 import java.util.Properties;
 import java.util.Set;
 
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -63,7 +64,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
  * s2 c1: unregister k1,k2,k3 see interest list on s1 contains only s4, s5 s2 ----> unavaliable //
  * fail over should to s1 with intrest list s4,s5 see only k4 and k5 are registerd on s1
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class InterestListRecoveryDUnitTest extends JUnit4DistributedTestCase {
 
   private static final String REGION_NAME =

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
index 904cd77..1ac06b0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
@@ -23,6 +23,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -53,7 +54,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
 /**
  * Written to test fix for Bug #47132
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class InterestRegrListenerDUnitTest extends JUnit4DistributedTestCase {
 
   private Cache cache;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
index 4294803..6a0f116 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -51,7 +52,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
 /**
  * DUnit Test for use-cases of various {@link InterestResultPolicy} types.
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class InterestResultPolicyDUnitTest extends JUnit4DistributedTestCase {
 
   /** test VM */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java
index 33c37a8..86fcbce 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/MessageJUnitTest.java
@@ -20,6 +20,7 @@ import static org.mockito.Mockito.*;
 import java.net.Socket;
 import java.nio.ByteBuffer;
 
+import org.apache.geode.test.junit.categories.ClientServerTest;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -27,7 +28,7 @@ import org.junit.experimental.categories.Category;
 import org.apache.geode.internal.Version;
 import org.apache.geode.test.junit.categories.UnitTest;
 
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
 public class MessageJUnitTest {
 
   private Message message;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
index 0436f99..eb603ca 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
+import org.apache.geode.test.junit.categories.ClientServerTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -42,7 +43,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
  * This tests that basic entry operations work properly when regions are configured with newly added
  * RegionAttributes in a P2P environment.
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
 public class NewRegionAttributesDUnitTest extends JUnit4DistributedTestCase {
 
   /** test VM */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartListJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
index 7be9075..52b5dc0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartListJUnitTest.java
@@ -19,6 +19,7 @@ import static org.junit.Assert.*;
 import java.io.IOException;
 import java.util.List;
 
+import org.apache.geode.test.junit.categories.ClientServerTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -26,7 +27,7 @@ import org.apache.geode.CopyHelper;
 import org.apache.geode.internal.util.BlobHelper;
 import org.apache.geode.test.junit.categories.UnitTest;
 
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
 public class ObjectPartListJUnitTest {
 
   @Test

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java
index 7a9d66c..d94fc1f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java
@@ -20,6 +20,7 @@ import org.apache.geode.cache.Region;
 import org.apache.geode.cache.client.Pool;
 import org.apache.geode.cache.client.PoolManager;
 import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.util.test.TestUtil;
 import org.junit.After;
@@ -36,7 +37,7 @@ import static org.junit.Assert.assertNotNull;
  * Tests the proper intialization of redundancyLevel property.
  * 
  */
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientSubscriptionTest.class})
 public class RedundancyLevelJUnitTest {
   private static final String expectedRedundantErrorMsg =
       "Could not find any server to create redundant client queue on.";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
index b850e5a..64e1bbf 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
@@ -16,6 +16,7 @@ package org.apache.geode.internal.cache.tier.sockets;
 
 import static org.junit.Assert.*;
 
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -31,7 +32,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
 /**
  * Tests Redundancy Level Functionality
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase {
 
   @BeforeClass

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java
index 3145367..3b110e8 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java
@@ -16,6 +16,7 @@ package org.apache.geode.internal.cache.tier.sockets;
 
 import static org.junit.Assert.*;
 
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -27,7 +28,7 @@ import org.apache.geode.test.dunit.Wait;
 import org.apache.geode.test.dunit.WaitCriterion;
 import org.apache.geode.test.junit.categories.DistributedTest;
 
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase {
 
   @BeforeClass

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
index 342d6fc..505d0a1 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
@@ -16,6 +16,7 @@ package org.apache.geode.internal.cache.tier.sockets;
 
 import static org.junit.Assert.*;
 
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -31,7 +32,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
 /**
  * Tests Redundancy Level Functionality
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class RedundancyLevelPart3DUnitTest extends RedundancyLevelTestBase {
 
   @BeforeClass

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegionCloseDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegionCloseDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegionCloseDUnitTest.java
index 69ffa1f..1e62dcd 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegionCloseDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegionCloseDUnitTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.*;
 import java.util.Iterator;
 import java.util.Properties;
 
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.apache.geode.test.junit.categories.FlakyTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -50,7 +51,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
  * Test to verify that client side region.close() should unregister the client with the server. It
  * also checks that client region queue also gets removed properly.
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class RegionCloseDUnitTest extends JUnit4DistributedTestCase {
 
   VM server1 = null;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
index f351750..6aac6e8 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
@@ -19,6 +19,7 @@ import static org.junit.Assert.*;
 
 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;
@@ -59,7 +60,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
  * put on region1 in server1 - mirrored region1 is created on server2 - data will come to region1 on
  * server2 via GII - data should be sent to client2
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class RegisterInterestBeforeRegionCreationDUnitTest extends JUnit4DistributedTestCase {
 
   /** Server1 VM **/

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
index 47ca0a0..1f72c97 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -50,7 +51,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
  * Test code copied from UpdatePropagationDUnitTest Tests that registering interest KEYS works
  * correctly.
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class RegisterInterestKeysDUnitTest extends JUnit4DistributedTestCase {
 
   VM server1 = null;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysPRDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysPRDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysPRDUnitTest.java
index 8d21162..a2bbb01 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysPRDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysPRDUnitTest.java
@@ -14,6 +14,7 @@
  */
 package org.apache.geode.internal.cache.tier.sockets;
 
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.junit.experimental.categories.Category;
 import org.junit.Test;
 
@@ -29,7 +30,7 @@ import org.apache.geode.cache.*;
  * subclass of UpdatePropagationDUnitTest to exercise partitioned regions
  *
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class RegisterInterestKeysPRDUnitTest extends RegisterInterestKeysDUnitTest {
 
   public RegisterInterestKeysPRDUnitTest() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
index a0a29cb..7c6d7b2 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
@@ -21,6 +21,7 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
 
+import org.apache.geode.test.junit.categories.ClientServerTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -59,7 +60,7 @@ import org.apache.geode.test.junit.categories.FlakyTest;
  * Tests the reliable messaging functionality - Client sends a periodic ack to the primary server
  * for the messages received.
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
 public class ReliableMessagingDUnitTest extends JUnit4DistributedTestCase {
 
   static VM server1 = null;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
index 920c136..520509a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.*;
 import java.util.ArrayList;
 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;
@@ -51,7 +52,7 @@ import org.apache.geode.test.dunit.WaitCriterion;
 import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
 import org.apache.geode.test.junit.categories.DistributedTest;
 
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class UnregisterInterestDUnitTest extends JUnit4DistributedTestCase {
 
   private VM server0 = null;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
index b1f9a0c..fbcbe3e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
@@ -27,6 +27,7 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import com.jayway.awaitility.Awaitility;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -66,7 +67,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
  * The key is to verify that the memberid being used by the client to register with the server is
  * the same across servers
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class UpdatePropagationDUnitTest extends JUnit4CacheTestCase {
 
   private static final String REGION_NAME = "UpdatePropagationDUnitTest_region";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
index b0f6abc..24b3b0d 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
@@ -18,6 +18,7 @@ import static org.junit.Assert.*;
 
 import java.util.Properties;
 
+import org.apache.geode.test.junit.categories.ClientServerTest;
 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;
  * To verify that new events get generated on the node by get operation for key that is not present
  * in the node's region. Currently test is commented because of the bug.
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
 public class VerifyEventIDGenerationInP2PDUnitTest extends JUnit4DistributedTestCase {
 
   private static Cache cache = null;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
index 9466250..4851c5b 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
@@ -19,6 +19,7 @@ import static org.junit.Assert.*;
 
 import java.util.Properties;
 
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -51,7 +52,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
  * One Client , two servers. Ensure that client 1 has registered interest list on server 2. Now
  * Client does a put on server1 . The Client should not receive callback of his own put.
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class VerifyUpdatesFromNonInterestEndPointDUnitTest extends JUnit4DistributedTestCase {
 
   private VM vm0 = null;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/net/ClientSocketFactoryIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/ClientSocketFactoryIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/ClientSocketFactoryIntegrationTest.java
index 80d8c00..da7b22b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/ClientSocketFactoryIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/ClientSocketFactoryIntegrationTest.java
@@ -24,6 +24,7 @@ import java.net.InetAddress;
 import java.net.Socket;
 import java.util.Properties;
 
+import org.apache.geode.test.junit.categories.ClientServerTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -42,7 +43,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
  * <p>
  * Extracted from {@code JSSESocketJUnitTest}.
  */
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
 public class ClientSocketFactoryIntegrationTest {
 
   private static final String EXCEPTION_MESSAGE =

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
index 051a9d4..38d4d87 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.*;
 import java.util.Properties;
 
 import org.apache.commons.lang.StringUtils;
+import org.apache.geode.test.junit.categories.MembershipTest;
 import org.junit.After;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -30,7 +31,7 @@ import org.apache.geode.internal.admin.SSLConfig;
 import org.apache.geode.internal.security.SecurableCommunicationChannel;
 import org.apache.geode.test.junit.categories.UnitTest;
 
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
 public class SSLConfigurationFactoryJUnitTest {
 
   @After

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
index 5746d9b..90ed468 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
@@ -38,6 +38,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.apache.geode.internal.security.SecurableCommunicationChannel;
+import org.apache.geode.test.junit.categories.MembershipTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -61,7 +62,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
  * 
  * @see ClientSocketFactoryIntegrationTest
  */
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, MembershipTest.class})
 public class SSLSocketIntegrationTest {
 
   private static final String MESSAGE = SSLSocketIntegrationTest.class.getName() + " Message";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionJUnitTest.java
index 78a524c..4512b9e 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/tcp/ConnectionJUnitTest.java
@@ -20,6 +20,7 @@ import java.io.InputStream;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 
+import org.apache.geode.test.junit.categories.MembershipTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -31,7 +32,7 @@ import org.apache.geode.internal.net.SocketCloser;
 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 ConnectionJUnitTest {
 
   /**



Mime
View raw message