http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAExpiryDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAExpiryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAExpiryDUnitTest.java index 4ef9dc0..dd941b6 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAExpiryDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAExpiryDUnitTest.java @@ -81,9 +81,8 @@ public class HAExpiryDUnitTest extends DistributedTestCase /** * This function creates regionqueue on 4 VMs */ - public void setUp() throws Exception - { - super.setUp(); + @Override + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); vm0 = host.getVM(0); @@ -93,11 +92,10 @@ public class HAExpiryDUnitTest extends DistributedTestCase vm2 = host.getVM(2); vm3 = host.getVM(3); - } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { vm0.invoke(() -> HAExpiryDUnitTest.closeCache()); vm1.invoke(() -> HAExpiryDUnitTest.closeCache()); vm2.invoke(() -> HAExpiryDUnitTest.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java index 4a24378..8e3d7af 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java @@ -99,9 +99,8 @@ public class HAGIIBugDUnitTest extends DistributedTestCase /** * This function creates regionqueue on 4 VMs */ - public void setUp() throws Exception - { - super.setUp(); + @Override + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); vm0 = host.getVM(0); @@ -113,11 +112,10 @@ public class HAGIIBugDUnitTest extends DistributedTestCase vm3 = host.getVM(3); vm0.invoke(() -> HAGIIBugDUnitTest.createRegionQueue()); - } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { vm0.invoke(() -> HAGIIBugDUnitTest.closeCache()); vm1.invoke(() -> HAGIIBugDUnitTest.closeCache()); vm2.invoke(() -> HAGIIBugDUnitTest.closeCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java index 4439e65..e23baa9 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java @@ -128,9 +128,8 @@ public class HAGIIDUnitTest extends DistributedTestCase super(name); } - public void setUp() throws Exception - { - super.setUp(); + @Override + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); //server @@ -450,7 +449,7 @@ public class HAGIIDUnitTest extends DistributedTestCase } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { ConflationDUnitTest.unsetIsSlowStart(); Invoke.invokeInEveryVM(ConflationDUnitTest.class, "unsetIsSlowStart"); // close the clients first http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java index 91aeb98..c2ff26b 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java @@ -110,9 +110,8 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase { /** * Sets up the test. */ - public void setUp() throws Exception { - super.setUp(); - + @Override + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); serverVM0 = host.getVM(0); serverVM1 = host.getVM(1); @@ -130,7 +129,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase { * Tears down the test. */ @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { closeCache(); clientVM1.invoke(() -> HARQueueNewImplDUnitTest.closeCache()); clientVM2.invoke(() -> HARQueueNewImplDUnitTest.closeCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionDUnitTest.java index 91f2ea5..64536d9 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionDUnitTest.java @@ -60,9 +60,8 @@ public class HARegionDUnitTest extends DistributedTestCase /** * get the VM's */ - public void setUp() throws Exception - { - super.setUp(); + @Override + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); vm0 = host.getVM(0); vm1 = host.getVM(1); @@ -72,7 +71,7 @@ public class HARegionDUnitTest extends DistributedTestCase * close the cache in tearDown */ @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { vm0.invoke(() -> HARegionDUnitTest.closeCache()); vm1.invoke(() -> HARegionDUnitTest.closeCache()); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java index cf31493..859c168 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java @@ -88,9 +88,8 @@ public class HARegionQueueDUnitTest extends DistributedTestCase /** * get the VM's */ - public void setUp() throws Exception - { - super.setUp(); + @Override + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); vm0 = host.getVM(0); vm1 = host.getVM(1); @@ -102,7 +101,7 @@ public class HARegionQueueDUnitTest extends DistributedTestCase * close the cache in tearDown */ @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { vm0.invoke(() -> HARegionQueueDUnitTest.closeCache()); vm1.invoke(() -> HARegionQueueDUnitTest.closeCache()); vm2.invoke(() -> HARegionQueueDUnitTest.closeCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java index aa7964c..0f12155 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java @@ -74,9 +74,7 @@ public class HASlowReceiverDUnitTest extends DistributedTestCase { } @Override - public void setUp() throws Exception { - super.setUp(); - + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); serverVM1 = host.getVM(1); serverVM2 = host.getVM(2); @@ -85,11 +83,10 @@ public class HASlowReceiverDUnitTest extends DistributedTestCase { PORT0 = createServerCache().intValue(); PORT1 = ((Integer)serverVM1.invoke(() -> HASlowReceiverDUnitTest.createServerCache())).intValue(); PORT2 = ((Integer)serverVM2.invoke(() -> HASlowReceiverDUnitTest.createServerCache())).intValue(); - } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { clientVM.invoke(() -> HASlowReceiverDUnitTest.closeCache()); // then close the servers http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java index ae85399..36ba2e9 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java @@ -100,9 +100,8 @@ public class OperationsPropagationDUnitTest extends DistributedTestCase * Create the server1, server2 (in the same DS) and client1 (which is * connected only to server2 */ - public void setUp() throws Exception - { - super.setUp(); + @Override + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); // Server1 VM server1 = host.getVM(0); @@ -116,14 +115,13 @@ public class OperationsPropagationDUnitTest extends DistributedTestCase PORT1 = ((Integer)server1.invoke(() -> OperationsPropagationDUnitTest.createServerCache())).intValue(); PORT2 = ((Integer)server2.invoke(() -> OperationsPropagationDUnitTest.createServerCache())).intValue(); client1.invoke(() -> OperationsPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT2) )); - } /** * close the caches of the client and the servers */ @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { client1.invoke(() -> OperationsPropagationDUnitTest.closeCache()); server1.invoke(() -> OperationsPropagationDUnitTest.closeCache()); server2.invoke(() -> OperationsPropagationDUnitTest.closeCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java index 7f9e79f..a8f6a00 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java @@ -91,9 +91,8 @@ public class PutAllDUnitTest extends DistributedTestCase } /** get the hosts and the VMs **/ - public void setUp() throws Exception - { - super.setUp(); + @Override + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); server1 = host.getVM(0); server2 = host.getVM(1); @@ -103,7 +102,7 @@ public class PutAllDUnitTest extends DistributedTestCase /** close the caches**/ @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { client1.invoke(() -> PutAllDUnitTest.closeCache()); client2.invoke(() -> PutAllDUnitTest.closeCache()); // close server http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java index f263113..74705fe 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java @@ -111,10 +111,9 @@ public class StatsBugDUnitTest extends DistributedTestCase * @throws Exception - * thrown if any problem occurs in initializing the test */ - public void setUp() throws Exception - { + @Override + public final void postSetUp() throws Exception { disconnectAllFromDS(); - super.setUp(); final Host host = Host.getHost(0); primary = host.getVM(0); secondary = host.getVM(1); @@ -152,7 +151,7 @@ public class StatsBugDUnitTest extends DistributedTestCase * thrown if any problem occurs in closing cache */ @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { // close client client1.invoke(() -> StatsBugDUnitTest.closeCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java index 8d150f9..867c214 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java @@ -67,9 +67,8 @@ public class TXLockServiceDUnitTest extends DistributedTestCase { * time this method is called in this VM) distributed system * which is somewhat configurable via hydra test parameters. */ - public void setUp() throws Exception { - super.setUp(); - + @Override + public final void postSetUp() throws Exception { // Create a DistributedSystem in every VM connectDistributedSystem(); @@ -89,7 +88,7 @@ public class TXLockServiceDUnitTest extends DistributedTestCase { } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { // invokeInEveryVM(TXLockServiceDUnitTest.class, // "remoteDumpAllDLockServices"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java index d2a5cc3..0a14527 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java @@ -71,8 +71,8 @@ public class Bug43684DUnitTest extends DistributedTestCase { super(name); } - public void setUp() throws Exception { - super.setUp(); + @Override + public final void postSetUp() throws Exception { host = Host.getHost(0); server1 = host.getVM(0); server2 = host.getVM(1); @@ -82,7 +82,7 @@ public class Bug43684DUnitTest extends DistributedTestCase { } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { closeCache(); client1.invoke(() -> Bug43684DUnitTest.closeCache()); server1.invoke(() -> Bug43684DUnitTest.closeCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug47388DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug47388DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug47388DUnitTest.java index 193a7dd..8232bf7 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug47388DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug47388DUnitTest.java @@ -80,8 +80,8 @@ public class Bug47388DUnitTest extends DistributedTestCase { super(name); } - public void setUp() throws Exception { - super.setUp(); + @Override + public final void postSetUp() throws Exception { disconnectFromDS(); Host host = Host.getHost(0); vm0 = host.getVM(0); // datastore and server @@ -102,7 +102,7 @@ public class Bug47388DUnitTest extends DistributedTestCase { } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { closeCache(); vm2.invoke(() -> Bug47388DUnitTest.closeCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java index c7fffe4..a8f37d0 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java @@ -65,18 +65,17 @@ public class Bug51400DUnitTest extends DistributedTestCase { super(name); } - public void setUp() throws Exception { - super.setUp(); + @Override + public final void postSetUp() throws Exception { Host host = Host.getHost(0); server0 = host.getVM(0); server1 = host.getVM(1); client0 = host.getVM(2); client1 = host.getVM(3); - } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { closeCache(); client0.invoke(() -> Bug51400DUnitTest.closeCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionResolverDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionResolverDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionResolverDUnitTest.java index 1ba824e..d371de1 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionResolverDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionResolverDUnitTest.java @@ -69,9 +69,9 @@ public class PartitionResolverDUnitTest extends CacheTestCase { public PartitionResolverDUnitTest(String name) { super(name); } + @Override - public void setUp() throws Exception { - super.setUp(); + public final void postSetUp() throws Exception { host = Host.getHost(0); accessor = host.getVM(0); datastore1 = host.getVM(1); @@ -79,7 +79,7 @@ public class PartitionResolverDUnitTest extends CacheTestCase { } @Override - protected final void postTearDownCacheTestCase() throws Exception { + public final void postTearDownCacheTestCase() throws Exception { CountingResolver.resetResolverCount(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java index faa6fb6..61b5c69 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java @@ -57,11 +57,6 @@ public class PartitionedRegionLoaderWriterDUnitTest extends CacheTestCase { super(name); } - @Override - public void setUp() throws Exception { - super.setUp(); - } - public void testLoader_OnAccessor_NotOnDataStore(){ host = Host.getHost(0); accessor = host.getVM(0); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java index 901d2d6..d0d9589 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java @@ -71,7 +71,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest extends } @Override - protected final void preTearDownCacheTestCase() throws Exception { + public final void preTearDownCacheTestCase() throws Exception { FileUtil.delete(getBackupDir()); } @@ -623,7 +623,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest extends //replying to the admin member. vm1.invoke(new SerializableRunnable() { public void run() { - system.disconnect(); + basicGetSystem().disconnect(); } }); @@ -853,7 +853,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest extends //replying to the admin member. vm1.invoke(new SerializableRunnable() { public void run() { - system.disconnect(); + basicGetSystem().disconnect(); } }); @@ -1000,7 +1000,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest extends public Object call() throws Exception { Wait.waitForCriterion(new WaitCriterion() { public boolean done() { - InternalDistributedSystem ds = system; + InternalDistributedSystem ds = basicGetSystem(); return ds == null || !ds.isConnected(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java index 3b89271..c0fece6 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java @@ -86,11 +86,14 @@ public abstract class PersistentPartitionedRegionTestBase extends CacheTestCase * @see dunit.DistributedTestCase#setUp() */ @Override - public void setUp() throws Exception { - super.setUp(); + public final void postSetUp() throws Exception { disconnectAllFromDS(); Invoke.invokeInEveryVM(PersistentPartitionedRegionTestBase.class,"setRegionName", new Object[]{getUniqueName()}); setRegionName(getUniqueName()); + postSetUpPersistentPartitionedRegionTestBase(); + } + + protected void postSetUpPersistentPartitionedRegionTestBase() throws Exception { } public static void setRegionName(String testName) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionWithTransactionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionWithTransactionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionWithTransactionDUnitTest.java index 90118d1..901cecb 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionWithTransactionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionWithTransactionDUnitTest.java @@ -42,7 +42,7 @@ public class PersistentPartitionedRegionWithTransactionDUnitTest extends Persist } @Override - protected final void postTearDownCacheTestCase() throws Exception { + public final void postTearDownCacheTestCase() throws Exception { Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { TXManagerImpl.ALLOW_PERSISTENT_TRANSACTIONS = false; @@ -52,8 +52,7 @@ public class PersistentPartitionedRegionWithTransactionDUnitTest extends Persist } @Override - public void setUp() throws Exception { - super.setUp(); + protected final void postSetUpPersistentPartitionedRegionTestBase() throws Exception { Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { @@ -63,7 +62,6 @@ public class PersistentPartitionedRegionWithTransactionDUnitTest extends Persist }); } - public void testRollback() throws Throwable { Host host = Host.getHost(0); VM vm0 = host.getVM(0); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/ShutdownAllDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/ShutdownAllDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/ShutdownAllDUnitTest.java index cd68c35..3bd7600 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/ShutdownAllDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/ShutdownAllDUnitTest.java @@ -85,10 +85,8 @@ public class ShutdownAllDUnitTest extends CacheTestCase { */ private static final int MAX_WAIT = 600 * 1000; - @Override - public void setUp() throws Exception { - super.setUp(); + public final void postSetUp() throws Exception { //Get rid of any existing distributed systems. We want //to make assertions about the number of distributed systems //we shut down, so we need to start with a clean slate. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java index 100e444..6790566 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java @@ -45,14 +45,13 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase { private static final long serialVersionUID = 1L; - public void setUp() throws Exception { - super.setUp(); + @Override + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); member1 = host.getVM(0); member2 = host.getVM(1); member3 = host.getVM(2); member4 = host.getVM(3); - } /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java index b1a2895..42428b8 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java @@ -1318,7 +1318,7 @@ public class FixedPartitioningTestBase extends DistributedTestCase { } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { try { closeCache(); member1.invoke(() -> FixedPartitioningTestBase.closeCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java index 8d861b7..b508b56 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java @@ -34,14 +34,13 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends private static final long serialVersionUID = 1L; - public void setUp() throws Exception { - super.setUp(); + @Override + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); member1 = host.getVM(0); member2 = host.getVM(1); member3 = host.getVM(2); member4 = host.getVM(3); - } /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentReplicatedTestBase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentReplicatedTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentReplicatedTestBase.java index e07b145..1500269 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentReplicatedTestBase.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentReplicatedTestBase.java @@ -55,8 +55,7 @@ public abstract class PersistentReplicatedTestBase extends CacheTestCase { } @Override - public void setUp() throws Exception { - super.setUp(); + public final void postSetUp() throws Exception { Invoke.invokeInEveryVM(PersistentReplicatedTestBase.class,"setRegionName", new Object[]{getUniqueName()}); setRegionName(getUniqueName()); diskDir = new File("diskDir-" + getName()).getAbsoluteFile(); @@ -70,7 +69,7 @@ public abstract class PersistentReplicatedTestBase extends CacheTestCase { } @Override - protected final void postTearDownCacheTestCase() throws Exception { + public final void postTearDownCacheTestCase() throws Exception { com.gemstone.gemfire.internal.FileUtil.delete(diskDir); postTearDownPersistentReplicatedTestBase(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/Bug40396DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/Bug40396DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/Bug40396DUnitTest.java index b69c973..b9958c8 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/Bug40396DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/Bug40396DUnitTest.java @@ -59,8 +59,8 @@ public class Bug40396DUnitTest extends DistributedTestCase { super(name); } - public void setUp() throws Exception { - super.setUp(); + @Override + public final void postSetUp() throws Exception { disconnectAllFromDS(); final Host host = Host.getHost(0); server = host.getVM(0); @@ -202,7 +202,7 @@ public class Bug40396DUnitTest extends DistributedTestCase { } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { // then close the servers server.invoke(() -> Bug40396DUnitTest.removeExceptions()); server.invoke(() -> Bug40396DUnitTest.closeCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java index 8839f97..e35b49b 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java @@ -75,8 +75,7 @@ public class BackwardCompatibilityHigherVersionClientDUnitTest extends } @Override - public void setUp() throws Exception { - super.setUp(); + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); server1 = host.getVM(0); client1 = host.getVM(1); @@ -135,7 +134,7 @@ public class BackwardCompatibilityHigherVersionClientDUnitTest extends } @Override - protected final void postTearDown() throws Exception { + public final void postTearDown() throws Exception { client1.invoke(() -> BackwardCompatibilityHigherVersionClientDUnitTest.unsetHandshakeVersionForTesting()); client1.invoke(() -> BackwardCompatibilityHigherVersionClientDUnitTest.unsetConnectionToServerFailed()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java index 12cd163..80d238e 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java @@ -71,8 +71,8 @@ public class Bug36269DUnitTest extends DistributedTestCase super(name); } - public void setUp() throws Exception { - super.setUp(); + @Override + public final void postSetUp() throws Exception { disconnectAllFromDS(); final Host host = Host.getHost(0); @@ -84,7 +84,6 @@ public class Bug36269DUnitTest extends DistributedTestCase PORT1 = ((Integer)server1.invoke(() -> Bug36269DUnitTest.createServerCache())).intValue(); PORT2 = ((Integer)server2.invoke(() -> Bug36269DUnitTest.createServerCache())).intValue(); - } private void createCache(Properties props) throws Exception @@ -217,7 +216,7 @@ public class Bug36269DUnitTest extends DistributedTestCase } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { closeCache(); // close server server1.invoke(() -> Bug36269DUnitTest.closeCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java index 5667928..545b2a8 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java @@ -73,15 +73,13 @@ public class Bug36457DUnitTest extends DistributedTestCase super(name); } - public void setUp() throws Exception - { - super.setUp(); + @Override + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); server1 = host.getVM(0); server2 = host.getVM(1); client1 = host.getVM(2); client2 = host.getVM(3); - } private void createCache(Properties props) throws Exception @@ -140,7 +138,7 @@ public class Bug36457DUnitTest extends DistributedTestCase } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { // close the clients first client1.invoke(() -> Bug36457DUnitTest.closeCache()); client2.invoke(() -> Bug36457DUnitTest.closeCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java index 16fab70..6ce5520 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java @@ -77,15 +77,13 @@ public class Bug36805DUnitTest extends DistributedTestCase super(name); } - public void setUp() throws Exception - { - super.setUp(); + @Override + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); server1 = host.getVM(0); server2 = host.getVM(1); client1 = host.getVM(2); client2 = host.getVM(3); - } private void createCache(Properties props) throws Exception @@ -134,7 +132,7 @@ public class Bug36805DUnitTest extends DistributedTestCase } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { // close the clients first client1.invoke(() -> Bug36805DUnitTest.closeCache()); client2.invoke(() -> Bug36805DUnitTest.closeCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java index def774a..8eeec93 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java @@ -46,8 +46,8 @@ public class Bug36829DUnitTest extends DistributedTestCase { super(name); } - public void setUp() throws Exception { - super.setUp(); + @Override + public final void postSetUp() throws Exception { Host host = Host.getHost(0); this.serverVM = host.getVM(0); this.ClientVM = host.getVM(1); @@ -164,7 +164,7 @@ public class Bug36829DUnitTest extends DistributedTestCase { } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { CacheServerTestUtil.resetDisableShufflingOfEndpointsFlag(); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java index 30fb4c6..094635c 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java @@ -56,14 +56,12 @@ public class Bug36995DUnitTest extends DistributedTestCase super(name); } - public void setUp() throws Exception - { - super.setUp(); + @Override + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); server1 = host.getVM(0); server2 = host.getVM(1); server3 = host.getVM(2); - } private void createCache(Properties props) throws Exception @@ -140,7 +138,7 @@ public class Bug36995DUnitTest extends DistributedTestCase } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { closeCache(); server1.invoke(() -> Bug36995DUnitTest.closeCache()); server2.invoke(() -> Bug36995DUnitTest.closeCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java index bd6d870..878a576 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java @@ -82,10 +82,8 @@ public class Bug37210DUnitTest extends DistributedTestCase * @throws Exception - * thrown if any problem occurs in initializing the test */ - public void setUp() throws Exception - { - super.setUp(); - + @Override + public final void postSetUp() throws Exception { IgnoredException.addIgnoredException("java.io.IOException"); final Host host = Host.getHost(0); @@ -124,7 +122,7 @@ public class Bug37210DUnitTest extends DistributedTestCase * thrown if any problem occurs in closing cache */ @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { // close client client.invoke(() -> Bug37210DUnitTest.closeCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java index 46e1679..4bfe1e1 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java @@ -56,8 +56,8 @@ public class Bug37805DUnitTest extends DistributedTestCase{ super(name); } - public void setUp() throws Exception { - super.setUp(); + @Override + public final void postSetUp() throws Exception { Host host = Host.getHost(0); this.server1VM = host.getVM(0); this.durableClientVM = host.getVM(1); @@ -66,7 +66,7 @@ public class Bug37805DUnitTest extends DistributedTestCase{ } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { // Stop server 1 this.server1VM.invoke(() -> CacheServerTestUtil.closeCache()); CacheServerTestUtil.resetDisableShufflingOfEndpointsFlag(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java index beb1a9d..52f416a 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java @@ -95,9 +95,8 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase protected static boolean invalidated = false; - public void setUp() throws Exception - { - super.setUp(); + @Override + public final void postSetUp() throws Exception { host = Host.getHost(0); server1 = host.getVM(0); server2 = host.getVM(1); @@ -806,7 +805,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { // close the clients first client1.invoke(() -> CacheServerTransactionsDUnitTest.closeCache()); client2.invoke(() -> CacheServerTransactionsDUnitTest.closeCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java index e71bebb..8f35ce2 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java @@ -83,8 +83,8 @@ public class ClearPropagationDUnitTest extends DistributedTestCase super(name); } - public void setUp() throws Exception { - super.setUp(); + @Override + public final void postSetUp() throws Exception { disconnectAllFromDS(); final Host host = Host.getHost(0); @@ -107,7 +107,6 @@ public class ClearPropagationDUnitTest extends DistributedTestCase client2.invoke(() -> ClearPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1), new Integer(PORT2) )); CacheObserverHolder.setInstance(new CacheObserverAdapter()); - } private void createCache(Properties props) throws Exception @@ -469,7 +468,7 @@ public class ClearPropagationDUnitTest extends DistributedTestCase } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { //close client client1.invoke(() -> ClearPropagationDUnitTest.closeCache()); client2.invoke(() -> ClearPropagationDUnitTest.closeCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java index 8a7a769..f7e6085 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java @@ -73,8 +73,8 @@ public class ClientConflationDUnitTest extends DistributedTestCase super(name); } - public void setUp() throws Exception { - super.setUp(); + @Override + public final void postSetUp() throws Exception { disconnectAllFromDS(); final Host host = Host.getHost(0); @@ -529,7 +529,7 @@ public class ClientConflationDUnitTest extends DistributedTestCase * close the cache in tearDown */ @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { // close client closeCacheFeeder(); vm1.invoke(() -> ClientConflationDUnitTest.closeCacheClient()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java index 1559506..8a6cd35 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java @@ -139,17 +139,13 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase super(name); } - public void setUp() throws Exception { - super.setUp(); + @Override + public final void postSetUp() throws Exception { disconnectAllFromDS(); final Host host = Host.getHost(0); vm0 = host.getVM(0); vm1 = host.getVM(1); - /* - vm2 = host.getVM(2); - vm3 = host.getVM(3); - */ } private Cache createCache(Properties props) throws Exception @@ -626,7 +622,7 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase * close the caches in tearDown */ @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { vm0.invoke(() -> ClientInterestNotifyDUnitTest.closeCache()); vm1.invoke(() -> ClientInterestNotifyDUnitTest.closeCache()); /* http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java index 8fb726a..98baa06 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java @@ -118,9 +118,8 @@ public class ClientServerMiscDUnitTest extends CacheTestCase super(name); } - public void setUp() throws Exception - { - super.setUp(); + @Override + public final void postSetUp() throws Exception { host = Host.getHost(0); server1 = host.getVM(0); server2 = host.getVM(1); @@ -1381,14 +1380,14 @@ public class ClientServerMiscDUnitTest extends CacheTestCase } @Override - protected final void postTearDownCacheTestCase() throws Exception { + public final void postTearDownCacheTestCase() throws Exception { // close the clients first - closeCache(); + closeCacheAndDisconnect(); // then close the servers - server1.invoke(() -> ClientServerMiscDUnitTest.closeCache()); + server1.invoke(() -> ClientServerMiscDUnitTest.closeCacheAndDisconnect()); } - public static void closeCache() + public static void closeCacheAndDisconnect() { Cache cache = new ClientServerMiscDUnitTest("temp").getCache(); if (cache != null && !cache.isClosed()) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java index 6839e32..363673c 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java @@ -83,8 +83,8 @@ public class ConflationDUnitTest extends DistributedTestCase super(name); } - public void setUp() throws Exception { - super.setUp(); + @Override + public final void postSetUp() throws Exception { disconnectAllFromDS(); final Host host = Host.getHost(0); @@ -899,7 +899,7 @@ public class ConflationDUnitTest extends DistributedTestCase * close the cache in tearDown */ @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { // close client closeCache(); vm2.invoke(() -> ConflationDUnitTest.closeCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java index 4c0c296..9d6ee1c 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java @@ -94,8 +94,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase { } @Override - public void setUp() throws Exception { - super.setUp(); + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); client1 = host.getVM(0); client2 = host.getVM(1); @@ -156,7 +155,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase { } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { try { // close the clients first client1.invoke(() -> DataSerializerPropogationDUnitTest.closeCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java index 6ca370f..6ce8409 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java @@ -83,10 +83,9 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase super(name); } - public void setUp() throws Exception { - super.setUp(); + @Override + public final void postSetUp() throws Exception { disconnectAllFromDS(); - // pause(5000); final Host host = Host.getHost(0); //Server1 VM @@ -106,7 +105,6 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase vm2.invoke(() -> DestroyEntryPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT1),new Integer(PORT2))); vm3.invoke(() -> DestroyEntryPropagationDUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT1),new Integer(PORT2))); - } private void createCache(Properties props) throws Exception @@ -486,7 +484,7 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { //close client vm2.invoke(() -> DestroyEntryPropagationDUnitTest.closeCache()); vm3.invoke(() -> DestroyEntryPropagationDUnitTest.closeCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java index fb425c1..70db594 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java @@ -50,7 +50,7 @@ public class DurableClientBug39997DUnitTest extends CacheTestCase { public final void postTearDownCacheTestCase() { Host.getHost(0) .getVM(0).invoke(() -> disconnectFromDS()); } - + public void testNoServerAvailableOnStartup() { Host host = Host.getHost(0); VM vm0 = host.getVM(0); @@ -62,10 +62,10 @@ public class DurableClientBug39997DUnitTest extends CacheTestCase { public void run() { getSystem(getClientProperties()); PoolImpl p = (PoolImpl)PoolManager.createFactory() - .addServer(hostName, port) - .setSubscriptionEnabled(true) - .setSubscriptionRedundancy(0) - .create("DurableClientReconnectDUnitTestPool"); + .addServer(hostName, port) + .setSubscriptionEnabled(true) + .setSubscriptionRedundancy(0) + .create("DurableClientReconnectDUnitTestPool"); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); factory.setPoolName(p.getName()); @@ -81,7 +81,7 @@ public class DurableClientBug39997DUnitTest extends CacheTestCase { } } }); - + vm1.invoke(new SerializableRunnable() { public void run() { Cache cache = getCache(); @@ -109,14 +109,14 @@ public class DurableClientBug39997DUnitTest extends CacheTestCase { } public boolean done() { - try { + try { region.registerInterest("ALL_KEYS"); } catch (NoSubscriptionServersAvailableException e) { return false; } return true; } - + }, 30000, 1000, true); } }); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java index 648718f..7994edf 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java @@ -76,8 +76,7 @@ public class DurableClientQueueSizeDUnitTest extends DistributedTestCase { } @Override - public void setUp() throws Exception { - super.setUp(); + public final void postSetUp() throws Exception { vm0 = Host.getHost(0).getVM(0); vm1 = Host.getHost(0).getVM(1); vm2 = Host.getHost(0).getVM(2); @@ -90,7 +89,7 @@ public class DurableClientQueueSizeDUnitTest extends DistributedTestCase { } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { closeCache(); vm2.invoke(() -> DurableClientQueueSizeDUnitTest.closeCache()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java index 5f25c3a..ce2a1e0 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java @@ -96,9 +96,7 @@ public class DurableClientReconnectDUnitTest extends DistributedTestCase } @Override - public void setUp() throws Exception - { - super.setUp(); + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); server1 = host.getVM(0); server2 = host.getVM(1); @@ -117,8 +115,8 @@ public class DurableClientReconnectDUnitTest extends DistributedTestCase //CacheServerTestUtil.disableShufflingOfEndpoints(); System.setProperty("gemfire.bridge.disableShufflingOfEndpoints", "false"); - } + public void testDurableReconnectSingleServer() throws Exception { createCacheClientAndConnectToSingleServer(NetworkUtils.getServerHostName(Host.getHost(0)), 0); @@ -732,7 +730,7 @@ public class DurableClientReconnectDUnitTest extends DistributedTestCase } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { // close the clients first closeCache(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java index e3e38a4..125a8c7 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java @@ -70,8 +70,7 @@ public class DurableClientStatsDUnitTest extends DistributedTestCase { } @Override - public void setUp() throws Exception { - super.setUp(); + public final void postSetUp() throws Exception { Host host = Host.getHost(0); this.server1VM = host.getVM(0); this.durableClientVM = host.getVM(1); @@ -80,7 +79,7 @@ public class DurableClientStatsDUnitTest extends DistributedTestCase { } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { // Stop server 1 this.server1VM.invoke(() -> CacheServerTestUtil.closeCache()); CacheServerTestUtil.resetDisableShufflingOfEndpointsFlag(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java index 5d5e0a8..237fc91 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java @@ -100,8 +100,8 @@ public class DurableRegistrationDUnitTest extends DistributedTestCase { super(name); } - public void setUp() throws Exception { - super.setUp(); + @Override + public final void postSetUp() throws Exception { Host host = Host.getHost(0); this.server1VM = host.getVM(0); this.server2VM = host.getVM(1); @@ -771,7 +771,7 @@ public class DurableRegistrationDUnitTest extends DistributedTestCase { } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { CacheServerTestUtil.resetDisableShufflingOfEndpointsFlag(); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java index bc49f93..d0f64cf 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java @@ -63,9 +63,8 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase super(name); } - public void setUp() throws Exception - { - super.setUp(); + @Override + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); server1 = host.getVM(0); // start servers first @@ -481,7 +480,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { // close the clients first closeCache(); // then close the servers http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java index 0217361..6a12e54 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java @@ -84,9 +84,8 @@ public class EventIDVerificationDUnitTest extends DistributedTestCase super(name); } - public void setUp() throws Exception - { - super.setUp(); + @Override + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); vm0 = host.getVM(0); vm1 = host.getVM(1); @@ -99,7 +98,6 @@ public class EventIDVerificationDUnitTest extends DistributedTestCase // Object[] { new Integer(PORT1),new Integer(PORT2)}); createClientCache(NetworkUtils.getServerHostName(host), new Integer(PORT1), new Integer(PORT2)); CacheObserverHolder.setInstance(new CacheObserverAdapter()); - } public void testEventIDOnServer() @@ -472,7 +470,7 @@ public class EventIDVerificationDUnitTest extends DistributedTestCase } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { // close the clients first closeCache(); // then close the servers http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java index f33e6e1..94b7b05 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java @@ -71,9 +71,8 @@ public class EventIDVerificationInP2PDUnitTest extends DistributedTestCase super(name); } - public void setUp() throws Exception - { - super.setUp(); + @Override + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); vm0 = host.getVM(0); receiver = false; @@ -310,7 +309,7 @@ public class EventIDVerificationInP2PDUnitTest extends DistributedTestCase } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { closeCache(); vm0.invoke(() -> EventIDVerificationInP2PDUnitTest.closeCache()); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java index b9c1893..3049551 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java @@ -36,7 +36,7 @@ public class ForceInvalidateOffHeapEvictionDUnitTest extends } @Override - protected final void preTearDownCacheTestCase() throws Exception { + public final void preTearDownCacheTestCase() throws Exception { SerializableRunnable checkOrphans = new SerializableRunnable() { @Override http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HABug36738DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HABug36738DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HABug36738DUnitTest.java index df81db8..a82061e 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HABug36738DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HABug36738DUnitTest.java @@ -16,8 +16,9 @@ */ package com.gemstone.gemfire.internal.cache.tier.sockets; -import java.util.Iterator; -import java.util.Properties; +import static com.gemstone.gemfire.test.dunit.Invoke.*; +import static com.jayway.awaitility.Awaitility.*; +import static com.jayway.awaitility.Duration.*; import com.gemstone.gemfire.cache.AttributesFactory; import com.gemstone.gemfire.cache.Cache; @@ -25,23 +26,16 @@ import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.DataPolicy; import com.gemstone.gemfire.cache.MirrorType; import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.internal.cache.EnumListenerEvent; import com.gemstone.gemfire.internal.cache.EventID; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.HARegion; import com.gemstone.gemfire.internal.cache.LocalRegion; import com.gemstone.gemfire.internal.cache.ha.HAHelper; -import com.gemstone.gemfire.internal.cache.ha.HARegionQueue; -import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID; -import com.gemstone.gemfire.internal.cache.tier.sockets.ClientUpdateMessage; import com.gemstone.gemfire.test.dunit.DistributedTestCase; import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.VM; -import com.gemstone.gemfire.test.dunit.Wait; /** * This is the bugtest for bug no. 36738. When Object of class @@ -52,143 +46,89 @@ import com.gemstone.gemfire.test.dunit.Wait; * 2. Perform put operations on HARegion with the value as ClientUpdateMessage. * 3. Create server2 and HARegion in it so that GII will happen. * 4. Perform get operations from server2. - * */ - -public class HABug36738DUnitTest extends DistributedTestCase -{ - - static VM server1 = null; - - static VM server2 = null; - - private static int NO_OF_PUTS = 10; +public class HABug36738DUnitTest extends DistributedTestCase { private static final String REGION_NAME = "HABug36738DUnitTest_Region"; + private static final String HAREGION_NAME = "haRegion"; + private static final int COUNT = 10; - protected static Cache cache = null; + private static Cache cache; - protected static HARegionQueue messageQueue = null; - - static Region haRegion = null; - - final static String HAREGION_NAME = "haRegion"; + private Region haRegion; public HABug36738DUnitTest(String name) { super(name); } - public void setUp() throws Exception - { - super.setUp(); - final Host host = Host.getHost(0); - server1 = host.getVM(0); - server2 = host.getVM(1); - - } - @Override - protected final void preTearDown() throws Exception { - server1.invoke(() -> HABug36738DUnitTest.closeCache()); - server2.invoke(() -> HABug36738DUnitTest.closeCache()); - } - - public void testBug36768() throws Exception - { - createServer1(); - Wait.pause(10000); - server1.invoke(() -> HABug36738DUnitTest.checkRegionQueueSize()); - createServer2(); - server1.invoke(() -> HABug36738DUnitTest.checkRegionQueueSize()); - server2.invoke(() -> HABug36738DUnitTest.checkRegionQueueSize()); - server2.invoke(() -> HABug36738DUnitTest.printRecs()); + public final void preTearDown() throws Exception { + disconnectAllFromDS(); + invokeInEveryVM( () -> cache = null ); } - public static void printRecs() - { - HARegion region = (HARegion)cache.getRegion(Region.SEPARATOR - + HAHelper.getRegionQueueName(HAREGION_NAME)); - assertNotNull(region); - Iterator itr = region.keys().iterator(); - while (itr.hasNext()) { - Object key = itr.next(); - ClientUpdateMessage value = (ClientUpdateMessage)region.get(key); - LogWriterUtils.getLogWriter().info("key : " + key + "Value " + value.getValue()); - - } + public void testBug36768() throws Exception { + final VM server1 = Host.getHost(0).getVM(0); + final VM server2 = Host.getHost(0).getVM(1); - } + server1.invoke(() -> createServerCacheWithHAAndRegion()); + await().atMost(TEN_SECONDS).until( () -> regionExists(server1, HAREGION_NAME) ); + server1.invoke(() -> checkRegionQueueSize()); - // function to create server and region in it. - private void createServer1() throws Exception - { - server1.invoke(() -> HABug36738DUnitTest.createServerCache( new Boolean(true) )); - } + server2.invoke(() -> createServerCacheWithHA()); - // function to create server without region. - private void createServer2() throws Exception - { - server2.invoke(() -> HABug36738DUnitTest.createServerCache( new Boolean(false) )); + server1.invoke(() -> checkRegionQueueSize()); + server2.invoke(() -> checkRegionQueueSize()); } - public static void createServerCache(Boolean isRegion) throws Exception - { - new HABug36738DUnitTest("temp").createCache(new Properties()); - if (isRegion.booleanValue()) { - AttributesFactory factory = new AttributesFactory(); - factory.setScope(Scope.DISTRIBUTED_ACK); - factory.setEnableConflation(true); - factory.setDataPolicy(DataPolicy.REPLICATE); - RegionAttributes attrs = factory.createRegionAttributes(); - cache.createVMRegion(REGION_NAME, attrs); - + private void createServerCacheWithHAAndRegion() throws Exception { + createServerCacheWithHA(); + assertNotNull(cache); + assertNotNull(this.haRegion); + + final AttributesFactory factory = new AttributesFactory(); + factory.setScope(Scope.DISTRIBUTED_ACK); + factory.setEnableConflation(true); + factory.setDataPolicy(DataPolicy.REPLICATE); + + cache.createVMRegion(REGION_NAME, factory.createRegionAttributes()); + + for (int i = 0; i < COUNT; i++) { + ClientUpdateMessage clientMessage = new ClientUpdateMessageImpl( + EnumListenerEvent.AFTER_UPDATE, + (LocalRegion)this.haRegion, + null, + ("value" + i).getBytes(), + (byte)0x01, + null, + new ClientProxyMembershipID(), + new EventID(("memberID" + i).getBytes(), i, i)); + + this.haRegion.put(i, clientMessage); } + } - AttributesFactory factoryForHARegion = new AttributesFactory(); - factoryForHARegion.setMirrorType(MirrorType.KEYS_VALUES); - factoryForHARegion.setScope(Scope.DISTRIBUTED_ACK); - RegionAttributes ra = factoryForHARegion.createRegionAttributes(); - haRegion = HARegion.getInstance(HAREGION_NAME, (GemFireCacheImpl)cache, null, - ra); - - if (isRegion.booleanValue()) { - for (int i = 0; i < NO_OF_PUTS; i++) { - ClientUpdateMessage clientMessage = new ClientUpdateMessageImpl( - EnumListenerEvent.AFTER_UPDATE, (LocalRegion)haRegion, null, ("value" + i) - .getBytes(), (byte)0x01, null, new ClientProxyMembershipID(), - new EventID(("memberID" + i).getBytes(), i, i)); + private void createServerCacheWithHA() throws Exception { + cache = CacheFactory.create(getSystem()); - haRegion.put(new Long(i), clientMessage); - LogWriterUtils.getLogWriter().info("Putting in the message Queue"); + final AttributesFactory factory = new AttributesFactory(); + factory.setMirrorType(MirrorType.KEYS_VALUES); + factory.setScope(Scope.DISTRIBUTED_ACK); - } - } + haRegion = HARegion.getInstance(HAREGION_NAME, (GemFireCacheImpl) cache, null, factory.createRegionAttributes()); } - private void createCache(Properties props) throws Exception - { - DistributedSystem ds = getSystem(props); - assertNotNull(ds); - ds.disconnect(); - ds = getSystem(props); - cache = CacheFactory.create(ds); - assertNotNull(cache); + private void checkRegionQueueSize() { + final HARegion region = (HARegion) cache.getRegion(Region.SEPARATOR + HAHelper.getRegionQueueName(HAREGION_NAME)); + assertNotNull(region); + assertEquals(COUNT, region.size()); } - public static void closeCache() - { - if (cache != null && !cache.isClosed()) { - cache.close(); - cache.getDistributedSystem().disconnect(); - } + private boolean regionExists(final VM vm, final String name) { + return vm.invoke(() -> regionExists(name)); } - public static void checkRegionQueueSize() - { - HARegion region = (HARegion)cache.getRegion(Region.SEPARATOR - + HAHelper.getRegionQueueName(HAREGION_NAME)); - assertNotNull(region); - LogWriterUtils.getLogWriter().info("Size of the Queue : " + region.size()); - + private boolean regionExists(final String name) { + return cache.getRegion(Region.SEPARATOR + HAHelper.getRegionQueueName(HAREGION_NAME)) != null; } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java index 85f3707..c86c473 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java @@ -100,8 +100,7 @@ public class HAInterestTestCase extends DistributedTestCase { } @Override - public void setUp() throws Exception { - super.setUp(); + public final void postSetUp() throws Exception { host = Host.getHost(0); server1 = host.getVM(0); server2 = host.getVM(1); @@ -116,7 +115,7 @@ public class HAInterestTestCase extends DistributedTestCase { } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { // close the clients first closeCache(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java index 7395a84..d92d6e9 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java @@ -78,9 +78,8 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase super(name); } - public void setUp() throws Exception - { - super.setUp(); + @Override + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); server1 = host.getVM(0); server2 = host.getVM(1); @@ -94,8 +93,8 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase PORT2 = ((Integer) server2.invoke(() -> HAStartupAndFailoverDUnitTest.createServerCache())); PORT3 = ((Integer) server3.invoke(() -> HAStartupAndFailoverDUnitTest.createServerCache())); CacheServerTestUtil.disableShufflingOfEndpoints(); - } + /** * Stops primary server one by one to ensure new primary is selected * @@ -718,7 +717,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { // close the clients first closeCache(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java index 9438af7..36ba531 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java @@ -91,8 +91,8 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase { // TODO Auto-generated constructor stub } - public void setUp() throws Exception { - super.setUp(); + @Override + public final void postSetUp() throws Exception { final Host host = Host.getHost(0); client1 = host.getVM(0); client2 = host.getVM(1); @@ -151,7 +151,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase { } @Override - protected final void preTearDown() throws Exception { + public final void preTearDown() throws Exception { // close the clients first closeCache(); client1.invoke(() -> InstantiatorPropagationDUnitTest.closeCache());
