geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [07/29] incubator-geode git commit: Converting dunits to junit 4 using dunits_to_junit4.sh
Date Tue, 24 May 2016 00:31:32 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/BasicDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/BasicDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/BasicDUnitTest.java
index a5663e5..a70c73d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/BasicDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/BasicDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.test.dunit.tests;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 import static com.gemstone.gemfire.test.dunit.Invoke.*;
 import static com.googlecode.catchexception.CatchException.*;
@@ -39,7 +48,8 @@ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
  * test framework.
  */
 @SuppressWarnings("unused")
-public class BasicDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class BasicDUnitTest extends JUnit4DistributedTestCase {
 
   private static final String MESSAGE_FOR_remoteThrowException = "Test exception.  Please ignore.";
 
@@ -48,8 +58,8 @@ public class BasicDUnitTest extends DistributedTestCase {
   private VM vm0;
   private VM vm1;
 
-  public BasicDUnitTest(String name) {
-    super(name);
+  public BasicDUnitTest() {
+    super();
   }
 
   @Override
@@ -66,41 +76,51 @@ public class BasicDUnitTest extends DistributedTestCase {
     invokeInEveryVM(() -> bindings = null);
   }
 
+  @Test
   public void testPreconditions() throws Exception {
     invokeInEveryVM(() -> assertThat("getUniqueName() must not return null", getUniqueName(), notNullValue()));
     invokeInEveryVM(() -> assertThat("bindings must not be null", bindings, notNullValue()));
   }
 
+  @Test
   public void testInvokeOnClassTargetWithEmptyArgs() throws Exception {
     assertThat(this.vm0.invoke(BasicDUnitTest.class, "booleanValue", new Object[] {}), is(true));
   }
+  @Test
   public void testInvokeOnObjectTargetWithEmptyArgs() throws Exception {
-    assertThat(this.vm0.invoke(new BasicDUnitTest(""), "booleanValue", new Object[] {}), is(true));
+    assertThat(this.vm0.invoke(new BasicDUnitTest(), "booleanValue", new Object[] {}), is(true));
   }
+  @Test
   public void testInvokeAsyncOnClassTargetWithEmptyArgs() throws Exception {
     AsyncInvocation<?> async = this.vm0.invokeAsync(BasicDUnitTest.class, "booleanValue", new Object[] {}).join();
     assertThat(async.getResult(), is(true));
   }
+  @Test
   public void testInvokeAsyncOnObjectTargetWithEmptyArgs() throws Exception {
-    AsyncInvocation<?> async = this.vm0.invokeAsync(new BasicDUnitTest(""), "booleanValue", new Object[] {}).join();
+    AsyncInvocation<?> async = this.vm0.invokeAsync(new BasicDUnitTest(), "booleanValue", new Object[] {}).join();
     assertThat(async.getResult(), is(true));
   }
 
+  @Test
   public void testInvokeOnClassTargetWithNullArgs() throws Exception {
     assertThat(this.vm0.invoke(BasicDUnitTest.class, "booleanValue", null), is(true));
   }
+  @Test
   public void testInvokeOnObjectTargetWithNullArgs() throws Exception {
-    assertThat(this.vm0.invoke(new BasicDUnitTest(""), "booleanValue", null), is(true));
+    assertThat(this.vm0.invoke(new BasicDUnitTest(), "booleanValue", null), is(true));
   }
+  @Test
   public void testInvokeAsyncOnClassTargetWithNullArgs() throws Exception {
     AsyncInvocation<?> async = this.vm0.invokeAsync(BasicDUnitTest.class, "booleanValue", null).join();
     assertThat(async.getResult(), is(true));
   }
+  @Test
   public void testInvokeAsyncOnObjectTargetWithNullArgs() throws Exception {
-    AsyncInvocation<?> async = this.vm0.invokeAsync(new BasicDUnitTest(""), "booleanValue", null).join();
+    AsyncInvocation<?> async = this.vm0.invokeAsync(new BasicDUnitTest(), "booleanValue", null).join();
     assertThat(async.getResult(), is(true));
   }
 
+  @Test
   public void testRemoteInvocationWithException() throws Exception {
     catchException(this.vm0).invoke(() -> remoteThrowException());
 
@@ -110,24 +130,29 @@ public class BasicDUnitTest extends DistributedTestCase {
     assertThat(caughtException().getCause().getMessage(), is(MESSAGE_FOR_remoteThrowException));
   }
 
+  @Test
   public void testInvokeWithLambda() throws Exception {
     assertThat(this.vm0.invoke(() -> DUnitEnv.get().getVMID()), is(0));
     assertThat(this.vm1.invoke(() -> DUnitEnv.get().getVMID()), is(1));
   }
 
+  @Test
   public void testInvokeLambdaAsync() throws Throwable {
     assertThat(this.vm0.invokeAsync(() -> DUnitEnv.get().getVMID()).getResult(), is(0));
   }
 
+  @Test
   public void testInvokeWithNamedLambda() {
     assertThat(this.vm0.invoke("getVMID", () -> DUnitEnv.get().getVMID()), is(0));
     assertThat(this.vm1.invoke("getVMID", () -> DUnitEnv.get().getVMID()), is(1));
   }
 
+  @Test
   public void testInvokeNamedLambdaAsync() throws Throwable {
     assertThat(this.vm0.invokeAsync("getVMID", () -> DUnitEnv.get().getVMID()).getResult(), is(0));
   }
 
+  @Test
   public void testRemoteInvokeAsync() throws Exception {
     String name = getUniqueName();
     String value = "Hello";
@@ -136,6 +161,7 @@ public class BasicDUnitTest extends DistributedTestCase {
     this.vm0.invokeAsync(() -> remoteValidateBind(name, value )).join().checkException();
   }
 
+  @Test
   public void testRemoteInvokeAsyncWithException() throws Exception {
     AsyncInvocation<?> async = this.vm0.invokeAsync(() -> remoteThrowException()).join();
 
@@ -150,6 +176,7 @@ public class BasicDUnitTest extends DistributedTestCase {
     assertThat(caughtThrowable().getCause().getMessage(), is(MESSAGE_FOR_remoteThrowException));
   }
 
+  @Test
   public void testInvokeNamedRunnableLambdaAsync() throws Exception {
     catchThrowable(this.vm0.invokeAsync("throwSomething", () -> throwException()).join()).checkException();
 
@@ -158,6 +185,7 @@ public class BasicDUnitTest extends DistributedTestCase {
     assertThat(caughtThrowable().getCause(), instanceOf(BasicDUnitException.class));
   }
 
+  @Test
   public void testInvokeNamedRunnableLambda() throws Exception {
     catchException(this.vm0).invoke("throwSomething", () -> throwException());
 
@@ -188,7 +216,7 @@ public class BasicDUnitTest extends DistributedTestCase {
     assertNotNull("value must not be null", value);
     assertNotNull("bindings must not be null", bindings);
 
-    new BasicDUnitTest("").getSystem(); // forces connection
+    new BasicDUnitTest().getSystem(); // forces connection
     bindings.setProperty(name, value);
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/GetDefaultDiskStoreNameDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/GetDefaultDiskStoreNameDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/GetDefaultDiskStoreNameDUnitTest.java
index c4f6160..6a62957 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/GetDefaultDiskStoreNameDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/GetDefaultDiskStoreNameDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.test.dunit.tests;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import static org.assertj.core.api.Assertions.*;
 
 import org.junit.experimental.categories.Category;
@@ -26,22 +35,26 @@ import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
 @SuppressWarnings("serial")
-public class GetDefaultDiskStoreNameDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class GetDefaultDiskStoreNameDUnitTest extends JUnit4DistributedTestCase {
 
   public GetDefaultDiskStoreNameDUnitTest(final String name) {
-    super(name);
+    super();
   }
 
+  @Test
   public void testGetTestMethodName() {
     String expected = createDefaultDiskStoreName(0, -1, "testGetTestMethodName");
     assertGetDefaultDiskStoreName(expected);
   }
 
+  @Test
   public void testGetTestMethodNameChanges() {
     String expected = createDefaultDiskStoreName(0, -1, "testGetTestMethodNameChanges");
     assertGetDefaultDiskStoreName(expected);
   }
 
+  @Test
   public void testGetTestMethodNameInAllVMs() {
     String expected = createDefaultDiskStoreName(0, -1, "testGetTestMethodNameInAllVMs");
     assertGetDefaultDiskStoreName(expected);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/GetTestMethodNameDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/GetTestMethodNameDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/GetTestMethodNameDUnitTest.java
index 2e9b1fd..d6113c9 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/GetTestMethodNameDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/GetTestMethodNameDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.test.dunit.tests;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import static org.assertj.core.api.Assertions.*;
 
 import org.junit.experimental.categories.Category;
@@ -25,20 +34,24 @@ import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
 @SuppressWarnings("serial")
-public class GetTestMethodNameDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class GetTestMethodNameDUnitTest extends JUnit4DistributedTestCase {
 
   public GetTestMethodNameDUnitTest(final String name) {
-    super(name);
+    super();
   }
 
+  @Test
   public void testGetTestMethodName() {
     assertGetTestMethodName("testGetTestMethodName");
   }
 
+  @Test
   public void testGetTestMethodNameChanges() {
     assertGetTestMethodName("testGetTestMethodNameChanges");
   }
 
+  @Test
   public void testGetTestMethodNameInAllVMs() {
     assertGetTestMethodName("testGetTestMethodNameInAllVMs");
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java
index fb4b4fe..f77046c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.test.dunit.tests;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import static com.gemstone.gemfire.test.dunit.Invoke.*;
 
 import java.util.Properties;
@@ -30,10 +39,11 @@ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
  * Verifies that overriding {@code getDistributedSystemProperties} results
  * in {@code disconnectAllFromDS} during tear down.
  */
-public class OverridingGetPropertiesDisconnectsAllDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class OverridingGetPropertiesDisconnectsAllDUnitTest extends JUnit4DistributedTestCase {
 
   public OverridingGetPropertiesDisconnectsAllDUnitTest(final String name) {
-    super(name);
+    super();
   }
 
   @Override
@@ -53,6 +63,7 @@ public class OverridingGetPropertiesDisconnectsAllDUnitTest extends DistributedT
     return props;
   }
 
+  @Test
   public void testDisconnects() throws Exception {
     invokeInEveryVM(() -> assertFalse(getDistributedSystemProperties().isEmpty()));
     invokeInEveryVM(() -> assertNotNull(getSystem()));

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/VMDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/VMDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/VMDUnitTest.java
index c0275d2..7d9efd5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/VMDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/VMDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.test.dunit.tests;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import java.io.Serializable;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -29,7 +38,8 @@ import com.gemstone.gemfire.test.dunit.VM;
 /**
  * This class tests the functionality of the {@link VM} class.
  */
-public class VMDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class VMDUnitTest extends JUnit4DistributedTestCase {
 
   private static final AtomicInteger COUNTER = new AtomicInteger();
   private static final boolean BOOLEAN_VALUE = true;
@@ -37,34 +47,39 @@ public class VMDUnitTest extends DistributedTestCase {
   private static final long LONG_VALUE = 42L;
   private static final String STRING_VALUE = "BLAH BLAH BLAH";
 
-  public VMDUnitTest(String name) {
-    super(name);
+  public VMDUnitTest() {
+    super();
   }
 
+  @Test
   public void testInvokeStaticBoolean() {
     Host host = Host.getHost(0);
     VM vm = host.getVM(0);
     assertEquals(BOOLEAN_VALUE, (boolean) vm.invoke(() -> remoteBooleanMethod()));
   }
 
+  @Test
   public void testInvokeStaticByte() {
     Host host = Host.getHost(0);
     VM vm = host.getVM(0);
     assertEquals(BYTE_VALUE, (byte) vm.invoke(() -> remoteByteMethod()));
   }
 
+  @Test
   public void testInvokeStaticLong() {
     Host host = Host.getHost(0);
     VM vm = host.getVM(0);
     assertEquals(LONG_VALUE, (long) vm.invoke(() -> remoteLongMethod()));
   }
 
+  @Test
   public void testInvokeInstance() {
     Host host = Host.getHost(0);
     VM vm = host.getVM(0);
     assertEquals(STRING_VALUE, vm.invoke(new ClassWithString(), "getString"));
   }
 
+  @Test
   public void testInvokeRunnableWithException() {
     Host host = Host.getHost(0);
     VM vm = host.getVM(0);
@@ -76,6 +91,7 @@ public class VMDUnitTest extends DistributedTestCase {
     }
   }
 
+  @Test
   public void testReturnValue() throws Exception {
     final Host host = Host.getHost(0);
     final VM vm = host.getVM(0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java
index 22c39d3..d422599 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import java.util.HashSet;
 import java.util.concurrent.CountDownLatch;
 
@@ -55,12 +64,13 @@ import com.gemstone.gemfire.test.dunit.Wait;
  * This includes the test with different data activities.
  *
  */
-public class CqDataDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class CqDataDUnitTest extends JUnit4CacheTestCase {
 
   protected CqQueryDUnitTest cqDUnitTest = new CqQueryDUnitTest("CqDataDUnitTest");
   
-  public CqDataDUnitTest(String name) {
-    super(name);
+  public CqDataDUnitTest() {
+    super();
   }
 
   @Override
@@ -87,6 +97,7 @@ public class CqDataDUnitTest extends CacheTestCase {
    * 
    * @throws Exception
    */
+  @Test
   public void testClientWithFeederAndCQ() throws Exception
   {
     final Host host = Host.getHost(0);
@@ -129,6 +140,7 @@ public class CqDataDUnitTest extends CacheTestCase {
    * Test for CQ Fail over/HA with redundancy level set.
    * @throws Exception
    */
+  @Test
   public void testCQHAWithState() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -250,6 +262,7 @@ public class CqDataDUnitTest extends CacheTestCase {
    * 
    * @throws Exception
    */
+  @Test
   public void testCQWithDestroysAndInvalidates() throws Exception
   {
     final Host host = Host.getHost(0);
@@ -321,6 +334,7 @@ public class CqDataDUnitTest extends CacheTestCase {
    * bug 37295.
    * 
    */
+  @Test
   public void testCQWithMultipleClients() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -390,6 +404,7 @@ public class CqDataDUnitTest extends CacheTestCase {
    * Test for CQ when region is populated with net load.
    * @throws Exception
    */
+  @Test
   public void testCQWithLoad() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -441,6 +456,7 @@ public class CqDataDUnitTest extends CacheTestCase {
    * Test for CQ when entries are evicted from region.
    * @throws Exception
    */
+  @Test
   public void testCQWithEviction() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -511,6 +527,7 @@ public class CqDataDUnitTest extends CacheTestCase {
    * Test for CQ with ConnectionPool.
    * @throws Exception
    */
+  @Test
   public void testCQWithConnectionPool() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -569,6 +586,7 @@ public class CqDataDUnitTest extends CacheTestCase {
    * Test for CQ with BridgeClient.
    * @throws Exception
    */
+  @Test
   public void testCQWithBridgeClient() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -624,6 +642,7 @@ public class CqDataDUnitTest extends CacheTestCase {
    * Test for CQ with ConnectionPool.
    * @throws Exception
    */
+  @Test
   public void testCQWithPool() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -678,6 +697,7 @@ public class CqDataDUnitTest extends CacheTestCase {
    * Test for CQ with establishCallBackConnection.
    * @throws Exception
    */
+  @Test
   public void testCQWithEstablishCallBackConnection() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -743,6 +763,7 @@ public class CqDataDUnitTest extends CacheTestCase {
    * Region invalidate triggers cqEvent with query op region invalidate.
    * @throws Exception
    */
+  @Test
   public void testRegionEvents() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -824,6 +845,7 @@ public class CqDataDUnitTest extends CacheTestCase {
    * thus making the query data and region data inconsistent.
    * @throws Exception
    */
+  @Test
   public void testEventsDuringQueryExecution() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -959,6 +981,7 @@ public class CqDataDUnitTest extends CacheTestCase {
    * 
    * @throws Exception
    */
+  @Test
   public void testMultipleExecuteWithInitialResults() throws Exception {
     final int numObjects = 200;
     final int totalObjects = 500;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
index 89e1554..4bf36f4 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 
 import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
 import com.gemstone.gemfire.test.dunit.IgnoredException;
@@ -26,10 +35,11 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
  * Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
  *
  */
+@Category(DistributedTest.class)
 public class CqDataOptimizedExecuteDUnitTest extends CqDataDUnitTest {
 
-  public CqDataOptimizedExecuteDUnitTest(String name) {
-    super(name);
+  public CqDataOptimizedExecuteDUnitTest() {
+    super();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
index 03bc48b..6d66ed7 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 
 import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
 import com.gemstone.gemfire.test.dunit.IgnoredException;
@@ -26,10 +35,11 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
  * Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
  *
  */
+@Category(DistributedTest.class)
 public class CqDataUsingPoolOptimizedExecuteDUnitTest extends CqDataUsingPoolDUnitTest {
 
-  public CqDataUsingPoolOptimizedExecuteDUnitTest(String name) {
-    super(name);
+  public CqDataUsingPoolOptimizedExecuteDUnitTest() {
+    super();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
index fe8e23e..21bbe16 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -51,12 +60,13 @@ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
  * This class tests the ContiunousQuery mechanism in GemFire.
  * This includes the test with diffetent data activities.
  */
-public class CqPerfDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class CqPerfDUnitTest extends JUnit4CacheTestCase {
 
   protected CqQueryDUnitTest cqDUnitTest = new CqQueryDUnitTest("CqPerfDUnitTest");
   
-  public CqPerfDUnitTest(String name) {
-    super(name);
+  public CqPerfDUnitTest() {
+    super();
   }
 
   @Override
@@ -181,6 +191,7 @@ public class CqPerfDUnitTest extends CacheTestCase {
    * Test for maintaining keys for update optimization.
    * @throws Exception
    */
+  @Test
   public void testKeyMaintainance() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -402,6 +413,7 @@ public class CqPerfDUnitTest extends CacheTestCase {
    * @throws Exception
    */
   @Category(FlakyTest.class) // GEODE-1164: random ports, thread sleeps, time sensitive, eats exceptions (fixed 1), async behavior
+  @Test
   public void testMatchingCqs() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -513,6 +525,7 @@ public class CqPerfDUnitTest extends CacheTestCase {
    * To test the changes relating to, executing CQ only once for all similar CQs.
    * @throws Exception
    */
+  @Test
   public void testMatchingCQWithMultipleClients() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -672,6 +685,7 @@ public class CqPerfDUnitTest extends CacheTestCase {
    * Test for CQ Fail over.
    * @throws Exception
    */
+  @Test
   public void testMatchingCQsWithMultipleServers() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -832,6 +846,7 @@ public class CqPerfDUnitTest extends CacheTestCase {
    * Test for CQ Fail over.
    * @throws Exception
    */
+  @Test
   public void testMatchingCQsOnDataNodeWithMultipleServers() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
index 2a91abb..011b5ae 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -51,12 +60,13 @@ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
  * This class tests the ContiunousQuery mechanism in GemFire.
  * This includes the test with diffetent data activities.
  */
-public class CqPerfUsingPoolDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class CqPerfUsingPoolDUnitTest extends JUnit4CacheTestCase {
 
   protected CqQueryUsingPoolDUnitTest cqDUnitTest = new CqQueryUsingPoolDUnitTest("CqPerfUsingPoolDUnitTest"); // TODO: get rid of this!
   
-  public CqPerfUsingPoolDUnitTest(String name) {
-    super(name);
+  public CqPerfUsingPoolDUnitTest() {
+    super();
   }
 
   @Override
@@ -181,6 +191,7 @@ public class CqPerfUsingPoolDUnitTest extends CacheTestCase {
    * Test for maintaining keys for update optimization.
    * @throws Exception
    */
+  @Test
   public void testKeyMaintenance() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -402,6 +413,7 @@ public class CqPerfUsingPoolDUnitTest extends CacheTestCase {
    * @throws Exception
    */
   @Category(FlakyTest.class) // GEODE-988: random ports, time sensitive, waitForCriterion, 20 second timeouts
+  @Test
   public void testMatchingCqs() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -516,6 +528,7 @@ public class CqPerfUsingPoolDUnitTest extends CacheTestCase {
    * To test the changes relating to, executing CQ only once for all similar CQs.
    * @throws Exception
    */
+  @Test
   public void testMatchingCQWithMultipleClients() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -679,6 +692,7 @@ public class CqPerfUsingPoolDUnitTest extends CacheTestCase {
    * Test for CQ Fail over.
    * @throws Exception
    */
+  @Test
   public void testMatchingCQsWithMultipleServers() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
index 2b2dbd7..64fb388 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -82,7 +91,8 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  *
  */
 @SuppressWarnings("serial")
-public class CqQueryDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class CqQueryDUnitTest extends JUnit4CacheTestCase {
   
   /** The port on which the bridge server was started in this VM */
   private static int bridgeServerPort;
@@ -167,8 +177,8 @@ public class CqQueryDUnitTest extends CacheTestCase {
   // 11 - Test for "short" number type
   "SELECT ALL * FROM /root/" + regions[0] + " p where p.shortID IN SET(1,2,3,4,5)" };
 
-  public CqQueryDUnitTest(String name) {
-    super(name);
+  public CqQueryDUnitTest() {
+    super();
   }
 
   @Override
@@ -1609,6 +1619,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
   /**
    * bug #47494 - CQs were destroyed when a server did a tombstone GC 
    */
+  @Test
   public void testCQRemainsWhenServerGCs() throws Exception {
 
     final Host host = Host.getHost(0);
@@ -1655,6 +1666,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
    * Test for InterestList and CQ registered from same clients.
    * @throws Exception
    */
+  @Test
   public void testInterestListAndCQs() throws Exception {
     final Host host = Host.getHost(0);
     VM server = host.getVM(0);
@@ -1824,6 +1836,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
    * Test for CQ register and UnRegister.
    * @throws Exception
    */
+  @Test
   public void testCQStopExecute() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -1908,6 +1921,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
    * Test for CQ Attributes Mutator functions
    * @throws Exception
    */
+  @Test
   public void testCQAttributesMutator() throws Exception {
     final Host host = Host.getHost(0);
     VM server = host.getVM(0);
@@ -2003,6 +2017,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
    * Test for CQ register and UnRegister.
    * @throws Exception
    */
+  @Test
   public void testCQCreateClose() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -2190,6 +2205,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
    * The CQs on the destroy region needs to be closed.
    *
    */
+  @Test
   public void testRegionDestroy() throws Exception {
     final Host host = Host.getHost(0);
     VM server = host.getVM(0);
@@ -2271,6 +2287,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
   /**
    * Test for CQ with multiple clients.
    */
+  @Test
   public void testCQWithMultipleClients() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -2423,6 +2440,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
   /**
    * Test for CQ ResultSet.
    */
+  @Test
   public void testCQResultSet() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -2494,6 +2512,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
    * Test for CQ Listener events.
    *
    */
+  @Test
   public void testCQEvents() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -2591,6 +2610,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
     closeServer(server);
   }
   
+  @Test
   public void testCQMapValues() throws Exception {
 
     final Host host = Host.getHost(0);
@@ -2681,6 +2701,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
    * Test for stopping and restarting CQs.
    * @throws Exception
    */
+  @Test
   public void testEnableDisableCQ() throws Exception {
     final Host host = Host.getHost(0);
     VM server = host.getVM(0);
@@ -2823,6 +2844,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
    * Test for Complex queries.
    * @throws Exception
    */
+  @Test
   public void testQuery() throws Exception {
     final Host host = Host.getHost(0);
     VM server = host.getVM(0);
@@ -2864,6 +2886,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
    * Test for CQ Fail over.
    * @throws Exception
    */
+  @Test
   public void testCQFailOver() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -2950,6 +2973,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
    * Test for CQ Fail over/HA with redundancy level set.
    * @throws Exception
    */
+  @Test
   public void testCQHA() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -3049,6 +3073,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
    * no CQService intiated.
    * @throws Exception
    */
+  @Test
   public void testWithoutCQs() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -3111,6 +3136,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
   /**
    * Test getCQs for a regions
    */
+  @Test
   public void testGetCQsForARegionName() throws Exception {
     final Host host = Host.getHost(0);
     VM server = host.getVM(0);
@@ -3178,6 +3204,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
   /**
    * Test exception message thrown when replicate region with local destroy is used
    */
+  @Test
   public void testCqExceptionForReplicateRegionWithEvictionLocalDestroy() throws Exception {
     final Host host = Host.getHost(0);
     VM server = host.getVM(0);
@@ -3213,6 +3240,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
    * 
    * @throws Exception
    */
+  @Test
   public void testQueryWithNULLInWhereClause() throws Exception
   {
     final Host host = Host.getHost(0);
@@ -3262,6 +3290,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
    * 
    * @throws Exception
    */
+  @Test
   public void testForSupportedRegionAttributes() throws Exception
   {
     final Host host = Host.getHost(0);
@@ -3364,6 +3393,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
   /**
    * 
    */
+  @Test
   public void testCQWhereCondOnShort() throws Exception {
        
        final Host host = Host.getHost(0);
@@ -3396,6 +3426,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
   /**
    * 
    */
+  @Test
   public void testCQEquals() throws Exception {
        
        final Host host = Host.getHost(0);
@@ -3448,6 +3479,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
   /**
    * 
    */
+  @Test
   public void testCQEqualsWithIndex() throws Exception {
        
        final Host host = Host.getHost(0);
@@ -3499,6 +3531,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
 
   
   //Tests that cqs get an onCqDisconnect and onCqConnect
+  @Test
   public void testCQAllServersCrash() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -3546,6 +3579,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
   }
 
   //Tests that we receive both an onCqConnected and a onCqDisconnected message
+  @Test
   public void testCQAllServersLeave() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -3591,6 +3625,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
   //Test cqstatus listeners, onCqDisconnect should trigger when All servers leave
   //and onCqConnect should trigger when a cq is first connected and when the pool
   //goes from no primary queue to having a primary
+  @Test
   public void testCQAllServersLeaveAndRejoin() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -3651,6 +3686,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
   /*
    * Tests that the cqs do not get notified if primary leaves and a new primary is elected
    */
+  @Test
   public void testCQPrimaryLeaves() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -3697,6 +3733,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
   // Each cq uses a different pool and the servers are shutdown.
   // The listeners for each cq should receive a connect and disconnect
   // when their respective servers are shutdown
+  @Test
   public void testCQAllServersLeaveMultiplePool() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -3749,7 +3786,8 @@ public class CqQueryDUnitTest extends CacheTestCase {
   }  
 
   
-public void testCqCloseAndExecuteWithInitialResults() throws Exception {
+  @Test
+  public void testCqCloseAndExecuteWithInitialResults() throws Exception {
     
     final Host host = Host.getHost(0);
     VM server = host.getVM(0);
@@ -3778,7 +3816,8 @@ public void testCqCloseAndExecuteWithInitialResults() throws Exception {
    closeServer(server);    
  }
 
-public void testCQEventsWithNotEqualsUndefined() throws Exception {
+  @Test
+  public void testCQEventsWithNotEqualsUndefined() throws Exception {
  
   final Host host = Host.getHost(0);
   VM server = host.getVM(0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
index eda4d1d..14511d3 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import com.gemstone.gemfire.cache.CacheException;
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.query.data.Portfolio;
@@ -36,10 +45,11 @@ import com.gemstone.gemfire.test.dunit.Wait;
  * Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
  *
  */
+@Category(DistributedTest.class)
 public class CqQueryOptimizedExecuteDUnitTest extends CqQueryDUnitTest {
 
-  public CqQueryOptimizedExecuteDUnitTest(String name) {
-    super(name);
+  public CqQueryOptimizedExecuteDUnitTest() {
+    super();
   }
 
   @Override
@@ -61,6 +71,7 @@ public class CqQueryOptimizedExecuteDUnitTest extends CqQueryDUnitTest {
     });
   }
   
+  @Test
   public void testCqExecuteWithoutQueryExecution() throws Exception {
     final Host host = Host.getHost(0);
     final VM server = host.getVM(0);
@@ -153,6 +164,7 @@ public class CqQueryOptimizedExecuteDUnitTest extends CqQueryDUnitTest {
     closeServer(server);    
   }
 
+  @Test
   public void testCqExecuteWithoutQueryExecutionAndNoRSCaching() throws Exception {
     final Host host = Host.getHost(0);
     final VM server = host.getVM(0);
@@ -256,6 +268,7 @@ public class CqQueryOptimizedExecuteDUnitTest extends CqQueryDUnitTest {
   // Each cq uses a different pool and the servers are shutdown.
   // The listeners for each cq should receive a connect and disconnect
   // when their respective servers are shutdown
+  @Test
   public void testCQAllServersLeaveMultiplePool() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(1);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
index 548dd2f..6967410 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -84,7 +93,8 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  * 
  *
  */
-public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class CqQueryUsingPoolDUnitTest extends JUnit4CacheTestCase {
   
   /** The port on which the bridge server was started in this VM */
   private static int bridgeServerPort;
@@ -155,8 +165,8 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
       "SELECT ALL * FROM /root/invalidRegion p where p.ID > 0"
   };
   
-  public CqQueryUsingPoolDUnitTest(String name) {
-    super(name);
+  public CqQueryUsingPoolDUnitTest() {
+    super();
   }
 
   @Override
@@ -1334,6 +1344,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
    * Test for InterestList and CQ registered from same clients.
    * @throws Exception
    */
+  @Test
   public void testInterestListAndCQs() throws Exception {
     final Host host = Host.getHost(0);
     VM server = host.getVM(0);
@@ -1525,6 +1536,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
    * Test for CQ register and UnRegister.
    * @throws Exception
    */
+  @Test
   public void testCQStopExecute() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -1613,6 +1625,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
    * Test for CQ Attributes Mutator functions
    * @throws Exception
    */
+  @Test
   public void testCQAttributesMutator() throws Exception {
     final Host host = Host.getHost(0);
     VM server = host.getVM(0);
@@ -1710,6 +1723,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
    * Test for CQ register and UnRegister.
    * @throws Exception
    */
+  @Test
   public void testCQCreateClose() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -1880,6 +1894,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
    * The CQs on the destroy region needs to be closed.
    *
    */
+  @Test
   public void testRegionDestroy() throws Exception {
     final Host host = Host.getHost(0);
     VM server = host.getVM(0);
@@ -1982,6 +1997,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
   /**
    * Test for CQ with multiple clients.
    */
+  @Test
   public void testCQWithMultipleClients() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -2137,6 +2153,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
   /**
    * Test for CQ ResultSet.
    */
+  @Test
   public void testCQResultSet() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -2211,6 +2228,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
    * Test for CQ Listener events.
    *
    */
+  @Test
   public void testCQEvents() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -2315,6 +2333,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
    * Test query execution multiple times on server without ALIAS.
    * @throws Exception
    */
+  @Test
   public void testCqEventsWithoutAlias() throws Exception {
 
     
@@ -2419,6 +2438,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
    * Test for stopping and restarting CQs.
    * @throws Exception
    */
+  @Test
   public void testEnableDisableCQ() throws Exception {
     final Host host = Host.getHost(0);
     VM server = host.getVM(0);
@@ -2560,6 +2580,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
    * Test for Complex queries.
    * @throws Exception
    */
+  @Test
   public void testQuery() throws Exception {
     final Host host = Host.getHost(0);
     VM server = host.getVM(0);
@@ -2604,6 +2625,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
    * Test for CQ Fail over.
    * @throws Exception
    */
+  @Test
   public void testCQFailOver() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -2693,6 +2715,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
    * Test for CQ Fail over/HA with redundancy level set.
    * @throws Exception
    */
+  @Test
   public void testCQHA() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -2797,6 +2820,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
    * Bug fix 39014
    * @throws Exception
    */
+  @Test
   public void testFilterRegistrationDuringGII() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -2931,6 +2955,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
    * no CQService intiated.
    * @throws Exception
    */
+  @Test
   public void testWithoutCQs() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -2993,6 +3018,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
   /**
    * Test getCQs for a regions
    */
+  @Test
   public void testGetCQsForARegionName() throws Exception {
     final Host host = Host.getHost(0);
     VM server = host.getVM(0);
@@ -3065,6 +3091,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
    * 
    * @throws Exception
    */
+  @Test
   public void testQueryWithNULLInWhereClause() throws Exception
   {
     final Host host = Host.getHost(0);
@@ -3118,6 +3145,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
    * 
    * @throws Exception
    */
+  @Test
   public void testForSupportedRegionAttributes() throws Exception
   {
     final Host host = Host.getHost(0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
index 993dd42..df5bf16 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
 import com.gemstone.gemfire.test.dunit.Invoke;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
@@ -24,10 +33,11 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
  * Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
  *
  */
+@Category(DistributedTest.class)
 public class CqQueryUsingPoolOptimizedExecuteDUnitTest extends CqQueryUsingPoolDUnitTest{
 
-  public CqQueryUsingPoolOptimizedExecuteDUnitTest(String name) {
-    super(name);
+  public CqQueryUsingPoolOptimizedExecuteDUnitTest() {
+    super();
    }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
index a94b72b..023fbfc 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
@@ -44,7 +53,8 @@ import com.gemstone.gemfire.test.dunit.Wait;
  * This class tests the ContinuousQuery mechanism in GemFire.
  *
  */
-public class CqResultSetUsingPoolDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class CqResultSetUsingPoolDUnitTest extends JUnit4CacheTestCase {
 
   protected CqQueryUsingPoolDUnitTest cqDUnitTest = new CqQueryUsingPoolDUnitTest("CqResultSetUsingPoolDUnitTest");
   
@@ -125,8 +135,8 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase {
   };
   
 
-  public CqResultSetUsingPoolDUnitTest(String name) {
-    super(name);
+  public CqResultSetUsingPoolDUnitTest() {
+    super();
   }
 
   @Override
@@ -150,6 +160,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase {
    * 
    * @throws Exception
    */
+  @Test
   public void testCqResults() throws Exception
   {
     final Host host = Host.getHost(0);
@@ -204,6 +215,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase {
    * 
    * @throws Exception
    */
+  @Test
   public void testCqResultsWithCompactRangeIndex() throws Exception
   {
     final Host host = Host.getHost(0);
@@ -247,6 +259,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase {
    * 
    * @throws Exception
    */
+  @Test
   public void testCqResultsWithRangeIndex() throws Exception
   {
     
@@ -304,6 +317,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase {
    * 
    * @throws Exception
    */
+  @Test
   public void testCqResultsOnPR() throws Exception
   {
     final Host host = Host.getHost(0);
@@ -360,6 +374,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase {
    * 
    * @throws Exception
    */
+  @Test
   public void testCqResultsWithCompactRangeIndexOnPR() throws Exception
   {
     final Host host = Host.getHost(0);
@@ -407,6 +422,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase {
    * 
    * @throws Exception
    */
+  @Test
   public void testCqResultsWithRangeIndexOnPR() throws Exception
   {
     
@@ -478,6 +494,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase {
    * 
    * @throws Exception
    */
+  @Test
   public void testCqResultsCaching() throws Exception
   {
     final Host host = Host.getHost(0);
@@ -600,6 +617,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase {
    * 
    * @throws Exception
    */
+  @Test
   public void testCqResultsCachingForMultipleCQs() throws Exception
   {
     final Host host = Host.getHost(0);
@@ -727,6 +745,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase {
    * 
    * @throws Exception
    */
+  @Test
   public void testCqResultsCachingForPR() throws Exception
   {
     final Host host = Host.getHost(0);
@@ -823,6 +842,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase {
    * 
    * @throws Exception
    */
+  @Test
   public void testCqResultsCachingForDestroyEventsOnPR() throws Exception
   {
     final Host host = Host.getHost(0);
@@ -941,6 +961,7 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase {
    * 
    * @throws Exception
    */
+  @Test
   public void testCqResultsCachingWithFailOver() throws Exception
   {
     final Host host = Host.getHost(0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
index d4e40fa..79ed0e0 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
@@ -39,10 +48,11 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.test.dunit.Wait;
 
+@Category(DistributedTest.class)
 public class CqResultSetUsingPoolOptimizedExecuteDUnitTest extends CqResultSetUsingPoolDUnitTest {
 
-  public CqResultSetUsingPoolOptimizedExecuteDUnitTest(String name) {
-    super(name);
+  public CqResultSetUsingPoolOptimizedExecuteDUnitTest() {
+    super();
   }
 
   @Override
@@ -70,6 +80,7 @@ public class CqResultSetUsingPoolOptimizedExecuteDUnitTest extends CqResultSetUs
    * @throws Exception
    */
   @Override
+  @Test
   public void testCqResultsCachingWithFailOver() throws Exception
   {
     final Host host = Host.getHost(0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
index 0165fbf..9ef8a43 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import java.util.Properties;
 
 import com.gemstone.gemfire.cache.query.CqQuery;
@@ -34,13 +43,15 @@ import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.test.dunit.Wait;
 import com.gemstone.gemfire.test.dunit.WaitCriterion;
 
+@Category(DistributedTest.class)
 public class CqStateDUnitTest extends HelperTestCase {
 
   
-  public CqStateDUnitTest(String name) {
-    super(name);
+  public CqStateDUnitTest() {
+    super();
   }
   
+  @Test
   public void testNothingBecauseBug51953() {
     // remove when bug #51953 is fixed
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
index fcd8160..a726021 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import java.util.Collection;
 
 import com.gemstone.gemfire.cache.CacheException;
@@ -47,12 +56,13 @@ import com.gemstone.gemfire.test.dunit.Wait;
  * This includes the test with different data activities.
  *
  */
-public class CqStatsDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class CqStatsDUnitTest extends JUnit4CacheTestCase {
 
   private CqQueryDUnitTest cqDUnitTest = new CqQueryDUnitTest("CqStatsDUnitTest");
   
-  public CqStatsDUnitTest(String name) {
-    super(name);
+  public CqStatsDUnitTest() {
+    super();
   }
 
   @Override
@@ -241,6 +251,7 @@ public class CqStatsDUnitTest extends CacheTestCase {
    * Test for CQ and CQ Service Statistics
    * @throws Exception
    */
+  @Test
   public void testCQStatistics() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -330,6 +341,7 @@ public class CqStatsDUnitTest extends CacheTestCase {
    * Test for CQ Service Statistics
    * @throws Exception
    */
+  @Test
   public void testCQServiceStatistics() throws Exception {
     
     final Host host = Host.getHost(0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
index 7d4a74e..72e2e7f 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import com.gemstone.gemfire.cache.query.internal.cq.CqService;
 import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
 import com.gemstone.gemfire.test.dunit.Invoke;
@@ -24,10 +33,11 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 /**
  * Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
  */
+@Category(DistributedTest.class)
 public class CqStatsOptimizedExecuteDUnitTest extends CqStatsDUnitTest {
 
-  public CqStatsOptimizedExecuteDUnitTest(String name) {
-    super(name);
+  public CqStatsOptimizedExecuteDUnitTest() {
+    super();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
index 71b11d8..4d7bf1d 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import java.util.Collection;
 
 import com.gemstone.gemfire.cache.CacheException;
@@ -47,12 +56,13 @@ import com.gemstone.gemfire.test.dunit.Wait;
  * This includes the test with different data activities.
  *
  */
-public class CqStatsUsingPoolDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class CqStatsUsingPoolDUnitTest extends JUnit4CacheTestCase {
 
   private CqQueryUsingPoolDUnitTest cqDUnitTest = new CqQueryUsingPoolDUnitTest("CqStatsUsingPoolDUnitTest");
   
-  public CqStatsUsingPoolDUnitTest(String name) {
-    super(name);
+  public CqStatsUsingPoolDUnitTest() {
+    super();
   }
 
   @Override
@@ -241,6 +251,7 @@ public class CqStatsUsingPoolDUnitTest extends CacheTestCase {
    * Test for CQ and CQ Service Statistics
    * @throws Exception
    */
+  @Test
   public void testCQStatistics() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -334,6 +345,7 @@ public class CqStatsUsingPoolDUnitTest extends CacheTestCase {
    * Test for CQ Service Statistics
    * @throws Exception
    */
+  @Test
   public void testCQServiceStatistics() throws Exception {
     
     final Host host = Host.getHost(0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
index 5ccb735..4e84a4a 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import com.gemstone.gemfire.cache.query.internal.cq.CqService;
 import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
 import com.gemstone.gemfire.test.dunit.Invoke;
@@ -24,10 +33,11 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 /**
  * Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
  */
+@Category(DistributedTest.class)
 public class CqStatsUsingPoolOptimizedExecuteDUnitTest extends CqStatsUsingPoolDUnitTest {
 
-  public CqStatsUsingPoolOptimizedExecuteDUnitTest(String name) {
-    super(name);
+  public CqStatsUsingPoolOptimizedExecuteDUnitTest() {
+    super();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
index 29eec8e..70a72f8 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import hydra.Log;
 
 import java.io.IOException;
@@ -58,11 +67,12 @@ import com.gemstone.gemfire.test.dunit.Wait;
  * 
  * @since 5.5
  */
-public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class PartitionedRegionCqQueryDUnitTest extends JUnit4CacheTestCase {
 
   
-  public PartitionedRegionCqQueryDUnitTest(String name) {
-    super(name);
+  public PartitionedRegionCqQueryDUnitTest() {
+    super();
   }
   
   static public final String[] regions = new String[] {
@@ -114,6 +124,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase {
   
   private static int bridgeServerPort;
   
+  @Test
   public void testCQLeakWithPartitionedRegion() throws Exception {
     // creating servers.
     final Host host = Host.getHost(0);
@@ -176,6 +187,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase {
     //cqHelper.closeServer(server1);
   }
   
+  @Test
   public void testCQAndPartitionedRegion() throws Exception {
     // creating servers.
     final Host host = Host.getHost(0);
@@ -288,6 +300,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase {
   /**
    * test for registering cqs on a bridge server with local max memory zero.
    */
+  @Test
   public void testPartitionedCqOnAccessorBridgeServer() throws Exception {
  // creating servers.
     final Host host = Host.getHost(0);
@@ -385,6 +398,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase {
    * will generate all the events locally and should always have the old value 
    * and should not sent the profile update on wire.
    */
+  @Test
   public void testPartitionedCqOnSingleBridgeServer() throws Exception { 
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -476,6 +490,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase {
    * will generate all the events locally but the puts, updates and destroys originate
    * at an accessor vm.
    */
+  @Test
   public void testPRCqOnSingleBridgeServerUpdatesOriginatingAtAccessor() throws Exception { 
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -572,6 +587,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase {
   /**
    * test to check invalidates on bridge server hosting datastores as well.
    */
+  @Test
   public void testPRCqWithInvalidatesOnBridgeServer()  {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -667,6 +683,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase {
    * test cqs with invalidates on bridge server not hosting datastores.
    * 
    */
+  @Test
   public void testPRCqWithInvalidatesOnAccessorBridgeServer() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -762,6 +779,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase {
    * test cqs with create updates and destroys from client on bridge server
    * hosting datastores.
    */
+  @Test
   public void testPRCqWithUpdatesFromClients() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -862,6 +880,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase {
    * test cqs on multiple partitioned region hosted by bridge servers.
    * 
    */
+  @Test
   public void testPRCqWithMultipleRegionsOnServer() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -1005,6 +1024,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase {
    * for not requiring old values.
    * 
    */
+  @Test
   public void testPRWithCQsAndProfileUpdates() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -1227,6 +1247,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase {
    * thus making the query data and region data inconsistent.
    * @throws Exception
    */
+  @Test
   public void testEventsDuringQueryExecution() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -1362,6 +1383,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase {
 
   
   
+  @Test
   public void testDestroyRegionEventOnClientsWithCQRegistered() throws Exception{
     final Host host = Host.getHost(0);
     VM server = host.getVM(0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
index 1913b4d..9d43ef6 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import com.gemstone.gemfire.cache.CacheException;
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.query.data.Portfolio;
@@ -30,10 +39,11 @@ import com.gemstone.gemfire.test.dunit.NetworkUtils;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.dunit.VM;
 
+@Category(DistributedTest.class)
 public class PartitionedRegionCqQueryOptimizedExecuteDUnitTest extends PartitionedRegionCqQueryDUnitTest{
 
-  public PartitionedRegionCqQueryOptimizedExecuteDUnitTest(String name) {
-    super(name);
+  public PartitionedRegionCqQueryOptimizedExecuteDUnitTest() {
+    super();
   }
 
   @Override
@@ -55,6 +65,7 @@ public class PartitionedRegionCqQueryOptimizedExecuteDUnitTest extends Partition
     });
   }
   
+  @Test
   public void testCqExecuteWithoutQueryExecution() throws Exception {
     final Host host = Host.getHost(0);
     final VM server = host.getVM(0);
@@ -146,6 +157,7 @@ public class PartitionedRegionCqQueryOptimizedExecuteDUnitTest extends Partition
     cqHelper.closeServer(server);    
   }
   
+  @Test
   public void testCqExecuteWithoutQueryExecutionAndNoRSCaching() throws Exception {
     final Host host = Host.getHost(0);
     final VM server = host.getVM(0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
index ee8ea9f..30ae41e 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -58,10 +67,11 @@ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
  * 
  * @since 5.5
  */
-public class PrCqUsingPoolDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class PrCqUsingPoolDUnitTest extends JUnit4CacheTestCase {
 
-  public PrCqUsingPoolDUnitTest(String name) {
-    super(name);
+  public PrCqUsingPoolDUnitTest() {
+    super();
   }
   
   static public final String[] regions = new String[] {
@@ -109,6 +119,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase {
   
   private static int bridgeServerPort;
   
+  @Test
   public void testCQAndPartitionedRegion() throws Exception {
     // creating servers.
     final Host host = Host.getHost(0);
@@ -223,6 +234,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase {
   /**
    * test for registering cqs on a bridge server with local max memory zero.
    */
+  @Test
   public void testPartitionedCqOnAccessorBridgeServer() throws Exception {
  // creating servers.
     final Host host = Host.getHost(0);
@@ -323,6 +335,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase {
    * will generate all the events locally and should always have the old value 
    * and should not sent the profile update on wire.
    */
+  @Test
   public void testPartitionedCqOnSingleBridgeServer() throws Exception { 
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -416,6 +429,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase {
    * will generate all the events locally but the puts, updates and destroys originate
    * at an accessor vm.
    */
+  @Test
   public void testPRCqOnSingleBridgeServerUpdatesOriginatingAtAccessor() throws Exception { 
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -515,6 +529,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase {
   /**
    * test to check invalidates on bridge server hosting datastores as well.
    */
+  @Test
   public void testPRCqWithInvalidatesOnBridgeServer()  {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -614,6 +629,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase {
    * test cqs with invalidates on bridge server not hosting datastores.
    * 
    */
+  @Test
   public void testPRCqWithInvalidatesOnAccessorBridgeServer() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -714,6 +730,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase {
    * test cqs with create updates and destroys from client on bridge server
    * hosting datastores.
    */
+  @Test
   public void testPRCqWithUpdatesFromClients() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -821,6 +838,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase {
    * test cqs on multiple partitioned region hosted by bridge servers.
    * 
    */
+  @Test
   public void testPRCqWithMultipleRegionsOnServer() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -967,6 +985,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase {
    * for not requiring old values.
    * 
    */
+  @Test
   public void testPRWithCQsAndProfileUpdates() throws Exception {
     
     final Host host = Host.getHost(0);
@@ -1193,6 +1212,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase {
    * @throws Exception
    */
   @Category(FlakyTest.class) // GEODE-1181: random ports, eats exceptions (fixed some), async behavior
+  @Test
   public void testEventsDuringQueryExecution() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -1321,6 +1341,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase {
 
   }
 
+  @Test
   public void testCQsWithPutalls() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -1415,6 +1436,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase {
     cqHelper.closeServer(server1);   
   }
   
+  @Test
   public void testCQsWithPutallsValidateStats() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -1517,6 +1539,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase {
     cqHelper.closeServer(server1);   
   }
   
+  @Test
   public void testCQsWithPutallsWithTx() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);
@@ -1639,6 +1662,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase {
   
   }
   
+  @Test
   public void testCQsWithPutallsWithTxValidateStats() throws Exception {
     final Host host = Host.getHost(0);
     VM server1 = host.getVM(0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
index bc552aa..d788b77 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
 import com.gemstone.gemfire.test.dunit.Invoke;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
@@ -24,10 +33,11 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
  * Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
  *
  */
+@Category(DistributedTest.class)
 public class PrCqUsingPoolOptimizedExecuteDUnitTest extends PrCqUsingPoolDUnitTest {
 
-  public PrCqUsingPoolOptimizedExecuteDUnitTest(String name) {
-    super(name);
+  public PrCqUsingPoolOptimizedExecuteDUnitTest() {
+    super();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java
index 8180b31..ac60c14 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.cache.query.dunit;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -46,15 +55,17 @@ import com.gemstone.gemfire.test.dunit.Assert;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 
 
+@Category(DistributedTest.class)
 public class PdxQueryCQDUnitTest extends PdxQueryCQTestBase {
 
-  public PdxQueryCQDUnitTest(String name) {
-    super(name);
+  public PdxQueryCQDUnitTest() {
+    super();
   }
   
   /**
    * Tests client-server query on PdxInstance.
    */
+  @Test
   public void testCq() throws CacheException {
     
     final Host host = Host.getHost(0);
@@ -234,6 +245,7 @@ public class PdxQueryCQDUnitTest extends PdxQueryCQTestBase {
    * Tests client-server query on PdxInstance.
    */
   
+  @Test
   public void testCqAndInterestRegistrations() throws CacheException {
     
     final Host host = Host.getHost(0);
@@ -429,6 +441,7 @@ public class PdxQueryCQDUnitTest extends PdxQueryCQTestBase {
   /**
    * Tests client-server query on PdxInstance.
    */
+  @Test
   public void testCqAndInterestRegistrationsWithFailOver() throws CacheException {
     
     final Host host = Host.getHost(0);


Mime
View raw message