You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by nn...@apache.org on 2018/03/08 23:53:48 UTC
[geode] branch develop updated: GEODE-4797: Added WANTest category
(#1580)
This is an automated email from the ASF dual-hosted git repository.
nnag pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new c138865 GEODE-4797: Added WANTest category (#1580)
c138865 is described below
commit c13886579a6075a5b2d52e60db668e9151b8a320
Author: Nabarun Nag <na...@users.noreply.github.com>
AuthorDate: Thu Mar 8 15:53:45 2018 -0800
GEODE-4797: Added WANTest category (#1580)
---
.../org/apache/geode/cache/CacheXml70GatewayDUnitTest.java | 3 ++-
.../org/apache/geode/cache/CacheXml80GatewayDUnitTest.java | 3 ++-
.../wan/GatewayReceiverAutoConnectionSourceDUnitTest.java | 3 ++-
.../apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java | 3 ++-
.../geode/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java | 4 +++-
.../apache/geode/internal/cache/UpdateVersionDUnitTest.java | 3 ++-
.../geode/internal/cache/wan/AckReaderThreadJUnitTest.java | 1 +
.../internal/cache/wan/CacheClientNotifierDUnitTest.java | 3 ++-
.../cache/wan/GatewayLegacyAuthenticationRegressionTest.java | 2 +-
.../cache/wan/GatewayReceiverFactoryImplJUnitTest.java | 1 +
.../internal/cache/wan/GatewayReceiverImplJUnitTest.java | 1 +
.../internal/cache/wan/GatewayReceiverMBeanDUnitTest.java | 3 ++-
.../wan/GatewaySenderEventRemoteDispatcherJUnitTest.java | 2 ++
.../internal/cache/wan/Simple2CacheServerDUnitTest.java | 3 ++-
.../concurrent/ConcurrentParallelGatewaySenderDUnitTest.java | 3 ++-
.../ConcurrentParallelGatewaySenderOffHeapDUnitTest.java | 3 ++-
...ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java | 3 ++-
...ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java | 3 ++-
.../ConcurrentSerialGatewaySenderOperationsDUnitTest.java | 3 ++-
...currentSerialGatewaySenderOperationsOffHeapDUnitTest.java | 3 ++-
.../wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java | 3 ++-
.../wan/concurrent/ConcurrentWANPropagation_2_DUnitTest.java | 3 ++-
.../geode/internal/cache/wan/disttx/DistTXWANDUnitTest.java | 3 ++-
.../cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java | 3 ++-
.../misc/CommonParallelGatewaySenderOffHeapDUnitTest.java | 3 ++-
.../wan/misc/KeepEventsOnGatewaySenderQueueDUnitTest.java | 3 ++-
.../wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java | 3 ++-
.../cache/wan/misc/NewWanAuthenticationDUnitTest.java | 3 ++-
.../geode/internal/cache/wan/misc/PDXNewWanDUnitTest.java | 3 ++-
.../ReplicatedRegion_ParallelWANPersistenceDUnitTest.java | 3 ++-
.../ReplicatedRegion_ParallelWANPropagationDUnitTest.java | 3 ++-
.../cache/wan/misc/SenderWithTransportFilterDUnitTest.java | 3 ++-
.../misc/ShutdownAllPersistentGatewaySenderDUnitTest.java | 3 ++-
.../internal/cache/wan/misc/WANConfigurationJUnitTest.java | 3 ++-
.../internal/cache/wan/misc/WANLocatorServerDUnitTest.java | 3 ++-
.../geode/internal/cache/wan/misc/WANSSLDUnitTest.java | 3 ++-
.../internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java | 5 +++--
.../internal/cache/wan/misc/WanValidationsDUnitTest.java | 3 ++-
...entParallelGatewaySenderOperation_2_OffHeapDUnitTest.java | 3 ++-
.../ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java | 3 ++-
.../ParallelGatewaySenderOperationsOffHeapDUnitTest.java | 3 ++-
.../ParallelGatewaySenderQueueOverflowOffHeapDUnitTest.java | 3 ++-
.../wan/offheap/ParallelWANConflationOffHeapDUnitTest.java | 3 ++-
...elWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java | 3 ++-
.../ParallelWANPropagationConcurrentOpsOffHeapDUnitTest.java | 3 ++-
.../wan/offheap/ParallelWANPropagationOffHeapDUnitTest.java | 3 ++-
.../offheap/SerialGatewaySenderQueueOffHeapDUnitTest.java | 3 ++-
...alWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java | 3 ++-
.../wan/offheap/SerialWANPropagationOffHeapDUnitTest.java | 3 ++-
...rialWANPropagation_PartitionedRegionOffHeapDUnitTest.java | 3 ++-
.../parallel/ParallelGatewaySenderOperation_2_DUnitTest.java | 3 ++-
.../parallel/ParallelGatewaySenderOperationsDUnitTest.java | 3 ++-
.../ParallelGatewaySenderQueueOverflowDUnitTest.java | 3 ++-
.../cache/wan/parallel/ParallelWANConflationDUnitTest.java | 3 ++-
.../ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java | 5 +++--
.../ParallelWANPropagationClientServerDUnitTest.java | 3 ++-
.../ParallelWANPropagationConcurrentOpsDUnitTest.java | 3 ++-
.../cache/wan/parallel/ParallelWANPropagationDUnitTest.java | 7 ++++---
.../parallel/ParallelWANPropagationLoopBackDUnitTest.java | 3 ++-
.../cache/wan/parallel/ParallelWANStatsDUnitTest.java | 5 +++--
.../internal/cache/wan/serial/GatewayReceiverDUnitTest.java | 3 ++-
.../SerialGatewaySenderDistributedDeadlockDUnitTest.java | 3 ++-
.../serial/SerialGatewaySenderEventListenerDUnitTest.java | 3 ++-
.../wan/serial/SerialGatewaySenderOperationsDUnitTest.java | 3 ++-
.../cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java | 3 ++-
.../cache/wan/serial/SerialWANConflationDUnitTest.java | 2 ++
.../SerialWANPersistenceEnabledGatewaySenderDUnitTest.java | 3 ++-
.../cache/wan/serial/SerialWANPropagationDUnitTest.java | 5 +++--
.../wan/serial/SerialWANPropagationLoopBackDUnitTest.java | 3 ++-
.../SerialWANPropagation_PartitionedRegionDUnitTest.java | 3 ++-
.../wan/serial/SerialWANPropagationsFeatureDUnitTest.java | 3 ++-
.../internal/cache/wan/serial/SerialWANStatsDUnitTest.java | 3 ++-
.../CreateDestroyGatewaySenderCommandDUnitTest.java | 3 ++-
.../wancommand/CreateGatewayReceiverCommandDUnitTest.java | 3 ++-
.../wan/wancommand/DestroyGatewaySenderCommandDUnitTest.java | 3 ++-
.../wan/wancommand/PauseGatewaySenderCommandDUnitTest.java | 3 ++-
.../wan/wancommand/ResumeGatewaySenderCommandDUnitTest.java | 3 ++-
.../wan/wancommand/StartGatewayReceiverCommandDUnitTest.java | 3 ++-
.../wan/wancommand/StartGatewaySenderCommandDUnitTest.java | 3 ++-
.../wancommand/StatusGatewayReceiverCommandDUnitTest.java | 3 ++-
.../wan/wancommand/StatusGatewaySenderCommandDUnitTest.java | 3 ++-
.../wan/wancommand/StopGatewayReceiverCommandDUnitTest.java | 3 ++-
.../wan/wancommand/StopGatewaySenderCommandDUnitTest.java | 3 ++-
.../cache/wan/wancommand/WanCommandListDUnitTest.java | 3 ++-
.../org/apache/geode/management/WANManagementDUnitTest.java | 7 ++++---
.../internal/cli/commands/DescribeRegionDUnitTest.java | 3 ++-
.../ClusterConfigurationIndexWithFromClauseDUnitTest.java | 3 ++-
.../configuration/WANClusterConfigurationDUnitTest.java | 3 ++-
gradle/test.gradle | 12 ++++++++++++
89 files changed, 193 insertions(+), 91 deletions(-)
diff --git a/geode-wan/src/test/java/org/apache/geode/cache/CacheXml70GatewayDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/cache/CacheXml70GatewayDUnitTest.java
index 9e50c94..b1c0c6d 100644
--- a/geode-wan/src/test/java/org/apache/geode/cache/CacheXml70GatewayDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/cache/CacheXml70GatewayDUnitTest.java
@@ -43,8 +43,9 @@ import org.apache.geode.internal.cache.xmlcache.ParallelGatewaySenderCreation;
import org.apache.geode.internal.cache.xmlcache.RegionAttributesCreation;
import org.apache.geode.internal.cache.xmlcache.SerialGatewaySenderCreation;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class CacheXml70GatewayDUnitTest extends CacheXmlTestCase {
@Override
diff --git a/geode-wan/src/test/java/org/apache/geode/cache/CacheXml80GatewayDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/cache/CacheXml80GatewayDUnitTest.java
index 5c256df..7ab24c9 100644
--- a/geode-wan/src/test/java/org/apache/geode/cache/CacheXml80GatewayDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/cache/CacheXml80GatewayDUnitTest.java
@@ -37,8 +37,9 @@ import org.apache.geode.cache30.MyGatewayTransportFilter2;
import org.apache.geode.internal.cache.xmlcache.CacheCreation;
import org.apache.geode.internal.cache.xmlcache.CacheXml;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class CacheXml80GatewayDUnitTest extends CacheXmlTestCase {
@Override
diff --git a/geode-wan/src/test/java/org/apache/geode/cache/wan/GatewayReceiverAutoConnectionSourceDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/cache/wan/GatewayReceiverAutoConnectionSourceDUnitTest.java
index 487f8ea..5683bc3 100644
--- a/geode-wan/src/test/java/org/apache/geode/cache/wan/GatewayReceiverAutoConnectionSourceDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/cache/wan/GatewayReceiverAutoConnectionSourceDUnitTest.java
@@ -34,8 +34,9 @@ import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
-@Category({DistributedTest.class})
+@Category({DistributedTest.class, WanTest.class})
public class GatewayReceiverAutoConnectionSourceDUnitTest extends LocatorTestBase {
public GatewayReceiverAutoConnectionSourceDUnitTest() {
diff --git a/geode-wan/src/test/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java
index e2dc99c..e0b7dfd 100644
--- a/geode-wan/src/test/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java
@@ -63,10 +63,11 @@ import org.apache.geode.test.dunit.standalone.DUnitLauncher;
import org.apache.geode.test.dunit.standalone.VersionManager;
import org.apache.geode.test.junit.categories.BackwardCompatibilityTest;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
@SuppressWarnings("ConstantConditions")
-@Category({DistributedTest.class, BackwardCompatibilityTest.class})
+@Category({DistributedTest.class, BackwardCompatibilityTest.class, WanTest.class})
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class WANRollingUpgradeDUnitTest extends JUnit4CacheTestCase {
diff --git a/geode-wan/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java b/geode-wan/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java
old mode 100755
new mode 100644
index 2cbac67..e416abc
--- a/geode-wan/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java
@@ -17,8 +17,10 @@ package org.apache.geode.codeAnalysis;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.WanTest;
-@Category(IntegrationTest.class)
+
+@Category({IntegrationTest.class, WanTest.class})
public class AnalyzeWANSerializablesJUnitTest extends AnalyzeSerializablesJUnitTest {
@Override
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/UpdateVersionDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/UpdateVersionDUnitTest.java
index 8bd445c..4e75db1 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/UpdateVersionDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/UpdateVersionDUnitTest.java
@@ -67,11 +67,12 @@ 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.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
/**
* @since GemFire 7.0.1
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class UpdateVersionDUnitTest extends JUnit4DistributedTestCase {
protected static final String regionName = "testRegion";
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/AckReaderThreadJUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/AckReaderThreadJUnitTest.java
index 9eef2da..c3a106d 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/AckReaderThreadJUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/AckReaderThreadJUnitTest.java
@@ -28,6 +28,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.geode.test.junit.categories.WanTest;
@Category(UnitTest.class)
public class AckReaderThreadJUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/CacheClientNotifierDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/CacheClientNotifierDUnitTest.java
old mode 100755
new mode 100644
index e4e37c9..647ed9f
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/CacheClientNotifierDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/CacheClientNotifierDUnitTest.java
@@ -51,8 +51,9 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class CacheClientNotifierDUnitTest extends WANTestBase {
private static final int NUM_KEYS = 10;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayLegacyAuthenticationRegressionTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayLegacyAuthenticationRegressionTest.java
index a393272..5103cd4 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayLegacyAuthenticationRegressionTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayLegacyAuthenticationRegressionTest.java
@@ -71,7 +71,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolde
* <p>
* GEODE-3117: "Gateway authentication throws NullPointerException"
*/
-@Category({DistributedTest.class, SecurityTest.class, WanTest.class})
+@Category({DistributedTest.class, SecurityTest.class, WanTest.class, WanTest.class})
public class GatewayLegacyAuthenticationRegressionTest implements Serializable {
private static final String REGION_NAME = "TheRegion";
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayReceiverFactoryImplJUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayReceiverFactoryImplJUnitTest.java
index e54dae7..1291d69 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayReceiverFactoryImplJUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayReceiverFactoryImplJUnitTest.java
@@ -40,6 +40,7 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.xmlcache.CacheCreation;
import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.geode.test.junit.categories.WanTest;
import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
@Category(UnitTest.class)
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayReceiverImplJUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayReceiverImplJUnitTest.java
index 32edb9b..4c73722 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayReceiverImplJUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayReceiverImplJUnitTest.java
@@ -32,6 +32,7 @@ import org.apache.geode.internal.cache.CacheServerImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.geode.test.junit.categories.WanTest;
@Category(UnitTest.class)
public class GatewayReceiverImplJUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayReceiverMBeanDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayReceiverMBeanDUnitTest.java
index 4eb567a..f0333d6 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayReceiverMBeanDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewayReceiverMBeanDUnitTest.java
@@ -36,8 +36,9 @@ import org.apache.geode.management.internal.MBeanJMXAdapter;
import org.apache.geode.management.internal.SystemManagementService;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class GatewayReceiverMBeanDUnitTest extends ManagementTestBase {
@Test
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcherJUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcherJUnitTest.java
index 6480d85..23fbd6e 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcherJUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcherJUnitTest.java
@@ -24,6 +24,8 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.geode.test.junit.categories.WanTest;
+
@Category(UnitTest.class)
public class GatewaySenderEventRemoteDispatcherJUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/Simple2CacheServerDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/Simple2CacheServerDUnitTest.java
old mode 100755
new mode 100644
index fbc34bf..93c7d2c
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/Simple2CacheServerDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/Simple2CacheServerDUnitTest.java
@@ -48,8 +48,9 @@ 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 org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class Simple2CacheServerDUnitTest extends WANTestBase {
private static final int NUM_KEYS = 10;
static int afterPrimaryCount = 0;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
index 4db1d01..e4a0833 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
@@ -32,12 +32,13 @@ import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
/**
* Test the functionality of ParallelGatewaySender with multiple dispatchers.
*
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
public ConcurrentParallelGatewaySenderDUnitTest() {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java
index e4f3f5f..e8b1075 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java
@@ -22,9 +22,10 @@ import org.junit.experimental.categories.Category;
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.WanTest;
@SuppressWarnings("serial")
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ConcurrentParallelGatewaySenderOffHeapDUnitTest
extends ConcurrentParallelGatewaySenderDUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
index 96b63a3..1061397 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
@@ -27,8 +27,9 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTestBase {
private static final long serialVersionUID = 1L;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
index 82817dc..36a2d68 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
@@ -37,11 +37,12 @@ import org.apache.geode.test.dunit.WaitCriterion;
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.WanTest;
/**
*
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTestBase {
private static final long serialVersionUID = 1L;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
index 6ad8de4..68355bb 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
@@ -30,11 +30,12 @@ import org.apache.geode.test.dunit.VM;
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.WanTest;
/**
*
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ConcurrentSerialGatewaySenderOperationsDUnitTest
extends SerialGatewaySenderOperationsDUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest.java
index ea3cf79..20e997b 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest.java
@@ -22,9 +22,10 @@ import org.junit.experimental.categories.Category;
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.WanTest;
@SuppressWarnings("serial")
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest
extends ConcurrentSerialGatewaySenderOperationsDUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java
index c0a9d87..4074985 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java
@@ -34,13 +34,14 @@ 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 org.apache.geode.test.junit.categories.WanTest;
/**
* All the test cases are similar to SerialWANPropagationDUnitTest except that the we create
* concurrent serial GatewaySender with concurrency of 4
*
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ConcurrentWANPropagation_1_DUnitTest extends WANTestBase {
/**
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_2_DUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_2_DUnitTest.java
index 524eb94..aa19bd1 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_2_DUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_2_DUnitTest.java
@@ -29,12 +29,13 @@ 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 org.apache.geode.test.junit.categories.WanTest;
/**
* All the test cases are similar to SerialWANPropagationDUnitTest except that the we create
* concurrent serial GatewaySender with concurrency of 4
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ConcurrentWANPropagation_2_DUnitTest extends WANTestBase {
public ConcurrentWANPropagation_2_DUnitTest() {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/disttx/DistTXWANDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/disttx/DistTXWANDUnitTest.java
index 30f7872..d4f070c 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/disttx/DistTXWANDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/disttx/DistTXWANDUnitTest.java
@@ -26,8 +26,9 @@ import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class DistTXWANDUnitTest extends WANTestBase {
@Override
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
index 0745bec..a023e0f 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
@@ -38,11 +38,12 @@ import org.apache.geode.test.dunit.WaitCriterion;
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.WanTest;
/**
*
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class CommonParallelGatewaySenderDUnitTest extends WANTestBase {
@Test
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelGatewaySenderOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelGatewaySenderOffHeapDUnitTest.java
index fe43675..6145a10 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelGatewaySenderOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelGatewaySenderOffHeapDUnitTest.java
@@ -22,9 +22,10 @@ import org.junit.experimental.categories.Category;
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.WanTest;
@SuppressWarnings("serial")
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class CommonParallelGatewaySenderOffHeapDUnitTest
extends CommonParallelGatewaySenderDUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/KeepEventsOnGatewaySenderQueueDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/KeepEventsOnGatewaySenderQueueDUnitTest.java
index 0f49a88..99b9e53 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/KeepEventsOnGatewaySenderQueueDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/KeepEventsOnGatewaySenderQueueDUnitTest.java
@@ -34,8 +34,9 @@ import org.apache.geode.internal.cache.wan.GatewayReceiverStats;
import org.apache.geode.internal.cache.wan.WANTestBase;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class KeepEventsOnGatewaySenderQueueDUnitTest extends WANTestBase {
public KeepEventsOnGatewaySenderQueueDUnitTest() {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
index 720c32d..98388f9 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
@@ -39,6 +39,7 @@ import org.apache.geode.test.dunit.Wait;
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.WanTest;
/**
*
@@ -49,7 +50,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
* Version tag information which is relevant between multiple distributed systems consistency check
* is basically dsid and timestamp.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class NewWANConcurrencyCheckForDestroyDUnitTest extends WANTestBase {
public NewWANConcurrencyCheckForDestroyDUnitTest() {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
index a7cb4aa..6d77fbb 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
@@ -40,8 +40,9 @@ import org.apache.geode.security.generator.CredentialGenerator;
import org.apache.geode.security.generator.DummyCredentialGenerator;
import org.apache.geode.security.templates.UserPasswordAuthInit;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class NewWanAuthenticationDUnitTest extends WANTestBase {
public static final Logger logger = LogService.getLogger();
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/PDXNewWanDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/PDXNewWanDUnitTest.java
index be027c9..ceb01cc 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/PDXNewWanDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/PDXNewWanDUnitTest.java
@@ -47,8 +47,9 @@ 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 org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class PDXNewWanDUnitTest extends WANTestBase {
private static final long serialVersionUID = 1L;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
index 1831aa7..007a1dd 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
@@ -27,8 +27,9 @@ import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBase {
public ReplicatedRegion_ParallelWANPersistenceDUnitTest() {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropagationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropagationDUnitTest.java
index 1b6f6f2..447811c 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropagationDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropagationDUnitTest.java
@@ -32,8 +32,9 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ReplicatedRegion_ParallelWANPropagationDUnitTest extends WANTestBase {
public ReplicatedRegion_ParallelWANPropagationDUnitTest() {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
index 349b0a4..0060637 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
@@ -43,8 +43,9 @@ import org.apache.geode.internal.cache.wan.InternalGatewaySenderFactory;
import org.apache.geode.internal.cache.wan.WANTestBase;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class SenderWithTransportFilterDUnitTest extends WANTestBase {
@Test
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
index ba14a91..032e87e 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
@@ -38,8 +38,9 @@ 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.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ShutdownAllPersistentGatewaySenderDUnitTest extends WANTestBase {
private static final long MAX_WAIT = 70000;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANConfigurationJUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANConfigurationJUnitTest.java
index 8e7be1e..cc15d83 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANConfigurationJUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANConfigurationJUnitTest.java
@@ -40,8 +40,9 @@ import org.apache.geode.internal.cache.wan.InternalGatewaySenderFactory;
import org.apache.geode.internal.cache.wan.MyGatewaySenderEventListener;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.WanTest;
-@Category(IntegrationTest.class)
+@Category({IntegrationTest.class, WanTest.class})
public class WANConfigurationJUnitTest {
private Cache cache;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANLocatorServerDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
index ff50c2b..78668f2 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
@@ -41,8 +41,9 @@ import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class WANLocatorServerDUnitTest extends WANTestBase {
static PoolImpl proxy;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANSSLDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANSSLDUnitTest.java
index 590d892..8f3d53f 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANSSLDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANSSLDUnitTest.java
@@ -28,8 +28,9 @@ 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 org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class WANSSLDUnitTest extends WANTestBase {
public WANSSLDUnitTest() {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
index 7c13087..7248628 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
@@ -43,8 +43,9 @@ 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 org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class WanAutoDiscoveryDUnitTest extends WANTestBase {
@@ -234,7 +235,7 @@ public class WanAutoDiscoveryDUnitTest extends WANTestBase {
vm2.invoke(() -> WANTestBase.checkAllSiteMetaData(dsVsPort));
}
- @Category(FlakyTest.class) // GEODE-1920
+ @Category({FlakyTest.class, WanTest.class}) // GEODE-1920
@Test
public void test_NY_Recognises_TK_AND_HK_Simultaneously() {
Map<Integer, Set<InetSocketAddress>> dsVsPort = new HashMap<>();
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanValidationsDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanValidationsDUnitTest.java
index 4a1b74d..57d5530 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanValidationsDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WanValidationsDUnitTest.java
@@ -41,8 +41,9 @@ 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 org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class WanValidationsDUnitTest extends WANTestBase {
public WanValidationsDUnitTest() {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
index 1617e99..7dbd50f 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
@@ -23,8 +23,9 @@ import org.apache.geode.internal.cache.wan.concurrent.ConcurrentParallelGatewayS
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.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest
extends ConcurrentParallelGatewaySenderOperation_2_DUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
index d6c74e8..2fc98c8 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
@@ -23,8 +23,9 @@ import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderOperati
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.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ParallelGatewaySenderOperation_2_OffHeapDUnitTest
extends ParallelGatewaySenderOperation_2_DUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java
index fafda68..e788955 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java
@@ -23,9 +23,10 @@ import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderOperati
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.WanTest;
@SuppressWarnings("serial")
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ParallelGatewaySenderOperationsOffHeapDUnitTest
extends ParallelGatewaySenderOperationsDUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderQueueOverflowOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderQueueOverflowOffHeapDUnitTest.java
index afafd43..da776ed 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderQueueOverflowOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderQueueOverflowOffHeapDUnitTest.java
@@ -23,9 +23,10 @@ import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderQueueOv
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.WanTest;
@SuppressWarnings("serial")
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ParallelGatewaySenderQueueOverflowOffHeapDUnitTest
extends ParallelGatewaySenderQueueOverflowDUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANConflationOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANConflationOffHeapDUnitTest.java
index 1c0b4c4..c943650 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANConflationOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANConflationOffHeapDUnitTest.java
@@ -23,9 +23,10 @@ import org.apache.geode.internal.cache.wan.parallel.ParallelWANConflationDUnitTe
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.WanTest;
@SuppressWarnings("serial")
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ParallelWANConflationOffHeapDUnitTest extends ParallelWANConflationDUnitTest {
public ParallelWANConflationOffHeapDUnitTest() {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
index 2cdd6eb..6985d45 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
@@ -23,9 +23,10 @@ import org.apache.geode.internal.cache.wan.parallel.ParallelWANPersistenceEnable
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.WanTest;
@SuppressWarnings("serial")
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ParallelWANPersistenceEnabledGatewaySenderOffHeapDUnitTest
extends ParallelWANPersistenceEnabledGatewaySenderDUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationConcurrentOpsOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationConcurrentOpsOffHeapDUnitTest.java
index 18e2fe9..7caa223 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationConcurrentOpsOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationConcurrentOpsOffHeapDUnitTest.java
@@ -23,9 +23,10 @@ import org.apache.geode.internal.cache.wan.parallel.ParallelWANPropagationConcur
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.WanTest;
@SuppressWarnings("serial")
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ParallelWANPropagationConcurrentOpsOffHeapDUnitTest
extends ParallelWANPropagationConcurrentOpsDUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationOffHeapDUnitTest.java
index 751a434..78ee84a 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationOffHeapDUnitTest.java
@@ -23,9 +23,10 @@ import org.apache.geode.internal.cache.wan.parallel.ParallelWANPropagationDUnitT
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.WanTest;
@SuppressWarnings("serial")
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ParallelWANPropagationOffHeapDUnitTest extends ParallelWANPropagationDUnitTest {
public ParallelWANPropagationOffHeapDUnitTest() {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialGatewaySenderQueueOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialGatewaySenderQueueOffHeapDUnitTest.java
index 4c357a8..ccab89a 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialGatewaySenderQueueOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialGatewaySenderQueueOffHeapDUnitTest.java
@@ -23,9 +23,10 @@ import org.apache.geode.internal.cache.wan.serial.SerialGatewaySenderQueueDUnitT
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.WanTest;
@SuppressWarnings("serial")
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class SerialGatewaySenderQueueOffHeapDUnitTest extends SerialGatewaySenderQueueDUnitTest {
public SerialGatewaySenderQueueOffHeapDUnitTest() {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
index 1742e1c..4e13f42 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
@@ -23,9 +23,10 @@ import org.apache.geode.internal.cache.wan.serial.SerialWANPersistenceEnabledGat
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.WanTest;
@SuppressWarnings("serial")
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest
extends SerialWANPersistenceEnabledGatewaySenderDUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagationOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagationOffHeapDUnitTest.java
index 49a392d..6793a80 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagationOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagationOffHeapDUnitTest.java
@@ -18,9 +18,10 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.wan.serial.SerialWANPropagationDUnitTest;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
@SuppressWarnings("serial")
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class SerialWANPropagationOffHeapDUnitTest extends SerialWANPropagationDUnitTest {
public SerialWANPropagationOffHeapDUnitTest() {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagation_PartitionedRegionOffHeapDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagation_PartitionedRegionOffHeapDUnitTest.java
index 146d50c..8bf480a 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagation_PartitionedRegionOffHeapDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/offheap/SerialWANPropagation_PartitionedRegionOffHeapDUnitTest.java
@@ -18,9 +18,10 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.wan.serial.SerialWANPropagation_PartitionedRegionDUnitTest;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
@SuppressWarnings("serial")
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class SerialWANPropagation_PartitionedRegionOffHeapDUnitTest
extends SerialWANPropagation_PartitionedRegionDUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperation_2_DUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperation_2_DUnitTest.java
index 147bad7..5f447d5 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperation_2_DUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperation_2_DUnitTest.java
@@ -24,8 +24,9 @@ import org.apache.geode.test.dunit.VM;
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.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ParallelGatewaySenderOperation_2_DUnitTest
extends ConcurrentParallelGatewaySenderOperation_2_DUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
index ca81c02..53d1508 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
@@ -36,11 +36,12 @@ import org.apache.geode.test.dunit.RMIException;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
/**
* DUnit test for operations on ParallelGatewaySender
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
@Rule
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
index 0d0461a..58dbbdb 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
@@ -49,11 +49,12 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
/**
* DUnit for ParallelSenderQueue overflow operations.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase {
@Test
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
index a792133..1613501 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
@@ -29,11 +29,12 @@ import org.apache.geode.test.dunit.IgnoredException;
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.WanTest;
/**
*
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ParallelWANConflationDUnitTest extends WANTestBase {
private static final long serialVersionUID = 1L;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
index 9727787..7bdba83 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
@@ -37,8 +37,9 @@ 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 org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends WANTestBase {
private static final long serialVersionUID = 1L;
@@ -129,7 +130,7 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends WANTest
/**
* Enable persistence for the GatewaySender but not the region
*/
- @Category(FlakyTest.class) // GEODE-1670
+ @Category({FlakyTest.class, WanTest.class}) // GEODE-1670
@Test
public void testPartitionedRegionWithPersistentGatewaySender() {
Integer lnPort = (Integer) vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId(1));
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
index 9ca5fd5..8c44a62 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
@@ -20,8 +20,9 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.internal.cache.wan.WANTestBase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ParallelWANPropagationClientServerDUnitTest extends WANTestBase {
/**
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
index 51de450..c82afa6 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
@@ -29,8 +29,9 @@ import org.apache.geode.test.dunit.Wait;
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.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ParallelWANPropagationConcurrentOpsDUnitTest extends WANTestBase {
private static final long serialVersionUID = 1L;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
index 9a0a531..2b038e1 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
@@ -40,8 +40,9 @@ 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 org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ParallelWANPropagationDUnitTest extends WANTestBase {
private static final long serialVersionUID = 1L;
@@ -282,7 +283,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
*
* @throws Exception
*/
- @Category(FlakyTest.class)
+ @Category({FlakyTest.class, WanTest.class})
@Test
public void testParallelPropagationWithLocalCacheClosedAndRebuilt() throws Exception {
Integer lnPort = (Integer) vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId(1));
@@ -457,7 +458,7 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
vm2.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_child2", 0));
}
- @Category(FlakyTest.class) // GEODE-1312
+ @Category({FlakyTest.class, WanTest.class}) // GEODE-1312
@Test
public void testParallelPropagationWithOverflow() throws Exception {
Integer lnPort = (Integer) vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId(1));
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java
index 724afd7..fa76304 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java
@@ -24,8 +24,9 @@ import org.apache.geode.test.dunit.Wait;
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.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ParallelWANPropagationLoopBackDUnitTest extends WANTestBase {
private static final long serialVersionUID = 1L;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
index 3b6e860..a54a67d 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
@@ -33,8 +33,9 @@ import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ParallelWANStatsDUnitTest extends WANTestBase {
private static final int NUM_PUTS = 100;
@@ -236,7 +237,7 @@ public class ParallelWANStatsDUnitTest extends WANTestBase {
vm3.invoke(() -> WANTestBase.checkGatewayReceiverStats(10, NUM_PUTS, NUM_PUTS));
}
- @Category(FlakyTest.class) // GEODE-2176
+ @Category({FlakyTest.class, WanTest.class}) // GEODE-2176
@Test
public void testParallelPropagationHA() throws Exception {
Integer lnPort = (Integer) vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId(1));
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/GatewayReceiverDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/GatewayReceiverDUnitTest.java
index 21cbaeb..b484488 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/GatewayReceiverDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/GatewayReceiverDUnitTest.java
@@ -38,8 +38,9 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableCallableIF;
import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class GatewayReceiverDUnitTest extends WANTestBase {
private static GatewayReceiver receiver;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
index acc0bfd..c54fb1c 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
@@ -30,6 +30,7 @@ import org.apache.geode.test.dunit.Wait;
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.WanTest;
// The tests here are to validate changes introduced because a distributed deadlock
// was found that caused issues for a production customer.
@@ -40,7 +41,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
//
// currently the 4th test using PR, conserve-sockets=true hangs/fails and is commented
// out to prevent issues
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class SerialGatewaySenderDistributedDeadlockDUnitTest extends WANTestBase {
public SerialGatewaySenderDistributedDeadlockDUnitTest() {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
index 3a3fb5e..9affc5d 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
@@ -38,8 +38,9 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class SerialGatewaySenderEventListenerDUnitTest extends WANTestBase {
private static final long serialVersionUID = 1L;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
index 76e2743..ee43b83 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
@@ -50,11 +50,12 @@ import org.apache.geode.test.dunit.VM;
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.WanTest;
/**
*
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
private static final long serialVersionUID = 1L;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
index 504a2f8..ab673e6 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
@@ -51,8 +51,9 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class SerialGatewaySenderQueueDUnitTest extends WANTestBase {
@Test
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDUnitTest.java
index 1e78539..7297179 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDUnitTest.java
@@ -25,6 +25,8 @@ import org.awaitility.Awaitility;
import org.junit.Test;
import org.apache.geode.internal.cache.wan.WANTestBase;
+import org.apache.geode.test.junit.categories.WanTest;
+
public class SerialWANConflationDUnitTest extends WANTestBase {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
index 3d7ff77..e743efa 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
@@ -26,11 +26,12 @@ import org.apache.geode.test.dunit.Wait;
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.WanTest;
/**
*
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends WANTestBase {
private static final long serialVersionUID = 1L;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java
index db861e4..e84fd89 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java
@@ -39,8 +39,9 @@ import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class SerialWANPropagationDUnitTest extends WANTestBase {
@Override
@@ -590,7 +591,7 @@ public class SerialWANPropagationDUnitTest extends WANTestBase {
* remote site. Puts to the local region are in progress. Receiver on remote site is stopped in
* the middle by closing remote site cache.
*/
- @Category(FlakyTest.class) // GEODE-1552
+ @Category({FlakyTest.class, WanTest.class}) // GEODE-1552
@Test
public void testReplicatedSerialPropagationWithRemoteReceiverStopped() throws Exception {
Integer lnPort = (Integer) vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId(1));
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
index 5c1c71a..da3edf0 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
@@ -29,8 +29,9 @@ 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 org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class SerialWANPropagationLoopBackDUnitTest extends WANTestBase {
private static final long serialVersionUID = 1L;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagation_PartitionedRegionDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagation_PartitionedRegionDUnitTest.java
index 4eed2e8..e74f9e5 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagation_PartitionedRegionDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagation_PartitionedRegionDUnitTest.java
@@ -29,8 +29,9 @@ 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 org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class SerialWANPropagation_PartitionedRegionDUnitTest extends WANTestBase {
private static final long serialVersionUID = 1L;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationsFeatureDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationsFeatureDUnitTest.java
index 5fc64f3..7261d5f 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationsFeatureDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationsFeatureDUnitTest.java
@@ -23,9 +23,10 @@ import org.apache.geode.internal.cache.wan.WANTestBase;
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.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class SerialWANPropagationsFeatureDUnitTest extends WANTestBase {
private static final long serialVersionUID = 1L;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
index a8ac978..7135be4 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
@@ -31,8 +31,9 @@ import org.apache.geode.internal.cache.wan.WANTestBase;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.WanTest;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class SerialWANStatsDUnitTest extends WANTestBase {
private static final long serialVersionUID = 1L;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateDestroyGatewaySenderCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateDestroyGatewaySenderCommandDUnitTest.java
index c6f3674..fa2d719 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateDestroyGatewaySenderCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateDestroyGatewaySenderCommandDUnitTest.java
@@ -38,10 +38,11 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.VMProvider;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class CreateDestroyGatewaySenderCommandDUnitTest {
public static final String CREATE =
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewayReceiverCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewayReceiverCommandDUnitTest.java
index 1a08108..7f09f61 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewayReceiverCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/CreateGatewayReceiverCommandDUnitTest.java
@@ -43,13 +43,14 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.VMProvider;
/**
* DUnit tests for 'create gateway-receiver' command.
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class CreateGatewayReceiverCommandDUnitTest {
private MemberVM locatorSite1;
private MemberVM server1, server2, server3;
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/DestroyGatewaySenderCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/DestroyGatewaySenderCommandDUnitTest.java
index 2387805..0f9ad0f 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/DestroyGatewaySenderCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/DestroyGatewaySenderCommandDUnitTest.java
@@ -30,9 +30,10 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class DestroyGatewaySenderCommandDUnitTest {
public static final String CREATE =
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/PauseGatewaySenderCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/PauseGatewaySenderCommandDUnitTest.java
index 0026590..3e6cec9 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/PauseGatewaySenderCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/PauseGatewaySenderCommandDUnitTest.java
@@ -44,9 +44,10 @@ import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class PauseGatewaySenderCommandDUnitTest {
@Rule
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/ResumeGatewaySenderCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/ResumeGatewaySenderCommandDUnitTest.java
index d29a8e4..379c96b 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/ResumeGatewaySenderCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/ResumeGatewaySenderCommandDUnitTest.java
@@ -46,9 +46,10 @@ import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class ResumeGatewaySenderCommandDUnitTest {
@Rule
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewayReceiverCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewayReceiverCommandDUnitTest.java
index 2d8e1db..efb2300 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewayReceiverCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewayReceiverCommandDUnitTest.java
@@ -43,9 +43,10 @@ import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class StartGatewayReceiverCommandDUnitTest {
@Rule
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewaySenderCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewaySenderCommandDUnitTest.java
index 3359b46..c30bc65 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewaySenderCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewaySenderCommandDUnitTest.java
@@ -44,9 +44,10 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class StartGatewaySenderCommandDUnitTest {
@Rule
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewayReceiverCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewayReceiverCommandDUnitTest.java
index 520f231..d202e2d 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewayReceiverCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewayReceiverCommandDUnitTest.java
@@ -44,9 +44,10 @@ import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class StatusGatewayReceiverCommandDUnitTest {
@Rule
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewaySenderCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewaySenderCommandDUnitTest.java
index 08cc6bf..23e73b6 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewaySenderCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewaySenderCommandDUnitTest.java
@@ -44,9 +44,10 @@ import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class StatusGatewaySenderCommandDUnitTest {
@Rule
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewayReceiverCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewayReceiverCommandDUnitTest.java
index 93a90de..e94d2a2 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewayReceiverCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewayReceiverCommandDUnitTest.java
@@ -44,9 +44,10 @@ import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class StopGatewayReceiverCommandDUnitTest {
@Rule
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewaySenderCommandDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewaySenderCommandDUnitTest.java
index 3d957a5..6d0302b 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewaySenderCommandDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewaySenderCommandDUnitTest.java
@@ -45,9 +45,10 @@ import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class StopGatewaySenderCommandDUnitTest {
@Rule
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandListDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
index c457304..27750e1 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
@@ -41,9 +41,10 @@ import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class WanCommandListDUnitTest {
private static final long serialVersionUID = 1L;
diff --git a/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java
index 52121bc..2b3b7fd 100644
--- a/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/management/WANManagementDUnitTest.java
@@ -30,6 +30,7 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.WanTest;
/**
* Tests for WAN artifacts like Sender and Receiver. The purpose of this test is not to check WAN
@@ -38,7 +39,7 @@ import org.apache.geode.test.junit.categories.FlakyTest;
*
*
*/
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class WANManagementDUnitTest extends ManagementTestBase {
private static final long serialVersionUID = 1L;
@@ -108,7 +109,7 @@ public class WANManagementDUnitTest extends ManagementTestBase {
WANTestBase.checkSenderMBean(managing, getTestMethodName() + "_PR", false);
}
- @Category(FlakyTest.class) // GEODE-1603
+ @Category({FlakyTest.class, WanTest.class}) // GEODE-1603
@Test
public void testReceiverMBean() throws Exception {
@@ -260,7 +261,7 @@ public class WANManagementDUnitTest extends ManagementTestBase {
});
}
- @Category(FlakyTest.class) // GEODE-1629
+ @Category({FlakyTest.class, WanTest.class}) // GEODE-1629
@Test
public void testMBeanCallbackInRemoteCluster() throws Exception {
diff --git a/geode-wan/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeRegionDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeRegionDUnitTest.java
index 866eff9..9e12282 100644
--- a/geode-wan/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeRegionDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeRegionDUnitTest.java
@@ -26,9 +26,10 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
public class DescribeRegionDUnitTest {
@ClassRule
diff --git a/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationIndexWithFromClauseDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationIndexWithFromClauseDUnitTest.java
index b78ff8c..5213aec 100644
--- a/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationIndexWithFromClauseDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationIndexWithFromClauseDUnitTest.java
@@ -31,9 +31,10 @@ import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, WanTest.class})
@RunWith(JUnitParamsRunner.class)
public class ClusterConfigurationIndexWithFromClauseDUnitTest {
diff --git a/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/WANClusterConfigurationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/WANClusterConfigurationDUnitTest.java
index a7e0ee3..8da4f9e 100644
--- a/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/WANClusterConfigurationDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/WANClusterConfigurationDUnitTest.java
@@ -34,9 +34,10 @@ import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.MemberVM;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.WanTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
-@Category({DistributedTest.class})
+@Category({DistributedTest.class, WanTest.class})
@SuppressWarnings("serial")
public class WANClusterConfigurationDUnitTest {
diff --git a/gradle/test.gradle b/gradle/test.gradle
index c775d6e..ce23b11 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -243,6 +243,18 @@ subprojects {
reports.junitXml.destination = file "$buildDir/test-reports-lucene"
}
+ task wanTest(type:Test) {
+ useJUnit {
+ includeCategories 'org.apache.geode.test.junit.categories.WanTest'
+ excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
+ }
+ doFirst {
+ TestPropertiesWriter.writeTestProperties(buildDir, name)
+ }
+ reports.junitXml.destination = file "$buildDir/test-reports-wan"
+ }
+
+
task restAPITest(type:Test) {
useJUnit {
includeCategories 'org.apache.geode.test.junit.categories.RestAPITest'
--
To stop receiving notification emails like this one, please contact
nnag@apache.org.