This is an automated email from the ASF dual-hosted git repository. jbarrett pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git
commit 9a86b74f0ea7fdfeea5152d0858d8b928c2341bf Author: Jacob Barrett <[email protected]> AuthorDate: Sat Apr 9 10:27:20 2022 -0700 GEODE-8228: Rename tests to current convention. --- ...va => WanCopyRegionCommandDistributedTest.java} | 2 +- ...ava => CacheClientNotifierDistributedTest.java} | 2 +- ...java => Simple2CacheServerDistributedTest.java} | 21 +++++++------- ...rrentParallelGatewaySenderDistributedTest.java} | 4 +-- ...rallelGatewaySenderOffHeapDistributedTest.java} | 6 ++-- ...lelGatewaySenderOperation2DistributedTest.java} | 32 +++++++++++----------- ...waySenderOperation2OffHeapDistributedTest.java} | 8 +++--- ...waySenderOperation2OffHeapDistributedTest.java} | 8 +++--- ...waySenderOperationsOffHeapDistributedTest.java} | 6 ++-- ...rallelWANConflationOffHeapDistributedTest.java} | 7 +++-- ...gationConcurrentOpsOffHeapDistributedTest.java} | 8 +++--- ...lGatewaySenderQueueOffHeapDistributedTest.java} | 7 +++-- ...atewaySenderAlertThresholdDistributedTest.java} | 18 ++++++------ ...lelGatewaySenderOperation2DistributedTest.java} | 8 +++--- ...lelGatewaySenderOperationsDistributedTest.java} | 2 +- ...a => ParallelWANConflationDistributedTest.java} | 4 +-- ...ANPropagationConcurrentOpsDistributedTest.java} | 4 +-- ...t.java => ParallelWANStatsDistributedTest.java} | 4 +-- ...> SerialGatewaySenderQueueDistributedTest.java} | 4 +-- ...ava => SerialWANConflationDistributedTest.java} | 2 +- ...est.java => SerialWANStatsDistributedTest.java} | 4 +-- 21 files changed, 82 insertions(+), 79 deletions(-) diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/cache/wan/internal/cli/commands/WanCopyRegionCommandDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/cache/wan/internal/cli/commands/WanCopyRegionCommandDistributedTest.java similarity index 99% rename from geode-wan/src/distributedTest/java/org/apache/geode/cache/wan/internal/cli/commands/WanCopyRegionCommandDUnitTest.java rename to geode-wan/src/distributedTest/java/org/apache/geode/cache/wan/internal/cli/commands/WanCopyRegionCommandDistributedTest.java index b05bf48264..759a919d40 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/cache/wan/internal/cli/commands/WanCopyRegionCommandDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/cache/wan/internal/cli/commands/WanCopyRegionCommandDistributedTest.java @@ -84,7 +84,7 @@ import org.apache.geode.test.junit.runners.GeodeParamsRunner; @RunWith(GeodeParamsRunner.class) @Category({WanTest.class}) -public class WanCopyRegionCommandDUnitTest extends WANTestBase { +public class WanCopyRegionCommandDistributedTest extends WANTestBase { protected static VM vm8; protected static VM vm9; diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/CacheClientNotifierDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/CacheClientNotifierDistributedTest.java similarity index 99% rename from geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/CacheClientNotifierDUnitTest.java rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/CacheClientNotifierDistributedTest.java index 2231a2a2c5..c8ab48da60 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/CacheClientNotifierDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/CacheClientNotifierDistributedTest.java @@ -57,7 +57,7 @@ import org.apache.geode.test.dunit.VM; import org.apache.geode.test.junit.categories.WanTest; @Category({WanTest.class}) -public class CacheClientNotifierDUnitTest extends WANTestBase { +public class CacheClientNotifierDistributedTest extends WANTestBase { private static final int NUM_KEYS = 10; diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/Simple2CacheServerDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/Simple2CacheServerDistributedTest.java similarity index 87% rename from geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/Simple2CacheServerDUnitTest.java rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/Simple2CacheServerDistributedTest.java index 7d96e606d5..2435cb126b 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/Simple2CacheServerDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/Simple2CacheServerDistributedTest.java @@ -39,12 +39,12 @@ import org.apache.geode.test.dunit.VM; import org.apache.geode.test.junit.categories.WanTest; @Category({WanTest.class}) -public class Simple2CacheServerDUnitTest extends WANTestBase { +public class Simple2CacheServerDistributedTest extends WANTestBase { private static final int NUM_KEYS = 10; static int afterPrimaryCount = 0; static int afterProxyReinitialized = 0; - public Simple2CacheServerDUnitTest() { + public Simple2CacheServerDistributedTest() { super(); } @@ -63,11 +63,11 @@ public class Simple2CacheServerDUnitTest extends WANTestBase { int serverPort2 = vm2.invoke(WANTestBase::createCacheServer); if (durable) { - vm2.invoke(Simple2CacheServerDUnitTest::setCacheClientProxyTestHook); + vm2.invoke(Simple2CacheServerDistributedTest::setCacheClientProxyTestHook); } else { - vm3.invoke(Simple2CacheServerDUnitTest::setClientServerObserver); + vm3.invoke(Simple2CacheServerDistributedTest::setClientServerObserver); } - vm3.invoke(() -> CacheClientNotifierDUnitTest.createClientWithLocator(lnPort, "localhost", + vm3.invoke(() -> CacheClientNotifierDistributedTest.createClientWithLocator(lnPort, "localhost", getTestMethodName() + "_PR", "123", durable)); vm0.invoke(() -> WANTestBase.createCache(lnPort)); @@ -76,24 +76,25 @@ public class Simple2CacheServerDUnitTest extends WANTestBase { int serverPort3 = vm0.invoke(WANTestBase::createCacheServer); if (durable) { - vm2.invoke(Simple2CacheServerDUnitTest::checkResultAndUnsetCacheClientProxyTestHook); + vm2.invoke(Simple2CacheServerDistributedTest::checkResultAndUnsetCacheClientProxyTestHook); } else { - vm3.invoke(Simple2CacheServerDUnitTest::checkResultAndUnsetClientServerObserver); + vm3.invoke(Simple2CacheServerDistributedTest::checkResultAndUnsetClientServerObserver); } await().until(() -> { return checkProxyIsPrimary(vm0) || checkProxyIsPrimary(vm2); }); // close the current primary cache server, then re-test - int serverPortAtVM1 = vm2.invoke(Simple2CacheServerDUnitTest::findCacheServerForPrimaryProxy); + int serverPortAtVM1 = + vm2.invoke(Simple2CacheServerDistributedTest::findCacheServerForPrimaryProxy); if (serverPortAtVM1 != 0) { - vm2.invoke(() -> CacheClientNotifierDUnitTest.closeACacheServer(serverPortAtVM1)); + vm2.invoke(() -> CacheClientNotifierDistributedTest.closeACacheServer(serverPortAtVM1)); LogService.getLogger().info("Closed cache server on vm2:" + serverPortAtVM1); await().until(() -> { return checkProxyIsPrimary(vm0) || checkProxyIsPrimary(vm2); }); } else { - vm0.invoke(() -> CacheClientNotifierDUnitTest.closeACacheServer(serverPort3)); + vm0.invoke(() -> CacheClientNotifierDistributedTest.closeACacheServer(serverPort3)); LogService.getLogger().info("Closed cache server on vm0:" + serverPort3); assertTrue(checkProxyIsPrimary(vm2)); } diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDistributedTest.java similarity index 99% rename from geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDistributedTest.java index 497db7641d..2888323ca5 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDistributedTest.java @@ -37,9 +37,9 @@ import org.apache.geode.test.junit.categories.WanTest; * */ @Category({WanTest.class}) -public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { +public class ConcurrentParallelGatewaySenderDistributedTest extends WANTestBase { - public ConcurrentParallelGatewaySenderDUnitTest() { + public ConcurrentParallelGatewaySenderDistributedTest() { super(); } diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDistributedTest.java similarity index 84% rename from geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDistributedTest.java index 98addbbf75..dba0c9c412 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDistributedTest.java @@ -20,10 +20,10 @@ import org.apache.geode.test.junit.categories.WanTest; @SuppressWarnings("serial") @Category({WanTest.class}) -public class ConcurrentParallelGatewaySenderOffHeapDUnitTest - extends ConcurrentParallelGatewaySenderDUnitTest { +public class ConcurrentParallelGatewaySenderOffHeapDistributedTest + extends ConcurrentParallelGatewaySenderDistributedTest { - public ConcurrentParallelGatewaySenderOffHeapDUnitTest() { + public ConcurrentParallelGatewaySenderOffHeapDistributedTest() { super(); } diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation2DistributedTest.java similarity index 94% rename from geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation2DistributedTest.java index 648ec7bb1c..19d9c29287 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation2DistributedTest.java @@ -38,11 +38,11 @@ import org.apache.geode.test.dunit.WaitCriterion; import org.apache.geode.test.junit.categories.WanTest; @Category({WanTest.class}) -public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTestBase { +public class ConcurrentParallelGatewaySenderOperation2DistributedTest extends WANTestBase { private static final long serialVersionUID = 1L; - public ConcurrentParallelGatewaySenderOperation_2_DUnitTest() { + public ConcurrentParallelGatewaySenderOperation2DistributedTest() { super(); } @@ -290,7 +290,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes vm2.invoke(() -> validateRegionSizeWithinRange(getTestMethodName() + "_PR", 20, 101)); } finally { vm4.invoke( - ConcurrentParallelGatewaySenderOperation_2_DUnitTest::clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME); + ConcurrentParallelGatewaySenderOperation2DistributedTest::clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME); } } @@ -330,11 +330,11 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes vm2.invoke(() -> validateRegionSize(getTestMethodName() + "_PR", 10)); } finally { vm4.invoke( - ConcurrentParallelGatewaySenderOperation_2_DUnitTest::clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME); + ConcurrentParallelGatewaySenderOperation2DistributedTest::clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME); vm5.invoke( - ConcurrentParallelGatewaySenderOperation_2_DUnitTest::clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME); + ConcurrentParallelGatewaySenderOperation2DistributedTest::clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME); vm6.invoke( - ConcurrentParallelGatewaySenderOperation_2_DUnitTest::clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME); + ConcurrentParallelGatewaySenderOperation2DistributedTest::clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME); } } @@ -369,7 +369,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes AsyncInvocation<Void> putAsync = vm4.invokeAsync(() -> WANTestBase.doPutsFrom(getTestMethodName() + "_PR", 10, 2000)); AsyncInvocation<Void> localDestroyAsync = - vm4.invokeAsync(() -> ConcurrentParallelGatewaySenderOperation_2_DUnitTest + vm4.invokeAsync(() -> ConcurrentParallelGatewaySenderOperation2DistributedTest .closeRegion(getTestMethodName() + "_PR")); try { putAsync.join(); @@ -449,7 +449,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes validateRegionSizes(regionName, 20, vm4, vm5, vm6); } finally { vm7.invoke( - ConcurrentParallelGatewaySenderOperation_2_DUnitTest::clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME); + ConcurrentParallelGatewaySenderOperation2DistributedTest::clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME); } } @@ -490,9 +490,9 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes validateRegionSizes(regionName, 20, vm4, vm2); } finally { vm4.invoke( - ConcurrentParallelGatewaySenderOperation_2_DUnitTest::clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME); + ConcurrentParallelGatewaySenderOperation2DistributedTest::clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME); vm5.invoke( - ConcurrentParallelGatewaySenderOperation_2_DUnitTest::clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME); + ConcurrentParallelGatewaySenderOperation2DistributedTest::clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME); } } @@ -538,9 +538,9 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes validateRegionSizes(regionName, 20, vm4, vm6, vm7); } finally { vm4.invoke( - ConcurrentParallelGatewaySenderOperation_2_DUnitTest::clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME); + ConcurrentParallelGatewaySenderOperation2DistributedTest::clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME); vm5.invoke( - ConcurrentParallelGatewaySenderOperation_2_DUnitTest::clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME); + ConcurrentParallelGatewaySenderOperation2DistributedTest::clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME); } } @@ -580,9 +580,9 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes validateRegionSizes(customerRegionName, 10, vm4, vm5, vm2); } finally { vm4.invoke( - ConcurrentParallelGatewaySenderOperation_2_DUnitTest::clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME); + ConcurrentParallelGatewaySenderOperation2DistributedTest::clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME); vm5.invoke( - ConcurrentParallelGatewaySenderOperation_2_DUnitTest::clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME); + ConcurrentParallelGatewaySenderOperation2DistributedTest::clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME); } } @@ -616,9 +616,9 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes fail("Expected UnsupportedOperationException"); } finally { vm4.invoke( - ConcurrentParallelGatewaySenderOperation_2_DUnitTest::clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME); + ConcurrentParallelGatewaySenderOperation2DistributedTest::clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME); vm5.invoke( - ConcurrentParallelGatewaySenderOperation_2_DUnitTest::clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME); + ConcurrentParallelGatewaySenderOperation2DistributedTest::clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME); } } diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation2OffHeapDistributedTest.java similarity index 80% rename from geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation2OffHeapDistributedTest.java index 77ba3f01e8..0b5af06412 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation2OffHeapDistributedTest.java @@ -16,14 +16,14 @@ package org.apache.geode.internal.cache.wan.offheap; import org.junit.experimental.categories.Category; -import org.apache.geode.internal.cache.wan.concurrent.ConcurrentParallelGatewaySenderOperation_2_DUnitTest; +import org.apache.geode.internal.cache.wan.concurrent.ConcurrentParallelGatewaySenderOperation2DistributedTest; import org.apache.geode.test.junit.categories.WanTest; @Category({WanTest.class}) -public class ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest - extends ConcurrentParallelGatewaySenderOperation_2_DUnitTest { +public class ConcurrentParallelGatewaySenderOperation2OffHeapDistributedTest + extends ConcurrentParallelGatewaySenderOperation2DistributedTest { - public ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest() { + public ConcurrentParallelGatewaySenderOperation2OffHeapDistributedTest() { super(); } diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperation2OffHeapDistributedTest.java similarity index 83% rename from geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperation2OffHeapDistributedTest.java index 245eaf6498..c210dacf8d 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperation2OffHeapDistributedTest.java @@ -16,14 +16,14 @@ package org.apache.geode.internal.cache.wan.offheap; import org.junit.experimental.categories.Category; -import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderOperation_2_DUnitTest; +import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderOperation2DistributedTest; import org.apache.geode.test.junit.categories.WanTest; @Category({WanTest.class}) -public class ParallelGatewaySenderOperation_2_OffHeapDUnitTest - extends ParallelGatewaySenderOperation_2_DUnitTest { +public class ParallelGatewaySenderOperation2OffHeapDistributedTest + extends ParallelGatewaySenderOperation2DistributedTest { - public ParallelGatewaySenderOperation_2_OffHeapDUnitTest() { + public ParallelGatewaySenderOperation2OffHeapDistributedTest() { super(); } diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDistributedTest.java similarity index 87% rename from geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDistributedTest.java index 8ca78e2cc2..72f41ebddd 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDistributedTest.java @@ -16,13 +16,13 @@ package org.apache.geode.internal.cache.wan.offheap; import org.junit.experimental.categories.Category; -import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderOperationsDUnitTest; +import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderOperationsDistributedTest; import org.apache.geode.test.junit.categories.WanTest; @Category({WanTest.class}) @SuppressWarnings("serial") -public class ParallelGatewaySenderOperationsOffHeapDUnitTest - extends ParallelGatewaySenderOperationsDUnitTest { +public class ParallelGatewaySenderOperationsOffHeapDistributedTest + extends ParallelGatewaySenderOperationsDistributedTest { @Override public boolean isOffHeap() { diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANConflationOffHeapDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANConflationOffHeapDistributedTest.java similarity index 85% rename from geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANConflationOffHeapDUnitTest.java rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANConflationOffHeapDistributedTest.java index 7a9b49faba..8f1252b2f9 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANConflationOffHeapDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANConflationOffHeapDistributedTest.java @@ -16,14 +16,15 @@ package org.apache.geode.internal.cache.wan.offheap; import org.junit.experimental.categories.Category; -import org.apache.geode.internal.cache.wan.parallel.ParallelWANConflationDUnitTest; +import org.apache.geode.internal.cache.wan.parallel.ParallelWANConflationDistributedTest; import org.apache.geode.test.junit.categories.WanTest; @SuppressWarnings("serial") @Category({WanTest.class}) -public class ParallelWANConflationOffHeapDUnitTest extends ParallelWANConflationDUnitTest { +public class ParallelWANConflationOffHeapDistributedTest + extends ParallelWANConflationDistributedTest { - public ParallelWANConflationOffHeapDUnitTest() { + public ParallelWANConflationOffHeapDistributedTest() { super(); } diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationConcurrentOpsOffHeapDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationConcurrentOpsOffHeapDistributedTest.java similarity index 82% rename from geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationConcurrentOpsOffHeapDUnitTest.java rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationConcurrentOpsOffHeapDistributedTest.java index 037d0fdac2..3ca10d210e 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationConcurrentOpsOffHeapDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/ParallelWANPropagationConcurrentOpsOffHeapDistributedTest.java @@ -16,15 +16,15 @@ package org.apache.geode.internal.cache.wan.offheap; import org.junit.experimental.categories.Category; -import org.apache.geode.internal.cache.wan.parallel.ParallelWANPropagationConcurrentOpsDUnitTest; +import org.apache.geode.internal.cache.wan.parallel.ParallelWANPropagationConcurrentOpsDistributedTest; import org.apache.geode.test.junit.categories.WanTest; @SuppressWarnings("serial") @Category({WanTest.class}) -public class ParallelWANPropagationConcurrentOpsOffHeapDUnitTest - extends ParallelWANPropagationConcurrentOpsDUnitTest { +public class ParallelWANPropagationConcurrentOpsOffHeapDistributedTest + extends ParallelWANPropagationConcurrentOpsDistributedTest { - public ParallelWANPropagationConcurrentOpsOffHeapDUnitTest() { + public ParallelWANPropagationConcurrentOpsOffHeapDistributedTest() { super(); } diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/SerialGatewaySenderQueueOffHeapDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/SerialGatewaySenderQueueOffHeapDistributedTest.java similarity index 85% rename from geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/SerialGatewaySenderQueueOffHeapDUnitTest.java rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/SerialGatewaySenderQueueOffHeapDistributedTest.java index acc78c2454..61c8224072 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/SerialGatewaySenderQueueOffHeapDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/offheap/SerialGatewaySenderQueueOffHeapDistributedTest.java @@ -16,14 +16,15 @@ package org.apache.geode.internal.cache.wan.offheap; import org.junit.experimental.categories.Category; -import org.apache.geode.internal.cache.wan.serial.SerialGatewaySenderQueueDUnitTest; +import org.apache.geode.internal.cache.wan.serial.SerialGatewaySenderQueueDistributedTest; import org.apache.geode.test.junit.categories.WanTest; @SuppressWarnings("serial") @Category({WanTest.class}) -public class SerialGatewaySenderQueueOffHeapDUnitTest extends SerialGatewaySenderQueueDUnitTest { +public class SerialGatewaySenderQueueOffHeapDistributedTest + extends SerialGatewaySenderQueueDistributedTest { - public SerialGatewaySenderQueueOffHeapDUnitTest() { + public SerialGatewaySenderQueueOffHeapDistributedTest() { super(); } diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderAlertThresholdDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderAlertThresholdDistributedTest.java similarity index 90% rename from geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderAlertThresholdDUnitTest.java rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderAlertThresholdDistributedTest.java index f7e2f77f85..e5eb628158 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderAlertThresholdDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderAlertThresholdDistributedTest.java @@ -33,7 +33,7 @@ import org.apache.geode.test.junit.categories.WanTest; * DUnit for ParallelSenderQueue alert threshold. */ @Category({WanTest.class}) -public class ParallelGatewaySenderAlertThresholdDUnitTest extends WANTestBase { +public class ParallelGatewaySenderAlertThresholdDistributedTest extends WANTestBase { @Test public void testParallelSenderQueueEventsAlertThreshold() { @@ -98,13 +98,13 @@ public class ParallelGatewaySenderAlertThresholdDUnitTest extends WANTestBase { }); int v4alert = vm4.invoke( - ParallelGatewaySenderAlertThresholdDUnitTest::checkSenderMBeanAlertThreshold); + ParallelGatewaySenderAlertThresholdDistributedTest::checkSenderMBeanAlertThreshold); int v5alert = vm5.invoke( - ParallelGatewaySenderAlertThresholdDUnitTest::checkSenderMBeanAlertThreshold); + ParallelGatewaySenderAlertThresholdDistributedTest::checkSenderMBeanAlertThreshold); int v6alert = vm6.invoke( - ParallelGatewaySenderAlertThresholdDUnitTest::checkSenderMBeanAlertThreshold); + ParallelGatewaySenderAlertThresholdDistributedTest::checkSenderMBeanAlertThreshold); int v7alert = vm7.invoke( - ParallelGatewaySenderAlertThresholdDUnitTest::checkSenderMBeanAlertThreshold); + ParallelGatewaySenderAlertThresholdDistributedTest::checkSenderMBeanAlertThreshold); assertThat((v4alert + v5alert + v6alert + v7alert) > 0).as( "GatewaySenders MBean should contain number of EventsExceedingAlertThreshold > 0").isTrue(); @@ -172,13 +172,13 @@ public class ParallelGatewaySenderAlertThresholdDUnitTest extends WANTestBase { }); int v4alert = vm4.invoke( - ParallelGatewaySenderAlertThresholdDUnitTest::checkSenderMBeanAlertThreshold); + ParallelGatewaySenderAlertThresholdDistributedTest::checkSenderMBeanAlertThreshold); int v5alert = vm5.invoke( - ParallelGatewaySenderAlertThresholdDUnitTest::checkSenderMBeanAlertThreshold); + ParallelGatewaySenderAlertThresholdDistributedTest::checkSenderMBeanAlertThreshold); int v6alert = vm6.invoke( - ParallelGatewaySenderAlertThresholdDUnitTest::checkSenderMBeanAlertThreshold); + ParallelGatewaySenderAlertThresholdDistributedTest::checkSenderMBeanAlertThreshold); int v7alert = vm7.invoke( - ParallelGatewaySenderAlertThresholdDUnitTest::checkSenderMBeanAlertThreshold); + ParallelGatewaySenderAlertThresholdDistributedTest::checkSenderMBeanAlertThreshold); assertThat(0).as( "GatewaySenders MBean should contain number of EventsExceedingAlertThreshold = 0") diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperation_2_DUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperation2DistributedTest.java similarity index 86% rename from geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperation_2_DUnitTest.java rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperation2DistributedTest.java index b91ce585c0..e2a99b128a 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperation_2_DUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperation2DistributedTest.java @@ -16,17 +16,17 @@ package org.apache.geode.internal.cache.wan.parallel; import org.junit.experimental.categories.Category; -import org.apache.geode.internal.cache.wan.concurrent.ConcurrentParallelGatewaySenderOperation_2_DUnitTest; +import org.apache.geode.internal.cache.wan.concurrent.ConcurrentParallelGatewaySenderOperation2DistributedTest; import org.apache.geode.test.dunit.VM; import org.apache.geode.test.junit.categories.WanTest; @Category({WanTest.class}) -public class ParallelGatewaySenderOperation_2_DUnitTest - extends ConcurrentParallelGatewaySenderOperation_2_DUnitTest { +public class ParallelGatewaySenderOperation2DistributedTest + extends ConcurrentParallelGatewaySenderOperation2DistributedTest { private static final long serialVersionUID = 1L; - public ParallelGatewaySenderOperation_2_DUnitTest() { + public ParallelGatewaySenderOperation2DistributedTest() { super(); } diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDistributedTest.java similarity index 99% rename from geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDistributedTest.java index 78e2aa2360..bc7ea22b21 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDistributedTest.java @@ -85,7 +85,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName; * DUnit test for operations on ParallelGatewaySender */ @Category(WanTest.class) -public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase { +public class ParallelGatewaySenderOperationsDistributedTest extends WANTestBase { @Rule public SerializableTestName testName = new SerializableTestName(); diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDistributedTest.java similarity index 99% rename from geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDistributedTest.java index 88fa8a43b3..406ffe512a 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDistributedTest.java @@ -36,10 +36,10 @@ import org.apache.geode.test.dunit.IgnoredException; import org.apache.geode.test.junit.categories.WanTest; @Category({WanTest.class}) -public class ParallelWANConflationDUnitTest extends WANTestBase { +public class ParallelWANConflationDistributedTest extends WANTestBase { private static final long serialVersionUID = 1L; - public ParallelWANConflationDUnitTest() { + public ParallelWANConflationDistributedTest() { super(); } diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDistributedTest.java similarity index 98% rename from geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDistributedTest.java index 44616cf237..76ff0ab870 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDistributedTest.java @@ -28,11 +28,11 @@ import org.apache.geode.test.dunit.AsyncInvocation; import org.apache.geode.test.junit.categories.WanTest; @Category({WanTest.class}) -public class ParallelWANPropagationConcurrentOpsDUnitTest extends WANTestBase { +public class ParallelWANPropagationConcurrentOpsDistributedTest extends WANTestBase { private static final long serialVersionUID = 1L; - public ParallelWANPropagationConcurrentOpsDUnitTest() { + public ParallelWANPropagationConcurrentOpsDistributedTest() { super(); } diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDistributedTest.java similarity index 99% rename from geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDistributedTest.java index ce7eb03b8b..59339561fb 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDistributedTest.java @@ -44,14 +44,14 @@ import org.apache.geode.test.dunit.VM; import org.apache.geode.test.junit.categories.WanTest; @Category({WanTest.class}) -public class ParallelWANStatsDUnitTest extends WANTestBase { +public class ParallelWANStatsDistributedTest extends WANTestBase { private static final int NUM_PUTS = 100; private static final long serialVersionUID = 1L; private String testName; - public ParallelWANStatsDUnitTest() { + public ParallelWANStatsDistributedTest() { super(); } diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDistributedTest.java similarity index 99% rename from geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDistributedTest.java index aac27e1393..248699a0de 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDistributedTest.java @@ -54,7 +54,7 @@ import org.apache.geode.test.dunit.Wait; import org.apache.geode.test.junit.categories.WanTest; @Category({WanTest.class}) -public class SerialGatewaySenderQueueDUnitTest extends WANTestBase { +public class SerialGatewaySenderQueueDistributedTest extends WANTestBase { @Test public void unprocessedTokensMapShouldDrainCompletely() throws Exception { @@ -516,7 +516,7 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase { } // Attempt to create one more sender - vm4.invoke(SerialGatewaySenderQueueDUnitTest::attemptToCreateGatewaySenderOverLimit); + vm4.invoke(SerialGatewaySenderQueueDistributedTest::attemptToCreateGatewaySenderOverLimit); } private static void attemptToCreateGatewaySenderOverLimit() { diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDistributedTest.java similarity index 99% rename from geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDUnitTest.java rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDistributedTest.java index 53d52b7f49..cfe6a03ccc 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDistributedTest.java @@ -55,7 +55,7 @@ import org.apache.geode.test.dunit.VM; import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder; -public class SerialWANConflationDUnitTest extends WANTestBase { +public class SerialWANConflationDistributedTest extends WANTestBase { @Rule public SerializableTemporaryFolder temporaryFolder = new SerializableTemporaryFolder(); diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDistributedTest.java similarity index 99% rename from geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java rename to geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDistributedTest.java index a027fdd274..5b23b628b1 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDistributedTest.java @@ -35,13 +35,13 @@ import org.apache.geode.test.junit.categories.WanTest; @SuppressWarnings("deprecation") @Category({WanTest.class}) -public class SerialWANStatsDUnitTest extends WANTestBase { +public class SerialWANStatsDistributedTest extends WANTestBase { private static final long serialVersionUID = 1L; private String testName; - public SerialWANStatsDUnitTest() { + public SerialWANStatsDistributedTest() { super(); }
