You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bs...@apache.org on 2016/11/18 20:01:01 UTC
[1/4] incubator-geode git commit: GEODE-2121 add DLockTest and other
categories
Repository: incubator-geode
Updated Branches:
refs/heads/develop cbff37e7d -> 845139e0f
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/pdx/AutoSerializableJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/AutoSerializableJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/AutoSerializableJUnitTest.java
index dcf1e0c..40ef28e 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/AutoSerializableJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/AutoSerializableJUnitTest.java
@@ -26,6 +26,7 @@ import org.apache.geode.pdx.internal.AutoSerializableManager;
import org.apache.geode.pdx.internal.PdxField;
import org.apache.geode.pdx.internal.PdxInstanceImpl;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -47,7 +48,7 @@ import static org.junit.Assert.*;
/**
* TODO: fails (on Windows 7?)
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, SerializationTest.class})
public class AutoSerializableJUnitTest {
private GemFireCacheImpl c;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/pdx/ByteSourceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/ByteSourceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/ByteSourceJUnitTest.java
index 9a16fba..bd1d7cb 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/ByteSourceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/ByteSourceJUnitTest.java
@@ -26,6 +26,8 @@ import java.nio.IntBuffer;
import java.nio.LongBuffer;
import java.nio.ShortBuffer;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -35,7 +37,7 @@ import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSource;
import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSourceFactory;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({IntegrationTest.class, SerializationTest.class})
public class ByteSourceJUnitTest {
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/pdx/ClientsWithVersioningRetryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/ClientsWithVersioningRetryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/ClientsWithVersioningRetryDUnitTest.java
index c3ed8dd..e1a6062 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/ClientsWithVersioningRetryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/ClientsWithVersioningRetryDUnitTest.java
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
+import org.apache.geode.test.junit.categories.SerializationTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -70,7 +71,7 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, SerializationTest.class})
public class ClientsWithVersioningRetryDUnitTest extends JUnit4CacheTestCase {
// list of expected exceptions to remove in tearDown2()
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/pdx/JSONFormatterJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/JSONFormatterJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/JSONFormatterJUnitTest.java
index d337e23..704bca9 100755
--- a/geode-core/src/test/java/org/apache/geode/pdx/JSONFormatterJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/JSONFormatterJUnitTest.java
@@ -22,6 +22,7 @@ import java.text.SimpleDateFormat;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.geode.test.junit.categories.SerializationTest;
import org.json.JSONException;
import org.json.JSONObject;
import org.junit.After;
@@ -40,7 +41,7 @@ import org.apache.geode.internal.Assert;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, SerializationTest.class})
public class JSONFormatterJUnitTest {
private GemFireCacheImpl c;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/pdx/PDXAsyncEventQueueDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PDXAsyncEventQueueDUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PDXAsyncEventQueueDUnitTest.java
index 4e3358e..2753554 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PDXAsyncEventQueueDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PDXAsyncEventQueueDUnitTest.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.pdx;
+import org.apache.geode.test.junit.categories.SerializationTest;
import org.junit.experimental.categories.Category;
import org.junit.Test;
@@ -44,7 +45,7 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, SerializationTest.class})
public class PDXAsyncEventQueueDUnitTest extends JUnit4CacheTestCase {
public PDXAsyncEventQueueDUnitTest() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/pdx/PdxAttributesJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxAttributesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxAttributesJUnitTest.java
index c45abce..b755abe 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxAttributesJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxAttributesJUnitTest.java
@@ -25,6 +25,7 @@ import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.pdx.internal.PeerTypeRegistration;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -40,7 +41,7 @@ import static org.junit.Assert.assertEquals;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, SerializationTest.class})
public class PdxAttributesJUnitTest {
private File diskDir;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
index b0820f9..cd927a8 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
@@ -21,6 +21,7 @@ import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.util.Properties;
+import org.apache.geode.test.junit.categories.SerializationTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -56,7 +57,7 @@ import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, SerializationTest.class})
public class PdxClientServerDUnitTest extends JUnit4CacheTestCase {
public PdxClientServerDUnitTest() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/pdx/PdxDeserializationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxDeserializationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxDeserializationDUnitTest.java
index 907fb62..52c0083 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxDeserializationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxDeserializationDUnitTest.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.pdx;
+import org.apache.geode.test.junit.categories.SerializationTest;
import org.junit.experimental.categories.Category;
import org.junit.Test;
@@ -60,7 +61,7 @@ import org.apache.geode.test.dunit.WaitCriterion;
*
*
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, SerializationTest.class})
public class PdxDeserializationDUnitTest extends JUnit4CacheTestCase {
public PdxDeserializationDUnitTest() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceFactoryJUnitTest.java
index 9ad007b..55e5fb9 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceFactoryJUnitTest.java
@@ -25,6 +25,7 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSourceFactory;
import org.apache.geode.pdx.internal.*;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -36,7 +37,7 @@ import java.util.*;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.junit.Assert.*;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, SerializationTest.class})
public class PdxInstanceFactoryJUnitTest {
private GemFireCacheImpl cache;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java
index 0155455..1c6671c 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java
@@ -22,6 +22,7 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.pdx.internal.EnumInfo.PdxInstanceEnumInfo;
import org.apache.geode.pdx.internal.PdxInstanceFactoryImpl;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -41,7 +42,7 @@ import static org.junit.Assert.*;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, SerializationTest.class})
public class PdxInstanceJUnitTest {
private GemFireCacheImpl c;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableDUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableDUnitTest.java
index 9b307dd..9ebf5b2 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableDUnitTest.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.pdx;
+import org.apache.geode.test.junit.categories.SerializationTest;
import org.junit.experimental.categories.Category;
import org.junit.Test;
@@ -46,7 +47,7 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, SerializationTest.class})
public class PdxSerializableDUnitTest extends JUnit4CacheTestCase {
public PdxSerializableDUnitTest() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
index 5cd822c..af0eb40 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
@@ -34,6 +34,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+import org.apache.geode.test.junit.categories.SerializationTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -65,7 +66,7 @@ import org.apache.geode.pdx.internal.PdxWriterImpl;
import org.apache.geode.pdx.internal.TypeRegistry;
import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, SerializationTest.class})
public class PdxSerializableJUnitTest {
private GemFireCacheImpl c;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/pdx/PdxStringJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxStringJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxStringJUnitTest.java
index 36cb085..c072e14 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxStringJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxStringJUnitTest.java
@@ -22,6 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import org.apache.geode.test.junit.categories.SerializationTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -34,7 +35,7 @@ import org.apache.geode.pdx.internal.PdxInstanceImpl;
import org.apache.geode.pdx.internal.PdxString;
import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, SerializationTest.class})
public class PdxStringJUnitTest {
private GemFireCacheImpl c;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/pdx/PdxTypeExportDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxTypeExportDUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxTypeExportDUnitTest.java
index 2fc5a99..0edfa28 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxTypeExportDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxTypeExportDUnitTest.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.pdx;
+import org.apache.geode.test.junit.categories.SerializationTest;
import org.junit.experimental.categories.Category;
import org.junit.Test;
@@ -46,7 +47,7 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.SerializableCallable;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, SerializationTest.class})
public class PdxTypeExportDUnitTest extends JUnit4CacheTestCase {
public PdxTypeExportDUnitTest() {
super();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryCQDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryCQDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryCQDUnitTest.java
index 0b83c37..2d888cf 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryCQDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryCQDUnitTest.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.cache.query.dunit;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
import org.junit.experimental.categories.Category;
import org.junit.Test;
@@ -53,7 +55,7 @@ import org.apache.geode.test.dunit.Assert;
import org.apache.geode.cache30.CacheSerializableRunnable;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, SerializationTest.class, ClientSubscriptionTest.class})
public class PdxQueryCQDUnitTest extends PdxQueryCQTestBase {
public PdxQueryCQDUnitTest() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
index ad9a1ab..6752d61 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.cache.query.dunit;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.experimental.categories.Category;
import org.junit.Test;
@@ -65,7 +66,7 @@ import org.apache.geode.cache30.CertifiableTestCacheListener;
*
*
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class QueryIndexUpdateRIDUnitTest extends JUnit4CacheTestCase {
/** The port on which the bridge server was started in this VM */
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryMonitorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryMonitorDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryMonitorDUnitTest.java
index af638c4..f298fae 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryMonitorDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/query/dunit/QueryMonitorDUnitTest.java
@@ -59,6 +59,7 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
@@ -74,7 +75,7 @@ import static org.junit.Assert.*;
*
* @since GemFire 6.0
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
private final String exampleRegionName = "exampleRegion";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-cq/src/test/java/org/apache/geode/cache/snapshot/ClientSnapshotDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/org/apache/geode/cache/snapshot/ClientSnapshotDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/cache/snapshot/ClientSnapshotDUnitTest.java
index 0f7e773..c93aac0 100644
--- a/geode-cq/src/test/java/org/apache/geode/cache/snapshot/ClientSnapshotDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/cache/snapshot/ClientSnapshotDUnitTest.java
@@ -22,6 +22,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import com.examples.snapshot.MyObject;
import com.examples.snapshot.MyPdxSerializer;
+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.dunit.SerializableCallable;
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 ClientSnapshotDUnitTest extends JUnit4CacheTestCase {
private transient Region<Integer, MyObject> region;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-cq/src/test/java/org/apache/geode/internal/cache/PRDeltaPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/PRDeltaPropagationDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/PRDeltaPropagationDUnitTest.java
index 728b8f0..dc84a34 100755
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/PRDeltaPropagationDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/PRDeltaPropagationDUnitTest.java
@@ -22,6 +22,8 @@ import java.io.DataOutput;
import java.io.IOException;
import java.util.Properties;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -71,7 +73,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Tests the PR delta propagation functionality.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, SerializationTest.class, ClientSubscriptionTest.class})
public class PRDeltaPropagationDUnitTest extends JUnit4DistributedTestCase {
private final static Compressor compressor = SnappyCompressor.getDefaultInstance();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-cq/src/test/java/org/apache/geode/internal/cache/PutAllCSDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/PutAllCSDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/PutAllCSDUnitTest.java
index e42d35a..2c6252b 100755
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/PutAllCSDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/PutAllCSDUnitTest.java
@@ -31,6 +31,8 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import org.apache.geode.test.junit.categories.ClientServerTest;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -98,7 +100,7 @@ import org.apache.geode.test.junit.categories.FlakyTest;
*
* @since GemFire 5.0.23
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class, ClientSubscriptionTest.class})
@SuppressWarnings("serial")
public class PutAllCSDUnitTest extends ClientServerTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-cq/src/test/java/org/apache/geode/internal/cache/RemoteCQTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/RemoteCQTransactionDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/RemoteCQTransactionDUnitTest.java
index 29cb760..38fd245 100755
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/RemoteCQTransactionDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/RemoteCQTransactionDUnitTest.java
@@ -14,15 +14,12 @@
*/
package org.apache.geode.internal.cache;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.CacheEvent;
@@ -69,9 +66,16 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class RemoteCQTransactionDUnitTest extends JUnit4CacheTestCase {
final protected String CUSTOMER = "custRegion";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/CQListGIIDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/CQListGIIDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/CQListGIIDUnitTest.java
index 6df3832..659c4a9 100755
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/CQListGIIDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/CQListGIIDUnitTest.java
@@ -26,6 +26,7 @@ import java.util.List;
import java.util.Map;
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;
@@ -71,7 +72,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* @since GemFire 5.7
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class CQListGIIDUnitTest extends JUnit4DistributedTestCase {
private final static int CREATE = 0;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/HADispatcherDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/HADispatcherDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/HADispatcherDUnitTest.java
index 233e1bb..76177ed 100755
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/HADispatcherDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/ha/HADispatcherDUnitTest.java
@@ -33,6 +33,7 @@ import org.apache.geode.internal.cache.tier.sockets.HAEventWrapper;
import org.apache.geode.test.dunit.VM;
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.junit.Test;
import org.junit.experimental.categories.Category;
@@ -60,7 +61,7 @@ import static org.apache.geode.test.dunit.Wait.waitForCriterion;
* QRM is envoked 7. Again the entry in the regionque of client2 on server2.It should not be
* present. 8. close client1 and client2 9. close server1 and server2
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class HADispatcherDUnitTest extends JUnit4DistributedTestCase {
private static final String REGION_NAME = HADispatcherDUnitTest.class.getSimpleName() + "_region";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
index b8002e9..20d057a 100755
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
@@ -14,16 +14,12 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.Properties;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.DELTA_PROPAGATION;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import org.apache.geode.DeltaTestImpl;
import org.apache.geode.cache.AttributesFactory;
@@ -58,14 +54,23 @@ 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.SerializationTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.Properties;
/**
* Test client to server flow for delta propogation
*
* @since GemFire 6.1
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class, SerializationTest.class})
public class ClientToServerDeltaDUnitTest extends JUnit4DistributedTestCase {
/*
* Test configuration one server one client also 2 server 2 client
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
index 777033f..af31a9b 100644
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
@@ -14,14 +14,11 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
-
-import java.util.List;
-import java.util.Properties;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import org.apache.geode.DeltaTestImpl;
import org.apache.geode.cache.AttributesFactory;
@@ -53,9 +50,16 @@ 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.SerializationTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.List;
+import java.util.Properties;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class, SerializationTest.class})
public class DeltaPropagationWithCQDUnitTest extends JUnit4DistributedTestCase {
private static GemFireCache cache = null;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
index 790c32e..89e7546 100755
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
@@ -14,14 +14,13 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.Assert.*;
-
-import java.util.Iterator;
-import java.util.Properties;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import static org.apache.geode.test.dunit.Assert.assertFalse;
+import static org.apache.geode.test.dunit.Assert.assertNotNull;
+import static org.apache.geode.test.dunit.Assert.assertTrue;
+import static org.apache.geode.test.dunit.Assert.fail;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -47,13 +46,20 @@ 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.SerializationTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.Iterator;
+import java.util.Properties;
/**
* This tests the flag setting for region ( DataPolicy as Empty ) for Delta propogation for a client
* while registering CQ
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class, SerializationTest.class})
public class DeltaToRegionRelationCQRegistrationDUnitTest extends JUnit4DistributedTestCase {
private static Cache cache = null;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
index 8ad5755..29584ac 100755
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
@@ -14,13 +14,13 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import static org.junit.Assert.*;
-
-import org.junit.experimental.categories.Category;
+import static org.junit.Assert.assertNotNull;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache30.CacheSerializableRunnable;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.experimental.categories.Category;
/**
* Class <code>DurableClientCrashDUnitTest</code> tests durable client functionality when clients
@@ -28,7 +28,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 5.2
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class DurableClientCrashDUnitTest extends DurableClientTestCase {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java
index c27dd9e..a425f34 100644
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java
@@ -14,9 +14,9 @@
*/
package org.apache.geode.internal.cache.tier.sockets;
-import org.junit.experimental.categories.Category;
-
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.experimental.categories.Category;
/**
* Class <code>DurableClientCrashDUnitTest</code> tests durable client functionality when clients
@@ -24,7 +24,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 5.2
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class DurableClientNetDownDUnitTest extends DurableClientCrashDUnitTest {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
index 836cb09..68c397d 100644
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
@@ -57,6 +57,7 @@ import org.apache.geode.test.dunit.NetworkUtils;
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.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.junit.Ignore;
@@ -65,7 +66,7 @@ import org.junit.experimental.categories.Category;
import com.jayway.awaitility.Awaitility;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class DurableClientSimpleDUnitTest extends DurableClientTestCase {
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-junit/src/main/java/org/apache/geode/test/junit/categories/ClientServerTest.java
----------------------------------------------------------------------
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/ClientServerTest.java b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/ClientServerTest.java
new file mode 100755
index 0000000..9896981
--- /dev/null
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/ClientServerTest.java
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.test.junit.categories;
+
+/**
+ * A category of tests for client/server not involving subscriptions
+ */
+public interface ClientServerTest {
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-junit/src/main/java/org/apache/geode/test/junit/categories/ClientSubscriptionTest.java
----------------------------------------------------------------------
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/ClientSubscriptionTest.java b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/ClientSubscriptionTest.java
new file mode 100755
index 0000000..79b09c1
--- /dev/null
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/ClientSubscriptionTest.java
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.test.junit.categories;
+
+/**
+ * A category of tests for register-interest and continuous-query
+ */
+public interface ClientSubscriptionTest {
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-junit/src/main/java/org/apache/geode/test/junit/categories/DLockTest.java
----------------------------------------------------------------------
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/DLockTest.java b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/DLockTest.java
new file mode 100755
index 0000000..6841010
--- /dev/null
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/DLockTest.java
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.test.junit.categories;
+
+/**
+ * A test category for distributed lock services
+ */
+public interface DLockTest {
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-junit/src/main/java/org/apache/geode/test/junit/categories/MembershipTest.java
----------------------------------------------------------------------
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/MembershipTest.java b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/MembershipTest.java
new file mode 100755
index 0000000..b924fa9
--- /dev/null
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/MembershipTest.java
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.test.junit.categories;
+
+/**
+ * A test category for membership-related tests
+ */
+public interface MembershipTest {
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-junit/src/main/java/org/apache/geode/test/junit/categories/RestAPITest.java
----------------------------------------------------------------------
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/RestAPITest.java b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/RestAPITest.java
new file mode 100755
index 0000000..6b488b4
--- /dev/null
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/RestAPITest.java
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.test.junit.categories;
+
+/**
+ * A categor for REST API tests
+ */
+public interface RestAPITest {
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-junit/src/main/java/org/apache/geode/test/junit/categories/SerializationTest.java
----------------------------------------------------------------------
diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/SerializationTest.java b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/SerializationTest.java
new file mode 100755
index 0000000..48e5ded
--- /dev/null
+++ b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/SerializationTest.java
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.test.junit.categories;
+
+/**
+ * A test category for DataSerializable, PDXSerializable, Autoserializer, etc.
+ */
+public interface SerializationTest {
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/gradle/test.gradle
----------------------------------------------------------------------
diff --git a/gradle/test.gradle b/gradle/test.gradle
index bb8ab39..724b569 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -134,6 +134,55 @@ subprojects {
reports.junitXml.destination = file "$buildDir/test-reports-security"
}
+
+
+ task clientServerTest(type:Test) {
+ useJUnit {
+ includeCategories 'org.apache.geode.test.junit.categories.ClientServerTest'
+ }
+ doFirst {
+ TestPropertiesWriter.writeTestProperties(buildDir, name)
+ }
+ reports.junitXml.destination = file "$buildDir/test-reports-security"
+ }
+ task dlockTest(type:Test) {
+ useJUnit {
+ includeCategories 'org.apache.geode.test.junit.categories.DLockTest'
+ }
+ doFirst {
+ TestPropertiesWriter.writeTestProperties(buildDir, name)
+ }
+ reports.junitXml.destination = file "$buildDir/test-reports-dlock"
+ }
+ task membershipTest(type:Test) {
+ useJUnit {
+ includeCategories 'org.apache.geode.test.junit.categories.MembershipTest'
+ }
+ doFirst {
+ TestPropertiesWriter.writeTestProperties(buildDir, name)
+ }
+ reports.junitXml.destination = file "$buildDir/test-reports-membership"
+ }
+ task restAPITest(type:Test) {
+ useJUnit {
+ includeCategories 'org.apache.geode.test.junit.categories.RestAPITest'
+ }
+ doFirst {
+ TestPropertiesWriter.writeTestProperties(buildDir, name)
+ }
+ forkEvery 1
+ reports.junitXml.destination = file "$buildDir/test-reports-restAPI"
+ }
+ task serializationTest(type:Test) {
+ useJUnit {
+ includeCategories 'org.apache.geode.test.junit.categories.serializationTest'
+ }
+ doFirst {
+ TestPropertiesWriter.writeTestProperties(buildDir, name)
+ }
+ reports.junitXml.destination = file "$buildDir/test-reports-serialization"
+ }
+
// By proving a file with an arbitrary list of test classes, we can select only those
// tests to run. Activated using -Dcustom.tests=<file> customTest
def customTestList = []
[3/4] incubator-geode git commit: GEODE-2121 add DLockTest and other
categories
Posted by bs...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
index f11d834..c0d9aa5 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
@@ -23,6 +23,7 @@ import org.apache.geode.distributed.internal.membership.gms.interfaces.Manager;
import org.apache.geode.distributed.internal.membership.gms.messenger.JGroupsMessenger;
import org.apache.geode.distributed.internal.membership.gms.messenger.StatRecorder;
import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
import org.jgroups.Event;
import org.jgroups.Message;
@@ -47,7 +48,7 @@ import static org.mockito.Mockito.*;
/**
* This class tests the GMS StatRecorder class, which records JGroups messaging statistics
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class StatRecorderJUnitTest {
private Protocol mockDownProtocol;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java
index 58c5b0d..7f64c67 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java
@@ -27,6 +27,7 @@ import org.apache.geode.distributed.internal.membership.gms.Services;
import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Assert;
import org.junit.Test;
@@ -50,7 +51,7 @@ import javax.crypto.Mac;
import javax.crypto.SecretKey;
import javax.crypto.spec.DHParameterSpec;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, MembershipTest.class})
public class GMSEncryptJUnitTest {
Services services;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumCheckerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumCheckerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumCheckerJUnitTest.java
index 499ba8e..133b2f8 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumCheckerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumCheckerJUnitTest.java
@@ -24,6 +24,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Set;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.jgroups.Event;
import org.jgroups.JChannel;
import org.jgroups.Message;
@@ -42,7 +44,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.distributed.internal.membership.NetView;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({IntegrationTest.class, MembershipTest.class})
public class GMSQuorumCheckerJUnitTest {
private InternalDistributedMember[] mockMembers;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
index 628fa0a..307b594 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
@@ -60,6 +60,7 @@ import java.util.Properties;
import java.util.Set;
import org.apache.commons.lang.SerializationException;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.jgroups.Address;
import org.jgroups.Event;
import org.jgroups.JChannel;
@@ -86,7 +87,7 @@ import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.Version;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, MembershipTest.class})
public class JGroupsMessengerJUnitTest {
private Services services;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
index 1578753..8c82a6f 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
@@ -33,6 +33,7 @@ import org.apache.geode.distributed.internal.membership.gms.mgr.GMSMembershipMan
import org.apache.geode.internal.admin.remote.AlertListenerMessage;
import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
import org.apache.geode.internal.tcp.ConnectExceptions;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
import org.assertj.core.api.Assertions;
import org.jgroups.util.UUID;
@@ -50,7 +51,7 @@ import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class GMSMembershipManagerJUnitTest {
private static final long WAIT_FOR_REPLIES_MILLIS = 2000;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
index dfe234b..0bcf608 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
@@ -21,6 +21,7 @@ import java.io.File;
import java.io.IOException;
import java.util.Properties;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -43,7 +44,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This tests the rolling upgrade for locators with different GOSSIPVERSION.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, MembershipTest.class})
public class TcpServerBackwardCompatDUnitTest extends JUnit4DistributedTestCase {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerJUnitTest.java
index e59eb7d..1ad149e 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/tcpserver/TcpServerJUnitTest.java
@@ -27,6 +27,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -42,7 +43,7 @@ import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.net.SocketCreatorFactory;
import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, MembershipTest.class})
public class TcpServerJUnitTest {
private/* GemStoneAddition */ InetAddress localhost;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/Bug41957DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug41957DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug41957DUnitTest.java
index 8b63c26..6d10d61 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/Bug41957DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/Bug41957DUnitTest.java
@@ -19,6 +19,7 @@ import static org.apache.geode.test.dunit.Assert.*;
import java.util.Properties;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -51,7 +52,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 6.5
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class Bug41957DUnitTest extends ClientServerTestCase {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerGetAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerGetAllDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerGetAllDUnitTest.java
index 2193d6e..063be78 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerGetAllDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerGetAllDUnitTest.java
@@ -24,6 +24,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;
@@ -57,7 +58,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 5.7
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class ClientServerGetAllDUnitTest extends ClientServerTestCase {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
index 41b1aca..0b69864 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
@@ -22,6 +22,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -56,7 +57,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* tombstones are treated in a similar manner. The ticket complains that a client that does a get(K)
* does not end up with the entry in its cache if K is invalid on the server.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class ClientServerInvalidAndDestroyedEntryDUnitTest extends JUnit4CacheTestCase {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java
index f9f8b70..43096d6 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopDUnitTest.java
@@ -33,6 +33,7 @@ import java.util.concurrent.ConcurrentHashMap;
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;
@@ -81,7 +82,7 @@ import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class PartitionedRegionSingleHopDUnitTest extends JUnit4CacheTestCase {
private static final String PR_NAME = "single_hop_pr";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
index 72aec02..6186ba7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
@@ -27,6 +27,7 @@ import java.util.Map.Entry;
import java.util.Properties;
import java.util.StringTokenizer;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -64,7 +65,7 @@ import org.apache.geode.test.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, ClientServerTest.class})
public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends JUnit4CacheTestCase {
protected static final String PR_NAME = "single_hop_pr";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
index ce4df64..4d5dd7e 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
@@ -43,6 +43,7 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.NetworkUtils;
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.DistributedTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -53,7 +54,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBase {
private static final String TEST_FUNCTION1 = TestFunction.TEST_FUNCTION1;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRDUnitTest.java
index 19c53ca..bf0998c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRDUnitTest.java
@@ -14,26 +14,14 @@
*/
package org.apache.geode.internal.cache.execute;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.cache.client.ClientCache;
-import org.apache.geode.cache.client.ClientCacheFactory;
-import org.apache.geode.cache.client.ClientRegionShortcut;
-import org.apache.geode.cache.execute.Execution;
-import org.apache.geode.cache.execute.FunctionService;
-import org.apache.geode.cache.partition.PartitionRegionHelper;
-import org.apache.geode.cache.server.CacheServer;
-import org.apache.geode.test.dunit.Host;
-import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-
-import org.junit.Before;
import org.junit.experimental.categories.Category;
/**
* Tests function execution with a client accessing a single member with a PR using onRegion calls.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class FunctionServiceClientAccessorPRDUnitTest extends FunctionServiceClientAccessorPRBase {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersDUnitTest.java
index a6f535c..02c05a8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersDUnitTest.java
@@ -14,31 +14,18 @@
*/
package org.apache.geode.internal.cache.execute;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.cache.client.ClientCache;
-import org.apache.geode.cache.client.ClientCacheFactory;
-import org.apache.geode.cache.client.ClientRegionShortcut;
import org.apache.geode.cache.client.internal.ClientMetadataService;
-import org.apache.geode.cache.execute.Execution;
-import org.apache.geode.cache.execute.FunctionService;
-import org.apache.geode.cache.partition.PartitionRegionHelper;
-import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.test.dunit.Host;
-import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-
-import org.junit.Before;
-import org.junit.Ignore;
import org.junit.experimental.categories.Category;
/**
* Tests function execution with a client accessing multiple members with a PR with redundancy 0
* using onRegion calls.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class FunctionServiceClientAccessorPRMultipleMembersDUnitTest
extends FunctionServiceClientAccessorPRBase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersMultihopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersMultihopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersMultihopDUnitTest.java
index eaaca7b..1e1bbbd 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersMultihopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRMultipleMembersMultihopDUnitTest.java
@@ -15,15 +15,15 @@
package org.apache.geode.internal.cache.execute;
import org.apache.geode.cache.client.ClientCacheFactory;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-
import org.junit.Ignore;
import org.junit.experimental.categories.Category;
/**
* Tests onRegion using multiple servers from a single client that has single hop disabled
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class FunctionServiceClientAccessorPRMultipleMembersMultihopDUnitTest
extends FunctionServiceClientAccessorPRBase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientMultipleOnServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientMultipleOnServerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientMultipleOnServerDUnitTest.java
index f948382..579a420 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientMultipleOnServerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientMultipleOnServerDUnitTest.java
@@ -14,24 +14,14 @@
*/
package org.apache.geode.internal.cache.execute;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.cache.client.ClientCache;
-import org.apache.geode.cache.client.ClientRegionShortcut;
-import org.apache.geode.cache.execute.Execution;
-import org.apache.geode.cache.execute.FunctionService;
-import org.apache.geode.cache.partition.PartitionRegionHelper;
-import org.apache.geode.test.dunit.Host;
-import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
-
-import org.junit.Before;
import org.junit.experimental.categories.Category;
/**
* Tests onServers using multiple servers from a single client.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class FunctionServiceClientMultipleOnServerDUnitTest
extends FunctionServiceClientOnServerBase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerDUnitTest.java
index 5bcfd9e..7e237df 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerDUnitTest.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.internal.cache.execute;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.junit.experimental.categories.Category;
@@ -21,7 +22,7 @@ import org.junit.experimental.categories.Category;
/**
* Tests onServers using a single server from a single client.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class FunctionServiceClientOnServerDUnitTest extends FunctionServiceClientOnServerBase {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
index afbd259..e5464bb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.internal.cache.execute;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.experimental.categories.Category;
import org.junit.Test;
@@ -40,7 +41,7 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.functions.TestFunction;
import org.apache.geode.test.dunit.LogWriterUtils;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class PRClientServerFunctionExecutionNoAckDUnitTest extends PRClientServerTestBase {
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
index 6680cd7..3b072d6 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
@@ -29,6 +29,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -66,7 +67,7 @@ import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServerTestBase {
private static final String TEST_FUNCTION7 = TestFunction.TEST_FUNCTION7;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
index 644f002..bc7e061 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
@@ -23,6 +23,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.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends PRClientServerTestBase {
private static Locator locator = null;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
index 189ced5..0925bc5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.internal.cache.execute;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.experimental.categories.Category;
import org.junit.Test;
@@ -65,7 +66,7 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.FlakyTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest
extends PRClientServerTestBase {
private static final String TEST_FUNCTION7 = TestFunction.TEST_FUNCTION7;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
index a4b7398..43540a8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
@@ -14,30 +14,10 @@
*/
package org.apache.geode.internal.cache.execute;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.Serializable;
-import java.net.SocketException;
-import java.net.SocketTimeoutException;
-import java.rmi.ServerException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.Region;
@@ -62,8 +42,28 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.junit.categories.ClientServerTest;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FlakyTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.Serializable;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
+import java.rmi.ServerException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest
extends PRClientServerTestBase {
private static final String TEST_FUNCTION7 = TestFunction.TEST_FUNCTION7;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
index 1b73fd9..d5d3d64 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.internal.cache.execute;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.experimental.categories.Category;
import org.junit.Test;
@@ -62,7 +63,7 @@ import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest
extends PRClientServerTestBase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQAddOperationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQAddOperationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQAddOperationJUnitTest.java
index 85284b5..4591639 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQAddOperationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQAddOperationJUnitTest.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Vector;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -39,7 +40,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientSubscriptionTest.class})
public class BlockingHARQAddOperationJUnitTest extends HARQAddOperationJUnitTest {
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQStatsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQStatsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQStatsJUnitTest.java
index c2096e3..581d79a 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQStatsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQStatsJUnitTest.java
@@ -16,6 +16,7 @@ package org.apache.geode.internal.cache.ha;
import java.io.IOException;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheException;
@@ -27,7 +28,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientSubscriptionTest.class})
public class BlockingHARQStatsJUnitTest extends HARegionQueueStatsJUnitTest {
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java
index 5bab912..b802b8e 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionJUnitTest.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.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -33,7 +34,7 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientSubscriptionTest.class})
public class BlockingHARegionJUnitTest {
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/ha/BlockingHARegionQueueJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java
index a1c9d6b..ee1cd6d 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java
@@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit;
import com.jayway.awaitility.Awaitility;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -39,7 +40,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientSubscriptionTest.class})
public class BlockingHARegionQueueJUnitTest extends HARegionQueueJUnitTest {
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
index 3eba796..081514d 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug36853EventsExpiryDUnitTest.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;
@@ -56,7 +57,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* make some of the events in the queue expire before dispatcher can start picking them up for
* delivery to the client.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class Bug36853EventsExpiryDUnitTest extends JUnit4CacheTestCase {
/** Cache-server */
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java
index 6d68ff8..c776984 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java
@@ -28,6 +28,7 @@ import java.util.Collection;
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;
@@ -57,7 +58,7 @@ import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class Bug48571DUnitTest extends JUnit4DistributedTestCase {
private static VM server = null;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48879DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48879DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48879DUnitTest.java
index 8d05145..efed99c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48879DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48879DUnitTest.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;
@@ -42,7 +43,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 Bug48879DUnitTest extends JUnit4DistributedTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationDUnitTest.java
index 4f1cabf..a2b6249 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationDUnitTest.java
@@ -20,6 +20,7 @@ import java.util.Iterator;
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;
@@ -67,7 +68,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
* p2p and then finally to client-2. It is verified that client-2 recieves the same values for
* thread-id and sequence-id.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class EventIdOptimizationDUnitTest extends JUnit4DistributedTestCase {
/** Cache-server1 */
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java
index 085d5d4..09c4a4d 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/EventIdOptimizationJUnitTest.java
@@ -18,6 +18,7 @@ import static org.junit.Assert.*;
import java.nio.ByteBuffer;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -32,7 +33,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* methods written in <code>EventID</code> class for the above optimization. For distributed testing
* for the same , please refer {@link EventIdOptimizationDUnitTest}.
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class EventIdOptimizationJUnitTest {
/** The long id (threadId or sequenceId) having value equivalent to byte */
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/ha/FailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/FailoverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/FailoverDUnitTest.java
index c9c6b30..9f8bc0d 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/FailoverDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/FailoverDUnitTest.java
@@ -20,6 +20,7 @@ import static org.apache.geode.test.dunit.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;
@@ -57,7 +58,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* failing to S2.During fail over duration do some puts on S1. The client on failing to S2 may
* receive duplicate events but should not miss any events.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class FailoverDUnitTest 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/ha/HABugInPutDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HABugInPutDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HABugInPutDUnitTest.java
index 1deac29..0be0700 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HABugInPutDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HABugInPutDUnitTest.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;
@@ -46,7 +47,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* and NotifyBySubscription is false then it follows normal path and then again calls put of region
* on which region queue is based. so recurssion is happening.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class HABugInPutDUnitTest extends JUnit4DistributedTestCase {
private static final String REGION_NAME = HABugInPutDUnitTest.class.getSimpleName() + "_region";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAClearDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAClearDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAClearDUnitTest.java
index 77fdf26..12ce01d 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAClearDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAClearDUnitTest.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;
@@ -53,7 +54,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 HAClearDUnitTest 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/ha/HAConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAConflationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAConflationDUnitTest.java
index b571ea8..e05c279 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAConflationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAConflationDUnitTest.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;
@@ -56,7 +57,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* invalidate. 4) Do a create , update , update & destroy. The client should receive 3 callbacks (
* craete , conflated update & destroy).
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class HAConflationDUnitTest extends JUnit4CacheTestCase {
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/ha/HADuplicateDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HADuplicateDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HADuplicateDUnitTest.java
index 2499f06..f8a1ec1 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HADuplicateDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HADuplicateDUnitTest.java
@@ -21,6 +21,7 @@ import java.util.HashMap;
import java.util.Map;
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;
@@ -55,7 +56,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* directy from the server1. 3. Stop the server1 so that fail over happens 4. Validate the
* duplicates received by the client1
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class HADuplicateDUnitTest 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/ha/HAEventIdPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAEventIdPropagationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAEventIdPropagationDUnitTest.java
index 783a123..eae8029 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAEventIdPropagationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAEventIdPropagationDUnitTest.java
@@ -22,6 +22,7 @@ import java.util.LinkedHashMap;
import java.util.Map;
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;
@@ -66,7 +67,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 5.1
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class HAEventIdPropagationDUnitTest extends JUnit4DistributedTestCase {
/** server VM * */
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAExpiryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAExpiryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAExpiryDUnitTest.java
index ca9d282..e568896 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAExpiryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAExpiryDUnitTest.java
@@ -18,6 +18,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;
@@ -53,7 +54,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* expiration period. 5. Checks size of the regionqueue. Size of the regionqueue should be equal to
* 0.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class HAExpiryDUnitTest 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/ha/HAGIIBugDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIBugDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIBugDUnitTest.java
index 3b497b7..27777e1 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIBugDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIBugDUnitTest.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
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;
@@ -60,7 +61,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* asynchronously till HARegion Queue gets created in vm1. 6. Validate the data. Puts happened
* during GII should be missed.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class HAGIIBugDUnitTest 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/ha/HAGIIDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIDUnitTest.java
index 65aa495..b411d9b 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAGIIDUnitTest.java
@@ -22,6 +22,7 @@ import java.util.Iterator;
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;
@@ -64,7 +65,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* and made available for the client. After that , S1 's server is stopped. The client fails over to
* S2. The client should receive all the puts . These puts have arrived on S2 via GII of HARegion.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class HAGIIDUnitTest 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/ha/HARQAddOperationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQAddOperationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQAddOperationJUnitTest.java
index 7cd6762..5fb0295 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQAddOperationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQAddOperationJUnitTest.java
@@ -22,6 +22,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.logging.log4j.Logger;
import org.junit.After;
import org.junit.Before;
@@ -48,7 +49,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Test to verify Add operation to HARegion Queue with and without conflation.
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientSubscriptionTest.class})
public class HARQAddOperationJUnitTest {
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/ha/HARQueueNewImplDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java
index f386d3c..12e5819 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java
@@ -26,6 +26,7 @@ import java.util.Map;
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;
*
* @since GemFire 5.7
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class HARQueueNewImplDUnitTest extends JUnit4DistributedTestCase {
private static final String regionName = HARQueueNewImplDUnitTest.class.getSimpleName();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionDUnitTest.java
index ae959df..e46782a 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionDUnitTest.java
@@ -18,6 +18,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;
@@ -42,7 +43,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* 1)put() on a mirrored HARegion does not propagate 2)localDestroy() allowed on a mirrored region
* 3) GII happens normally
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class HARegionDUnitTest 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/ha/HARegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionJUnitTest.java
index 90e64c8..7e9eeab 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionJUnitTest.java
@@ -19,6 +19,7 @@ import static org.junit.Assert.*;
import java.io.IOException;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -51,7 +52,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* Test verifies the properties of a HARegion which allows localPuts and localDestroys on a
* MirroredRegion
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientSubscriptionTest.class})
public class HARegionJUnitTest {
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java
index e87148a..14be90e 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueDUnitTest.java
@@ -22,6 +22,7 @@ import java.util.Map;
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;
@@ -52,7 +53,7 @@ import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class HARegionQueueDUnitTest extends JUnit4DistributedTestCase {
private static volatile boolean toCnt = true;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java
index 59b2674..43f1ac7 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueJUnitTest.java
@@ -32,6 +32,7 @@ import java.util.concurrent.TimeUnit;
import com.jayway.awaitility.Awaitility;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
@@ -58,7 +59,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
* This is a test for the APIs of a HARegionQueue and verifies that the head, tail and size counters
* are updated properly.
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientSubscriptionTest.class})
public class HARegionQueueJUnitTest {
/** The cache instance */
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStartStopJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStartStopJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStartStopJUnitTest.java
index 529fc7f..3445b33 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStartStopJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStartStopJUnitTest.java
@@ -24,6 +24,7 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.RegionQueue;
+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;
@@ -38,7 +39,7 @@ import static org.junit.Assert.fail;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientSubscriptionTest.class})
public class HARegionQueueStartStopJUnitTest {
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStatsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStatsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStatsJUnitTest.java
index 77e6a32..49efed7 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStatsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStatsJUnitTest.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache.ha;
import org.apache.geode.cache.*;
import org.apache.geode.internal.cache.Conflatable;
import org.apache.geode.internal.cache.EventID;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
@@ -34,7 +35,7 @@ import static org.junit.Assert.assertNotNull;
*
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientSubscriptionTest.class})
public class HARegionQueueStatsJUnitTest {
/** The cache instance */
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HASlowReceiverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HASlowReceiverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HASlowReceiverDUnitTest.java
index e420ce8..0c21162 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HASlowReceiverDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HASlowReceiverDUnitTest.java
@@ -19,6 +19,7 @@ import static org.junit.Assert.*;
import java.net.SocketException;
import java.util.Properties;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -44,7 +45,7 @@ import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import static org.apache.geode.distributed.ConfigurationProperties.*;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class HASlowReceiverDUnitTest 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/ha/OperationsPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/OperationsPropagationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/OperationsPropagationDUnitTest.java
index 7fda8b5..e29e67a 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/OperationsPropagationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/OperationsPropagationDUnitTest.java
@@ -22,6 +22,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;
@@ -50,7 +51,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* one server1 to another server2 do get delivered to the client connected to server2 (server2 is
* primary for client)
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class OperationsPropagationDUnitTest 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/ha/PutAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/PutAllDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/PutAllDUnitTest.java
index ba9463b..6fb7c45 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/PutAllDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/PutAllDUnitTest.java
@@ -22,6 +22,7 @@ import java.util.LinkedHashMap;
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;
@@ -58,7 +59,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 5.1
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class PutAllDUnitTest 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/ha/StatsBugDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/StatsBugDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/StatsBugDUnitTest.java
index c06a05c..8007b7d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/StatsBugDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/StatsBugDUnitTest.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;
@@ -53,7 +54,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* , with the failed endpoint getting closed. This bug has been fixed by moving the invalidate stat
* to be part of our implementation.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
@Ignore("Test was disabled by renaming to DisabledTest")
public class StatsBugDUnitTest extends JUnit4DistributedTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java
index 8aa1ac0..29b22be 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/ThreadIdentifierJUnitTest.java
@@ -16,13 +16,14 @@ package org.apache.geode.internal.cache.ha;
import static org.junit.Assert.*;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.ha.ThreadIdentifier.WanType;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class ThreadIdentifierJUnitTest {
@Test
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java
index 6a5eae8..14267a4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java
@@ -41,6 +41,7 @@ import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DLockTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -57,7 +58,7 @@ import java.util.concurrent.TimeUnit;
/**
* This class tests distributed ownership via the DistributedLockService api.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, DLockTest.class})
public class TXLockServiceDUnitTest extends JUnit4DistributedTestCase {
private static DistributedSystem system;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/Bug40396DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/Bug40396DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/Bug40396DUnitTest.java
index d76177b..7ed9d4a 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/Bug40396DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/Bug40396DUnitTest.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.Test;
import org.junit.experimental.categories.Category;
@@ -45,7 +46,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 6.1
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class Bug40396DUnitTest extends JUnit4DistributedTestCase {
private static 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/AcceptorImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplJUnitTest.java
index 428e553..7aa11b7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplJUnitTest.java
@@ -29,6 +29,7 @@ import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.tier.Acceptor;
import org.apache.geode.internal.cache.tier.MessageType;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
@@ -45,7 +46,7 @@ import java.util.Properties;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.junit.Assert.*;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class AcceptorImplJUnitTest {
DistributedSystem system;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
index 6934976..f126859 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.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;
@@ -46,7 +47,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* Test to verify that server responds to a higher versioned client.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class BackwardCompatibilityHigherVersionClientDUnitTest extends JUnit4DistributedTestCase {
/** the 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/Bug36269DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36269DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36269DUnitTest.java
index e3a1b5e..e361ccf 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36269DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36269DUnitTest.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;
@@ -51,7 +52,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* does the p2p messaging has provision of sending Context object in the DestroyRegionMessage. This
* can cause sender to recieve it own region destruction message.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class Bug36269DUnitTest 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/Bug36457DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36457DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36457DUnitTest.java
index 218ce99..d578412 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36457DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36457DUnitTest.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;
@@ -55,7 +56,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* unnecessary callback). The unregister encounters an error because the region has been destroyed
* on the server and hence falsely marks the server dead.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class Bug36457DUnitTest 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/Bug36805DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36805DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36805DUnitTest.java
index fdc743a..c70789c 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36805DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36805DUnitTest.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;
@@ -57,7 +58,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.*;
* To avoid this, there should not be any check of region before registration. And region
* registration should not fail due to non existent region.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class Bug36805DUnitTest 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/Bug36829DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36829DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36829DUnitTest.java
index eb4817d..69b8a79 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36829DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36829DUnitTest.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;
@@ -37,7 +38,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, ClientServerTest.class})
public class Bug36829DUnitTest extends JUnit4DistributedTestCase {
private VM serverVM;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36995DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36995DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36995DUnitTest.java
index 4f8e220..66fff6b 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36995DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/Bug36995DUnitTest.java
@@ -20,6 +20,7 @@ import static org.apache.geode.test.dunit.Assert.*;
import java.util.Iterator;
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.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 Bug36995DUnitTest extends JUnit4DistributedTestCase {
private static Cache cache = null;
[4/4] incubator-geode git commit: GEODE-2121 add DLockTest and other
categories
Posted by bs...@apache.org.
GEODE-2121 add DLockTest and other categories
I need these test categories in order to run code-coverage analysis for
the components I usually work with. The categories should be added to
the appropriate unit tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/845139e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/845139e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/845139e0
Branch: refs/heads/develop
Commit: 845139e0f865cc28595b45c38f340eb2092bc0ec
Parents: cbff37e
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Fri Nov 18 11:58:23 2016 -0800
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Fri Nov 18 12:00:42 2016 -0800
----------------------------------------------------------------------
.../org/apache/geode/BundledJarsJUnitTest.java | 3 +-
.../internal/web/RestInterfaceJUnitTest.java | 3 +-
.../rest/internal/web/RestServersJUnitTest.java | 3 +-
.../internal/web/SwaggerVerificationTest.java | 4 +-
.../cache/ClientServerTimeSyncDUnitTest.java | 3 +-
.../cache/ConnectionPoolAndLoaderDUnitTest.java | 3 +-
.../cache/ConnectionPoolAutoDUnitTest.java | 3 +-
.../geode/cache/ConnectionPoolDUnitTest.java | 3 +-
.../cache/ConnectionPoolFactoryJUnitTest.java | 3 +-
...MembershipAttributesAreSerializableTest.java | 3 +-
.../geode/cache/PoolManagerJUnitTest.java | 3 +-
.../client/ClientCacheFactoryJUnitTest.java | 3 +-
.../client/ClientRegionFactoryJUnitTest.java | 3 +-
.../ClientServerRegisterInterestsDUnitTest.java | 31 +++++++-----
.../internal/AutoConnectionSourceDUnitTest.java | 2 +-
.../AutoConnectionSourceImplJUnitTest.java | 3 +-
.../CacheServerSSLConnectionDUnitTest.java | 3 +-
.../internal/ConnectionPoolImplJUnitTest.java | 3 +-
.../internal/LocatorLoadBalancingDUnitTest.java | 3 +-
.../internal/OpExecutorImplJUnitTest.java | 3 +-
.../client/internal/QueueManagerJUnitTest.java | 3 +-
.../internal/SSLNoClientAuthDUnitTest.java | 3 +-
.../internal/ServerBlackListJUnitTest.java | 3 +-
.../pooling/ConnectionManagerJUnitTest.java | 3 +-
.../mapInterface/PutAllGlobalLockJUnitTest.java | 39 +++++++--------
.../apache/geode/cache30/Bug38741DUnitTest.java | 3 +-
.../cache30/ClientMembershipDUnitTest.java | 3 +-
.../ClientMembershipSelectorDUnitTest.java | 3 +-
.../ClientRegisterInterestDUnitTest.java | 3 +-
...ClientRegisterInterestSelectorDUnitTest.java | 3 +-
.../geode/cache30/ClientServerCCEDUnitTest.java | 3 +-
.../geode/cache30/GlobalLockingDUnitTest.java | 3 +-
.../DistributedLockServiceDUnitTest.java | 4 +-
.../distributed/DistributedSystemDUnitTest.java | 3 +-
.../DistributedSystemIntegrationJUnitTest.java | 3 +-
.../distributed/DistributedSystemJUnitTest.java | 3 +-
.../distributed/HostedLocatorsDUnitTest.java | 3 +-
.../geode/distributed/LocatorDUnitTest.java | 2 +-
.../geode/distributed/LocatorJUnitTest.java | 3 +-
.../LocatorUDPSecurityDUnitTest.java | 3 ++
.../distributed/internal/Bug40751DUnitTest.java | 3 +-
.../internal/DistributionAdvisorDUnitTest.java | 3 +-
.../internal/DistributionConfigJUnitTest.java | 3 +-
.../internal/DistributionManagerDUnitTest.java | 3 +-
.../InternalDistributedSystemJUnitTest.java | 3 +-
.../internal/ProductUseLogDUnitTest.java | 3 +-
.../internal/ProductUseLogJUnitTest.java | 3 +-
.../internal/ServerLocatorJUnitTest.java | 3 +-
.../internal/StartupMessageDataJUnitTest.java | 3 +-
.../locks/DLockReentrantLockJUnitTest.java | 3 +-
.../membership/MembershipJUnitTest.java | 2 +-
.../internal/membership/NetViewJUnitTest.java | 3 +-
.../gms/fd/GMSHealthMonitorJUnitTest.java | 3 +-
.../locator/GMSLocatorRecoveryJUnitTest.java | 3 +-
.../gms/membership/GMSJoinLeaveJUnitTest.java | 3 +-
.../gms/membership/StatRecorderJUnitTest.java | 3 +-
.../gms/messenger/GMSEncryptJUnitTest.java | 3 +-
.../messenger/GMSQuorumCheckerJUnitTest.java | 4 +-
.../messenger/JGroupsMessengerJUnitTest.java | 3 +-
.../gms/mgr/GMSMembershipManagerJUnitTest.java | 3 +-
.../TcpServerBackwardCompatDUnitTest.java | 3 +-
.../internal/tcpserver/TcpServerJUnitTest.java | 3 +-
.../geode/internal/cache/Bug41957DUnitTest.java | 3 +-
.../cache/ClientServerGetAllDUnitTest.java | 3 +-
...ServerInvalidAndDestroyedEntryDUnitTest.java | 3 +-
.../PartitionedRegionSingleHopDUnitTest.java | 3 +-
...RegionSingleHopWithServerGroupDUnitTest.java | 3 +-
.../ClientServerFunctionExecutionDUnitTest.java | 3 +-
...unctionServiceClientAccessorPRDUnitTest.java | 16 +------
...lientAccessorPRMultipleMembersDUnitTest.java | 17 +------
...essorPRMultipleMembersMultihopDUnitTest.java | 4 +-
...nServiceClientMultipleOnServerDUnitTest.java | 14 +-----
.../FunctionServiceClientOnServerDUnitTest.java | 3 +-
...ntServerFunctionExecutionNoAckDUnitTest.java | 3 +-
...tServerRegionFunctionExecutionDUnitTest.java | 3 +-
...egionFunctionExecutionFailoverDUnitTest.java | 3 +-
...onFunctionExecutionNoSingleHopDUnitTest.java | 3 +-
...onExecutionSelectorNoSingleHopDUnitTest.java | 50 ++++++++++----------
...gionFunctionExecutionSingleHopDUnitTest.java | 3 +-
.../ha/BlockingHARQAddOperationJUnitTest.java | 3 +-
.../cache/ha/BlockingHARQStatsJUnitTest.java | 3 +-
.../cache/ha/BlockingHARegionJUnitTest.java | 3 +-
.../ha/BlockingHARegionQueueJUnitTest.java | 3 +-
.../cache/ha/Bug36853EventsExpiryDUnitTest.java | 3 +-
.../internal/cache/ha/Bug48571DUnitTest.java | 3 +-
.../internal/cache/ha/Bug48879DUnitTest.java | 3 +-
.../cache/ha/EventIdOptimizationDUnitTest.java | 3 +-
.../cache/ha/EventIdOptimizationJUnitTest.java | 3 +-
.../internal/cache/ha/FailoverDUnitTest.java | 3 +-
.../internal/cache/ha/HABugInPutDUnitTest.java | 3 +-
.../internal/cache/ha/HAClearDUnitTest.java | 3 +-
.../cache/ha/HAConflationDUnitTest.java | 3 +-
.../internal/cache/ha/HADuplicateDUnitTest.java | 3 +-
.../cache/ha/HAEventIdPropagationDUnitTest.java | 3 +-
.../internal/cache/ha/HAExpiryDUnitTest.java | 3 +-
.../internal/cache/ha/HAGIIBugDUnitTest.java | 3 +-
.../geode/internal/cache/ha/HAGIIDUnitTest.java | 3 +-
.../cache/ha/HARQAddOperationJUnitTest.java | 3 +-
.../cache/ha/HARQueueNewImplDUnitTest.java | 3 +-
.../internal/cache/ha/HARegionDUnitTest.java | 3 +-
.../internal/cache/ha/HARegionJUnitTest.java | 3 +-
.../cache/ha/HARegionQueueDUnitTest.java | 3 +-
.../cache/ha/HARegionQueueJUnitTest.java | 3 +-
.../ha/HARegionQueueStartStopJUnitTest.java | 3 +-
.../cache/ha/HARegionQueueStatsJUnitTest.java | 3 +-
.../cache/ha/HASlowReceiverDUnitTest.java | 3 +-
.../ha/OperationsPropagationDUnitTest.java | 3 +-
.../internal/cache/ha/PutAllDUnitTest.java | 3 +-
.../internal/cache/ha/StatsBugDUnitTest.java | 3 +-
.../cache/ha/ThreadIdentifierJUnitTest.java | 3 +-
.../cache/locks/TXLockServiceDUnitTest.java | 3 +-
.../internal/cache/tier/Bug40396DUnitTest.java | 3 +-
.../tier/sockets/AcceptorImplJUnitTest.java | 3 +-
...mpatibilityHigherVersionClientDUnitTest.java | 3 +-
.../cache/tier/sockets/Bug36269DUnitTest.java | 3 +-
.../cache/tier/sockets/Bug36457DUnitTest.java | 3 +-
.../cache/tier/sockets/Bug36805DUnitTest.java | 3 +-
.../cache/tier/sockets/Bug36829DUnitTest.java | 3 +-
.../cache/tier/sockets/Bug36995DUnitTest.java | 3 +-
.../cache/tier/sockets/Bug37210DUnitTest.java | 3 +-
.../cache/tier/sockets/Bug37805DUnitTest.java | 3 +-
.../CacheServerMaxConnectionsJUnitTest.java | 3 +-
...heServerSelectorMaxConnectionsJUnitTest.java | 3 +-
.../CacheServerTransactionsDUnitTest.java | 3 +-
...acheServerTransactionsSelectorDUnitTest.java | 3 +-
.../tier/sockets/ClearPropagationDUnitTest.java | 3 +-
.../tier/sockets/ClientConflationDUnitTest.java | 3 +-
.../sockets/ClientHealthMonitorJUnitTest.java | 3 +-
.../ClientHealthMonitorSelectorJUnitTest.java | 3 +-
.../sockets/ClientInterestNotifyDUnitTest.java | 3 +-
.../ClientServerForceInvalidateDUnitTest.java | 3 +-
.../tier/sockets/ClientServerMiscDUnitTest.java | 3 +-
.../ClientServerMiscSelectorDUnitTest.java | 3 +-
.../cache/tier/sockets/ConflationDUnitTest.java | 3 +-
.../tier/sockets/ConnectionProxyJUnitTest.java | 3 +-
.../DataSerializerPropogationDUnitTest.java | 3 +-
.../DestroyEntryPropagationDUnitTest.java | 3 +-
.../sockets/DurableClientBug39997DUnitTest.java | 3 +-
.../DurableClientQueueSizeDUnitTest.java | 3 +-
.../DurableClientReconnectAutoDUnitTest.java | 3 +-
.../DurableClientReconnectDUnitTest.java | 3 +-
.../sockets/DurableClientStatsDUnitTest.java | 3 +-
.../sockets/DurableRegistrationDUnitTest.java | 3 +-
.../sockets/DurableResponseMatrixDUnitTest.java | 3 +-
.../sockets/EventIDVerificationDUnitTest.java | 3 +-
.../EventIDVerificationInP2PDUnitTest.java | 3 +-
.../FilterProfileIntegrationJUnitTest.java | 14 +++---
.../tier/sockets/FilterProfileJUnitTest.java | 28 ++++++-----
.../ForceInvalidateEvictionDUnitTest.java | 3 +-
...ForceInvalidateOffHeapEvictionDUnitTest.java | 3 +-
.../cache/tier/sockets/HABug36738DUnitTest.java | 3 +-
.../tier/sockets/HAInterestPart1DUnitTest.java | 3 +-
.../tier/sockets/HAInterestPart2DUnitTest.java | 3 +-
.../sockets/HAStartupAndFailoverDUnitTest.java | 3 +-
.../InstantiatorPropagationDUnitTest.java | 3 +-
.../tier/sockets/InterestListDUnitTest.java | 3 +-
.../sockets/InterestListEndpointDUnitTest.java | 3 +-
.../InterestListEndpointPRDUnitTest.java | 3 +-
.../InterestListEndpointSelectorDUnitTest.java | 3 +-
.../sockets/InterestListFailoverDUnitTest.java | 3 +-
.../sockets/InterestListRecoveryDUnitTest.java | 3 +-
.../sockets/InterestRegrListenerDUnitTest.java | 3 +-
.../sockets/InterestResultPolicyDUnitTest.java | 3 +-
.../cache/tier/sockets/MessageJUnitTest.java | 3 +-
.../sockets/NewRegionAttributesDUnitTest.java | 3 +-
.../tier/sockets/ObjectPartListJUnitTest.java | 3 +-
.../tier/sockets/RedundancyLevelJUnitTest.java | 3 +-
.../sockets/RedundancyLevelPart1DUnitTest.java | 3 +-
.../sockets/RedundancyLevelPart2DUnitTest.java | 3 +-
.../sockets/RedundancyLevelPart3DUnitTest.java | 3 +-
.../tier/sockets/RegionCloseDUnitTest.java | 3 +-
...erInterestBeforeRegionCreationDUnitTest.java | 3 +-
.../sockets/RegisterInterestKeysDUnitTest.java | 3 +-
.../RegisterInterestKeysPRDUnitTest.java | 3 +-
.../sockets/ReliableMessagingDUnitTest.java | 3 +-
.../sockets/UnregisterInterestDUnitTest.java | 3 +-
.../sockets/UpdatePropagationDUnitTest.java | 3 +-
.../VerifyEventIDGenerationInP2PDUnitTest.java | 3 +-
...UpdatesFromNonInterestEndPointDUnitTest.java | 3 +-
.../net/ClientSocketFactoryIntegrationTest.java | 3 +-
.../net/SSLConfigurationFactoryJUnitTest.java | 3 +-
.../internal/net/SSLSocketIntegrationTest.java | 3 +-
.../geode/internal/tcp/ConnectionJUnitTest.java | 3 +-
.../geode/pdx/AutoSerializableJUnitTest.java | 3 +-
.../apache/geode/pdx/ByteSourceJUnitTest.java | 4 +-
.../ClientsWithVersioningRetryDUnitTest.java | 3 +-
.../geode/pdx/JSONFormatterJUnitTest.java | 3 +-
.../geode/pdx/PDXAsyncEventQueueDUnitTest.java | 3 +-
.../geode/pdx/PdxAttributesJUnitTest.java | 3 +-
.../geode/pdx/PdxClientServerDUnitTest.java | 3 +-
.../geode/pdx/PdxDeserializationDUnitTest.java | 3 +-
.../geode/pdx/PdxInstanceFactoryJUnitTest.java | 3 +-
.../apache/geode/pdx/PdxInstanceJUnitTest.java | 3 +-
.../geode/pdx/PdxSerializableDUnitTest.java | 3 +-
.../geode/pdx/PdxSerializableJUnitTest.java | 3 +-
.../apache/geode/pdx/PdxStringJUnitTest.java | 3 +-
.../geode/pdx/PdxTypeExportDUnitTest.java | 3 +-
.../cache/query/dunit/PdxQueryCQDUnitTest.java | 4 +-
.../dunit/QueryIndexUpdateRIDUnitTest.java | 3 +-
.../query/dunit/QueryMonitorDUnitTest.java | 3 +-
.../cache/snapshot/ClientSnapshotDUnitTest.java | 3 +-
.../cache/PRDeltaPropagationDUnitTest.java | 4 +-
.../geode/internal/cache/PutAllCSDUnitTest.java | 4 +-
.../cache/RemoteCQTransactionDUnitTest.java | 24 ++++++----
.../internal/cache/ha/CQListGIIDUnitTest.java | 3 +-
.../cache/ha/HADispatcherDUnitTest.java | 3 +-
.../sockets/ClientToServerDeltaDUnitTest.java | 27 ++++++-----
.../DeltaPropagationWithCQDUnitTest.java | 22 +++++----
...ToRegionRelationCQRegistrationDUnitTest.java | 24 ++++++----
.../sockets/DurableClientCrashDUnitTest.java | 8 ++--
.../sockets/DurableClientNetDownDUnitTest.java | 6 +--
.../sockets/DurableClientSimpleDUnitTest.java | 3 +-
.../test/junit/categories/ClientServerTest.java | 21 ++++++++
.../categories/ClientSubscriptionTest.java | 21 ++++++++
.../geode/test/junit/categories/DLockTest.java | 21 ++++++++
.../test/junit/categories/MembershipTest.java | 21 ++++++++
.../test/junit/categories/RestAPITest.java | 21 ++++++++
.../junit/categories/SerializationTest.java | 21 ++++++++
gradle/test.gradle | 49 +++++++++++++++++++
219 files changed, 728 insertions(+), 366 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java
index 8c228f2..53f49cd 100644
--- a/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java
@@ -29,6 +29,7 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.apache.geode.test.junit.categories.RestAPITest;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -37,7 +38,7 @@ import org.apache.geode.internal.FileUtil;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.test.TestUtil;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, RestAPITest.class})
public class BundledJarsJUnitTest {
private static final String VERSION_PATTERN = "[0-9-_.v]{3,}.*\\.jar$";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java
index 932119d..324284e 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java
@@ -50,6 +50,7 @@ import org.apache.geode.pdx.PdxSerializable;
import org.apache.geode.pdx.PdxWriter;
import org.apache.geode.pdx.ReflectionBasedAutoSerializer;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.RestAPITest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -85,7 +86,7 @@ import org.springframework.web.client.RestTemplate;
// @RunWith(SpringJUnit4ClassRunner.class)
// @ContextConfiguration
@SuppressWarnings("unused")
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, RestAPITest.class})
public class RestInterfaceJUnitTest {
protected static int DEFAULT_HTTP_SERVICE_PORT = 8189;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java
index b49e6ca..10ce515 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java
@@ -21,6 +21,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.START_DEV_RES
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.http.HttpResponse;
import org.json.JSONArray;
import org.junit.BeforeClass;
@@ -30,7 +31,7 @@ import org.junit.experimental.categories.Category;
import java.util.Properties;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, RestAPITest.class})
public class RestServersJUnitTest {
private static int defaultPort = 7070;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
index e706b0e..975ccde 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
@@ -27,6 +27,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.test.dunit.rules.ServerStarterRule;
import org.apache.geode.security.templates.SimpleSecurityManager;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.RestAPITest;
import org.apache.http.HttpResponse;
import org.json.JSONObject;
import org.junit.ClassRule;
@@ -35,8 +36,7 @@ import org.junit.experimental.categories.Category;
import java.util.Properties;
-@Category(IntegrationTest.class)
-
+@Category({IntegrationTest.class, RestAPITest.class})
public class SwaggerVerificationTest {
private static int restPort = AvailablePortHelper.getRandomAvailableTCPPort();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/ClientServerTimeSyncDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ClientServerTimeSyncDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/ClientServerTimeSyncDUnitTest.java
index 6d5e840..61e7c3a 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/ClientServerTimeSyncDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ClientServerTimeSyncDUnitTest.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.cache;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.experimental.categories.Category;
import org.junit.Test;
@@ -36,7 +37,7 @@ import java.util.Properties;
import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class ClientServerTimeSyncDUnitTest extends JUnit4CacheTestCase {
public ClientServerTimeSyncDUnitTest() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAndLoaderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAndLoaderDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAndLoaderDUnitTest.java
index 8c02589..e9cf762 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAndLoaderDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAndLoaderDUnitTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.*;
import java.io.IOException;
import java.util.Properties;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -39,7 +40,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This tests cases where we have both a connection pool and a bridge loader.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class ConnectionPoolAndLoaderDUnitTest extends JUnit4CacheTestCase {
private static int bridgeServerPort;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAutoDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAutoDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAutoDUnitTest.java
index 68269e3..542475a 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAutoDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolAutoDUnitTest.java
@@ -17,6 +17,7 @@ package org.apache.geode.cache;
import org.apache.geode.cache30.ClientServerTestCase;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.SerializableRunnable;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import static org.junit.runners.MethodSorters.*;
@@ -24,7 +25,7 @@ import org.junit.FixMethodOrder;
import org.junit.experimental.categories.Category;
@FixMethodOrder(NAME_ASCENDING)
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class ConnectionPoolAutoDUnitTest extends ConnectionPoolDUnitTest {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
index 8bff8be..2d5a71b 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
@@ -27,6 +27,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.FixMethodOrder;
import org.junit.Ignore;
import org.junit.Test;
@@ -81,7 +82,7 @@ import org.apache.geode.test.junit.categories.FlakyTest;
*
* Test uses Groboutils TestRunnable objects to achieve multi threading behavior in the test.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
@FixMethodOrder(NAME_ASCENDING)
public class ConnectionPoolDUnitTest extends JUnit4CacheTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java
index b2be14a..18af019 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolFactoryJUnitTest.java
@@ -19,6 +19,7 @@ import org.apache.geode.cache.client.PoolFactory;
import org.apache.geode.cache.client.PoolManager;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.PoolFactoryImpl;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
@@ -31,7 +32,7 @@ import java.util.Properties;
import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class ConnectionPoolFactoryJUnitTest {
private Cache cache;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableTest.java b/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableTest.java
index 93d702b..d1d4d32 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/MembershipAttributesAreSerializableTest.java
@@ -21,6 +21,7 @@ import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -29,7 +30,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Tests MembershipAttributes and SubscriptionAttributes to make sure they are Serializable
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class MembershipAttributesAreSerializableTest {
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/PoolManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/PoolManagerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/PoolManagerJUnitTest.java
index 23d8d98..7b97f1b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/PoolManagerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/PoolManagerJUnitTest.java
@@ -19,6 +19,7 @@ import org.apache.geode.cache.client.PoolFactory;
import org.apache.geode.cache.client.PoolManager;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.PoolFactoryImpl;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
@@ -37,7 +38,7 @@ import static org.junit.Assert.assertNotNull;
*
* @since GemFire 5.7
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class PoolManagerJUnitTest {
private DistributedSystem ds;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
index a2339e2..f881d38 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
@@ -31,6 +31,7 @@ import org.apache.geode.internal.VersionedDataInputStream;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.pdx.ReflectionBasedAutoSerializer;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.jgroups.util.UUID;
import org.junit.After;
@@ -60,7 +61,7 @@ import static org.junit.runners.MethodSorters.NAME_ASCENDING;
* @since GemFire 6.5
*/
@FixMethodOrder(NAME_ASCENDING)
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class ClientCacheFactoryJUnitTest {
private ClientCache cc;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/client/ClientRegionFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/ClientRegionFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/ClientRegionFactoryJUnitTest.java
index d099b06..433e76c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/ClientRegionFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/ClientRegionFactoryJUnitTest.java
@@ -22,6 +22,7 @@ import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Rule;
@@ -43,7 +44,7 @@ import static org.junit.Assert.*;
*
* @since GemFire 6.5
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class ClientRegionFactoryJUnitTest {
@Rule
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java
index 9c8044d..1f001b0 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/ClientServerRegisterInterestsDUnitTest.java
@@ -14,17 +14,15 @@
*/
package org.apache.geode.cache.client;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.net.UnknownHostException;
-import java.util.Stack;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_ID;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -43,7 +41,16 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.IOException;
+import java.net.UnknownHostException;
+import java.util.Stack;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* The ClientServerRegisterInterestsDUnitTest class is a test suite of test cases testing the
@@ -51,7 +58,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 8.0
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class ClientServerRegisterInterestsDUnitTest extends JUnit4DistributedTestCase {
protected static final long WAIT_TIME_MILLISECONDS = TimeUnit.SECONDS.toMillis(5);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java
index f0fd7a6..387984c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java
@@ -38,7 +38,7 @@ import org.apache.geode.test.junit.categories.*;
* Tests cases that are particular for the auto connection source - dynamically discovering servers,
* locators, handling locator disappearance, etc.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
protected static final Object BRIDGE_LISTENER = "BRIDGE_LISTENER";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
index fdde35c..737c583 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
@@ -37,6 +37,7 @@ import org.apache.geode.internal.cache.tier.sockets.HandShake;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.management.membership.ClientMembershipEvent;
import org.apache.geode.management.membership.ClientMembershipListener;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
@@ -68,7 +69,7 @@ import com.jayway.awaitility.Awaitility;
*
*/
@SuppressWarnings("deprecation")
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class AutoConnectionSourceImplJUnitTest {
private Cache cache;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/CacheServerSSLConnectionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
index d3c4e3c..3597152 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
@@ -38,6 +38,7 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.util.test.TestUtil;
import org.junit.Test;
@@ -47,7 +48,7 @@ import org.junit.experimental.categories.Category;
* Tests cacheserver ssl support added. See https://svn.gemstone.com/trac/gemfire/ticket/48995 for
* details
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class CacheServerSSLConnectionDUnitTest extends JUnit4DistributedTestCase {
private static final String TRUSTED_STORE = "trusted.keystore";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java
index a9eb672..272580d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java
@@ -25,6 +25,7 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
@@ -42,7 +43,7 @@ import static org.junit.Assert.*;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class ConnectionPoolImplJUnitTest {
private static final String expectedRedundantErrorMsg =
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java
index f468e93..fffc09b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.cache.client.internal;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.experimental.categories.Category;
import org.junit.Test;
@@ -65,7 +66,7 @@ import java.util.concurrent.TimeUnit;
/**
*
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java
index 37511cf..9b1b6e9 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/OpExecutorImplJUnitTest.java
@@ -28,6 +28,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ScheduledExecutorService;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -46,7 +47,7 @@ import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.internal.logging.LocalLogWriter;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class OpExecutorImplJUnitTest {
DummyManager manager;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
index 812ce16..0ec69aa 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
@@ -28,6 +28,7 @@ import org.apache.geode.internal.cache.tier.sockets.ServerQueueStatus;
import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.internal.logging.LocalLogWriter;
import org.apache.geode.internal.util.StopWatch;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
@@ -50,7 +51,7 @@ import static org.junit.Assert.*;
/**
*
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class QueueManagerJUnitTest {
private static final String expectedRedundantErrorMsg =
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/client/internal/SSLNoClientAuthDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/SSLNoClientAuthDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/SSLNoClientAuthDUnitTest.java
index bba6d54..87a915e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/SSLNoClientAuthDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/SSLNoClientAuthDUnitTest.java
@@ -22,6 +22,7 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Properties;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -45,7 +46,7 @@ import org.apache.geode.util.test.TestUtil;
/**
* Test for GEODE-396
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, MembershipTest.class})
public class SSLNoClientAuthDUnitTest extends JUnit4DistributedTestCase {
private Cache cache;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java
index eccbefd..47bf9ad 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ServerBlackListJUnitTest.java
@@ -21,6 +21,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -32,7 +33,7 @@ import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.util.StopWatch;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, ClientServerTest.class})
public class ServerBlackListJUnitTest {
private ScheduledExecutorService background;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
index 0f632b8..f3afe6e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
@@ -29,6 +29,7 @@ import org.apache.geode.internal.logging.LocalLogWriter;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Assert;
@@ -53,7 +54,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.junit.Assert.fail;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, ClientServerTest.class})
public class ConnectionManagerJUnitTest {
private static final long TIMEOUT = 30 * 1000;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache/mapInterface/PutAllGlobalLockJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/mapInterface/PutAllGlobalLockJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/mapInterface/PutAllGlobalLockJUnitTest.java
index bc88b7a..fb9d7b7 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/mapInterface/PutAllGlobalLockJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/mapInterface/PutAllGlobalLockJUnitTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.*;
import java.util.Properties;
import java.util.TreeMap;
+import org.apache.geode.test.junit.categories.DLockTest;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -36,7 +37,7 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, DLockTest.class})
public class PutAllGlobalLockJUnitTest { // TODO: reformat
Region testRegion = null;
@@ -46,36 +47,28 @@ public class PutAllGlobalLockJUnitTest { // TODO: reformat
@Before
public void setUp() throws Exception {
- try {
- Properties properties = new Properties();
- properties.setProperty(MCAST_PORT, "0");
- properties.setProperty(LOCATORS, "");
- DistributedSystem distributedSystem = DistributedSystem.connect(properties);
- Cache cache = CacheFactory.create(distributedSystem);
- AttributesFactory factory = new AttributesFactory();
- factory.setScope(Scope.GLOBAL);
- factory.setCacheListener(new Listener());
- RegionAttributes regionAttributes = factory.create();
- testRegion = cache.createRegion("TestRegion", regionAttributes);
- } catch (Exception e) {
- throw new AssertionError("test failed to create a distributed system/cache", e);
- }
+ Properties properties = new Properties();
+ properties.setProperty(MCAST_PORT, "0");
+ properties.setProperty(LOCATORS, "");
+ DistributedSystem distributedSystem = DistributedSystem.connect(properties);
+ Cache cache = CacheFactory.create(distributedSystem);
+ AttributesFactory factory = new AttributesFactory();
+ factory.setScope(Scope.GLOBAL);
+ factory.setCacheListener(new Listener());
+ RegionAttributes regionAttributes = factory.create();
+ testRegion = cache.createRegion("TestRegion", regionAttributes);
}
@Test
- public void testPutAllGlobalLock() {
+ public void testPutAllGlobalLock() throws Exception {
TreeMap trialMap = new TreeMap();
for (long i = 0; i < 1000; i++) {
trialMap.put(new Long(i), new Long(i));
}
- try {
- testRegion.putAll(trialMap);
- ThreadUtils.join(this.thread, 30 * 1000);
- assertTrue(this.testOK);
- } catch (Exception e) {
- throw new AssertionError("Test has failed due to ", e);
- }
+ testRegion.putAll(trialMap);
+ ThreadUtils.join(this.thread, 30 * 1000);
+ assertTrue(this.testOK);
}
protected class Listener extends CacheListenerAdapter {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache30/Bug38741DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/Bug38741DUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/Bug38741DUnitTest.java
index 2c8b0f7..c9c3b37 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/Bug38741DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/Bug38741DUnitTest.java
@@ -25,6 +25,7 @@ import java.util.Properties;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -64,7 +65,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* @since GemFire bugfix5.7
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class Bug38741DUnitTest extends ClientServerTestCase {
protected RegionAttributes getRegionAttributes() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
index 67b1e9e..3756163 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
@@ -35,6 +35,7 @@ import java.util.concurrent.TimeUnit;
import com.jayway.awaitility.Awaitility;
import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -72,7 +73,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 4.2.1
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class ClientMembershipDUnitTest extends ClientServerTestCase {
protected static final boolean CLIENT = true;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipSelectorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipSelectorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipSelectorDUnitTest.java
index c066bcc..e34db9c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipSelectorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipSelectorDUnitTest.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.cache30;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.DistributedTest;
@@ -23,7 +24,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 5.1
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class ClientMembershipSelectorDUnitTest extends ClientMembershipDUnitTest {
@Override
protected int getMaxThreads() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestDUnitTest.java
index 447cca6..8af26e3 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestDUnitTest.java
@@ -20,6 +20,7 @@ import static org.apache.geode.test.dunit.Assert.*;
import java.io.IOException;
import java.util.Properties;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -44,7 +45,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 4.2.3
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class ClientRegisterInterestDUnitTest extends ClientServerTestCase {
protected static int bridgeServerPort;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestSelectorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestSelectorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestSelectorDUnitTest.java
index 3c0dddf..a049464 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestSelectorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ClientRegisterInterestSelectorDUnitTest.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.cache30;
+import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.DistributedTest;
@@ -23,7 +24,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
* @since GemFire 5.1
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientSubscriptionTest.class})
public class ClientRegisterInterestSelectorDUnitTest extends ClientRegisterInterestDUnitTest {
@Override
protected int getMaxThreads() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java
index 19e9ea6..9780563 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java
@@ -33,6 +33,7 @@ import org.apache.geode.cache.AttributesMutator;
import org.apache.geode.cache.ExpirationAction;
import org.apache.geode.cache.ExpirationAttributes;
import org.apache.geode.test.dunit.IgnoredException;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -73,7 +74,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
*
*
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class ClientServerCCEDUnitTest extends JUnit4CacheTestCase {
public static LocalRegion TestRegion;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
index 93229a4..8b6a7e8 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/GlobalLockingDUnitTest.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.cache30;
+import org.apache.geode.test.junit.categories.DLockTest;
import org.junit.experimental.categories.Category;
import org.junit.Test;
@@ -42,7 +43,7 @@ import org.apache.geode.test.dunit.VM;
/**
* This class tests distributed locking of global region entries.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, DLockTest.class})
public class GlobalLockingDUnitTest extends JUnit4CacheTestCase {
public static Region region_testBug32356;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/DistributedLockServiceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/DistributedLockServiceDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/DistributedLockServiceDUnitTest.java
index dcbca7e..277c604 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/DistributedLockServiceDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/DistributedLockServiceDUnitTest.java
@@ -25,6 +25,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.geode.test.junit.categories.DLockTest;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -60,7 +61,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This class tests distributed ownership via the DistributedLockService api.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, DLockTest.class})
public class DistributedLockServiceDUnitTest extends JUnit4DistributedTestCase {
private static DistributedSystem dlstSystem;
@@ -1455,7 +1456,6 @@ public class DistributedLockServiceDUnitTest extends JUnit4DistributedTestCase {
* Test that suspend locking behaves under various usage patterns. This ensures that suspend and
* regular locks behave as ReadWriteLocks and processing occurs in order.
*/
- @Ignore
@Test
public void testSuspendLockingBehaves() throws Exception {
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemDUnitTest.java
index 4111d8c..c57ad17 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemDUnitTest.java
@@ -34,6 +34,7 @@ import org.apache.geode.test.dunit.*;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.*;
import org.junit.experimental.categories.Category;
@@ -55,7 +56,7 @@ import static org.junit.Assert.*;
* @see InternalDistributedSystemJUnitTest
*
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, MembershipTest.class})
public class DistributedSystemDUnitTest extends JUnit4DistributedTestCase {
public void postSetUp() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemIntegrationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemIntegrationJUnitTest.java
index e802eb1..5d82ee0 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemIntegrationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemIntegrationJUnitTest.java
@@ -21,6 +21,7 @@ import java.io.FileWriter;
import java.net.URL;
import java.util.Properties;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
@@ -33,7 +34,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
/**
* Integration tests for DistributedSystem class. These tests require file system I/O.
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, MembershipTest.class})
public class DistributedSystemIntegrationJUnitTest {
@Rule
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java
index 1da0a52..548d107 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/DistributedSystemJUnitTest.java
@@ -16,6 +16,7 @@ package org.apache.geode.distributed;
import static org.assertj.core.api.Assertions.*;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
@@ -26,7 +27,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* Unit tests for DistributedSystem class.
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class DistributedSystemJUnitTest {
@Rule
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/HostedLocatorsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/HostedLocatorsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/HostedLocatorsDUnitTest.java
index 7a30652..1eeef07 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/HostedLocatorsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/HostedLocatorsDUnitTest.java
@@ -28,6 +28,7 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -49,7 +50,7 @@ import static org.apache.geode.test.dunit.Host.getHost;
*
* @since GemFire 8.0
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, ClientServerTest.class})
public class HostedLocatorsDUnitTest extends JUnit4DistributedTestCase {
protected static final int TIMEOUT_MILLISECONDS = 5 * 60 * 1000; // 5 minutes
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
index 83098d9..128f970 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
@@ -73,7 +73,7 @@ import org.apache.geode.util.test.TestUtil;
*
* @since GemFire 4.0
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, MembershipTest.class})
public class LocatorDUnitTest extends JUnit4DistributedTestCase {
static volatile InternalDistributedSystem system = null;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java
index d3f5139..d1e56c4 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java
@@ -30,6 +30,7 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.management.internal.JmxManagerAdvisor.JmxManagerProfile;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
import org.junit.After;
import org.junit.Before;
@@ -51,7 +52,7 @@ import static org.apache.geode.internal.AvailablePort.SOCKET;
import static org.apache.geode.internal.AvailablePort.getRandomAvailablePort;
import static org.junit.Assert.*;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, MembershipTest.class})
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class LocatorJUnitTest {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java
index 3b1ac06..3246f85 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java
@@ -18,6 +18,8 @@ import java.io.File;
import java.io.IOException;
import java.util.Properties;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Assert;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -38,6 +40,7 @@ import org.apache.geode.test.junit.categories.FlakyTest;
import static org.apache.geode.distributed.ConfigurationProperties.*;
+@Category({DistributedTest.class, MembershipTest.class})
public class LocatorUDPSecurityDUnitTest extends LocatorDUnitTest {
public LocatorUDPSecurityDUnitTest() {}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java
index c512a36..b9a601d 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/Bug40751DUnitTest.java
@@ -22,6 +22,7 @@ import java.io.DataOutput;
import java.io.IOException;
import java.util.Properties;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -40,7 +41,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, MembershipTest.class})
public class Bug40751DUnitTest extends JUnit4CacheTestCase {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java
index 2747031..37e0140 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorDUnitTest.java
@@ -22,6 +22,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -33,7 +34,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, MembershipTest.class})
public class DistributionAdvisorDUnitTest extends JUnit4DistributedTestCase {
private transient DistributionAdvisor.Profile profiles[];
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java
index 155ac65..2ae62aa 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionConfigJUnitTest.java
@@ -33,12 +33,13 @@ import org.apache.geode.UnmodifiableException;
import org.apache.geode.internal.ConfigSource;
import org.apache.geode.security.templates.SamplePostProcessor;
import org.apache.geode.security.templates.SampleSecurityManager;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class DistributionConfigJUnitTest {
private Map<Class<?>, Class<?>> classMap;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java
index b1478e2..b38a769 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java
@@ -21,6 +21,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Properties;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.apache.logging.log4j.Logger;
import org.junit.Assert;
import org.junit.Ignore;
@@ -64,7 +65,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
/**
* This class tests the functionality of the {@link DistributionManager} class.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, MembershipTest.class})
public class DistributionManagerDUnitTest extends JUnit4DistributedTestCase {
private static final Logger logger = LogService.getLogger();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java
index 408e004..49e8fa6 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java
@@ -30,6 +30,7 @@ import java.util.Enumeration;
import java.util.Properties;
import java.util.logging.Level;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.After;
import org.junit.Assert;
import org.junit.Ignore;
@@ -54,7 +55,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
*
* @since GemFire 2.1
*/
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, MembershipTest.class})
public class InternalDistributedSystemJUnitTest {
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogDUnitTest.java
index e80cf6b..b354a76 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogDUnitTest.java
@@ -23,6 +23,7 @@ import java.io.FileReader;
import java.io.IOException;
import java.util.Properties;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -43,7 +44,7 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, MembershipTest.class})
public class ProductUseLogDUnitTest extends JUnit4CacheTestCase {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java
index 3562303..4374e85 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/ProductUseLogJUnitTest.java
@@ -20,6 +20,7 @@ import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -30,7 +31,7 @@ import org.junit.rules.TestName;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class) // Fails on Windows -- see GEODE-373
+@Category({UnitTest.class, MembershipTest.class}) // Fails on Windows -- see GEODE-373
public class ProductUseLogJUnitTest {
private long oldMax;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java
index c744aee..af8475b 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/ServerLocatorJUnitTest.java
@@ -18,6 +18,7 @@ import static org.junit.Assert.*;
import java.io.IOException;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -40,7 +41,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* @see org.junit.Test
* @since GemFire 7.0
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class ServerLocatorJUnitTest {
@Test
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java
index f191aaf..9d63050 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/StartupMessageDataJUnitTest.java
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.Properties;
import java.util.StringTokenizer;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -38,7 +39,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
*
* @since GemFire 7.0
*/
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class StartupMessageDataJUnitTest {
@Test
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockReentrantLockJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockReentrantLockJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockReentrantLockJUnitTest.java
index 57451b4..937cc1b 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockReentrantLockJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/locks/DLockReentrantLockJUnitTest.java
@@ -15,6 +15,7 @@
package org.apache.geode.distributed.internal.locks;
import org.apache.geode.cache.*;
+import org.apache.geode.test.junit.categories.DLockTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Assert;
@@ -28,7 +29,7 @@ import java.util.concurrent.locks.Lock;
import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, DLockTest.class})
public class DLockReentrantLockJUnitTest {
final long id = 1213L;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/MembershipJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/MembershipJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/MembershipJUnitTest.java
index b565290..e367450 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/MembershipJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/MembershipJUnitTest.java
@@ -65,7 +65,7 @@ import static org.junit.Assert.*;
import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, MembershipJUnitTest.class})
public class MembershipJUnitTest {
static Level baseLogLevel;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java
index f8cbfa1..715da47 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/NetViewJUnitTest.java
@@ -23,6 +23,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -31,7 +32,7 @@ import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.test.junit.categories.UnitTest;
-@Category(UnitTest.class)
+@Category({UnitTest.class, MembershipTest.class})
public class NetViewJUnitTest {
private List<InternalDistributedMember> members;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
index 505c010..ebf87be 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
@@ -34,6 +34,7 @@ import org.apache.geode.internal.Version;
import org.apache.geode.internal.net.SocketCreatorFactory;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.jgroups.util.UUID;
import org.junit.After;
import org.junit.Assert;
@@ -59,7 +60,7 @@ import static org.mockito.Matchers.any;
import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, MembershipTest.class})
public class GMSHealthMonitorJUnitTest {
private Services services;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
index ad0faf2..489d4b8 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
@@ -27,6 +27,7 @@ import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.admin.remote.RemoteTransportConfig;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -42,7 +43,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
import static org.mockito.Mockito.mock;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, MembershipTest.class})
public class GMSLocatorRecoveryJUnitTest {
File tempStateFile = null;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/845139e0/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
index 4fa6f07..453e894 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
@@ -37,6 +37,7 @@ import org.apache.geode.internal.Version;
import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
@@ -56,7 +57,7 @@ import static org.mockito.Matchers.any;
import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, MembershipTest.class})
public class GMSJoinLeaveJUnitTest {
private Services services;
private ServiceConfig mockConfig;
[2/4] incubator-geode git commit: GEODE-2121 add DLockTest and other
categories
Posted by bs...@apache.org.
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 {
/**