You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/03/11 18:19:35 UTC
[1/7] incubator-geode git commit: Cleaning up dunit
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-1050 680ab28b7 -> 3543e224c
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
index f01d36f..e8a5e4e 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
@@ -30,10 +30,6 @@ public class ParallelWANPropagationClientServerDUnitTest extends WANTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
/**
* Normal happy scenario test case.
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
index 8f3042a..8ae5d0b 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
@@ -32,10 +32,6 @@ public class ParallelWANPropagationConcurrentOpsDUnitTest extends WANTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
/**
* Normal propagation scenario test case for a PR with only one bucket.
* This has been added for bug# 44284.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
index 474231c..40eb0de 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
@@ -44,10 +44,6 @@ public class ParallelWANPropagationDUnitTest extends WANTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
public void test_ParallelGatewaySenderMetaRegionNotExposedToUser_Bug44216() {
Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java
index 4dd9b20..b921c88 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java
@@ -32,10 +32,6 @@ public class ParallelWANPropagationLoopBackDUnitTest extends WANTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
/**
* Test loop back issue between 2 WAN sites (LN & NY). LN -> NY -> LN.
* Site1 (LN): vm2, vm4, vm5
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
index f1c8b1c..55fd5ad 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
@@ -38,8 +38,8 @@ public class ParallelWANStatsDUnitTest extends WANTestBase{
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ protected final void postSetUpWANTestBase() throws Exception {
this.testName = getTestMethodName();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
index 8e3a760..93979f0 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
@@ -40,10 +40,6 @@ public class SerialGatewaySenderDistributedDeadlockDUnitTest extends WANTestBase
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
//Uses replicated regions and conserve-sockets=false
public void testPrimarySendersOnDifferentVMsReplicated() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
index 90dde8c..755b6f3 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
@@ -43,10 +43,6 @@ public class SerialGatewaySenderEventListenerDUnitTest extends WANTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
/**
* Test validates whether the listener attached receives all the events.
* this test hangs after the Darrel's checkin 36685. Need to work with Darrel.Commenting it out so that test suit will not hang
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
index c824eb6..ea6de11 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
@@ -52,8 +52,8 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ protected final void postSetUpWANTestBase() throws Exception {
IgnoredException.addIgnoredException("Broken pipe");
IgnoredException.addIgnoredException("Connection reset");
IgnoredException.addIgnoredException("Unexpected IOException");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
index 1bf132b..43c4b04 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
@@ -54,11 +54,6 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
-
public void testPrimarySecondaryQueueDrainInOrder_RR() throws Exception {
Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
index 591d3d5..2f6fd0e 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
@@ -35,10 +35,6 @@ public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
/**
* Just enable the persistence for GatewaySender and see if it remote site
* receives all the events.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
index bd971ce..b1fb8d9 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
@@ -32,10 +32,6 @@ public class SerialWANPropagationLoopBackDUnitTest extends WANTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
public void testReplicatedSerialPropagationLoopBack() throws Exception {
Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
index d89c864..a272eeb 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
@@ -39,8 +39,8 @@ public class SerialWANPropogationDUnitTest extends WANTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUpWANTestBase() throws Exception {
IgnoredException.addIgnoredException("Connection reset");
IgnoredException.addIgnoredException("Broken pipe");
IgnoredException.addIgnoredException("Connection refused");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java
index 89749dc..126e737 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java
@@ -32,11 +32,6 @@ public class SerialWANPropogation_PartitionedRegionDUnitTest extends WANTestBase
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
-
public void testPartitionedSerialPropagation() throws Exception {
Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java
index 18eb081..5846e75 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java
@@ -28,10 +28,6 @@ public class SerialWANPropogationsFeatureDUnitTest extends WANTestBase{
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
public void testSerialReplicatedWanWithOverflow() {
Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
index 85aae7f..6602104 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
@@ -37,8 +37,8 @@ public class SerialWANStatsDUnitTest extends WANTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ protected final void postSetUpWANTestBase() throws Exception {
this.testName = getTestMethodName();
addIgnoredException("java.net.ConnectException");
addIgnoredException("java.net.SocketException");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
index 9825975..b3fc365 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
@@ -71,8 +71,8 @@ public class WANCommandTestBase extends CliCommandTestBase{
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);
@@ -492,7 +492,7 @@ public class WANCommandTestBase extends CliCommandTestBase{
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
closeCacheAndDisconnect();
vm0.invoke(() -> WANCommandTestBase.closeCacheAndDisconnect());
vm1.invoke(() -> WANCommandTestBase.closeCacheAndDisconnect());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
index b885071..5cf9df3 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
@@ -44,10 +44,6 @@ public class WanCommandCreateGatewayReceiverDUnitTest extends
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
/**
* GatewayReceiver with all default attributes
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
index 2106257..c21ad23 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
@@ -41,10 +41,6 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
private CommandResult executeCommandWithIgnoredExceptions(String command) {
final IgnoredException exln = IgnoredException.addIgnoredException("Could not connect");
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
index 1ef7f11..ef22370 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
@@ -39,10 +39,6 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase{
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
/**
* Test wan commands for error in input 1> start gateway-sender command needs
* only one of member or group.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
index 08bd07d..e6b998d 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
@@ -39,10 +39,6 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
/**
* Test wan commands for error in input 1> start gateway-sender command needs
* only one of member or group.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
index 7e6a06d..e476557 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
@@ -38,10 +38,6 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
/**
* Test wan commands for error in input 1> start gateway-sender command needs
* only one of member or group.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
index 7c90d34..c20448e 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
@@ -38,10 +38,6 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
private CommandResult executeCommandWithIgnoredExceptions(String command) {
final IgnoredException exln = IgnoredException.addIgnoredException("Could not connect");
CommandResult commandResult = executeCommand(command);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
index d54895d..597b353 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
@@ -38,10 +38,6 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
public void testListGatewayWithNoSenderReceiver() {
Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
index a1e806b..c3f3faf 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
@@ -37,10 +37,6 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
public void testPauseGatewaySender_ErrorConditions() {
Integer punePort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
index d01c4c7..4c6613b 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
@@ -38,10 +38,6 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
public void testGatewaySenderStatus(){
Integer lnPort = (Integer) vm1.invoke(() -> WANCommandTestBase.createFirstLocatorWithDSId( 1 ));
[4/7] incubator-geode git commit: Cleaning up dunit
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/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 defba4f..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());
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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 45a9c2c..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,7 +1380,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
// close the clients first
closeCacheAndDisconnect();
// then close the servers
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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..dfcd59f 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
@@ -78,17 +78,15 @@ public class HABug36738DUnitTest 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);
-
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
server1.invoke(() -> HABug36738DUnitTest.closeCache());
server2.invoke(() -> HABug36738DUnitTest.closeCache());
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/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/3543e224/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/3543e224/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());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
index 50ceda7..b841609 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
@@ -134,8 +134,8 @@ public class InterestListDUnitTest extends DistributedTestCase
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
Wait.pause(10000);
final Host host = Host.getHost(0);
@@ -144,8 +144,8 @@ public class InterestListDUnitTest extends DistributedTestCase
vm2 = host.getVM(2);
// start servers first
PORT1 = ((Integer) vm0.invoke(() -> InterestListDUnitTest.createServerCache())).intValue();
-
}
+
/**
* one server two clients
* create Entries in all the vms
@@ -1028,7 +1028,7 @@ public class InterestListDUnitTest extends DistributedTestCase
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
// close the clients first
vm1.invoke(() -> InterestListDUnitTest.closeCache());
vm2.invoke(() -> InterestListDUnitTest.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
index 392bdd3..c001124 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
@@ -90,8 +90,8 @@ public class InterestListEndpointDUnitTest extends DistributedTestCase
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
Wait.pause(5000);
final Host host = Host.getHost(0);
@@ -112,7 +112,6 @@ public class InterestListEndpointDUnitTest extends DistributedTestCase
Wait.pause(5000); // [bruce] avoid ConnectException
client1.invoke(() -> impl.createClientCache(
NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1),new Integer(PORT2)));
-
}
/** subclass support */
@@ -491,7 +490,7 @@ public class InterestListEndpointDUnitTest extends DistributedTestCase
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
// Close client cache first, then server caches
client1.invoke(() -> impl.closeCache());
server2.invoke(() -> impl.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
index 1e98cc5..8cd3c12 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
@@ -72,8 +72,8 @@ public class InterestListFailoverDUnitTest 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);
@@ -299,7 +299,7 @@ public class InterestListFailoverDUnitTest extends DistributedTestCase
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
closeAll();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
index 5243015..d83e61a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
@@ -89,10 +89,9 @@ public class InterestListRecoveryDUnitTest extends DistributedTestCase
}
@Override
- public void setUp() throws Exception {
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
Wait.pause(2000);
- super.setUp();
final Host host = Host.getHost(0);
server1 = host.getVM(0);
server2 = host.getVM(1);
@@ -484,7 +483,7 @@ public class InterestListRecoveryDUnitTest extends DistributedTestCase
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
// close the clients first
server2.invoke(() -> InterestListRecoveryDUnitTest.closeCache());
closeCache();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
index 66b33fa..4f3b813 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
@@ -72,10 +72,10 @@ public class InterestRegrListenerDUnitTest extends DistributedTestCase {
}
private static final long serialVersionUID = 1L;
-
- public void setUp() throws Exception {
+
+ @Override
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
- super.setUp();
}
public Cache createCache(Properties props) throws Exception
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
index d163e29..5b400e7 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
@@ -79,8 +79,7 @@ public class InterestResultPolicyDUnitTest extends DistributedTestCase
* Creates the server cache and populates it with some entries
*/
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
Wait.pause(5000);
final Host host = Host.getHost(0);
@@ -94,7 +93,7 @@ public class InterestResultPolicyDUnitTest extends DistributedTestCase
* Closes the cache on server and client
*/
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
// might get ServerConnectivityExceptions during shutdown
this.expectedEx = IgnoredException.addIgnoredException(ServerConnectivityException.class
.getName());
@@ -105,7 +104,7 @@ public class InterestResultPolicyDUnitTest extends DistributedTestCase
}
@Override
- protected void postTearDown() throws Exception {
+ public final void postTearDown() throws Exception {
if (this.expectedEx != null) {
this.expectedEx.remove();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
index 1a952c8..7a74627 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
@@ -71,8 +71,8 @@ public class NewRegionAttributesDUnitTest extends DistributedTestCase
* @throws Exception
* thrown if any problem occurs in set-up
*/
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
Wait.pause(5000);
final Host host = Host.getHost(0);
@@ -100,7 +100,7 @@ public class NewRegionAttributesDUnitTest extends DistributedTestCase
* thrown if any problem occurs while closing the cache
*/
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
vm0.invoke(() -> NewRegionAttributesDUnitTest.closeCache());
vm1.invoke(() -> NewRegionAttributesDUnitTest.closeCache());
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
index eaba8d9..e65d2cd 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
@@ -102,9 +102,8 @@ public class RedundancyLevelTestBase extends DistributedTestCase
DistributedTestCase.disconnectAllFromDS();
}
- public void setUp() throws Exception
- {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
final Host host = Host.getHost(0);
server0 = host.getVM(0);
@@ -127,7 +126,6 @@ public class RedundancyLevelTestBase extends DistributedTestCase
SERVER4 = hostName + PORT4;
CacheServerTestUtil.disableShufflingOfEndpoints();
-
}
protected static volatile boolean registerInterestCalled = false;
@@ -621,7 +619,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
try {
if(!FailOverDetectionByCCU)
ClientServerObserverHolder.setInstance(oldBo);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
index b925bf7..4fb4278 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
@@ -68,9 +68,8 @@ public class RegionCloseDUnitTest 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 VM
server1 = host.getVM(0);
@@ -80,7 +79,6 @@ public class RegionCloseDUnitTest extends DistributedTestCase
PORT1 = ((Integer)server1.invoke(() -> RegionCloseDUnitTest.createServerCache())).intValue();
client1.invoke(() -> RegionCloseDUnitTest.createClientCache(
NetworkUtils.getServerHostName(host), new Integer(PORT1)));
-
}
private void createCache(Properties props) throws Exception
@@ -237,7 +235,7 @@ public class RegionCloseDUnitTest extends DistributedTestCase
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
//close client
client1.invoke(() -> RegionCloseDUnitTest.closeCache());
//close server
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
index 097da6a..7f4d365 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
@@ -86,13 +86,8 @@ public class RegisterInterestBeforeRegionCreationDUnitTest extends DistributedTe
super(name);
}
- /**
- * get the hosts
- * @throws Exception
- */
- 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);
@@ -106,7 +101,7 @@ public class RegisterInterestBeforeRegionCreationDUnitTest extends DistributedTe
* @throws Exception
*/
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
client1.invoke(() -> RegisterInterestBeforeRegionCreationDUnitTest.closeCache());
client2.invoke(() -> RegisterInterestBeforeRegionCreationDUnitTest.closeCache());
server1.invoke(() -> RegisterInterestBeforeRegionCreationDUnitTest.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
index df131a9..91a068f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
@@ -66,8 +66,8 @@ public class RegisterInterestKeysDUnitTest extends DistributedTestCase
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
Wait.pause(5000);
@@ -98,7 +98,6 @@ public class RegisterInterestKeysDUnitTest extends DistributedTestCase
NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1),new Integer(PORT2)));
client2.invoke(() -> impl.createClientCache(
NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1),new Integer(PORT2)));
-
}
/** subclass support */
@@ -237,7 +236,7 @@ public class RegisterInterestKeysDUnitTest extends DistributedTestCase
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
//close client
client1.invoke(() -> impl.closeCache());
client2.invoke(() -> impl.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
index f02fef5..7da68f7 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
@@ -326,10 +326,9 @@ public class ReliableMessagingDUnitTest extends DistributedTestCase
sleep(2000);
}
}
-
- 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);
@@ -339,7 +338,6 @@ public class ReliableMessagingDUnitTest extends DistributedTestCase
CacheServerTestUtil.disableShufflingOfEndpoints();
createClientCache(PORT1, PORT2);
-
}
private Cache createCache(Properties props) throws Exception
@@ -413,7 +411,7 @@ public class ReliableMessagingDUnitTest extends DistributedTestCase
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
creationTime = 0;
closeCache();
server1.invoke(() -> ReliableMessagingDUnitTest.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
index 4056483..3690e57 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
@@ -70,8 +70,8 @@ public class UnregisterInterestDUnitTest 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);
client1 = host.getVM(1);
@@ -83,7 +83,7 @@ public class UnregisterInterestDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
closeCache();
server0.invoke(() -> UnregisterInterestDUnitTest.closeCache());
client1.invoke(() -> UnregisterInterestDUnitTest.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
index f544e74..3c5e9e0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
@@ -100,8 +100,8 @@ public class UpdatePropagationDUnitTest 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);
@@ -127,7 +127,6 @@ public class UpdatePropagationDUnitTest extends DistributedTestCase
IgnoredException.addIgnoredException("java.net.SocketException");
IgnoredException.addIgnoredException("Unexpected IOException");
-
}
private void createCache(Properties props) throws Exception
@@ -572,7 +571,7 @@ public class UpdatePropagationDUnitTest extends DistributedTestCase
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
//close client
client1.invoke(() -> closeCache());
client2.invoke(() -> closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
index 5287c9f..c329beb 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
@@ -67,9 +67,8 @@ public class VerifyEventIDGenerationInP2PDUnitTest 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);
createServerCache();
@@ -170,7 +169,7 @@ public class VerifyEventIDGenerationInP2PDUnitTest extends DistributedTestCase
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
closeCache();
vm0.invoke(() -> VerifyEventIDGenerationInP2PDUnitTest.closeCache());
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
index 238a094..0587313 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
@@ -73,8 +73,8 @@ public class VerifyUpdatesFromNonInterestEndPointDUnitTest extends DistributedTe
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
Wait.pause(5000);
final Host host = Host.getHost(0);
@@ -82,13 +82,10 @@ public class VerifyUpdatesFromNonInterestEndPointDUnitTest extends DistributedTe
vm1 = host.getVM(1);
vm2 = host.getVM(2);
-
PORT1 = ((Integer)vm0.invoke(() -> VerifyUpdatesFromNonInterestEndPointDUnitTest.createServerCache())).intValue();
PORT2 = ((Integer)vm1.invoke(() -> VerifyUpdatesFromNonInterestEndPointDUnitTest.createServerCache())).intValue();
vm2.invoke(() -> VerifyUpdatesFromNonInterestEndPointDUnitTest.createClientCache( NetworkUtils.getServerHostName(vm0.getHost()), new Integer(PORT1),new Integer(PORT2)));
-
-
}
private Cache createCache(Properties props) throws Exception
@@ -246,7 +243,7 @@ public class VerifyUpdatesFromNonInterestEndPointDUnitTest extends DistributedTe
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
//close client
vm2.invoke(() -> VerifyUpdatesFromNonInterestEndPointDUnitTest.closeCache());
//close server
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
index d834017..2bc51ec 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
@@ -126,8 +126,8 @@ public class AsyncEventQueueTestBase 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);
@@ -1568,7 +1568,7 @@ public class AsyncEventQueueTestBase extends DistributedTestCase {
}
@Override
- protected final void postTearDown() throws Exception {
+ public final void postTearDown() throws Exception {
cleanupVM();
vm0.invoke(() -> AsyncEventQueueTestBase.cleanupVM());
vm1.invoke(() -> AsyncEventQueueTestBase.cleanupVM());
@@ -1607,16 +1607,16 @@ public class AsyncEventQueueTestBase extends DistributedTestCase {
((MyGatewaySenderEventListener)eventListener1).printMap();
}
-
@Override
- public InternalDistributedSystem getSystem(Properties props) {
- // For now all WANTestBase tests allocate off-heap memory even though
+ public final Properties getDistributedSystemProperties() {
+ // For now all WANTestBase tests allocate off-heap memory even though
// many of them never use it.
// The problem is that WANTestBase has static methods that create instances
// of WANTestBase (instead of instances of the subclass). So we can't override
// this method so that only the off-heap subclasses allocate off heap memory.
+ Properties props = new Properties();
props.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "300m");
- return super.getSystem(props);
+ return props;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
index 779fc75..fbe97bc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
@@ -48,10 +48,6 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
/**
* Test to verify that AsyncEventQueue can not be created when null listener
* is passed.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
index 71a3227..cd11ae9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
@@ -31,10 +31,6 @@ public class AsyncEventQueueStatsDUnitTest extends AsyncEventQueueTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
/**
* Normal replication scenario
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java
index 41accac..5440a08 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java
@@ -34,10 +34,6 @@ public class ConcurrentAsyncEventQueueDUnitTest extends AsyncEventQueueTestBase
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
public void testConcurrentSerialAsyncEventQueueAttributes() {
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java
index a21e2ab..7c31949 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java
@@ -32,10 +32,6 @@ public class CommonParallelAsyncEventQueueDUnitTest extends AsyncEventQueueTestB
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
public void testSameSenderWithNonColocatedRegions() throws Exception {
IgnoredException.addIgnoredException("cannot have the same parallel async");
Integer lnPort = (Integer)vm0.invoke(() -> AsyncEventQueueTestBase.createFirstLocatorWithDSId( 1 ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheConfigDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheConfigDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheConfigDUnitTest.java
index 653a376..c2d1814 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheConfigDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheConfigDUnitTest.java
@@ -62,11 +62,6 @@ public class CompressionCacheConfigDUnitTest extends CacheTestCase {
super(name);
}
- @Override
- public void setUp() throws Exception {
- super.setUp();
- }
-
/**
* Asserts that a member is successfully initialized with a compressed region when
* a compressor is included in the region attributes.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerDUnitTest.java
index 84a9faf..48facca 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerDUnitTest.java
@@ -162,8 +162,7 @@ public class CompressionCacheListenerDUnitTest extends CacheTestCase {
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
createRegion();
}
@@ -179,7 +178,7 @@ public class CompressionCacheListenerDUnitTest extends CacheTestCase {
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
preTearDownCompressionCacheListenerDUnitTest();
try {
[6/7] incubator-geode git commit: Cleaning up dunit
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
index 2323b0e..2ab2446 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
@@ -39,7 +39,7 @@ public class DistributedAckOverflowRegionCCEOffHeapDUnitTest extends Distributed
}
@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/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
index 52a4313..718ca18 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
@@ -39,7 +39,7 @@ public class DistributedAckPersistentRegionCCEOffHeapDUnitTest extends Distribut
}
@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/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
index 1c1cbaf..c8fc191 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
@@ -39,7 +39,7 @@ public class DistributedAckRegionCCEOffHeapDUnitTest extends DistributedAckRegio
}
@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/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
index cbf8367..f218f14 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
@@ -39,7 +39,7 @@ public class DistributedAckRegionOffHeapDUnitTest extends DistributedAckRegionDU
}
@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/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
index 9a0a6dd..b878a29 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
@@ -61,13 +61,12 @@ public class DistributedMulticastRegionDUnitTest extends CacheTestCase {
}
@Override
- public void setUp() throws Exception {
+ public final void preSetUp() throws Exception {
clean();
- super.setUp();
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
clean();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
index c068876..b49d8f5 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
@@ -39,7 +39,7 @@ public class DistributedNoAckRegionCCEOffHeapDUnitTest extends DistributedNoAckR
}
@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/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
index e668d3f..c2e22b4 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
@@ -39,7 +39,7 @@ public class DistributedNoAckRegionOffHeapDUnitTest extends DistributedNoAckRegi
}
@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/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/DynamicRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DynamicRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DynamicRegionDUnitTest.java
index 19d2bb7..eacb1d1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DynamicRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DynamicRegionDUnitTest.java
@@ -53,15 +53,15 @@ public class DynamicRegionDUnitTest extends CacheTestCase {
// the setUp and tearDown methods need to make sure we don't
// use the ds from previous test and that we don't leave ours around
// for the next test to use.
-
- public void setUp() throws Exception {
+
+ @Override
+ public final void preSetUp() throws Exception {
try {
disconnectAllFromDS();
} finally {
File d = new File("DynamicRegionData" + OSProcess.getId());
d.mkdirs();
DynamicRegionFactory.get().open(new DynamicRegionFactory.Config(d, null));
- super.setUp();
}
}
@@ -73,7 +73,7 @@ public class DynamicRegionDUnitTest extends CacheTestCase {
* </p>
*/
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
LogWriterUtils.getLogWriter().info("Running tearDown in " + this);
try {
//Asif destroy dynamic regions at the end of the test
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java
index 653cab2..5362137 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java
@@ -39,7 +39,7 @@ public class GlobalRegionCCEOffHeapDUnitTest extends GlobalRegionCCEDUnitTest {
}
@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/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
index c652c55..2f774cc 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
@@ -39,7 +39,7 @@ public class GlobalRegionOffHeapDUnitTest extends GlobalRegionDUnitTest {
}
@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/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
index 0caa7bd..89a721e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
@@ -41,7 +41,7 @@ public class OffHeapLRUEvictionControllerDUnitTest 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/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java
index efd42ad..ca4c192 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java
@@ -38,7 +38,7 @@ public class PartitionedRegionOffHeapDUnitTest extends PartitionedRegionDUnitTes
}
@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/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkRemoteVMDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkRemoteVMDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkRemoteVMDUnitTest.java
index 01a1f42..781dc2d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkRemoteVMDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkRemoteVMDUnitTest.java
@@ -77,8 +77,7 @@ public class PutAllCallBkRemoteVMDUnitTest extends DistributedTestCase {
static boolean notified = false;
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
@@ -88,7 +87,7 @@ public class PutAllCallBkRemoteVMDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkSingleVMDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkSingleVMDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkSingleVMDUnitTest.java
index 12337cd..faeb8b3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkSingleVMDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkSingleVMDUnitTest.java
@@ -67,8 +67,7 @@ public class PutAllCallBkSingleVMDUnitTest extends DistributedTestCase{
static int beforeUpdateputAllcounter = 0;
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
@@ -78,7 +77,7 @@ public class PutAllCallBkSingleVMDUnitTest extends DistributedTestCase{
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllMultiVmDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllMultiVmDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllMultiVmDUnitTest.java
index 4ec8054..7ff73f9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllMultiVmDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PutAllMultiVmDUnitTest.java
@@ -64,8 +64,7 @@ public class PutAllMultiVmDUnitTest extends DistributedTestCase{
static CacheTransactionManager cacheTxnMgr;
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
@@ -74,7 +73,7 @@ public class PutAllMultiVmDUnitTest extends DistributedTestCase{
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
index de3d7a2..a4ba33d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
@@ -85,8 +85,7 @@ public class ReconnectDUnitTest extends CacheTestCase
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
this.locatorPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
final int locPort = this.locatorPort;
Host.getHost(0).getVM(locatorVMNumber)
@@ -133,7 +132,7 @@ public class ReconnectDUnitTest extends CacheTestCase
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
try {
Host.getHost(0).getVM(locatorVMNumber).invoke(new SerializableRunnable("stop locator") {
public void run() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectedCacheServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectedCacheServerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectedCacheServerDUnitTest.java
index f3d6964..8da7dfb 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectedCacheServerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectedCacheServerDUnitTest.java
@@ -37,7 +37,7 @@ public class ReconnectedCacheServerDUnitTest extends CacheTestCase {
private Cache cache;
@Override
- public void setUp() {
+ public final void postSetUp() {
this.cache = getCache();
if (this.cache.getCacheServers().isEmpty()) {
this.cache.addCacheServer();
@@ -46,7 +46,7 @@ public class ReconnectedCacheServerDUnitTest extends CacheTestCase {
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
if (addedCacheServer && this.cache != null && !this.cache.isClosed()) {
// since I polluted the cache I should shut it down in order
// to avoid affecting other tests
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionMembershipListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionMembershipListenerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionMembershipListenerDUnitTest.java
index f693c29..9a0554a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionMembershipListenerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionMembershipListenerDUnitTest.java
@@ -62,13 +62,12 @@ public class RegionMembershipListenerDUnitTest extends CacheTestCase {
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
DistributedRegion.TEST_HOOK_ADD_PROFILE = true;
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
DistributedRegion.TEST_HOOK_ADD_PROFILE = false;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
index 8cc65d3..b630eec 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
@@ -85,7 +85,7 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
DistributedCacheOperation.setBeforePutOutgoing(null);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionTestCase.java
index ed89a13..ce705ea 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionTestCase.java
@@ -111,7 +111,7 @@ public abstract class RegionTestCase extends CacheTestCase {
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
cleanup();
Invoke.invokeInEveryVM(getClass(), "cleanup");
postTearDownRegionTestCase();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/RemoveAllMultiVmDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RemoveAllMultiVmDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RemoveAllMultiVmDUnitTest.java
index cfd1ce8..f219539 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RemoveAllMultiVmDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RemoveAllMultiVmDUnitTest.java
@@ -62,8 +62,7 @@ public class RemoveAllMultiVmDUnitTest extends DistributedTestCase {
static CacheTransactionManager cacheTxnMgr;
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
@@ -72,7 +71,7 @@ public class RemoveAllMultiVmDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/SearchAndLoadDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/SearchAndLoadDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/SearchAndLoadDUnitTest.java
index f26f94a..d564fca 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/SearchAndLoadDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/SearchAndLoadDUnitTest.java
@@ -77,7 +77,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
for (int h = 0; h < Host.getHostCount(); h++) {
Host host = Host.getHost(h);
for (int v = 0; v < host.getVMCount(); v++) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java
index 899fbb1..d96ae20 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java
@@ -66,17 +66,14 @@ public class SlowRecDUnitTest extends CacheTestCase {
// the setUp and tearDown methods need to make sure we don't
// use the ds from previous test and that we don't leave ours around
// for the next test to use.
-
- public void setUp() throws Exception {
- try {
- disconnectAllFromDS();
- } finally {
- super.setUp();
- }
+
+ @Override
+ public final void preSetUp() throws Exception {
+ disconnectAllFromDS(); // TODO: this should probably be postSetUp() but this maintains original order
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
disconnectAllFromDS();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java
index fe2202f..f874417 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java
@@ -50,13 +50,14 @@ public class HostedLocatorsDUnitTest extends DistributedTestCase {
protected transient volatile int locatorPort;
protected transient volatile LocatorLauncher launcher;
-
- public void setUp() throws Exception {
+
+ @Override
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
disconnectAllFromDS();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
index 7e4943d..f6dfde4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
@@ -95,15 +95,14 @@ public class LocatorDUnitTest extends DistributedTestCase {
private int port2;
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
port1 = -1;
port2 = -1;
IgnoredException.addIgnoredException("Removing shunned member");
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
if (Locator.hasLocator()) {
Locator.getLocator().stop();
}
@@ -118,7 +117,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
}
@Override
- protected final void postTearDown() throws Exception {
+ public final void postTearDown() throws Exception {
if (system != null) {
system.disconnect();
system = null;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/distributed/SystemAdminDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/SystemAdminDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/SystemAdminDUnitTest.java
index 18159f8..73c9c8c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/SystemAdminDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/SystemAdminDUnitTest.java
@@ -40,13 +40,12 @@ public class SystemAdminDUnitTest extends DistributedTestCase {
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
disconnect();
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
disconnect();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/Bug40751DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/Bug40751DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/Bug40751DUnitTest.java
index e98c608..d906c09 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/Bug40751DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/Bug40751DUnitTest.java
@@ -48,7 +48,7 @@ public class Bug40751DUnitTest extends CacheTestCase {
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
disconnectAllFromDS();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
index 847edb5..2aa9d27 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
@@ -71,7 +71,8 @@ public class ConsoleDistributionManagerDUnitTest
// this.lastAlert = alert;
}
- public void setUp() throws Exception {
+ @Override
+ public final void postSetUp() throws Exception {
boolean finishedSetup = false;
IgnoredException.addIgnoredException("Error occurred while reading system log");
try {
@@ -83,7 +84,6 @@ public class ConsoleDistributionManagerDUnitTest
DistributionManager.isDedicatedAdminVM = true;
- super.setUp();
populateCache();
RemoteTransportConfig transport = null;
@@ -145,12 +145,12 @@ public class ConsoleDistributionManagerDUnitTest
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
this.agent.disconnect();
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
try {
disconnectFromDS(); //make sure there's no ldm lying around
} finally {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionAdvisorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionAdvisorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionAdvisorDUnitTest.java
index 8e238ac..d24eeeb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionAdvisorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionAdvisorDUnitTest.java
@@ -40,9 +40,9 @@ public class DistributionAdvisorDUnitTest extends DistributedTestCase {
public DistributionAdvisorDUnitTest(String name) {
super(name);
}
-
- public void setUp() throws Exception {
- super.setUp();
+
+ @Override
+ public final void postSetUp() throws Exception {
// connect to distributed system in every VM
Invoke.invokeInEveryVM(new SerializableRunnable("DistributionAdvisorDUnitTest: SetUp") {
public void run() {
@@ -83,7 +83,7 @@ public class DistributionAdvisorDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
this.advisor.close();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java
index 149d6d8..e2217b5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java
@@ -1,19 +1,19 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.gemstone.gemfire.distributed.internal;
import java.io.BufferedReader;
@@ -27,24 +27,24 @@ import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.distributed.Locator;
import com.gemstone.gemfire.internal.AvailablePort;
-import com.gemstone.gemfire.internal.cache.CacheServerImpl;
-import com.gemstone.gemfire.test.dunit.Assert;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
-import com.gemstone.gemfire.test.dunit.Host;
-import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.internal.cache.CacheServerImpl;
+import com.gemstone.gemfire.test.dunit.Assert;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
public class ProductUseLogDUnitTest extends DistributedTestCase {
public ProductUseLogDUnitTest(String name) {
super(name);
- }
-
- @Override
- public Properties getDistributedSystemProperties() {
- Properties p = super.getDistributedSystemProperties();
- p.put(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "false");
- return p;
+ }
+
+ @Override
+ public Properties getDistributedSystemProperties() {
+ Properties p = super.getDistributedSystemProperties();
+ p.put(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "false");
+ return p;
}
public void testMembershipMonitoring() throws Exception {
@@ -54,8 +54,8 @@ public class ProductUseLogDUnitTest extends DistributedTestCase {
// use a locator so we will monitor server load and record member->server mappings
int locatorPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
Properties p = new Properties();
- p.put(DistributionConfig.START_LOCATOR_NAME, "localhost["+locatorPort+"],peer=false");
- p.put(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "false");
+ p.put(DistributionConfig.START_LOCATOR_NAME, "localhost["+locatorPort+"],peer=false");
+ p.put(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "false");
InternalDistributedSystem system = getSystem(p);
InternalLocator locator = (InternalLocator)Locator.getLocator();
@@ -71,7 +71,7 @@ public class ProductUseLogDUnitTest extends DistributedTestCase {
public void run() {
InternalDistributedSystem system = getSystem();
Cache cache = CacheFactory.create(system);
- CacheServer server = cache.addCacheServer();
+ CacheServer server = cache.addCacheServer();
server.setPort(0);
try {
server.start();
@@ -101,8 +101,8 @@ public class ProductUseLogDUnitTest extends DistributedTestCase {
return sb.toString();
}
- @Override
- protected final void preTearDown() throws Exception {
+ @Override
+ public final void preTearDown() throws Exception {
disconnectAllFromDS();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java
index bc3bee6..9120366 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java
@@ -53,7 +53,7 @@ public class GemFireDeadlockDetectorDUnitTest extends CacheTestCase {
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
disconnectAllFromDS();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
index a66367b..a250b33 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
@@ -62,8 +62,7 @@ public class TcpServerBackwardCompatDUnitTest extends DistributedTestCase {
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
Invoke.invokeInEveryVM(new CacheSerializableRunnable("Set TcpServer.isTesting true") {
@@ -75,7 +74,7 @@ public class TcpServerBackwardCompatDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
Invoke.invokeInEveryVM(new CacheSerializableRunnable("Set TcpServer.isTesting true") {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
index c0e8268..fd39f4c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
@@ -32,7 +32,8 @@ public class CacheMapDistTXDUnitTest extends CacheMapTxnDUnitTest {
super(name);
}
- public void setUp() throws Exception {
+ @Override
+ public final void postSetUpCacheMapTxnDUnitTest() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
@@ -40,7 +41,7 @@ public class CacheMapDistTXDUnitTest extends CacheMapTxnDUnitTest {
vm0.invoke(() -> CacheMapDistTXDUnitTest.setDistributedTX());
vm1.invoke(() -> CacheMapDistTXDUnitTest.setDistributedTX());
- super.setUp(); // creates cache
+ // super call used to be here
// make sure that "distributed-transactions" is true
vm0.invoke(() -> CacheMapDistTXDUnitTest.checkIsDistributedTX());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXDebugDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXDebugDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXDebugDUnitTest.java
index 768b800..71374d0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXDebugDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXDebugDUnitTest.java
@@ -60,17 +60,20 @@ public class DistTXDebugDUnitTest extends CacheTestCase {
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
dataStore1 = host.getVM(0);
dataStore2 = host.getVM(1);
dataStore3 = host.getVM(2);
accessor = host.getVM(3);
+ postSetUpDistTXDebugDUnitTest();
+ }
+
+ protected void postSetUpDistTXDebugDUnitTest() throws Exception {
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM(new SerializableRunnable() {
public void run() {
InternalResourceManager.setResourceObserver(null);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXPersistentDebugDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXPersistentDebugDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXPersistentDebugDUnitTest.java
index 80fad20..69d6149 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXPersistentDebugDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXPersistentDebugDUnitTest.java
@@ -38,8 +38,7 @@ public class DistTXPersistentDebugDUnitTest extends DistTXDebugDUnitTest {
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUpDistTXDebugDUnitTest() throws Exception {
Invoke.invokeInEveryVM(new SerializableCallable() {
@Override
public Object call() throws Exception {
@@ -51,7 +50,7 @@ public class DistTXPersistentDebugDUnitTest extends DistTXDebugDUnitTest {
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM(new SerializableCallable() {
@Override
public Object call() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
index ab8fad4..5b1a736 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
@@ -80,8 +80,7 @@ public class DistributedTransactionDUnitTest extends CacheTestCase {
final protected String CUSTOMER_RR = "customerRRRegion";
@Override
- public void setUp() throws Exception{
- super.setUp();
+ public final void postSetUp() throws Exception{
Invoke.invokeInEveryVM(new SerializableCallable() {
@Override
public Object call() throws Exception {
@@ -90,14 +89,6 @@ public class DistributedTransactionDUnitTest extends CacheTestCase {
}
});
-// this.invokeInEveryVM(new SerializableCallable() {
-// @Override
-// public Object call() throws Exception {
-// System.setProperty("gemfire.log-level", "fine");
-// return null;
-// }
-// });
-
Invoke.invokeInEveryVM(new SerializableCallable() {
@Override
public Object call() throws Exception {
@@ -109,7 +100,7 @@ public class DistributedTransactionDUnitTest extends CacheTestCase {
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM(new SerializableCallable() {
@Override
public Object call() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/BackwardCompatibilitySerializationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/BackwardCompatibilitySerializationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/BackwardCompatibilitySerializationDUnitTest.java
index f1e5dda..d85b5df 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/BackwardCompatibilitySerializationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/BackwardCompatibilitySerializationDUnitTest.java
@@ -61,8 +61,8 @@ public class BackwardCompatibilitySerializationDUnitTest extends CacheTestCase {
super(name);
}
- @Before
- public void setUp() {
+ @Override
+ public final void postSetUp() {
baos = new ByteArrayOutputStream();
// register TestMessage using an existing dsfid
DSFIDFactory.registerDSFID(DataSerializableFixedID.PUTALL_VERSIONS_LIST,
@@ -70,7 +70,7 @@ public class BackwardCompatibilitySerializationDUnitTest extends CacheTestCase {
}
@After
- protected final void preTearDownCacheTestCase() {
+ public final void preTearDownCacheTestCase() {
resetFlags();
// reset the class mapped to the dsfid
DSFIDFactory.registerDSFID(DataSerializableFixedID.PUTALL_VERSIONS_LIST,
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
index 5895a7d..5139a6f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
@@ -66,7 +66,7 @@ public class JarDeployerDUnitTest extends CacheTestCase {
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
JarDeployer jarDeployer = new JarDeployer();
for (JarClassLoader jarClassLoader : jarDeployer.findJarClassLoaders()) {
if (jarClassLoader.getJarName().startsWith("JarDeployerDUnit")) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupDUnitTest.java
index 3ad768e..62a74d6 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupDUnitTest.java
@@ -80,7 +80,7 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase {
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
StringBuilder failures = new StringBuilder();
FileUtil.delete(getBackupDir(), failures);
if (failures.length() > 0) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33359DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33359DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33359DUnitTest.java
index df09027..6857fa7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33359DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33359DUnitTest.java
@@ -61,8 +61,7 @@ public class Bug33359DUnitTest extends DistributedTestCase {
static boolean flag = false;
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
@@ -72,7 +71,7 @@ public class Bug33359DUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown(){
+ public final void preTearDown(){
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33726DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33726DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33726DUnitTest.java
index e41d072..16443b3 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33726DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33726DUnitTest.java
@@ -45,7 +45,7 @@ public class Bug33726DUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37241DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37241DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37241DUnitTest.java
index 788be04..1b4ca3b 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37241DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37241DUnitTest.java
@@ -58,13 +58,11 @@ public class Bug37241DUnitTest 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);
-
}
/*
@@ -222,7 +220,7 @@ public class Bug37241DUnitTest extends DistributedTestCase
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
server1.invoke(() -> Bug37241DUnitTest.closeCache());
server2.invoke(() -> Bug37241DUnitTest.closeCache());
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37377DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37377DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37377DUnitTest.java
index 766ecd4..0cb3bba 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37377DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37377DUnitTest.java
@@ -86,19 +86,15 @@ public class Bug37377DUnitTest extends CacheTestCase
dirs[1] = file2;
}
- 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);
-
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception
- {
-
+ public final void preTearDownCacheTestCase() throws Exception {
vm1.invoke(destroyRegion());
vm0.invoke(destroyRegion());
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java
index 31ac3d9..ac11257 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java
@@ -94,8 +94,8 @@ public class Bug39079DUnitTest extends CacheTestCase {
dirs[1] = file2;
}
- 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);
@@ -103,7 +103,6 @@ public class Bug39079DUnitTest extends CacheTestCase {
vm0.invoke(() -> Bug39079DUnitTest.ignorePreAllocate( Boolean.TRUE ));
vm1.invoke(() -> Bug39079DUnitTest.ignorePreAllocate( Boolean.TRUE ));
}
-
/**
* This method is used to create Cache in VM0
@@ -179,7 +178,7 @@ public class Bug39079DUnitTest extends CacheTestCase {
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
disconnectAllFromDS();
vm0.invoke(() -> Bug39079DUnitTest.ignorePreAllocate( Boolean.FALSE ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug40299DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug40299DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug40299DUnitTest.java
index 60f9bd5..b73957a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug40299DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug40299DUnitTest.java
@@ -77,16 +77,14 @@ public class Bug40299DUnitTest extends CacheTestCase
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);
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception
- {
+ public final void preTearDownCacheTestCase() throws Exception {
vm0.invoke(destroyRegion());
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java
index a03f035..882c7c6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java
@@ -58,7 +58,7 @@ public class Bug41091DUnitTest extends CacheTestCase {
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
disconnectAllFromDS();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41733DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41733DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41733DUnitTest.java
index cbd503f..75e4375 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41733DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41733DUnitTest.java
@@ -58,7 +58,7 @@ public class Bug41733DUnitTest extends CacheTestCase {
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
disconnectAllFromDS();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
index a16a9c3..3b459f6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
@@ -56,7 +56,7 @@ import com.gemstone.gemfire.test.dunit.VM;
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
disconnectAllFromDS();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug45164DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug45164DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug45164DUnitTest.java
index 371df3f..7a6ff90 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug45164DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug45164DUnitTest.java
@@ -70,9 +70,9 @@ public class Bug45164DUnitTest extends CacheTestCase {
async1.getResult();
async2.getResult();
}
-
- public void setUp() throws Exception {
- super.setUp();
+
+ @Override
+ public final void postSetUp() throws Exception {
SerializableRunnable create = new SerializableRunnable() {
@Override
public void run() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug47667DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug47667DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug47667DUnitTest.java
index 097aeb5..de43c29 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug47667DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug47667DUnitTest.java
@@ -38,8 +38,7 @@ public class Bug47667DUnitTest extends LocatorTestBase {
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheAdvisorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheAdvisorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheAdvisorDUnitTest.java
index eb64e93..4dc18cf 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheAdvisorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheAdvisorDUnitTest.java
@@ -66,9 +66,9 @@ public class CacheAdvisorDUnitTest extends CacheTestCase {
DistributedSystem ds = cache.getDistributedSystem();
return ((InternalDistributedSystem)ds).getDistributionManager().getId();
}
-
- public void setUp() throws Exception {
- super.setUp();
+
+ @Override
+ public final void postSetUp() throws Exception {
List vmList = new ArrayList();
List idList = new ArrayList();
for (int h = 0; h < Host.getHostCount(); h++) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java
index 7c8327e..889775a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java
@@ -66,8 +66,7 @@ public class ClearDAckDUnitTest extends DistributedTestCase {
DistributedMember vm0ID, vm1ID;
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
@@ -77,7 +76,7 @@ public class ClearDAckDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearGlobalDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearGlobalDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearGlobalDUnitTest.java
index 0c94795..b7795c2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearGlobalDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearGlobalDUnitTest.java
@@ -76,8 +76,8 @@ public class ClearGlobalDUnitTest extends DistributedTestCase
/** name of the test region */
private static final String REGION_NAME = "ClearGlobalDUnitTest_Region";
- public void setUp()throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp()throws Exception {
Host host = Host.getHost(0);
server1 = host.getVM(0);
server1.invoke(() -> ClearGlobalDUnitTest.createCacheServer1());
@@ -86,7 +86,7 @@ public class ClearGlobalDUnitTest extends DistributedTestCase
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
server1.invoke(() -> ClearGlobalDUnitTest.closeCache());
resetClearCallBack();
closeCache();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
index f7f633c..2b9977f 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
@@ -61,7 +61,7 @@ import com.gemstone.gemfire.test.dunit.VM;
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
disconnectAllFromDS();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
index e5ec301..8b9050f 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
@@ -60,9 +60,9 @@ public class ClientServerInvalidAndDestroyedEntryDUnitTest extends CacheTestCase
public ClientServerInvalidAndDestroyedEntryDUnitTest(String name) {
super(name);
}
-
- public void setUp() throws Exception {
- super.setUp();
+
+ @Override
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionCCEDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionCCEDUnitTest.java
index 6f76fc8..c343afc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionCCEDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionCCEDUnitTest.java
@@ -36,15 +36,14 @@ import com.gemstone.gemfire.test.dunit.VM;
public class ClientServerTransactionCCEDUnitTest extends
ClientServerTransactionDUnitTest {
-
- public void setUp() throws Exception {
- super.setUp();
+
+ protected final void postSetUpClientServerTransactionDUnitTest() throws Exception {
IgnoredException.addIgnoredException("Connection reset");
IgnoredException.addIgnoredException("SocketTimeoutException");
IgnoredException.addIgnoredException("ServerConnectivityException");
IgnoredException.addIgnoredException("Socket Closed");
-
}
+
/**
*
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java
index 995e1cf..1d8d9a4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java
@@ -110,10 +110,14 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest
public ClientServerTransactionDUnitTest(String name) {
super(name);
}
-
- public void setUp() throws Exception {
- super.setUp();
+
+ @Override
+ public final void postSetUp() throws Exception {
IgnoredException.addIgnoredException("java.net.SocketException");
+ postSetUpClientServerTransactionDUnitTest();
+ }
+
+ protected void postSetUpClientServerTransactionDUnitTest() throws Exception {
}
private Integer createRegionsAndStartServer(VM vm, boolean accessor) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentDestroySubRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentDestroySubRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentDestroySubRegionDUnitTest.java
index 2a7c0b5..354cc24 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentDestroySubRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentDestroySubRegionDUnitTest.java
@@ -36,8 +36,7 @@ import com.gemstone.gemfire.test.dunit.VM;
public class ConcurrentDestroySubRegionDUnitTest extends CacheTestCase {
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
// this test expects to be able to create a region named "region"
// but other tests seem to leave regions around, so we need
// to create a new cache
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java
index 7a29e65..680fa84 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java
@@ -112,7 +112,7 @@ public class ConnectDisconnectDUnitTest extends CacheTestCase {
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
if (locatorPorts != null) {
DistributedTestUtils.deleteLocatorStateFile(locatorPorts);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
index b502992..3a49515 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
@@ -149,9 +149,8 @@ public class DeltaPropagationDUnitTest 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);
@@ -166,7 +165,7 @@ public class DeltaPropagationDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
DeltaPropagationDUnitTest.closeCache();
VM2.invoke(() -> DeltaPropagationDUnitTest.closeCache());
VM3.invoke(() -> DeltaPropagationDUnitTest.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java
index f383199..fabd69a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java
@@ -85,8 +85,8 @@ public class DeltaPropagationStatsDUnitTest 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);
@@ -95,7 +95,7 @@ public class DeltaPropagationStatsDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
lastKeyReceived = false;
vm0.invoke(() -> DeltaPropagationStatsDUnitTest.resetLastKeyReceived());
vm1.invoke(() -> DeltaPropagationStatsDUnitTest.resetLastKeyReceived());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegByteArrayDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegByteArrayDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegByteArrayDUnitTest.java
index a49dbec..2690cd1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegByteArrayDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegByteArrayDUnitTest.java
@@ -75,13 +75,10 @@ public class DiskRegByteArrayDUnitTest extends CacheTestCase {
dirs[1] = file2;
dirs[2] = file3;
dirs[3] = file4;
-
}
-
-
+
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
@@ -90,7 +87,7 @@ public class DiskRegByteArrayDUnitTest extends CacheTestCase {
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
cache = null;
Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } });
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java
index 6ce3ffd..b9c90dc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java
@@ -40,7 +40,7 @@ public class DistrbutedRegionProfileOffHeapDUnitTest extends CacheTestCase {
}
@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/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java
index 99abf49..d3f28d6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java
@@ -53,15 +53,15 @@ public abstract class DistributedCacheTestCase
super(name);
}
- public void setUp() throws Exception {
- setUp(true);
+ @Override
+ public final void postSetUp() throws Exception {
+ setUpDistributedCacheTestCase(true);
}
/**
* Creates the {@link Cache} and root region in each remote VM
* and, if createLocalCache, in this VM.
*/
- protected void setUp(boolean createLocalCache) throws Exception {
- super.setUp();
+ private final void setUpDistributedCacheTestCase(boolean createLocalCache) throws Exception {
if (createLocalCache) {
try {
remoteCreateCache();
@@ -105,7 +105,7 @@ public abstract class DistributedCacheTestCase
* Closes the cache in this VM and each remote VM
*/
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
StringBuffer problems = new StringBuffer();
if (cache != null) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java
index 5fbc537..fa15370 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java
@@ -79,7 +79,7 @@ public class EventTrackerDUnitTest extends CacheTestCase {
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
disconnectAllFromDS();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionObjectSizerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionObjectSizerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionObjectSizerDUnitTest.java
index 18346b7..2eee95f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionObjectSizerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionObjectSizerDUnitTest.java
@@ -58,11 +58,6 @@ public class EvictionObjectSizerDUnitTest extends CacheTestCase {
super(name);
}
- @Override
- public void setUp() throws Exception {
- super.setUp();
- }
-
/**
* Without object sizer
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionStatsDUnitTest.java
index 819afdf..e820e1f 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionStatsDUnitTest.java
@@ -67,8 +67,8 @@ public class EvictionStatsDUnitTest extends CacheTestCase {
// TODO Auto-generated constructor stub
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
dataStore1 = host.getVM(0);
dataStore2 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionTestBase.java
index 5416862..ec8d46c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionTestBase.java
@@ -78,9 +78,7 @@ public class EvictionTestBase extends CacheTestCase {
}
@Override
- public void setUp() throws Exception {
- super.setUp();
-
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
dataStore1 = host.getVM(0);
dataStore2 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIDeltaDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIDeltaDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIDeltaDUnitTest.java
index e8dbe56..f3b0742 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIDeltaDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIDeltaDUnitTest.java
@@ -98,8 +98,8 @@ public class GIIDeltaDUnitTest extends CacheTestCase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
Invoke.invokeInEveryVM(GIIDeltaDUnitTest.class,"setRegionName", new Object[]{getUniqueName()});
setRegionName(getUniqueName());
}
@@ -109,7 +109,7 @@ public class GIIDeltaDUnitTest extends CacheTestCase {
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
P.invoke(() -> GIIDeltaDUnitTest.resetSlowGII());
R.invoke(() -> GIIDeltaDUnitTest.resetSlowGII());
P.invoke(() -> InitialImageOperation.resetAllGIITestHooks());
@@ -122,7 +122,7 @@ public class GIIDeltaDUnitTest extends CacheTestCase {
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
// clean up the test hook, which can be moved to CacheTestCase
DistributedCacheOperation.SLOW_DISTRIBUTION_MS = 0;
if (expectedEx != null) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIFlowControlDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIFlowControlDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIFlowControlDUnitTest.java
index e2d4af6..80c582e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIFlowControlDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIFlowControlDUnitTest.java
@@ -59,7 +59,7 @@ public class GIIFlowControlDUnitTest extends CacheTestCase {
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM(new SerializableRunnable("reset chunk size") {
public void run() {
InitialImageOperation.CHUNK_SIZE_IN_BYTES = origChunkSize;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
index 69f73ec..0046959 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
@@ -86,16 +86,16 @@ public class HAOverflowMemObjectSizerDUnitTest extends DistributedTestCase {
super(name);
}
- public void setUp() throws Exception {
+ @Override
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
- super.setUp();
Host host = Host.getHost(0);
client = host.getVM(1);
serverVM = host.getVM(3);
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
serverVM.invoke(() -> ConflationDUnitTest.unsetIsSlowStart());
client.invoke(() -> HAOverflowMemObjectSizerDUnitTest.closeCache());
serverVM.invoke(() -> HAOverflowMemObjectSizerDUnitTest.closeCache());
[3/7] incubator-geode git commit: Cleaning up dunit
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionConfigDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionConfigDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionConfigDUnitTest.java
index cd71a2c..083e5c0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionConfigDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionConfigDUnitTest.java
@@ -71,11 +71,6 @@ public class CompressionRegionConfigDUnitTest extends CacheTestCase {
super(name);
}
- @Override
- public void setUp() throws Exception {
- super.setUp();
- }
-
/**
* Sanity check using two peers sharing a replicated region.
* @throws Exception
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionFactoryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionFactoryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionFactoryDUnitTest.java
index 7a0793b..cf7cd04 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionFactoryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionFactoryDUnitTest.java
@@ -54,11 +54,6 @@ public class CompressionRegionFactoryDUnitTest extends CacheTestCase {
super(name);
}
- @Override
- public void setUp() throws Exception {
- super.setUp();
- }
-
/**
* Asserts that a region is created when a valid compressor is used.
* Asserts that the region attributes contain the correct compressor value.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsDUnitTest.java
index 32164bd..34b037c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsDUnitTest.java
@@ -129,9 +129,7 @@ public class CompressionRegionOperationsDUnitTest extends CacheTestCase {
}
@Override
- public void setUp() throws Exception {
- super.setUp();
-
+ public final void postSetUp() throws Exception {
createRegion();
}
@@ -147,7 +145,7 @@ public class CompressionRegionOperationsDUnitTest extends CacheTestCase {
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
Error error = null;
Exception exception = null;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java
index e9c725d..e94ddf6 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java
@@ -178,15 +178,15 @@ public class ExceptionsDUnitTest extends DistributedTestCase {
}
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
vm0.invoke(() -> ExceptionsDUnitTest.init());
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
vm0.invoke(() -> ExceptionsDUnitTest.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
index 68153eb..c66f57a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
@@ -244,8 +244,8 @@ public class IdleTimeOutDUnitTest extends DistributedTestCase {
}
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
Object o[] = new Object[1];
@@ -254,7 +254,7 @@ public class IdleTimeOutDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
VM vm0 = Host.getHost(0).getVM(0);
vm0.invoke(() -> IdleTimeOutDUnitTest.closeCache());
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
index 9ee5922..3845587 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
@@ -245,8 +245,8 @@ public class MaxPoolSizeDUnitTest extends DistributedTestCase {
}
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -256,7 +256,7 @@ public class MaxPoolSizeDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
index 1a19b0b..7993e75 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
@@ -119,15 +119,15 @@ public class TransactionTimeOutDUnitTest extends DistributedTestCase {
}
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
vm0.invoke(() -> TransactionTimeOutDUnitTest.init());
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
vm0.invoke(() -> TransactionTimeOutDUnitTest.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
index 8096dc0..72a6723 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
@@ -315,9 +315,8 @@ public class TxnManagerMultiThreadDUnitTest extends DistributedTestCase {
}
}//end of closeCache
- /////setUp and tearDown methods/////
- public void setUp() throws java.lang.Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws java.lang.Exception {
VM vm0 = Host.getHost(0).getVM(0);
Object o[] = new Object[1];
o[0] = "TxnManagerMultiThreadDUnitTest";
@@ -356,7 +355,7 @@ public class TxnManagerMultiThreadDUnitTest extends DistributedTestCase {
}//end of delRows
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
VM vm0 = Host.getHost(0).getVM(0);
//get tableName to pass to destroyTable
String tableName = CacheUtils.getTableName();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
index 6109852..44c21cd 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
@@ -115,15 +115,15 @@ public class TxnTimeOutDUnitTest extends DistributedTestCase {
}
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
vm0.invoke(() -> TxnTimeOutDUnitTest.init());
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
vm0.invoke(() -> TxnTimeOutDUnitTest.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
index 25de4ea..225fea2 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
@@ -68,14 +68,17 @@ public class OutOfOffHeapMemoryDUnitTest extends CacheTestCase {
}
@Override
- public void setUp() throws Exception {
+ public final void preSetUp() throws Exception {
disconnectAllFromDS();
- super.setUp();
+ }
+
+ @Override
+ public final void postSetUp() throws Exception {
IgnoredException.addIgnoredException(OutOfOffHeapMemoryException.class.getSimpleName());
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
final SerializableRunnable checkOrphans = new SerializableRunnable() {
@Override
public void run() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessLauncherDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessLauncherDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessLauncherDUnitTest.java
index cb05740..fc9c614 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessLauncherDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessLauncherDUnitTest.java
@@ -44,8 +44,7 @@ public class LocalProcessLauncherDUnitTest extends DistributedTestCase {
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
new File(getClass().getSimpleName()).mkdir();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
index fcc2e7b..11a9bb7 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
@@ -126,12 +126,7 @@ public class StatisticsDUnitTest extends CacheTestCase {
}
@Override
- public void setUp() throws Exception {
- super.setUp();
- }
-
- @Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM(getClass(), "cleanup");
disconnectAllFromDS(); // because this test enabled stat sampling!
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java
index 6ef2180..b9025e5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java
@@ -96,11 +96,6 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
-
- }
-
public void testGemFireConfigData() throws Exception {
initManagement(false);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
index de5c07f..6751aea 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
@@ -96,10 +96,11 @@ public class ClientHealthStatsDUnitTest extends DistributedTestCase {
super(name);
}
- public void setUp() throws Exception {
+ @Override
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
- super.setUp();
- final Host host = Host.getHost(0);
+
+ final Host host = Host.getHost(0);
managingNode = host.getVM(0);
server = host.getVM(1);
client = host.getVM(2);
@@ -108,7 +109,7 @@ public class ClientHealthStatsDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
reset();
helper.closeCache(managingNode);
helper.closeCache(client);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/CompositeTypeTestDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/CompositeTypeTestDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/CompositeTypeTestDUnitTest.java
index 49db7d5..565de1b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/CompositeTypeTestDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/CompositeTypeTestDUnitTest.java
@@ -43,11 +43,6 @@ public class CompositeTypeTestDUnitTest extends ManagementTestBase {
private static ObjectName objectName;
- public void setUp() throws Exception {
- super.setUp();
-
- }
-
public void testCompositeTypeGetters() throws Exception{
initManagement(false);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/DLockManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/DLockManagementDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/DLockManagementDUnitTest.java
index 2e08d58..5da954f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/DLockManagementDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/DLockManagementDUnitTest.java
@@ -53,11 +53,6 @@ public class DLockManagementDUnitTest extends ManagementTestBase {
}
- public void setUp() throws Exception {
- super.setUp();
-
- }
-
/**
* Distributed Lock Service test
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/DiskManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/DiskManagementDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/DiskManagementDUnitTest.java
index b850b54..d90fbe2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/DiskManagementDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/DiskManagementDUnitTest.java
@@ -85,11 +85,10 @@ public class DiskManagementDUnitTest extends ManagementTestBase {
diskDir.deleteOnExit();
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ protected final void postSetUpManagementTestBase() throws Exception {
failureCause = "";
testFailed = false;
-
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java
index 10f628d..cd73ec0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java
@@ -110,12 +110,6 @@ public class DistributedSystemDUnitTest extends ManagementTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
-
-
- }
-
/**
* Tests each and every operations that is defined on the MemberMXBean
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
index 0d2fdbc..fcc3081 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
@@ -68,8 +68,8 @@ public class LocatorManagementDUnitTest extends ManagementTestBase {
private static final long serialVersionUID = 1L;
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ protected final void postSetUpManagementTestBase() throws Exception {
locator = managedNode1;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
index 663abee..6064297 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
@@ -104,28 +104,30 @@ public class ManagementTestBase extends DistributedTestCase {
private static Cache cache;
- public void setUp() throws Exception {
+ @Override
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
- super.setUp();
+
Host host = Host.getHost(0);
managingNode = host.getVM(0);
managedNode1 = host.getVM(1);
managedNode2 = host.getVM(2);
managedNode3 = host.getVM(3);
-
-
managedNodeList = new ArrayList<VM>();
managedNodeList.add(managedNode1);
managedNodeList.add(managedNode2);
managedNodeList.add(managedNode3);
locatorVM = host.getLocator();
+ postSetUpManagementTestBase();
+ }
+ protected void postSetUpManagementTestBase() throws Exception {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
preTearDownManagementTestBase();
closeAllCache();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/MemberMBeanAttributesDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/MemberMBeanAttributesDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/MemberMBeanAttributesDUnitTest.java
index c3c1c2f..bb5d50a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/MemberMBeanAttributesDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/MemberMBeanAttributesDUnitTest.java
@@ -58,11 +58,6 @@ public class MemberMBeanAttributesDUnitTest extends ManagementTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
-
- }
-
protected void sample(VM vm1) {
vm1.invoke(new SerializableRunnable("Create Cache") {
public void run() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java
index 3d06e11..07febb8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java
@@ -143,8 +143,7 @@ public class OffHeapManagementDUnitTest extends CacheTestCase {
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
Host.getHost(0).getVM(0).invoke(new SerializableRunnable() {
@Override
public void run() {
@@ -154,7 +153,7 @@ public class OffHeapManagementDUnitTest extends CacheTestCase {
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
Host.getHost(0).getVM(0).invoke(new SerializableRunnable() {
@Override
public void run() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java
index e06fd3e..7fa222c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java
@@ -142,11 +142,9 @@ public class QueryDataDUnitTest extends ManagementTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ protected final void postSetUpManagementTestBase() throws Exception {
initManagement(false);
-
-
}
private void initCommonRegions(){
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java
index 303188a..55cd4ec 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java
@@ -103,11 +103,6 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
public RegionManagementDUnitTest(String name) {
super(name);
-
- }
-
- public void setUp() throws Exception {
- super.setUp();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
index 394a155..6dfb075 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
@@ -90,7 +90,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
InternalClientMembership.unregisterAllListeners();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsDUnitTest.java
index 7e70b85..24cd2bc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsDUnitTest.java
@@ -44,10 +44,6 @@ public class DistributedSystemStatsDUnitTest extends ManagementTestBase{
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
public void testDistributedSystemStats() throws Exception {
initManagement(true);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
index 192b458..383711e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
@@ -77,7 +77,7 @@ public class CliUtilDUnitTest extends CacheTestCase {
private static final long serialVersionUID = 1L;
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
destroySetup();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
index 664e7a6..2b79128 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
@@ -76,12 +76,8 @@ public class CliCommandTestBase extends CacheTestCase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
preTearDownCliCommandTestBase();
destroyDefaultSetup();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
index 9373d0f..b8e9780 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
@@ -62,9 +62,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase {
@SuppressWarnings("serial")
@Override
- public void setUp() throws Exception {
- super.setUp();
-
+ public final void postSetUp() throws Exception {
this.commandProcessor = new CommandProcessor();
assertFalse(this.commandProcessor.isStopped());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
index dc580cd..82bd92e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
@@ -88,9 +88,7 @@ public class GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest extends C
}
@Override
- public void setUp() throws Exception {
- super.setUp();
-
+ public final void postSetUp() throws Exception {
Properties managerDistributedSystemProperties = createDistributedSystemProperties(GEMFIRE_MANAGER_NAME);
HeadlessGfsh gfsh = createDefaultSetup(managerDistributedSystemProperties);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
index 4f86a55..2fac594 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
@@ -63,8 +63,7 @@ public class ListAndDescribeDiskStoreCommandsDUnitTest extends CliCommandTestBas
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
createDefaultSetup(null);
setupGemFire();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
index c60f33e..1df8d00 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
@@ -85,8 +85,7 @@ public class ListIndexCommandDUnitTest extends CliCommandTestBase {
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
createDefaultSetup(null);
setupGemFire();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
index 7d6efc5..e7b8442 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
@@ -73,15 +73,14 @@ public class MemberCommandsDUnitTest extends CacheTestCase {
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
// This test does not require an actual Gfsh connection to work, however when run as part of a suite, prior tests
// may mess up the environment causing this test to fail. Setting this prevents false failures.
CliUtil.isGfshVM = false;
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
disconnectFromDS();
CliUtil.isGfshVM = true;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
index e6c1e47..343d5eb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
@@ -60,9 +60,9 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
super(testName);
}
- public void setUp() throws Exception {
+ @Override
+ public final void preSetUp() throws Exception {
disconnectAllFromDS();
- super.setUp();
}
public void testAsyncEventQueue() throws IOException {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
index 9dc9506..319a21f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
@@ -333,7 +333,7 @@ public class SharedConfigurationCommandsDUnitTest extends CliCommandTestBase {
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
for (int i = 0; i < 4; i++) {
Host.getHost(0).getVM(i).invoke(SharedConfigurationDUnitTest.locatorCleanup);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
index 2ff86ba..ee6fcac 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommandsDUnitTest.java
@@ -43,10 +43,8 @@ public class ShellCommandsDUnitTest extends CliCommandTestBase {
super(name);
}
- @Before
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
getDefaultShell();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
index cee7229..6bf05b3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
@@ -65,15 +65,14 @@ public class ShowDeadlockDUnitTest extends CacheTestCase {
private static final Map<String, String> EMPTY_ENV = Collections.emptyMap();
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
// This test does not require an actual Gfsh connection to work, however when run as part of a suite, prior tests
// may mess up the environment causing this test to fail. Setting this prevents false failures.
CliUtil.isGfshVM = false;
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM(new SerializableRunnable() {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java
index c7a8f5d..e9d01db 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java
@@ -52,13 +52,12 @@ public class UserCommandsDUnitTest extends CliCommandTestBase {
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
createUserCommandJarFile();
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
if (this.deleteJarDirectory) {
FileUtil.delete(this.jarDirectory);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
index d583e51..2298e1f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
@@ -435,7 +435,7 @@ public class SharedConfigurationDUnitTest extends CacheTestCase {
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
for (int i=0; i<4; i++) {
Host.getHost(0).getVM(i).invoke(SharedConfigurationDUnitTest.locatorCleanup);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
index 696de8e..a84f477 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
@@ -81,8 +81,8 @@ public class TestClientIdsDUnitTest extends DistributedTestCase {
this.helper = new ManagementTestBase(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
final Host host = Host.getHost(0);
managingNode = host.getVM(0);
server = host.getVM(1);
@@ -91,7 +91,7 @@ public class TestClientIdsDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
helper.closeCache(managingNode);
helper.closeCache(server);
helper.closeCache(client);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java
index b410a82..2666b0c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java
@@ -44,11 +44,6 @@ public class TestFunctionsDUnitTest extends ManagementTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
-
- }
-
public static Integer getNumOfRunningFunction() {
final WaitCriterion waitCriteria = new WaitCriterion() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java
index 78e91b0..4eefdca 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java
@@ -38,12 +38,7 @@ public class TestHeapDUnitTest extends ManagementTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
-
- }
-
- public static long getHeapSizeOfClient() {
+ public static long getHeapSizeOfClient() {
return (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory());
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java
index 926c2ff..69f8bc9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java
@@ -37,11 +37,6 @@ public class TestLocatorsDUnitTest extends ManagementTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
-
- }
-
public static int getNumOfLocatorFromMBean() {
final WaitCriterion waitCriteria = new WaitCriterion() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
index ef491b0..95ef63b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
@@ -74,8 +74,8 @@ public class TestSubscriptionsDUnitTest extends DistributedTestCase {
this.helper = new ManagementTestBase(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
final Host host = Host.getHost(0);
managingNode = host.getVM(0);
server = host.getVM(1);
@@ -84,7 +84,7 @@ public class TestSubscriptionsDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
helper.closeCache(managingNode);
helper.closeCache(server);
helper.closeCache(client);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java
index 40592ff..0f747db 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java
@@ -79,8 +79,7 @@ public class ClientsWithVersioningRetryDUnitTest extends CacheTestCase {
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
Invoke.invokeInEveryVM(new SerializableRunnable() {
@Override
public void run() {
@@ -93,7 +92,7 @@ public class ClientsWithVersioningRetryDUnitTest extends CacheTestCase {
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM(new SerializableRunnable() {
@Override
public void run() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
index 937ff31..4949b43 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
@@ -60,7 +60,7 @@ public class JSONPdxClientServerDUnitTest extends CacheTestCase {
}
@Override
- protected final void preTearDownCacheTestCase() {
+ public final void preTearDownCacheTestCase() {
// this test creates client caches in some VMs and so
// breaks the contract of CacheTestCase to hold caches in
// that class's "cache" instance variable
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxSerializableDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxSerializableDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxSerializableDUnitTest.java
index 51635f3..1e901bc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxSerializableDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxSerializableDUnitTest.java
@@ -35,12 +35,6 @@ public class PdxSerializableDUnitTest extends CacheTestCase {
super(name);
}
-
- @Override
- public void setUp() throws Exception {
- super.setUp();
- }
-
public void testSimplePut() {
Host host = Host.getHost(0);
VM vm1 = host.getVM(0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxTypeExportDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxTypeExportDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxTypeExportDUnitTest.java
index c820e72..58f2128 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxTypeExportDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxTypeExportDUnitTest.java
@@ -68,9 +68,9 @@ public class PdxTypeExportDUnitTest extends CacheTestCase {
Host.getHost(0).getVM(3).invoke(test);
}
-
- public void setUp() throws Exception {
- super.setUp();
+
+ @Override
+ public final void postSetUp() throws Exception {
loadCache();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java
index f787909..825f532 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java
@@ -64,8 +64,7 @@ public class RedisDistDUnitTest extends DistributedTestCase {
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
host = Host.getHost(0);
server1 = host.getVM(0);
@@ -102,7 +101,7 @@ public class RedisDistDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
disconnectAllFromDS();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java
index 8446eae..e3acbce 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java
@@ -75,9 +75,7 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
SSLHandshakeException.class.getName() };
@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);
@@ -894,7 +892,7 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
//////////////////////////////////////////////////////////////////////////////
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
// close the clients first
client1.invoke(() -> SecurityTestUtil.closeCache());
client2.invoke(() -> SecurityTestUtil.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
index 1d0b481..9d16394 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
@@ -57,9 +57,7 @@ public class ClientAuthorizationDUnitTest extends ClientAuthorizationTestBase {
}
@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);
@@ -802,7 +800,7 @@ public class ClientAuthorizationDUnitTest extends ClientAuthorizationTestBase {
// End Region: Tests
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
// close the clients first
client1.invoke(() -> SecurityTestUtil.closeCache());
client2.invoke(() -> SecurityTestUtil.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/security/ClientMultiUserAuthzDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientMultiUserAuthzDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientMultiUserAuthzDUnitTest.java
index dc03990..e610942 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientMultiUserAuthzDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientMultiUserAuthzDUnitTest.java
@@ -45,9 +45,8 @@ public class ClientMultiUserAuthzDUnitTest extends ClientAuthorizationTestBase {
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);
@@ -511,7 +510,7 @@ public class ClientMultiUserAuthzDUnitTest extends ClientAuthorizationTestBase {
// End Region: Tests
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
// close the clients first
client1.invoke(() -> SecurityTestUtil.closeCache());
client2.invoke(() -> SecurityTestUtil.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java
index 5c184d1..e0c0d73 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java
@@ -98,8 +98,8 @@ public class DeltaClientAuthorizationDUnitTest extends
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);
@@ -113,7 +113,7 @@ public class DeltaClientAuthorizationDUnitTest extends
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
// close the clients first
client1.invoke(() -> SecurityTestUtil.closeCache());
client2.invoke(() -> SecurityTestUtil.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java
index ec1c692..3c3b4e8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java
@@ -59,9 +59,8 @@ public class DeltaClientPostAuthorizationDUnitTest extends
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);
@@ -75,7 +74,7 @@ public class DeltaClientPostAuthorizationDUnitTest extends
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
// close the clients first
client1.invoke(() -> SecurityTestUtil.closeCache());
client2.invoke(() -> SecurityTestUtil.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
index d47b1c4..f5296f8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
@@ -73,9 +73,8 @@ public class P2PAuthenticationDUnitTest extends DistributedTestCase {
super(name);
}
- public void setUp() throws Exception {
-
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
final Host host = Host.getHost(0);
locatorVM = host.getVM(0);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java
index a131034..2a5adce 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java
@@ -16,6 +16,7 @@
*/
package com.gemstone.gemfire.test.dunit;
+import java.io.Serializable;
import java.text.DecimalFormat;
import java.util.Iterator;
import java.util.LinkedHashSet;
@@ -23,6 +24,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import com.gemstone.gemfire.test.dunit.internal.DistributedTestFixture;
import org.apache.logging.log4j.Logger;
import org.junit.experimental.categories.Category;
@@ -74,14 +76,14 @@ import junit.framework.TestCase;
*/
@Category(DistributedTest.class)
@SuppressWarnings("serial")
-public abstract class DistributedTestCase extends TestCase implements java.io.Serializable {
+public abstract class DistributedTestCase extends TestCase implements DistributedTestFixture, Serializable {
private static final Logger logger = LogService.getLogger();
private static final Set<String> testHistory = new LinkedHashSet<String>();
/** This VM's connection to the distributed system */
- private static InternalDistributedSystem system; // TODO: make private
+ private static InternalDistributedSystem system;
private static Class lastSystemCreatedInTest;
private static Properties lastSystemProperties;
private static volatile String testMethodName;
@@ -89,9 +91,9 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
/** For formatting timing info */
private static final DecimalFormat format = new DecimalFormat("###.###");
- private static boolean reconnect = false; // TODO: make private
+ private static boolean reconnect = false;
- private static final boolean logPerTest = Boolean.getBoolean("dunitLogPerTest"); // TODO: make private
+ private static final boolean logPerTest = Boolean.getBoolean("dunitLogPerTest");
/**
* Creates a new <code>DistributedTestCase</code> test with the given name.
@@ -127,7 +129,7 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
*
* @since 3.0
*/
- public /*final*/ InternalDistributedSystem getSystem(final Properties props) { // TODO: restore final
+ public final InternalDistributedSystem getSystem(final Properties props) {
// Setting the default disk store name is now done in setUp
if (system == null) {
system = InternalDistributedSystem.getAnyInstance();
@@ -203,7 +205,7 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
}
public final InternalDistributedSystem basicGetSystem() {
- return this.system;
+ return system;
}
public final void nullSystem() { // TODO: delete
@@ -253,7 +255,7 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
* Disconnects this VM from the distributed system
*/
public static final void disconnectFromDS() {
- setTestMethodName(null);
+ //setTestMethodName(null);
GemFireCacheImpl.testCacheXml = null;
if (system != null) {
system.disconnect();
@@ -310,7 +312,7 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
* that needs to occur after setUp().
*/
@Override
- public void setUp() throws Exception { // TODO: make final and force subclasses to override template methods
+ public final void setUp() throws Exception {
preSetUp();
setUpDistributedTestCase();
postSetUp();
@@ -348,7 +350,7 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
*
* <p>Override this as needed. Default implementation is empty.
*/
- protected void preSetUp() throws Exception {
+ public void preSetUp() throws Exception {
}
/**
@@ -356,7 +358,7 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
*
* <p>Override this as needed. Default implementation is empty.
*/
- protected void postSetUp() throws Exception {
+ public void postSetUp() throws Exception {
}
private static final String getDefaultDiskStoreName(final int hostIndex, final int vmIndex, final String className, final String methodName) {
@@ -377,28 +379,28 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
private static final void setUpCreationStackGenerator() {
// the following is moved from InternalDistributedSystem to fix #51058
InternalDistributedSystem.TEST_CREATION_STACK_GENERATOR.set(
- new CreationStackGenerator() {
- @Override
- public Throwable generateCreationStack(final DistributionConfig config) {
- final StringBuilder sb = new StringBuilder();
- final String[] validAttributeNames = config.getAttributeNames();
- for (int i = 0; i < validAttributeNames.length; i++) {
- final String attName = validAttributeNames[i];
- final Object actualAtt = config.getAttributeObject(attName);
- String actualAttStr = actualAtt.toString();
- sb.append(" ");
- sb.append(attName);
- sb.append("=\"");
- if (actualAtt.getClass().isArray()) {
- actualAttStr = InternalDistributedSystem.arrayToString(actualAtt);
+ new CreationStackGenerator() {
+ @Override
+ public Throwable generateCreationStack(final DistributionConfig config) {
+ final StringBuilder sb = new StringBuilder();
+ final String[] validAttributeNames = config.getAttributeNames();
+ for (int i = 0; i < validAttributeNames.length; i++) {
+ final String attName = validAttributeNames[i];
+ final Object actualAtt = config.getAttributeObject(attName);
+ String actualAttStr = actualAtt.toString();
+ sb.append(" ");
+ sb.append(attName);
+ sb.append("=\"");
+ if (actualAtt.getClass().isArray()) {
+ actualAttStr = InternalDistributedSystem.arrayToString(actualAtt);
+ }
+ sb.append(actualAttStr);
+ sb.append("\"");
+ sb.append("\n");
+ }
+ return new Throwable("Creating distributed system with the following configuration:\n" + sb.toString());
}
- sb.append(actualAttStr);
- sb.append("\"");
- sb.append("\n");
- }
- return new Throwable("Creating distributed system with the following configuration:\n" + sb.toString());
- }
- });
+ });
}
/**
@@ -443,7 +445,7 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
*
* <p>Override this as needed. Default implementation is empty.
*/
- protected void preTearDown() throws Exception {
+ public void preTearDown() throws Exception {
}
/**
@@ -451,7 +453,7 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
*
* <p>Override this as needed. Default implementation is empty.
*/
- protected void postTearDown() throws Exception {
+ public void postTearDown() throws Exception {
}
private static final void cleanupAllVms() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit3CacheTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit3CacheTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit3CacheTestCase.java
index ace9c31..f7c49fa 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit3CacheTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit3CacheTestCase.java
@@ -17,49 +17,21 @@
package com.gemstone.gemfire.test.dunit.cache.internal;
import java.io.File;
-import java.io.FileWriter;
-import java.io.FilenameFilter;
import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Map;
-import java.util.Properties;
-import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheException;
-import com.gemstone.gemfire.cache.CacheExistsException;
import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.CacheTransactionManager;
-import com.gemstone.gemfire.cache.ExpirationAttributes;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.RegionExistsException;
import com.gemstone.gemfire.cache.TimeoutException;
import com.gemstone.gemfire.cache.client.ClientCache;
import com.gemstone.gemfire.cache.client.ClientCacheFactory;
-import com.gemstone.gemfire.cache.client.PoolManager;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
-import com.gemstone.gemfire.distributed.internal.DistributionMessageObserver;
-import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.internal.FileUtil;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-import com.gemstone.gemfire.internal.cache.InternalRegionArguments;
-import com.gemstone.gemfire.internal.cache.LocalRegion;
-import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation;
-import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.test.dunit.Assert;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
-import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.IgnoredException;
-import com.gemstone.gemfire.test.dunit.Invoke;
-import com.gemstone.gemfire.test.dunit.LogWriterUtils;
-import com.gemstone.gemfire.test.dunit.VM;
-import com.gemstone.gemfire.test.dunit.Wait;
-import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.dunit.internal.JUnit3DistributedTestCase;
-import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.logging.log4j.Logger;
/**
* The abstract superclass of tests that require the creation of a
@@ -85,7 +57,7 @@ public abstract class JUnit3CacheTestCase extends JUnit3DistributedTestCase impl
* Sets this test up with a CacheCreation as its cache.
* Any existing cache is closed. Whoever calls this must also call finishCacheXml
*/
- public static final synchronized void beginCacheXml() {
+ public static final void beginCacheXml() {
JUnit4CacheTestCase.beginCacheXml();
}
@@ -139,23 +111,19 @@ public abstract class JUnit3CacheTestCase extends JUnit3DistributedTestCase impl
return delegate.getGemfireCache();
}
- public static synchronized final boolean hasCache() {
+ public static final boolean hasCache() {
return JUnit4CacheTestCase.hasCache();
}
/**
* Return current cache without creating one.
*/
- public static synchronized final Cache basicGetCache() {
+ public static final Cache basicGetCache() {
return JUnit4CacheTestCase.basicGetCache();
}
-// public static synchronized final void disconnectFromDS() {
-// JUnit4CacheTestCase.disconnectFromDS();
-// }
-
/** Close the cache */
- public static synchronized final void closeCache() {
+ public static final void closeCache() {
JUnit4CacheTestCase.closeCache();
}
@@ -180,7 +148,7 @@ public abstract class JUnit3CacheTestCase extends JUnit3DistributedTestCase impl
/**
* Local destroy all root regions and close the cache.
*/
- protected final synchronized static void remoteTearDown() {
+ protected static final void remoteTearDown() {
JUnit4CacheTestCase.remoteTearDown();
}
@@ -219,7 +187,7 @@ public abstract class JUnit3CacheTestCase extends JUnit3DistributedTestCase impl
* @deprecated Please use {@link IgnoredException#addIgnoredException(String)} instead.
*/
@Deprecated
- public CacheSerializableRunnable addExceptionTag1(final String exceptionStringToIgnore) {
+ public final CacheSerializableRunnable addExceptionTag1(final String exceptionStringToIgnore) {
return delegate.addExceptionTag1(exceptionStringToIgnore);
}
@@ -227,7 +195,7 @@ public abstract class JUnit3CacheTestCase extends JUnit3DistributedTestCase impl
* @deprecated Please use {@link IgnoredException#remove()} instead.
*/
@Deprecated
- public CacheSerializableRunnable removeExceptionTag1(final String exceptionStringToIgnore) {
+ public final CacheSerializableRunnable removeExceptionTag1(final String exceptionStringToIgnore) {
return delegate.removeExceptionTag1(exceptionStringToIgnore);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
index 4182ffc..a6312ed 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
@@ -375,7 +375,7 @@ public class JUnit4CacheTestCase extends JUnit4DistributedTestCase implements Ca
postTearDownCacheTestCase();
}
- public final void tearDownCacheTestCase() {
+ public final void tearDownCacheTestCase() { // TODO: make private
// locally destroy all root regions and close the cache
remoteTearDown();
// Now invoke it in every VM
@@ -390,16 +390,22 @@ public class JUnit4CacheTestCase extends JUnit4DistributedTestCase implements Ca
@Override
public void preTearDownCacheTestCase() throws Exception {
+ if (this.cacheTestFixture != this) {
+ this.cacheTestFixture.preTearDownCacheTestCase();
+ }
}
@Override
public void postTearDownCacheTestCase() throws Exception {
+ if (this.cacheTestFixture != this) {
+ this.cacheTestFixture.postTearDownCacheTestCase();
+ }
}
/**
* Local destroy all root regions and close the cache.
*/
- protected static synchronized void remoteTearDown() {
+ protected static final synchronized void remoteTearDown() {
try {
DistributionMessageObserver.setInstance(null);
destroyRegions(cache);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/DistributedTestFixture.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/DistributedTestFixture.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/DistributedTestFixture.java
index e12b22c..f752c01 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/DistributedTestFixture.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/DistributedTestFixture.java
@@ -63,8 +63,4 @@ public interface DistributedTestFixture {
*/
public Properties getDistributedSystemProperties();
- /**
- * @deprecated Please override {@link #getDistributedSystemProperties()} instead. This should be removed.
- */
- public InternalDistributedSystem getSystem(final Properties props); // TODO: remove and make final in DistributedTestCase
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit3DistributedTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit3DistributedTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit3DistributedTestCase.java
index 90d88d8..ed514a3 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit3DistributedTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit3DistributedTestCase.java
@@ -18,12 +18,17 @@ package com.gemstone.gemfire.test.dunit.internal;
import java.io.Serializable;
import java.text.DecimalFormat;
+import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.Properties;
import java.util.Set;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.internal.cache.HARegion;
+import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.logging.LogService;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
import junit.framework.TestCase;
@@ -43,6 +48,8 @@ import org.junit.experimental.categories.Category;
@Category(DistributedTest.class)
public abstract class JUnit3DistributedTestCase extends TestCase implements DistributedTestFixture, Serializable {
+ private static final Logger logger = LogService.getLogger();
+
private final JUnit4DistributedTestCase delegate = new JUnit4DistributedTestCase(this);
/**
@@ -58,30 +65,37 @@ public abstract class JUnit3DistributedTestCase extends TestCase implements Dist
// methods for tests
//---------------------------------------------------------------------------
+ /**
+ * @deprecated Please override {@link #getDistributedSystemProperties()} instead.
+ */
+ @Deprecated
public final void setSystem(final Properties props, final DistributedSystem ds) { // TODO: override getDistributedSystemProperties and then delete
delegate.setSystem(props, ds);
}
/**
- * Returns this VM's connection to the distributed system. If
- * necessary, the connection will be lazily created using the given
- * <code>Properties</code>. Note that this method uses hydra's
- * configuration to determine the location of log files, etc.
- * Note: "final" was removed so that WANTestBase can override this method.
+ * Returns this VM's connection to the distributed system. If necessary, the
+ * connection will be lazily created using the given {@code Properties}.
+ *
+ * <p>Do not override this method. Override {@link #getDistributedSystemProperties()}
+ * instead.
+ *
+ * <p>Note: "final" was removed so that WANTestBase can override this method.
* This was part of the xd offheap merge.
*
- * see hydra.DistributedConnectionMgr#connect
* @since 3.0
*/
- public /*final*/ InternalDistributedSystem getSystem(final Properties props) { // TODO: make final
- return delegate.defaultGetSystem(props);
+ public final InternalDistributedSystem getSystem(final Properties props) {
+ return delegate.getSystem(props);
}
/**
- * Returns this VM's connection to the distributed system. If
- * necessary, the connection will be lazily created using the
- * <code>Properties</code> returned by {@link
- * #getDistributedSystemProperties}.
+ * Returns this VM's connection to the distributed system. If necessary, the
+ * connection will be lazily created using the {@code Properties} returned by
+ * {@link #getDistributedSystemProperties()}.
+ *
+ * <p>Do not override this method. Override {@link #getDistributedSystemProperties()}
+ * instead.
*
* @see #getSystem(Properties)
*
@@ -104,8 +118,7 @@ public abstract class JUnit3DistributedTestCase extends TestCase implements Dist
}
/**
- * Returns a loner distributed system that isn't connected to other
- * vms
+ * Returns a loner distributed system that isn't connected to other vms.
*
* @since 6.5
*/
@@ -114,19 +127,16 @@ public abstract class JUnit3DistributedTestCase extends TestCase implements Dist
}
/**
- * Returns whether or this VM is connected to a {@link
- * DistributedSystem}.
+ * Returns whether or this VM is connected to a {@link DistributedSystem}.
*/
public final boolean isConnectedToDS() {
return delegate.isConnectedToDS();
}
/**
- * Returns a <code>Properties</code> object used to configure a
- * connection to a {@link
- * com.gemstone.gemfire.distributed.DistributedSystem}.
- * Unless overridden, this method will return an empty
- * <code>Properties</code> object.
+ * Returns a {@code Properties} object used to configure a connection to a
+ * {@link DistributedSystem}. Unless overridden, this method will return an
+ * empty {@code Properties} object.
*
* @since 3.0
*/
@@ -203,8 +213,8 @@ public abstract class JUnit3DistributedTestCase extends TestCase implements Dist
/**
* Tears down the DistributedTestCase.
- * <p>
- * Do not override this method. Override {@link #preTearDown()} with work that
+ *
+ * <p>Do not override this method. Override {@link #preTearDown()} with work that
* needs to occur before tearDown() or override {@link #postTearDown()} with work
* that needs to occur after tearDown().
*/
@@ -229,7 +239,7 @@ public abstract class JUnit3DistributedTestCase extends TestCase implements Dist
public void postTearDown() throws Exception {
}
- public static void cleanupAllVms() { // TODO: make private
- JUnit4DistributedTestCase.cleanupAllVms();
+ protected static final void destroyRegions(final Cache cache) {
+ JUnit4DistributedTestCase.destroyRegions(cache);
}
}
[5/7] incubator-geode git commit: Cleaning up dunit
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java
index c8f0933..f95ae50 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java
@@ -655,8 +655,8 @@ public class IncrementalBackupDUnitTest extends CacheTestCase {
* 1. Add partitioned persistent region to all members.
* 2. Fills region with data.
*/
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
createDataRegions();
createRegions.run();
loadMoreData();
@@ -668,7 +668,7 @@ public class IncrementalBackupDUnitTest extends CacheTestCase {
* Removes backup directories (and all backup data).
*/
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
FileUtil.delete(getIncremental2Dir());
FileUtil.delete(getIncrementalDir());
FileUtil.delete(getBaselineDir());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptClientServerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptClientServerDUnitTest.java
index 5927289..0a8c63f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptClientServerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptClientServerDUnitTest.java
@@ -56,7 +56,7 @@ public class InterruptClientServerDUnitTest extends CacheTestCase {
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM(new SerializableCallable() {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsDUnitTest.java
index 028d3fa..be41318 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsDUnitTest.java
@@ -51,7 +51,7 @@ public class InterruptsDUnitTest extends CacheTestCase {
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM(new SerializableCallable() {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java
index 708b983..43a824a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java
@@ -43,7 +43,7 @@ public class OffHeapEvictionDUnitTest extends EvictionDUnitTest {
}
@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/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java
index f574e99..f64374c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java
@@ -39,7 +39,7 @@ public class OffHeapEvictionStatsDUnitTest extends EvictionStatsDUnitTest {
}
@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/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java
index 4889f0f..21f5c05 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java
@@ -399,10 +399,9 @@ public class P2PDeltaPropagationDUnitTest extends DistributedTestCase
{
assertFalse(check);
}
-
- 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);
@@ -496,7 +495,7 @@ public class P2PDeltaPropagationDUnitTest extends DistributedTestCase
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
closeCache();
server1.invoke(() -> P2PDeltaPropagationDUnitTest.closeCache());
server2.invoke(() -> P2PDeltaPropagationDUnitTest.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDUnitTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDUnitTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDUnitTestCase.java
index cd6e980..f401e0d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDUnitTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDUnitTestCase.java
@@ -93,7 +93,7 @@ public class PartitionedRegionDUnitTestCase extends CacheTestCase
* because we want to destroy any existing PartitionedRegions)
*/
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
preTearDownPartitionedRegionDUnitTest();
closeCache();
Invoke.invokeInEveryVM(CacheTestCase.class, "closeCache");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
index 337e6ce..23709ad 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
@@ -45,7 +45,7 @@ public class PartitionedRegionDelayedRecoveryDUnitTest extends CacheTestCase {
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM(new SerializableRunnable() {
public void run() {
InternalResourceManager.setResourceObserver(null);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java
index 002a5f6..046d787 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java
@@ -34,7 +34,7 @@ public class PartitionedRegionOffHeapEvictionDUnitTest 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/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
index c112539..027ae30 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.test.dunit.VM;
public class PartitionedRegionRedundancyZoneDUnitTest extends CacheTestCase {
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
// this makes sure we don't leave anything for the next tests
// Tests that set redundancy zones causes other jvms connected
// to the ds to have "enforce-unique-hosts" set to true.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java
index d360c52..636075c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java
@@ -108,8 +108,8 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
IgnoredException.addIgnoredException("Connection refused");
Host host = Host.getHost(0);
member0 = host.getVM(0);
@@ -119,7 +119,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
try {
closeCacheAndDisconnect();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
index c866110..4508b25 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
@@ -114,9 +114,8 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends CacheTes
super(name);
}
-
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
member0 = host.getVM(0);
member1 = host.getVM(1);
@@ -126,7 +125,7 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends CacheTes
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
// close the clients first
member0.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.closeCacheAndDisconnect());
member1.invoke(() -> PartitionedRegionSingleHopWithServerGroupDUnitTest.closeCacheAndDisconnect());
@@ -136,7 +135,7 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends CacheTes
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
try {
member0 = null;
member1 = null;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java
index ba8fd66..1611272 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java
@@ -66,8 +66,7 @@ public class PutAllDAckDUnitTest extends DistributedTestCase {
static boolean flag = false;
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
@@ -77,7 +76,7 @@ public class PutAllDAckDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java
index 8326ec5..a41e4a9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java
@@ -82,8 +82,7 @@ public class PutAllGlobalDUnitTest extends DistributedTestCase {
static boolean flag = false;
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
@@ -93,7 +92,7 @@ public class PutAllGlobalDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java
index 7f5f4bb..07c6fd1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java
@@ -152,7 +152,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
try {
Invoke.invokeInEveryVM(verifyNoTxState);
} finally {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java
index 5f51cbd..9b9543b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java
@@ -63,8 +63,7 @@ public class RemoveAllDAckDUnitTest extends DistributedTestCase {
static boolean flag = false;
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
@@ -74,7 +73,7 @@ public class RemoveAllDAckDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java
index 5f60779..4a9eb03 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java
@@ -59,8 +59,7 @@ public class RemoveDAckDUnitTest extends DistributedTestCase {
static boolean flag = false;
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
@@ -70,7 +69,7 @@ public class RemoveDAckDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java
index c25c24d..9bce9c4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java
@@ -64,8 +64,7 @@ public class RemoveGlobalDUnitTest extends DistributedTestCase {
static VM vm1 = null;
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
vm0 = host.getVM(0);
vm1 = host.getVM(1);
@@ -74,7 +73,7 @@ public class RemoveGlobalDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
vm0.invoke(() -> RemoveGlobalDUnitTest.resetFlag());
vm1.invoke(() -> RemoveGlobalDUnitTest.resetFlag());
vm0.invoke(() -> RemoveGlobalDUnitTest.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java
index f63ea31..c702d9f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java
@@ -102,8 +102,8 @@ public class SingleHopStatsDUnitTest extends CacheTestCase{
// TODO Auto-generated constructor stub
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
member0 = host.getVM(0);
member1 = host.getVM(1);
@@ -112,7 +112,7 @@ public class SingleHopStatsDUnitTest extends CacheTestCase{
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
// close the clients first
member0.invoke(() -> SingleHopStatsDUnitTest.closeCacheAndDisconnect());
member1.invoke(() -> SingleHopStatsDUnitTest.closeCacheAndDisconnect());
@@ -122,7 +122,7 @@ public class SingleHopStatsDUnitTest extends CacheTestCase{
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
try {
member0 = null;
member1 = null;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java
index f7275b7..6b7216e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java
@@ -94,7 +94,7 @@ public class RebalanceOperationDUnitTest extends CacheTestCase {
private static final long MAX_WAIT = 60;
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM(new SerializableRunnable() {
public void run() {
InternalResourceManager.setResourceObserver(null);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java
index de58569..9a7fb8b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java
@@ -62,16 +62,14 @@ public class Bug51193DUnitTest extends DistributedTestCase {
private VM client0;
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
server0 = host.getVM(0);
client0 = host.getVM(1);
-
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
closeCache();
server0.invoke(() -> Bug51193DUnitTest.closeCache());
client0.invoke(() -> Bug51193DUnitTest.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
index 821407f..67d66b7 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
@@ -62,12 +62,11 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ protected final void postSetUpPRClientServerTestBase() throws Exception {
IgnoredException.addIgnoredException("java.net.ConnectException");
}
-
public void test_Bug_43126_Function_Not_Registered()
throws InterruptedException {
createScenario();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java
index 089c301..11eefd0 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java
@@ -77,8 +77,8 @@ public class ColocationFailoverDUnitTest extends DistributedTestCase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
dataStore1 = host.getVM(0);
dataStore2 = host.getVM(1);
@@ -469,7 +469,7 @@ public class ColocationFailoverDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
closeCache();
Invoke.invokeInEveryVM(new SerializableRunnable() {
public void run() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
index d1437f5..5fd649b 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
@@ -89,8 +89,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
replicate1 = host.getVM(0);
replicate2 = host.getVM(1);
@@ -99,7 +98,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
// this test creates a cache that is incompatible with CacheTestCase,
// so we need to close it and null out the cache variable
disconnectAllFromDS();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java
index 9edb736..6db487b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java
@@ -118,8 +118,8 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase{
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ protected final void postSetUpPRClientServerTestBase() throws Exception {
//Make sure stats to linger from a previous test
disconnectAllFromDS();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetDUnitTest.java
index 96fc72c..850f925 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetDUnitTest.java
@@ -74,8 +74,8 @@ public class LocalDataSetDUnitTest extends CacheTestCase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
dataStore1 = host.getVM(0);
dataStore2 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetIndexingDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetIndexingDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetIndexingDUnitTest.java
index 1d933e3..27aeae6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetIndexingDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetIndexingDUnitTest.java
@@ -86,8 +86,7 @@ public class LocalDataSetIndexingDUnitTest extends CacheTestCase {
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
dataStore1 = host.getVM(0);
dataStore2 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
index fc3777d..1c47ffd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
@@ -55,13 +55,12 @@ public class LocalFunctionExecutionDUnitTest extends DistributedTestCase{
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
dataStore1 = host.getVM(0);
}
-
-
+
public void testLocalDataSetPR(){
dataStore1.invoke(() -> LocalFunctionExecutionDUnitTest.createCacheInVm());
Object args[] = new Object[] { "testRegion", new Integer(1), new Integer(50),
@@ -170,7 +169,7 @@ public class LocalFunctionExecutionDUnitTest extends DistributedTestCase{
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
if(cache != null) {
cache.close();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
index abad8d8..ada68c9 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
@@ -73,8 +73,7 @@ public class MemberFunctionExecutionDUnitTest extends CacheTestCase {
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
member1 = host.getVM(0);
member2 = host.getVM(1);
@@ -658,7 +657,7 @@ public class MemberFunctionExecutionDUnitTest extends CacheTestCase {
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
List<VM> members = new ArrayList<VM>(4);
members.add(member1); members.add(member2); members.add(member3); members.add(member4);
for (VM member: members) {
@@ -667,7 +666,7 @@ public class MemberFunctionExecutionDUnitTest extends CacheTestCase {
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
disconnectAllFromDS();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java
index 7f9d918..a129af9 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java
@@ -61,9 +61,8 @@ public class MultiRegionFunctionExecutionDUnitTest extends CacheTestCase {
super(name);
}
- public void setUp() throws Exception {
-
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
vm0 = host.getVM(0);
vm1 = host.getVM(1);
@@ -72,7 +71,7 @@ public class MultiRegionFunctionExecutionDUnitTest extends CacheTestCase {
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
cache = null;
Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } });
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
index 3cc34d8..c77a201 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
@@ -64,7 +64,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
Invoke.invokeInEveryVM(new SerializableCallable() {
@Override
public Object call() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
index 80d59ed..0c33b5f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
@@ -51,9 +51,6 @@ public class PRClientServerFunctionExecutionNoAckDUnitTest extends PRClientServe
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
/*
* Execution of the function on server using the name of the function
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
index 0104e7a..ed61274 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
@@ -81,11 +81,6 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
super(name);
}
- @Override
- public void setUp() throws Exception {
- super.setUp();
- }
-
public void test_Bug_43126_Function_Not_Registered()
throws InterruptedException {
createScenario();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
index 1164543..d139bbf 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
@@ -67,8 +67,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ protected void postSetUpPRClientServerTestBase() throws Exception {
IgnoredException.addIgnoredException("Connection reset");
IgnoredException.addIgnoredException("SocketTimeoutException");
IgnoredException.addIgnoredException("ServerConnectivityException");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
index ffcac65..cd54be6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
@@ -69,10 +69,6 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
/*
* Execution of the function on server with
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
index 5a17f4d..482ab9a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
@@ -69,10 +69,6 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
/*
* Execution of the function on server with
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
index 84da524..1f65ad2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
@@ -67,11 +67,10 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
}
@Override
- public void setUp() throws Exception {
+ public final void preSetUp() throws Exception {
//Workaround for bug #52004
IgnoredException.addIgnoredException("InternalFunctionInvocationTargetException");
IgnoredException.addIgnoredException("Connection refused");
- super.setUp();
}
/*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
index 2456cec..88d0222 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
@@ -110,13 +110,17 @@ public class PRClientServerTestBase extends CacheTestCase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
server1 = host.getVM(0);
server2 = host.getVM(1);
server3 = host.getVM(2);
client = host.getVM(3);
+ postSetUpPRClientServerTestBase();
+ }
+
+ protected void postSetUpPRClientServerTestBase() throws Exception {
}
public ArrayList createCommonServerAttributes(String regionName,
@@ -682,7 +686,7 @@ public class PRClientServerTestBase extends CacheTestCase {
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
closeCacheAndDisconnect();
client.invoke(() -> PRClientServerTestBase.closeCacheAndDisconnect());
server1.invoke(() -> PRClientServerTestBase.closeCacheAndDisconnect());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRColocationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRColocationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRColocationDUnitTest.java
index 839d78c..6c5dc9f 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRColocationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRColocationDUnitTest.java
@@ -118,8 +118,7 @@ public class PRColocationDUnitTest extends CacheTestCase {
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
disconnectAllFromDS(); // isolate this test from others to avoid periodic CacheExistsExceptions
Host host = Host.getHost(0);
dataStore1 = host.getVM(0);
@@ -2556,7 +2555,7 @@ public class PRColocationDUnitTest extends CacheTestCase {
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM(new SerializableRunnable() {
public void run() {
InternalResourceManager.setResourceObserver(null);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java
index 15cf753..102d52d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java
@@ -665,7 +665,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest {
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM(verifyNoTxState);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java
index 863e260..f2ab3e2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java
@@ -45,11 +45,6 @@ public class SingleHopGetAllPutAllDUnitTest extends PRClientServerTestBase{
}
- @Override
- public void setUp() throws Exception {
- super.setUp();
- }
-
/*
* Do a getAll from client and see if all the values are returned.
* Will also have to see if the function was routed from client to all the servers
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
index 4eef430..714fe49 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
@@ -102,10 +102,13 @@ public class Bug36853EventsExpiryDUnitTest extends CacheTestCase
* @throws Exception -
* thrown in any problem occurs in setUp
*/
- public void setUp() throws Exception
- {
+ @Override
+ public final void preSetUp() throws Exception {
disconnectAllFromDS();
- super.setUp();
+ }
+
+ @Override
+ public final void postSetUp() throws Exception {
final Host host = Host.getHost(0);
server = host.getVM(0);
client = host.getVM(1);
@@ -113,7 +116,6 @@ public class Bug36853EventsExpiryDUnitTest extends CacheTestCase
int PORT2 = ((Integer)server.invoke(() -> Bug36853EventsExpiryDUnitTest.createServerCache())).intValue();
client.invoke(() -> Bug36853EventsExpiryDUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT2) ));
-
}
/**
@@ -292,7 +294,7 @@ public class Bug36853EventsExpiryDUnitTest extends CacheTestCase
* thrown if any problem occurs in closing client and server caches.
*/
@Override
- protected final void preTearDownCacheTestCase() throws Exception
+ public final void preTearDownCacheTestCase() throws Exception
{
// close client
client.invoke(() -> Bug36853EventsExpiryDUnitTest.unSetExpiryTimeAndCloseCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java
index e5acf27..09ed9a5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java
@@ -62,15 +62,15 @@ public class Bug48571DUnitTest 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 = host.getVM(0);
client = host.getVM(1);
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
reset();
server.invoke(() -> Bug48571DUnitTest.reset());
client.invoke(() -> Bug48571DUnitTest.reset());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java
index 636333a..fef1ef9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java
@@ -52,8 +52,8 @@ public class Bug48879DUnitTest extends DistributedTestCase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
Host host = Host.getHost(0);
vm0 = host.getVM(0); // server1
@@ -66,7 +66,7 @@ public class Bug48879DUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
closeCache();
vm0.invoke(() -> Bug48879DUnitTest.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java
index b4fbc58..89a385c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java
@@ -159,8 +159,8 @@ public class EventIdOptimizationDUnitTest extends DistributedTestCase
* @throws Exception -
* thrown in any problem occurs in setUp
*/
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
final Host host = Host.getHost(0);
@@ -174,7 +174,6 @@ public class EventIdOptimizationDUnitTest extends DistributedTestCase
client1.invoke(() -> EventIdOptimizationDUnitTest.createClientCache1( NetworkUtils.getServerHostName(host), new Integer(PORT1) ));
client2.invoke(() -> EventIdOptimizationDUnitTest.createClientCache2( NetworkUtils.getServerHostName(host), new Integer(PORT2) ));
-
}
/**
@@ -499,7 +498,7 @@ public class EventIdOptimizationDUnitTest extends DistributedTestCase
* Closes the caches on clients and servers
*/
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
// close client
client1.invoke(() -> EventIdOptimizationDUnitTest.closeCache());
client2.invoke(() -> EventIdOptimizationDUnitTest.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java
index 90e9703..ac14478 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java
@@ -76,9 +76,8 @@ public class FailoverDUnitTest 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);
@@ -325,7 +324,7 @@ public class FailoverDUnitTest 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/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java
index 4adb2a8..53dc338 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java
@@ -70,10 +70,9 @@ public class HABugInPutDUnitTest extends DistributedTestCase
super(name);
}
- public void setUp() throws Exception
- {
- super.setUp();
- final Host host = Host.getHost(0);
+ @Override
+ public final void postSetUp() throws Exception {
+ final Host host = Host.getHost(0);
// Server1 VM
server1 = host.getVM(0);
@@ -96,12 +95,10 @@ public class HABugInPutDUnitTest extends DistributedTestCase
NetworkUtils.getServerHostName(host), new Integer(PORT1), new Integer(PORT2) ));
client2.invoke(() -> HABugInPutDUnitTest.createClientCache(
NetworkUtils.getServerHostName(host), new Integer(PORT1), new Integer(PORT2) ));
- //Boolean.getBoolean("")
-
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
client1.invoke(() -> HABugInPutDUnitTest.closeCache());
client2.invoke(() -> HABugInPutDUnitTest.closeCache());
// close server
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java
index bb2ca69..3a23140 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java
@@ -85,9 +85,8 @@ public class HAClearDUnitTest 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);
@@ -101,11 +100,10 @@ public class HAClearDUnitTest extends DistributedTestCase
client2 = host.getVM(3);
CacheObserverHolder.setInstance(new CacheObserverAdapter());
-
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
client1.invoke(() -> HAClearDUnitTest.closeCache());
client2.invoke(() -> HAClearDUnitTest.closeCache());
server1.invoke(() -> HAClearDUnitTest.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java
index 8edefa6..1d027bf 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java
@@ -97,9 +97,8 @@ public class HAConflationDUnitTest extends CacheTestCase
super(name);
}
- 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);
@@ -111,11 +110,10 @@ public class HAConflationDUnitTest extends CacheTestCase
server1.invoke(() -> ConflationDUnitTest.setIsSlowStart());
server1.invoke(() -> HAConflationDUnitTest.makeDispatcherSlow());
client1.invoke(() -> HAConflationDUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT1), new Boolean(true) ));
-
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
client1.invoke(() -> HAConflationDUnitTest.closeCacheAndDisconnect());
// close server
server1.invoke(() -> HAConflationDUnitTest.closeCacheAndDisconnect());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
index 1d18390..937b2cc 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
@@ -89,9 +89,8 @@ public class HADuplicateDUnitTest 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);
@@ -104,7 +103,7 @@ public class HADuplicateDUnitTest extends DistributedTestCase
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
client1.invoke(() -> HADuplicateDUnitTest.closeCache());
// close server
server1.invoke(() -> HADuplicateDUnitTest.reSetQRMslow());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
index 4753fb7..153ee20 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
@@ -87,9 +87,8 @@ public class HAEventIdPropagationDUnitTest 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);
server1.invoke(() -> ConflationDUnitTest.unsetIsSlowStart());
@@ -98,7 +97,7 @@ public class HAEventIdPropagationDUnitTest extends DistributedTestCase
/** close the caches* */
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
client1.invoke(() -> HAEventIdPropagationDUnitTest.closeCache());
// close server
server1.invoke(() -> HAEventIdPropagationDUnitTest.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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/3543e224/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);
[2/7] incubator-geode git commit: Cleaning up dunit
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java
index 01a3f49..be15c9a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java
@@ -129,6 +129,10 @@ public class JUnit4DistributedTestCase implements DistributedTestFixture, Serial
// methods for tests
//---------------------------------------------------------------------------
+ /**
+ * @deprecated Please override {@link #getDistributedSystemProperties()} instead.
+ */
+ @Deprecated
public final void setSystem(final Properties props, final DistributedSystem ds) { // TODO: override getDistributedSystemProperties and then delete
system = (InternalDistributedSystem)ds;
lastSystemProperties = props;
@@ -136,25 +140,18 @@ public class JUnit4DistributedTestCase implements DistributedTestFixture, Serial
}
/**
- * Returns this VM's connection to the distributed system. If
- * necessary, the connection will be lazily created using the given
- * <code>Properties</code>. Note that this method uses hydra's
- * configuration to determine the location of log files, etc.
- * Note: "final" was removed so that WANTestBase can override this method.
+ * Returns this VM's connection to the distributed system. If necessary, the
+ * connection will be lazily created using the given {@code Properties}.
+ *
+ * <p>Do not override this method. Override {@link #getDistributedSystemProperties()}
+ * instead.
+ *
+ * <p>Note: "final" was removed so that WANTestBase can override this method.
* This was part of the xd offheap merge.
*
- * see hydra.DistributedConnectionMgr#connect
* @since 3.0
*/
- @Override
- public /*final*/ InternalDistributedSystem getSystem(final Properties props) { // TODO: make final and remove from DistributedTestFixture
- if (this.distributedTestFixture != this) {
- return this.distributedTestFixture.getSystem(props);
- }
- return defaultGetSystem(props);
- }
-
- final InternalDistributedSystem defaultGetSystem(final Properties props) {
+ public final InternalDistributedSystem getSystem(final Properties props) {
// Setting the default disk store name is now done in setUp
if (system == null) {
system = InternalDistributedSystem.getAnyInstance();
@@ -214,10 +211,12 @@ public class JUnit4DistributedTestCase implements DistributedTestFixture, Serial
}
/**
- * Returns this VM's connection to the distributed system. If
- * necessary, the connection will be lazily created using the
- * <code>Properties</code> returned by {@link
- * #getDistributedSystemProperties}.
+ * Returns this VM's connection to the distributed system. If necessary, the
+ * connection will be lazily created using the {@code Properties} returned by
+ * {@link #getDistributedSystemProperties()}.
+ *
+ * <p>Do not override this method. Override {@link #getDistributedSystemProperties()}
+ * instead.
*
* @see #getSystem(Properties)
*
@@ -228,7 +227,7 @@ public class JUnit4DistributedTestCase implements DistributedTestFixture, Serial
}
public final InternalDistributedSystem basicGetSystem() {
- return this.system;
+ return system;
}
public final void nullSystem() { // TODO: delete
@@ -240,8 +239,7 @@ public class JUnit4DistributedTestCase implements DistributedTestFixture, Serial
}
/**
- * Returns a loner distributed system that isn't connected to other
- * vms
+ * Returns a loner distributed system that isn't connected to other vms.
*
* @since 6.5
*/
@@ -253,19 +251,16 @@ public class JUnit4DistributedTestCase implements DistributedTestFixture, Serial
}
/**
- * Returns whether or this VM is connected to a {@link
- * DistributedSystem}.
+ * Returns whether or this VM is connected to a {@link DistributedSystem}.
*/
public final boolean isConnectedToDS() {
return system != null && system.isConnected();
}
/**
- * Returns a {@code Properties} object used to configure a
- * connection to a {@link
- * com.gemstone.gemfire.distributed.DistributedSystem}.
- * Unless overridden, this method will return an empty
- * {@code Properties} object.
+ * Returns a {@code Properties} object used to configure a connection to a
+ * {@link DistributedSystem}. Unless overridden, this method will return an
+ * empty {@code Properties} object.
*
* <p>Override this as needed. Default implementation returns empty {@code Properties}.
*
@@ -291,8 +286,8 @@ public class JUnit4DistributedTestCase implements DistributedTestFixture, Serial
/**
* Disconnects this VM from the distributed system
*/
- public static final void disconnectFromDS() { // TODO: this is overridden by CacheTestCase
- setTestMethodName(null);
+ public static final void disconnectFromDS() {
+ //setTestMethodName(null);
GemFireCacheImpl.testCacheXml = null;
if (system != null) {
system.disconnect();
@@ -344,7 +339,7 @@ public class JUnit4DistributedTestCase implements DistributedTestFixture, Serial
/**
* Sets up the DistributedTestCase.
*
- * <p> Do not override this method. Override {@link #preSetUp()} with work that
+ * <p>Do not override this method. Override {@link #preSetUp()} with work that
* needs to occur before setUp() or override {@link #postSetUp()} with work
* that needs to occur after setUp().
*/
@@ -391,7 +386,6 @@ public class JUnit4DistributedTestCase implements DistributedTestFixture, Serial
public void preSetUp() throws Exception {
if (this.distributedTestFixture != this) {
this.distributedTestFixture.preSetUp();
- return;
}
}
@@ -404,7 +398,6 @@ public class JUnit4DistributedTestCase implements DistributedTestFixture, Serial
public void postSetUp() throws Exception {
if (this.distributedTestFixture != this) {
this.distributedTestFixture.postSetUp();
- return;
}
}
@@ -496,7 +489,6 @@ public class JUnit4DistributedTestCase implements DistributedTestFixture, Serial
public void preTearDown() throws Exception {
if (this.distributedTestFixture != this) {
this.distributedTestFixture.preTearDown();
- return;
}
}
@@ -509,11 +501,10 @@ public class JUnit4DistributedTestCase implements DistributedTestFixture, Serial
public void postTearDown() throws Exception {
if (this.distributedTestFixture != this) {
this.distributedTestFixture.postTearDown();
- return;
}
}
- public static final void cleanupAllVms() { // TODO: make private
+ private static final void cleanupAllVms() {
tearDownVM();
Invoke.invokeInEveryVM(()->tearDownVM());
Invoke.invokeInLocator(()->{
@@ -558,7 +549,7 @@ public class JUnit4DistributedTestCase implements DistributedTestFixture, Serial
IgnoredException.removeAllExpectedExceptions();
}
- private static final void closeCache() {
+ private static final void closeCache() { // TODO: this should move to CacheTestCase
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
if (cache != null && !cache.isClosed()) {
destroyRegions(cache);
@@ -566,7 +557,7 @@ public class JUnit4DistributedTestCase implements DistributedTestFixture, Serial
}
}
- protected static final void destroyRegions(final Cache cache) { // TODO: make private
+ protected static final void destroyRegions(final Cache cache) { // TODO: this should move to CacheTestCase
if (cache != null && !cache.isClosed()) {
// try to destroy the root regions first so that we clean up any persistent files.
for (Iterator itr = cache.rootRegions().iterator(); itr.hasNext();) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java
index ebc6f53..bd473b3 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java
@@ -63,10 +63,9 @@ public class CqDataDUnitTest extends CacheTestCase {
public CqDataDUnitTest(String name) {
super(name);
}
-
- public void setUp() throws Exception {
- super.setUp();
-
+
+ @Override
+ public final void postSetUp() throws Exception {
// avoid IllegalStateException from HandShake by connecting all vms tor
// system before creating ConnectionPools
getSystem();
@@ -75,7 +74,10 @@ public class CqDataDUnitTest extends CacheTestCase {
getSystem();
}
});
-
+ postSetUpCqDataDUnitTest();
+ }
+
+ protected void postSetUpCqDataDUnitTest() throws Exception {
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
index e185af1..89e1554 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
@@ -26,14 +26,14 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
* Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
*
*/
-public class CqDataOptimizedExecuteDUnitTest extends CqDataDUnitTest{
+public class CqDataOptimizedExecuteDUnitTest extends CqDataDUnitTest {
public CqDataOptimizedExecuteDUnitTest(String name) {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ protected final void postSetUpCqDataDUnitTest() throws Exception {
//We're seeing this on the server when the client
//disconnects.
IgnoredException.addIgnoredException("Connection reset");
@@ -45,7 +45,7 @@ public class CqDataOptimizedExecuteDUnitTest extends CqDataDUnitTest{
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
public void run() {
CqServiceImpl.EXECUTE_QUERY_DURING_INIT = true;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
index a329a2b..2efc646 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
@@ -82,9 +82,9 @@ public class CqDataUsingPoolDUnitTest extends CacheTestCase {
public CqDataUsingPoolDUnitTest(String name) {
super(name);
}
-
- public void setUp() throws Exception {
- super.setUp();
+
+ @Override
+ public final void postSetUp() throws Exception {
// avoid IllegalStateException from HandShake by connecting all vms tor
// system before creating ConnectionPools
getSystem();
@@ -93,7 +93,10 @@ public class CqDataUsingPoolDUnitTest extends CacheTestCase {
getSystem();
}
});
-
+ postSetUpCqDataUsingPoolDUnitTest();
+ }
+
+ protected void postSetUpCqDataUsingPoolDUnitTest() throws Exception {
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
index 47b9a89..03bc48b 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
@@ -26,16 +26,20 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
* Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
*
*/
-public class CqDataUsingPoolOptimizedExecuteDUnitTest extends CqDataUsingPoolDUnitTest{
+public class CqDataUsingPoolOptimizedExecuteDUnitTest extends CqDataUsingPoolDUnitTest {
public CqDataUsingPoolOptimizedExecuteDUnitTest(String name) {
super(name);
}
- public void setUp() throws Exception {
+ @Override
+ public final void preSetUp() throws Exception {
IgnoredException.addIgnoredException("Read timed out");
IgnoredException.addIgnoredException("java.net.SocketException");
- super.setUp();
+ }
+
+ @Override
+ protected final void postSetUpCqDataUsingPoolDUnitTest() throws Exception {
Invoke.invokeInEveryVM(new SerializableRunnable("set test hook") {
public void run() {
CqServiceImpl.EXECUTE_QUERY_DURING_INIT = false;
@@ -44,7 +48,7 @@ public class CqDataUsingPoolOptimizedExecuteDUnitTest extends CqDataUsingPoolDUn
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
public void run() {
CqServiceImpl.EXECUTE_QUERY_DURING_INIT = true;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
index 97035f0..fc5b09a 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
@@ -57,10 +57,9 @@ public class CqPerfDUnitTest extends CacheTestCase {
public CqPerfDUnitTest(String name) {
super(name);
}
-
- public void setUp() throws Exception {
- super.setUp();
-
+
+ @Override
+ public final void postSetUp() throws Exception {
// avoid IllegalStateException from HandShake by connecting all vms tor
// system before creating connection pools
getSystem();
@@ -69,9 +68,7 @@ public class CqPerfDUnitTest extends CacheTestCase {
getSystem();
}
});
-
}
-
/**
* Tests the cq performance.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
index e631886..4b8e321 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
@@ -57,10 +57,9 @@ public class CqPerfUsingPoolDUnitTest extends CacheTestCase {
public CqPerfUsingPoolDUnitTest(String name) {
super(name);
}
-
- public void setUp() throws Exception {
- super.setUp();
-
+
+ @Override
+ public final void postSetUp() throws Exception {
// avoid IllegalStateException from HandShake by connecting all vms tor
// system before creating connection pools
getSystem();
@@ -69,9 +68,7 @@ public class CqPerfUsingPoolDUnitTest extends CacheTestCase {
getSystem();
}
});
-
}
-
/**
* Tests the cq performance.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
index 9730395..ff14a7d 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
@@ -171,10 +171,9 @@ public class CqQueryDUnitTest extends CacheTestCase {
public CqQueryDUnitTest(String name) {
super(name);
}
-
- public void setUp() throws Exception {
- super.setUp();
-
+
+ @Override
+ public final void postSetUp() throws Exception {
// avoid IllegalStateException from HandShake by connecting all vms tor
// system before creating connection pools
getSystem();
@@ -183,7 +182,10 @@ public class CqQueryDUnitTest extends CacheTestCase {
getSystem();
}
});
-
+ postSetUpCqQueryDUnitTest();
+ }
+
+ protected void postSetUpCqQueryDUnitTest() throws Exception {
}
/* Returns Cache Server Port */
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
index a3ccf36..eda4d1d 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
@@ -36,14 +36,14 @@ import com.gemstone.gemfire.test.dunit.Wait;
* Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
*
*/
-public class CqQueryOptimizedExecuteDUnitTest extends CqQueryDUnitTest{
+public class CqQueryOptimizedExecuteDUnitTest extends CqQueryDUnitTest {
public CqQueryOptimizedExecuteDUnitTest(String name) {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ protected final void postSetUpCqQueryDUnitTest() throws Exception {
Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
public void run() {
CqServiceImpl.EXECUTE_QUERY_DURING_INIT = false;
@@ -52,7 +52,7 @@ public class CqQueryOptimizedExecuteDUnitTest extends CqQueryDUnitTest{
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
public void run() {
CqServiceImpl.EXECUTE_QUERY_DURING_INIT = true;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
index f333b77..be91665 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
@@ -159,10 +159,9 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
public CqQueryUsingPoolDUnitTest(String name) {
super(name);
}
-
- public void setUp() throws Exception {
- super.setUp();
-
+
+ @Override
+ public final void postSetUp() throws Exception {
//We're seeing this on the server when the client
//disconnects.
IgnoredException.addIgnoredException("Connection reset");
@@ -178,7 +177,10 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
getSystem();
}
});
-
+ postSetUpCqQueryUsingPoolDUnitTest();
+ }
+
+ protected void postSetUpCqQueryUsingPoolDUnitTest() throws Exception {
}
/* Returns Cache Server Port */
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
index cf3dc95..993dd42 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
@@ -30,8 +30,8 @@ public class CqQueryUsingPoolOptimizedExecuteDUnitTest extends CqQueryUsingPoolD
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUpCqQueryUsingPoolDUnitTest() throws Exception {
Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
public void run() {
CqServiceImpl.EXECUTE_QUERY_DURING_INIT = false;
@@ -40,7 +40,7 @@ public class CqQueryUsingPoolOptimizedExecuteDUnitTest extends CqQueryUsingPoolD
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
public void run() {
CqServiceImpl.EXECUTE_QUERY_DURING_INIT = true;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
index 35cef9d..5388f62 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
@@ -40,6 +40,7 @@ import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
+import junit.framework.TestResult;
/**
* This class tests the ContiunousQuery mechanism in GemFire.
@@ -130,10 +131,9 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase {
public CqResultSetUsingPoolDUnitTest(String name) {
super(name);
}
-
- public void setUp() throws Exception {
- super.setUp();
-
+
+ @Override
+ public final void postSetUp() throws Exception {
// avoid IllegalStateException from HandShake by connecting all vms tor
// system before creating ConnectionPools
getSystem();
@@ -142,10 +142,12 @@ public class CqResultSetUsingPoolDUnitTest extends CacheTestCase {
getSystem();
}
});
-
+ postSetUpCqResultSetUsingPoolDUnitTest();
}
-
-
+
+ protected void postSetUpCqResultSetUsingPoolDUnitTest() throws Exception {
+ }
+
/**
* Tests CQ Result Set.
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
index 2363d2d..d4e40fa 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
@@ -39,14 +39,14 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
-public class CqResultSetUsingPoolOptimizedExecuteDUnitTest extends CqResultSetUsingPoolDUnitTest{
+public class CqResultSetUsingPoolOptimizedExecuteDUnitTest extends CqResultSetUsingPoolDUnitTest {
public CqResultSetUsingPoolOptimizedExecuteDUnitTest(String name) {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ protected final void postSetUpCqResultSetUsingPoolDUnitTest() throws Exception {
Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
public void run() {
CqServiceImpl.EXECUTE_QUERY_DURING_INIT = false;
@@ -55,7 +55,7 @@ public class CqResultSetUsingPoolOptimizedExecuteDUnitTest extends CqResultSetUs
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
public void run() {
CqServiceImpl.EXECUTE_QUERY_DURING_INIT = true;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
index 6afdaec..094fcda 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
@@ -55,10 +55,9 @@ public class CqStatsDUnitTest extends CacheTestCase {
public CqStatsDUnitTest(String name) {
super(name);
}
-
- public void setUp() throws Exception {
- super.setUp();
-
+
+ @Override
+ public final void postSetUp() throws Exception {
// avoid IllegalStateException from HandShake by connecting all vms to
// system before creating pool
getSystem();
@@ -67,7 +66,10 @@ public class CqStatsDUnitTest extends CacheTestCase {
getSystem();
}
});
-
+ postSetUpCqStatsDUnitTest();
+ }
+
+ protected void postSetUpCqStatsDUnitTest() throws Exception {
}
public void validateCQStats(VM vm, final String cqName,
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
index df0b950..7d4a74e 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
@@ -24,14 +24,14 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
/**
* Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
*/
-public class CqStatsOptimizedExecuteDUnitTest extends CqStatsDUnitTest{
+public class CqStatsOptimizedExecuteDUnitTest extends CqStatsDUnitTest {
public CqStatsOptimizedExecuteDUnitTest(String name) {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ protected final void postSetUpCqStatsDUnitTest() throws Exception {
Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
public void run() {
CqServiceImpl.EXECUTE_QUERY_DURING_INIT = false;
@@ -40,7 +40,7 @@ public class CqStatsOptimizedExecuteDUnitTest extends CqStatsDUnitTest{
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
public void run() {
CqServiceImpl.EXECUTE_QUERY_DURING_INIT = true;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
index 04e9b42..5a75cfb 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
@@ -55,10 +55,9 @@ public class CqStatsUsingPoolDUnitTest extends CacheTestCase {
public CqStatsUsingPoolDUnitTest(String name) {
super(name);
}
-
- public void setUp() throws Exception {
- super.setUp();
-
+
+ @Override
+ public final void postSetUp() throws Exception {
// avoid IllegalStateException from HandShake by connecting all vms to
// system before creating pool
getSystem();
@@ -67,7 +66,10 @@ public class CqStatsUsingPoolDUnitTest extends CacheTestCase {
getSystem();
}
});
-
+ postSetUpCqStatsUsingPoolDUnitTest();
+ }
+
+ protected void postSetUpCqStatsUsingPoolDUnitTest() throws Exception {
}
private void validateCQStats(VM vm, final String cqName,
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
index a959024..5ccb735 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
@@ -24,14 +24,14 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
/**
* Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
*/
-public class CqStatsUsingPoolOptimizedExecuteDUnitTest extends CqStatsUsingPoolDUnitTest{
+public class CqStatsUsingPoolOptimizedExecuteDUnitTest extends CqStatsUsingPoolDUnitTest {
public CqStatsUsingPoolOptimizedExecuteDUnitTest(String name) {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUpCqStatsUsingPoolDUnitTest() throws Exception {
Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
public void run() {
CqServiceImpl.EXECUTE_QUERY_DURING_INIT = false;
@@ -40,7 +40,7 @@ public class CqStatsUsingPoolOptimizedExecuteDUnitTest extends CqStatsUsingPoolD
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
public void run() {
CqServiceImpl.EXECUTE_QUERY_DURING_INIT = true;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
index 7989bc0..1913b4d 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
@@ -36,8 +36,8 @@ public class PartitionedRegionCqQueryOptimizedExecuteDUnitTest extends Partition
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
public void run() {
CqServiceImpl.EXECUTE_QUERY_DURING_INIT = false;
@@ -46,7 +46,7 @@ public class PartitionedRegionCqQueryOptimizedExecuteDUnitTest extends Partition
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
public void run() {
CqServiceImpl.EXECUTE_QUERY_DURING_INIT = true;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
index d71a7be..bc552aa 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
@@ -24,14 +24,14 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
* Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
*
*/
-public class PrCqUsingPoolOptimizedExecuteDUnitTest extends PrCqUsingPoolDUnitTest{
+public class PrCqUsingPoolOptimizedExecuteDUnitTest extends PrCqUsingPoolDUnitTest {
public PrCqUsingPoolOptimizedExecuteDUnitTest(String name) {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
public void run() {
CqServiceImpl.EXECUTE_QUERY_DURING_INIT = false;
@@ -40,7 +40,7 @@ public class PrCqUsingPoolOptimizedExecuteDUnitTest extends PrCqUsingPoolDUnitTe
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
public void run() {
CqServiceImpl.EXECUTE_QUERY_DURING_INIT = true;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
index 7fa5077..9bcb341 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
@@ -79,7 +79,7 @@ public abstract class PdxQueryCQTestBase extends CacheTestCase {
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
disconnectAllFromDS(); // tests all expect to create a new ds
// Reset the testObject numinstance for the next test.
TestObject.numInstance = 0;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
index 8008c3a..49a0360 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
@@ -172,7 +172,7 @@ public class QueryMonitorDUnitTest extends CacheTestCase {
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
Host host = Host.getHost(0);
disconnectFromDS();
// shut down clients before servers
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
index 540b37b..08ad752 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
@@ -232,9 +232,9 @@ public class ClientSnapshotDUnitTest extends CacheTestCase {
assertFalse(region.containsValueForKey(1));
assertNull(region.get(1));
}
-
- public void setUp() throws Exception {
- super.setUp();
+
+ @Override
+ public final void postSetUp() throws Exception {
loadCache();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
index 12fd791..e8816f9 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
@@ -126,8 +126,8 @@ public class PRDeltaPropagationDUnitTest extends DistributedTestCase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
dataStore1 = host.getVM(0);
dataStore2 = host.getVM(1);
@@ -1111,7 +1111,7 @@ public class PRDeltaPropagationDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
closeCache();
client1.invoke(() -> PRDeltaPropagationDUnitTest.closeCache());
dataStore1.invoke(() -> PRDeltaPropagationDUnitTest.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
index 4bca2c4..386fb63 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
@@ -123,7 +123,7 @@ public class RemoteCQTransactionDUnitTest extends CacheTestCase {
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
// try { Thread.sleep(5000); } catch (InterruptedException e) { } // FOR MANUAL TESTING OF STATS - DON"T KEEP THIS
try {
Invoke.invokeInEveryVM(verifyNoTxState);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
index 95d46a4..1656306 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
@@ -158,9 +158,8 @@ public class CQListGIIDUnitTest 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);
@@ -175,7 +174,7 @@ public class CQListGIIDUnitTest extends DistributedTestCase {
* Tears down the test.
*/
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
serverVM0.invoke(() -> ConflationDUnitTest.unsetIsSlowStart());
serverVM1.invoke(() -> ConflationDUnitTest.unsetIsSlowStart());
closeCache();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
index d74f3ff..824fa82 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
@@ -118,9 +118,7 @@ public class HADispatcherDUnitTest extends DistributedTestCase
}
@Override
- public void setUp() throws Exception
- {
- super.setUp();
+ public final void postSetUp() throws Exception {
final Host host = Host.getHost(0);
// Server1 VM
@@ -151,12 +149,10 @@ public class HADispatcherDUnitTest extends DistributedTestCase
NetworkUtils.getServerHostName(host),
new Integer(PORT1), new Integer(PORT2),
new Boolean(true) ));
- //createClientCache(new Integer(PORT1), new Integer(PORT2), new Boolean(true) );
-
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
client1.invoke(() -> HADispatcherDUnitTest.closeCache());
client2.invoke(() -> HADispatcherDUnitTest.closeCache());
// close server
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
index 0e589e4..6df5965 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
@@ -124,7 +124,8 @@ public class ClientToServerDeltaDUnitTest extends DistributedTestCase {
super(name);
}
- public void setUp() throws Exception {
+ @Override
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
final Host host = Host.getHost(0);
server = host.getVM(0);
@@ -134,7 +135,7 @@ public class ClientToServerDeltaDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
// reset all flags
DeltaTestImpl.resetDeltaInvokationCounters();
server.invoke(() -> DeltaTestImpl.resetDeltaInvokationCounters());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
index 7316e0c..6e5521a 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
@@ -95,8 +95,8 @@ public class DeltaPropagationWithCQDUnitTest extends DistributedTestCase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
server1 = host.getVM(0);
server2 = host.getVM(1);
@@ -105,7 +105,7 @@ public class DeltaPropagationWithCQDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
server1.invoke(() -> DeltaPropagationWithCQDUnitTest.close());
server2.invoke(() -> DeltaPropagationWithCQDUnitTest.close());
client1.invoke(() -> DeltaPropagationWithCQDUnitTest.close());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
index 824f2e7..579ac29 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
@@ -114,9 +114,9 @@ public class DeltaToRegionRelationCQRegistrationDUnitTest extends DistributedTes
public DeltaToRegionRelationCQRegistrationDUnitTest(String name) {
super(name);
}
-
- public void setUp() throws Exception
- {
+
+ @Override
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
Wait.pause(5000);
final Host host = Host.getHost(0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
index dce35bf..399ecc4 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
@@ -33,8 +33,8 @@ public class DurableClientCrashDUnitTest extends DurableClientTestCase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ protected final void postSetUpDurableClientTestCase() throws Exception {
configureClientStop1();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
index 1fc2e9f..fc216d3 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
@@ -92,7 +92,8 @@ public class DurableClientTestCase extends DistributedTestCase {
super(name);
}
- public void setUp() throws Exception {
+ @Override
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
this.server1VM = host.getVM(0);
this.server2VM = host.getVM(1);
@@ -104,10 +105,14 @@ public class DurableClientTestCase extends DistributedTestCase {
setTestMethodName(getName());
assertEquals(getName(), getTestMethodName());
System.out.println("\n\n[setup] START TEST " + getClass().getSimpleName()+"."+ getTestMethodName()+"\n\n");
+ postSetUpDurableClientTestCase();
+ }
+
+ protected void postSetUpDurableClientTestCase() throws Exception {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
preTearDownDurableClientTestCase();
this.durableClientVM.invoke(() -> CacheServerTestUtil.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
index 64bbe0c..b4006ba 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
@@ -88,9 +88,9 @@ public class CacheServerManagementDUnitTest extends LocatorTestBase {
}
- public void setUp() throws Exception {
+ @Override
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
- super.setUp();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
index 12b11e3..5e05561 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
@@ -1437,7 +1437,7 @@ private void setUpNonSubscribedClient() throws Exception {
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
Host.getHost(0).getVM(0).invoke(() -> CacheServerTestUtil.closeCache());
Host.getHost(0).getVM(1).invoke(() -> CacheServerTestUtil.closeCache());
Host.getHost(0).getVM(2).invoke(() -> CacheServerTestUtil.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
index bb97cf3..0a1f433 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
@@ -428,7 +428,7 @@ public class DurableClientCommandsDUnitTest extends CliCommandTestBase {
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
Host.getHost(0).getVM(0).invoke(() -> CacheServerTestUtil.closeCache());
Host.getHost(0).getVM(1).invoke(() -> CacheServerTestUtil.closeCache());
Host.getHost(0).getVM(2).invoke(() -> CacheServerTestUtil.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java
index a8dcf59..a515db9 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java
@@ -46,11 +46,6 @@ public class TestCQDUnitTest extends ManagementTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
-
- }
-
public static long getNumOfCQ() {
final WaitCriterion waitCriteria = new WaitCriterion() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java
index 5decf7d..55b304c 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java
@@ -43,11 +43,6 @@ public class TestClientsDUnitTest extends ManagementTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
-
- }
-
public static Integer getNumOfClients() {
final WaitCriterion waitCriteria = new WaitCriterion() {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java
index e632993..b37e43b 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java
@@ -40,11 +40,6 @@ public class TestServerDUnitTest extends ManagementTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
-
- }
-
public static int getNumOfServersFromMBean() {
final WaitCriterion waitCriteria = new WaitCriterion() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java
index 9910c8a..f146160 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java
@@ -42,9 +42,7 @@ public class ClientAuthorizationTwoDUnitTest 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);
server2 = host.getVM(1);
@@ -227,7 +225,7 @@ public class ClientAuthorizationTwoDUnitTest extends
// End Region: Tests
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
// close the clients first
client1.invoke(() -> SecurityTestUtil.closeCache());
client2.invoke(() -> SecurityTestUtil.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
index f415bb0..f2a0795 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
@@ -110,9 +110,8 @@ public class ClientAuthzObjectModDUnitTest extends ClientAuthorizationTestBase {
}
}
- 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);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java
index 0cb125f..b185d7b 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java
@@ -70,9 +70,8 @@ public class ClientCQPostAuthorizationDUnitTest extends
super(name);
}
- public void setUp() throws Exception {
-
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
getSystem();
Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
public void run() {
@@ -93,7 +92,7 @@ public class ClientCQPostAuthorizationDUnitTest extends
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
client1.invoke(() -> SecurityTestUtil.closeCache());
client2.invoke(() -> SecurityTestUtil.closeCache());
server1.invoke(() -> SecurityTestUtil.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
index 62bff2b..6b77396 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
@@ -46,9 +46,8 @@ public class ClientPostAuthorizationDUnitTest extends
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);
@@ -378,7 +377,7 @@ public class ClientPostAuthorizationDUnitTest extends
// End Region: Tests
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
// close the clients first
client1.invoke(() -> SecurityTestUtil.closeCache());
client2.invoke(() -> SecurityTestUtil.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
index 7161830..859d3c8 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
@@ -70,8 +70,8 @@ public class MultiuserAPIDUnitTest extends ClientAuthorizationTestBase {
AuthenticationFailedException.class.getName(),
SSLHandshakeException.class.getName()};
- 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);
@@ -372,7 +372,7 @@ public class MultiuserAPIDUnitTest extends ClientAuthorizationTestBase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
// close the clients first
client1.invoke(() -> SecurityTestUtil.closeCache());
client2.invoke(() -> SecurityTestUtil.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
index 9f9d4c0..2491a77 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
@@ -61,8 +61,8 @@ public class MultiuserDurableCQAuthzDUnitTest extends
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
getSystem();
Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
public void run() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
index f24b136..901b363 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/distributed/LuceneFunctionReadPathDUnitTest.java
@@ -64,8 +64,7 @@ public class LuceneFunctionReadPathDUnitTest extends CacheTestCase {
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
server1 = host.getVM(0);
server2 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
index cae30d2..9ccbd01 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
@@ -81,7 +81,7 @@ public class UpdateVersionDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
closeCache();
Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() {
closeCache();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
index 58292f7..4dc290a 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
@@ -170,8 +170,9 @@ public class WANTestBase extends DistributedTestCase{
public WANTestBase(String name) {
super(name);
}
-
- public void setUp() throws Exception {
+
+ @Override
+ public final void postSetUp() throws Exception {
final Host host = Host.getHost(0);
vm0 = host.getVM(0);
vm1 = host.getVM(1);
@@ -182,8 +183,8 @@ public class WANTestBase extends DistributedTestCase{
vm6 = host.getVM(6);
vm7 = host.getVM(7);
//Need to set the test name after the VMs are created
- super.setUp();
- //this is done to vary the number of dispatchers for sender
+
+ //this is done to vary the number of dispatchers for sender
//during every test method run
shuffleNumDispatcherThreads();
Invoke.invokeInEveryVM(WANTestBase.class,"setNumDispatcherThreadsForTheRun",
@@ -191,6 +192,10 @@ public class WANTestBase extends DistributedTestCase{
IgnoredException.addIgnoredException("Connection refused");
IgnoredException.addIgnoredException("Software caused connection abort");
IgnoredException.addIgnoredException("Connection reset");
+ postSetUpWANTestBase();
+ }
+
+ protected void postSetUpWANTestBase() throws Exception {
}
public static void shuffleNumDispatcherThreads() {
@@ -5119,7 +5124,7 @@ public class WANTestBase extends DistributedTestCase{
}*/
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
cleanupVM();
List<AsyncInvocation> invocations = new ArrayList<AsyncInvocation>();
final Host host = Host.getHost(0);
@@ -5168,14 +5173,15 @@ public class WANTestBase extends DistributedTestCase{
}
@Override
- public InternalDistributedSystem getSystem(Properties props) {
+ public final Properties getDistributedSystemProperties() {
// For now all WANTestBase tests allocate off-heap memory even though
// many of them never use it.
// The problem is that WANTestBase has static methods that create instances
// of WANTestBase (instead of instances of the subclass). So we can't override
// this method so that only the off-heap subclasses allocate off heap memory.
+ Properties props = new Properties();
props.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "300m");
- return super.getSystem(props);
+ return props;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
index 54b6431..670928f 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
@@ -43,10 +43,6 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
/**
* Normal happy scenario test case.
* checks that all the dispatchers have successfully
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
index ed48b15..28971ce 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
@@ -33,9 +33,9 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
public ConcurrentParallelGatewaySenderOperation_1_DUnitTest(String name) {
super(name);
}
-
- public void setUp() throws Exception {
- super.setUp();
+
+ @Override
+ protected final void postSetUpWANTestBase() throws Exception {
IgnoredException.addIgnoredException("Broken pipe");
IgnoredException.addIgnoredException("Connection reset");
IgnoredException.addIgnoredException("Unexpected IOException");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
index a387e29..3348140 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
@@ -40,9 +40,9 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
public ConcurrentParallelGatewaySenderOperation_2_DUnitTest(String name) {
super(name);
}
-
- public void setUp() throws Exception {
- super.setUp();
+
+ @Override
+ protected final void postSetUpWANTestBase() throws Exception {
IgnoredException.addIgnoredException("RegionDestroyedException");
IgnoredException.addIgnoredException("Broken pipe");
IgnoredException.addIgnoredException("Connection reset");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
index 529ad47..cfa2dc0 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
@@ -33,9 +33,8 @@ public class DistTXWANDUnitTest extends WANTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
-
+ @Override
+ protected final void postSetUpWANTestBase() throws Exception {
Invoke.invokeInEveryVM(new SerializableCallable() {
@Override
public Object call() throws Exception {
@@ -44,7 +43,6 @@ public class DistTXWANDUnitTest extends WANTestBase {
}
});
}
-
/*
* Disabled because it hangs with current implementation of notifying
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
index e0e7836..fce71d3 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
@@ -50,10 +50,6 @@ public class NewWANConcurrencyCheckForDestroyDUnitTest extends WANTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
public void testVersionTagTimestampForDestroy() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
index a7e17b6..dd9ab09 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
@@ -31,10 +31,6 @@ public class PDXNewWanDUnitTest extends WANTestBase{
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
/**
* Test
* 1> Site 1 : 1 locator, 1 member
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
index a019751..10e82e6 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
@@ -48,10 +48,6 @@ public class SenderWithTransportFilterDUnitTest extends WANTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
public void testSerialSenderWithTansportFilter() {
Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
index 9028531..f821ab1 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
@@ -46,8 +46,7 @@ public class ShutdownAllPersistentGatewaySenderDUnitTest extends WANTestBase {
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ protected final void postSetUpWANTestBase() throws Exception {
IgnoredException.addIgnoredException("Cache is being closed by ShutdownAll");
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
index 54773ad..1f47c05 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
@@ -47,10 +47,9 @@ public class WANLocatorServerDUnitTest extends WANTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ protected final void postSetUpWANTestBase() throws Exception {
final Host host = Host.getHost(0);
-
}
public void test_3Locators_2Servers() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
index 36f1226..837599d 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
@@ -28,10 +28,6 @@ public class WANSSLDUnitTest extends WANTestBase{
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
public void testSenderSSLReceiverSSL(){
Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
index 42788d9..73c7e1d 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
@@ -39,10 +39,9 @@ public class WanAutoDiscoveryDUnitTest extends WANTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ protected void postSetUpWANTestBase() throws Exception {
final Host host = Host.getHost(0);
-
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
index 3d0c01b..dbe9844 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
@@ -41,10 +41,6 @@ public class WanValidationsDUnitTest extends WANTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
/**
* Test to make sure that serial sender Ids configured in Distributed Region
* is same across all DR nodes TODO : Should this validation hold tru now.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
index 9e1b28c..5637fbc 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
@@ -40,9 +40,9 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
public ParallelGatewaySenderOperationsDUnitTest(String name) {
super(name);
}
-
- public void setUp() throws Exception {
- super.setUp();
+
+ @Override
+ protected final void postSetUpWANTestBase() throws Exception {
IgnoredException.addIgnoredException("Broken pipe||Unexpected IOException");
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
index 5e0142c..84d2cb8 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
@@ -57,10 +57,6 @@ public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
public void testParallelSenderQueueEventsOverflow_NoDiskStoreSpecified() throws Exception {
Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
index b3c3445..6454e35 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
@@ -35,8 +35,8 @@ public class ParallelWANConflationDUnitTest extends WANTestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ protected final void postSetUpWANTestBase() throws Exception {
IgnoredException.addIgnoredException("java.net.ConnectException");
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
index a29a210..fd1f0ee 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
@@ -40,9 +40,9 @@ public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
public ParallelWANPersistenceEnabledGatewaySenderDUnitTest(String name) {
super(name);
}
-
- public void setUp() throws Exception {
- super.setUp();
+
+ @Override
+ protected final void postSetUpWANTestBase() throws Exception {
//The restart tests log this string
IgnoredException.addIgnoredException("failed accepting client connection");
}
[7/7] incubator-geode git commit: Cleaning up dunit
Posted by kl...@apache.org.
Cleaning up dunit
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3543e224
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3543e224
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3543e224
Branch: refs/heads/feature/GEODE-1050
Commit: 3543e224c719cfcfa31278f8e626c467495bed59
Parents: 680ab28
Author: Kirk Lund <kl...@apache.org>
Authored: Fri Mar 11 09:19:06 2016 -0800
Committer: Kirk Lund <kl...@apache.org>
Committed: Fri Mar 11 09:19:06 2016 -0800
----------------------------------------------------------------------
.../LauncherLifecycleCommandsDUnitTest.java | 7 +-
...stAPIOnRegionFunctionExecutionDUnitTest.java | 4 +-
.../web/controllers/RestAPITestBase.java | 11 ++-
.../RestAPIsAndInterOpsDUnitTest.java | 4 +-
...tAPIsOnGroupsFunctionExecutionDUnitTest.java | 6 +-
...APIsOnMembersFunctionExecutionDUnitTest.java | 3 +-
.../controllers/RestAPIsWithSSLDUnitTest.java | 4 +-
.../cache/CacheRegionClearStatsDUnitTest.java | 5 +-
.../cache/ConnectionPoolAndLoaderDUnitTest.java | 6 +-
.../ClientServerRegisterInterestsDUnitTest.java | 5 +-
.../internal/AutoConnectionSourceDUnitTest.java | 6 +-
.../CacheServerSSLConnectionDUnitTest.java | 7 +-
.../cache/client/internal/LocatorTestBase.java | 2 +-
.../internal/SSLNoClientAuthDUnitTest.java | 7 +-
.../management/MemoryThresholdsDUnitTest.java | 3 +-
.../MemoryThresholdsOffHeapDUnitTest.java | 6 +-
.../query/dunit/CompactRangeIndexDUnitTest.java | 9 +-
.../cache/query/dunit/HashIndexDUnitTest.java | 6 +-
.../dunit/QueryDataInconsistencyDUnitTest.java | 7 +-
.../dunit/QueryIndexUsingXMLDUnitTest.java | 53 ++++++++----
.../QueryUsingFunctionContextDUnitTest.java | 8 +-
.../query/dunit/QueryUsingPoolDUnitTest.java | 5 +-
.../cache/query/dunit/RemoteQueryDUnitTest.java | 5 +-
...esourceManagerWithQueryMonitorDUnitTest.java | 3 +-
...pdateWithInplaceObjectModFalseDUnitTest.java | 5 +-
...ConcurrentIndexUpdateWithoutWLDUnitTest.java | 2 +-
.../index/CopyOnReadIndexDUnitTest.java | 10 +--
.../index/MultiIndexCreationDUnitTest.java | 4 +-
.../index/PutAllWithIndexPerfDUnitTest.java | 6 +-
.../snapshot/ParallelSnapshotDUnitTest.java | 8 +-
.../snapshot/SnapshotByteArrayDUnitTest.java | 6 +-
.../cache/snapshot/SnapshotDUnitTest.java | 6 +-
.../snapshot/SnapshotPerformanceDUnitTest.java | 6 +-
.../gemfire/cache30/CacheCloseDUnitTest.java | 3 +-
.../gemfire/cache30/CacheMapTxnDUnitTest.java | 9 +-
.../gemstone/gemfire/cache30/CacheTestCase.java | 88 +++++---------------
.../gemfire/cache30/CacheXmlTestCase.java | 8 +-
.../cache30/CachedAllEventsDUnitTest.java | 3 +
.../cache30/ClearMultiVmCallBkDUnitTest.java | 6 +-
.../gemfire/cache30/ClearMultiVmDUnitTest.java | 5 +-
.../cache30/ClientMembershipDUnitTest.java | 6 +-
.../ClientRegisterInterestDUnitTest.java | 2 +-
.../cache30/ClientServerCCEDUnitTest.java | 2 +-
.../gemfire/cache30/ClientServerTestCase.java | 9 +-
.../cache30/DistAckMapMethodsDUnitTest.java | 5 +-
...tedAckOverflowRegionCCEOffHeapDUnitTest.java | 2 +-
...dAckPersistentRegionCCEOffHeapDUnitTest.java | 2 +-
...DistributedAckRegionCCEOffHeapDUnitTest.java | 2 +-
.../DistributedAckRegionOffHeapDUnitTest.java | 2 +-
.../DistributedMulticastRegionDUnitTest.java | 5 +-
...stributedNoAckRegionCCEOffHeapDUnitTest.java | 2 +-
.../DistributedNoAckRegionOffHeapDUnitTest.java | 2 +-
.../gemfire/cache30/DynamicRegionDUnitTest.java | 8 +-
.../GlobalRegionCCEOffHeapDUnitTest.java | 2 +-
.../cache30/GlobalRegionOffHeapDUnitTest.java | 2 +-
.../OffHeapLRUEvictionControllerDUnitTest.java | 2 +-
.../PartitionedRegionOffHeapDUnitTest.java | 2 +-
.../cache30/PutAllCallBkRemoteVMDUnitTest.java | 5 +-
.../cache30/PutAllCallBkSingleVMDUnitTest.java | 5 +-
.../gemfire/cache30/PutAllMultiVmDUnitTest.java | 5 +-
.../gemfire/cache30/ReconnectDUnitTest.java | 5 +-
.../ReconnectedCacheServerDUnitTest.java | 4 +-
.../RegionMembershipListenerDUnitTest.java | 5 +-
.../cache30/RegionReliabilityTestCase.java | 2 +-
.../gemfire/cache30/RegionTestCase.java | 2 +-
.../cache30/RemoveAllMultiVmDUnitTest.java | 5 +-
.../gemfire/cache30/SearchAndLoadDUnitTest.java | 2 +-
.../gemfire/cache30/SlowRecDUnitTest.java | 13 ++-
.../distributed/HostedLocatorsDUnitTest.java | 7 +-
.../gemfire/distributed/LocatorDUnitTest.java | 7 +-
.../distributed/SystemAdminDUnitTest.java | 5 +-
.../distributed/internal/Bug40751DUnitTest.java | 2 +-
.../ConsoleDistributionManagerDUnitTest.java | 8 +-
.../internal/DistributionAdvisorDUnitTest.java | 8 +-
.../internal/ProductUseLogDUnitTest.java | 66 +++++++--------
.../GemFireDeadlockDetectorDUnitTest.java | 2 +-
.../TcpServerBackwardCompatDUnitTest.java | 5 +-
.../gemfire/disttx/CacheMapDistTXDUnitTest.java | 5 +-
.../gemfire/disttx/DistTXDebugDUnitTest.java | 9 +-
.../disttx/DistTXPersistentDebugDUnitTest.java | 5 +-
.../disttx/DistributedTransactionDUnitTest.java | 13 +--
...wardCompatibilitySerializationDUnitTest.java | 6 +-
.../gemfire/internal/JarDeployerDUnitTest.java | 2 +-
.../gemfire/internal/cache/BackupDUnitTest.java | 2 +-
.../internal/cache/Bug33359DUnitTest.java | 5 +-
.../internal/cache/Bug33726DUnitTest.java | 2 +-
.../internal/cache/Bug37241DUnitTest.java | 8 +-
.../internal/cache/Bug37377DUnitTest.java | 10 +--
.../internal/cache/Bug39079DUnitTest.java | 7 +-
.../internal/cache/Bug40299DUnitTest.java | 8 +-
.../internal/cache/Bug41091DUnitTest.java | 2 +-
.../internal/cache/Bug41733DUnitTest.java | 2 +-
.../internal/cache/Bug41957DUnitTest.java | 2 +-
.../internal/cache/Bug45164DUnitTest.java | 6 +-
.../internal/cache/Bug47667DUnitTest.java | 3 +-
.../internal/cache/CacheAdvisorDUnitTest.java | 6 +-
.../internal/cache/ClearDAckDUnitTest.java | 5 +-
.../internal/cache/ClearGlobalDUnitTest.java | 6 +-
.../cache/ClientServerGetAllDUnitTest.java | 2 +-
...ServerInvalidAndDestroyedEntryDUnitTest.java | 6 +-
.../ClientServerTransactionCCEDUnitTest.java | 7 +-
.../cache/ClientServerTransactionDUnitTest.java | 10 ++-
.../ConcurrentDestroySubRegionDUnitTest.java | 3 +-
.../cache/ConnectDisconnectDUnitTest.java | 2 +-
.../cache/DeltaPropagationDUnitTest.java | 7 +-
.../cache/DeltaPropagationStatsDUnitTest.java | 6 +-
.../cache/DiskRegByteArrayDUnitTest.java | 9 +-
...DistrbutedRegionProfileOffHeapDUnitTest.java | 2 +-
.../cache/DistributedCacheTestCase.java | 10 +--
.../internal/cache/EventTrackerDUnitTest.java | 2 +-
.../cache/EvictionObjectSizerDUnitTest.java | 5 --
.../internal/cache/EvictionStatsDUnitTest.java | 4 +-
.../internal/cache/EvictionTestBase.java | 4 +-
.../internal/cache/GIIDeltaDUnitTest.java | 8 +-
.../internal/cache/GIIFlowControlDUnitTest.java | 2 +-
.../HAOverflowMemObjectSizerDUnitTest.java | 6 +-
.../cache/IncrementalBackupDUnitTest.java | 6 +-
.../cache/InterruptClientServerDUnitTest.java | 2 +-
.../internal/cache/InterruptsDUnitTest.java | 2 +-
.../cache/OffHeapEvictionDUnitTest.java | 2 +-
.../cache/OffHeapEvictionStatsDUnitTest.java | 2 +-
.../cache/P2PDeltaPropagationDUnitTest.java | 9 +-
.../cache/PartitionedRegionDUnitTestCase.java | 2 +-
...rtitionedRegionDelayedRecoveryDUnitTest.java | 2 +-
...rtitionedRegionOffHeapEvictionDUnitTest.java | 2 +-
...artitionedRegionRedundancyZoneDUnitTest.java | 2 +-
.../PartitionedRegionSingleHopDUnitTest.java | 6 +-
...RegionSingleHopWithServerGroupDUnitTest.java | 9 +-
.../internal/cache/PutAllDAckDUnitTest.java | 5 +-
.../internal/cache/PutAllGlobalDUnitTest.java | 5 +-
.../cache/RemoteTransactionDUnitTest.java | 2 +-
.../internal/cache/RemoveAllDAckDUnitTest.java | 5 +-
.../internal/cache/RemoveDAckDUnitTest.java | 5 +-
.../internal/cache/RemoveGlobalDUnitTest.java | 5 +-
.../internal/cache/SingleHopStatsDUnitTest.java | 8 +-
.../control/RebalanceOperationDUnitTest.java | 2 +-
.../cache/execute/Bug51193DUnitTest.java | 6 +-
.../ClientServerFunctionExecutionDUnitTest.java | 5 +-
.../execute/ColocationFailoverDUnitTest.java | 6 +-
...ributedRegionFunctionExecutionDUnitTest.java | 5 +-
.../execute/FunctionServiceStatsDUnitTest.java | 4 +-
.../cache/execute/LocalDataSetDUnitTest.java | 4 +-
.../execute/LocalDataSetIndexingDUnitTest.java | 3 +-
.../LocalFunctionExecutionDUnitTest.java | 9 +-
.../MemberFunctionExecutionDUnitTest.java | 7 +-
.../MultiRegionFunctionExecutionDUnitTest.java | 7 +-
.../OnGroupsFunctionExecutionDUnitTest.java | 2 +-
...ntServerFunctionExecutionNoAckDUnitTest.java | 3 -
...tServerRegionFunctionExecutionDUnitTest.java | 5 --
...egionFunctionExecutionFailoverDUnitTest.java | 3 +-
...onFunctionExecutionNoSingleHopDUnitTest.java | 4 -
...onExecutionSelectorNoSingleHopDUnitTest.java | 4 -
...gionFunctionExecutionSingleHopDUnitTest.java | 3 +-
.../cache/execute/PRClientServerTestBase.java | 10 ++-
.../cache/execute/PRColocationDUnitTest.java | 5 +-
.../cache/execute/PRTransactionDUnitTest.java | 2 +-
.../execute/SingleHopGetAllPutAllDUnitTest.java | 5 --
.../cache/ha/Bug36853EventsExpiryDUnitTest.java | 12 +--
.../internal/cache/ha/Bug48571DUnitTest.java | 6 +-
.../internal/cache/ha/Bug48879DUnitTest.java | 6 +-
.../cache/ha/EventIdOptimizationDUnitTest.java | 7 +-
.../internal/cache/ha/FailoverDUnitTest.java | 7 +-
.../internal/cache/ha/HABugInPutDUnitTest.java | 11 +--
.../internal/cache/ha/HAClearDUnitTest.java | 8 +-
.../cache/ha/HAConflationDUnitTest.java | 8 +-
.../internal/cache/ha/HADuplicateDUnitTest.java | 7 +-
.../cache/ha/HAEventIdPropagationDUnitTest.java | 7 +-
.../internal/cache/ha/HAExpiryDUnitTest.java | 8 +-
.../internal/cache/ha/HAGIIBugDUnitTest.java | 8 +-
.../internal/cache/ha/HAGIIDUnitTest.java | 7 +-
.../cache/ha/HARQueueNewImplDUnitTest.java | 7 +-
.../internal/cache/ha/HARegionDUnitTest.java | 7 +-
.../cache/ha/HARegionQueueDUnitTest.java | 7 +-
.../cache/ha/HASlowReceiverDUnitTest.java | 7 +-
.../ha/OperationsPropagationDUnitTest.java | 8 +-
.../internal/cache/ha/PutAllDUnitTest.java | 7 +-
.../internal/cache/ha/StatsBugDUnitTest.java | 7 +-
.../cache/locks/TXLockServiceDUnitTest.java | 7 +-
.../cache/partitioned/Bug43684DUnitTest.java | 6 +-
.../cache/partitioned/Bug47388DUnitTest.java | 6 +-
.../cache/partitioned/Bug51400DUnitTest.java | 7 +-
.../partitioned/PartitionResolverDUnitTest.java | 6 +-
.../PartitionedRegionLoaderWriterDUnitTest.java | 5 --
...tentColocatedPartitionedRegionDUnitTest.java | 2 +-
.../PersistentPartitionedRegionTestBase.java | 7 +-
...rtitionedRegionWithTransactionDUnitTest.java | 6 +-
.../cache/partitioned/ShutdownAllDUnitTest.java | 4 +-
.../fixed/FixedPartitioningDUnitTest.java | 5 +-
.../fixed/FixedPartitioningTestBase.java | 2 +-
...ngWithColocationAndPersistenceDUnitTest.java | 5 +-
.../PersistentReplicatedTestBase.java | 5 +-
.../internal/cache/tier/Bug40396DUnitTest.java | 6 +-
...mpatibilityHigherVersionClientDUnitTest.java | 5 +-
.../cache/tier/sockets/Bug36269DUnitTest.java | 7 +-
.../cache/tier/sockets/Bug36457DUnitTest.java | 8 +-
.../cache/tier/sockets/Bug36805DUnitTest.java | 8 +-
.../cache/tier/sockets/Bug36829DUnitTest.java | 6 +-
.../cache/tier/sockets/Bug36995DUnitTest.java | 8 +-
.../cache/tier/sockets/Bug37210DUnitTest.java | 8 +-
.../cache/tier/sockets/Bug37805DUnitTest.java | 6 +-
.../CacheServerTransactionsDUnitTest.java | 7 +-
.../tier/sockets/ClearPropagationDUnitTest.java | 7 +-
.../tier/sockets/ClientConflationDUnitTest.java | 6 +-
.../sockets/ClientInterestNotifyDUnitTest.java | 10 +--
.../tier/sockets/ClientServerMiscDUnitTest.java | 7 +-
.../cache/tier/sockets/ConflationDUnitTest.java | 6 +-
.../DataSerializerPropogationDUnitTest.java | 5 +-
.../DestroyEntryPropagationDUnitTest.java | 8 +-
.../DurableClientQueueSizeDUnitTest.java | 5 +-
.../DurableClientReconnectDUnitTest.java | 8 +-
.../sockets/DurableClientStatsDUnitTest.java | 5 +-
.../sockets/DurableRegistrationDUnitTest.java | 6 +-
.../sockets/DurableResponseMatrixDUnitTest.java | 7 +-
.../sockets/EventIDVerificationDUnitTest.java | 8 +-
.../EventIDVerificationInP2PDUnitTest.java | 7 +-
...ForceInvalidateOffHeapEvictionDUnitTest.java | 2 +-
.../cache/tier/sockets/HABug36738DUnitTest.java | 8 +-
.../cache/tier/sockets/HAInterestTestCase.java | 5 +-
.../sockets/HAStartupAndFailoverDUnitTest.java | 9 +-
.../InstantiatorPropagationDUnitTest.java | 6 +-
.../tier/sockets/InterestListDUnitTest.java | 8 +-
.../sockets/InterestListEndpointDUnitTest.java | 7 +-
.../sockets/InterestListFailoverDUnitTest.java | 6 +-
.../sockets/InterestListRecoveryDUnitTest.java | 5 +-
.../sockets/InterestRegrListenerDUnitTest.java | 6 +-
.../sockets/InterestResultPolicyDUnitTest.java | 7 +-
.../sockets/NewRegionAttributesDUnitTest.java | 6 +-
.../tier/sockets/RedundancyLevelTestBase.java | 8 +-
.../tier/sockets/RegionCloseDUnitTest.java | 8 +-
...erInterestBeforeRegionCreationDUnitTest.java | 11 +--
.../sockets/RegisterInterestKeysDUnitTest.java | 7 +-
.../sockets/ReliableMessagingDUnitTest.java | 10 +--
.../sockets/UnregisterInterestDUnitTest.java | 6 +-
.../sockets/UpdatePropagationDUnitTest.java | 7 +-
.../VerifyEventIDGenerationInP2PDUnitTest.java | 7 +-
...UpdatesFromNonInterestEndPointDUnitTest.java | 9 +-
.../cache/wan/AsyncEventQueueTestBase.java | 14 ++--
.../asyncqueue/AsyncEventListenerDUnitTest.java | 4 -
.../AsyncEventQueueStatsDUnitTest.java | 4 -
.../ConcurrentAsyncEventQueueDUnitTest.java | 4 -
.../CommonParallelAsyncEventQueueDUnitTest.java | 4 -
.../CompressionCacheConfigDUnitTest.java | 5 --
.../CompressionCacheListenerDUnitTest.java | 5 +-
.../CompressionRegionConfigDUnitTest.java | 5 --
.../CompressionRegionFactoryDUnitTest.java | 5 --
.../CompressionRegionOperationsDUnitTest.java | 6 +-
.../internal/jta/dunit/ExceptionsDUnitTest.java | 6 +-
.../jta/dunit/IdleTimeOutDUnitTest.java | 6 +-
.../jta/dunit/MaxPoolSizeDUnitTest.java | 6 +-
.../jta/dunit/TransactionTimeOutDUnitTest.java | 6 +-
.../dunit/TxnManagerMultiThreadDUnitTest.java | 7 +-
.../internal/jta/dunit/TxnTimeOutDUnitTest.java | 6 +-
.../offheap/OutOfOffHeapMemoryDUnitTest.java | 9 +-
.../process/LocalProcessLauncherDUnitTest.java | 3 +-
.../statistics/StatisticsDUnitTest.java | 7 +-
.../management/CacheManagementDUnitTest.java | 5 --
.../management/ClientHealthStatsDUnitTest.java | 9 +-
.../management/CompositeTypeTestDUnitTest.java | 5 --
.../management/DLockManagementDUnitTest.java | 5 --
.../management/DiskManagementDUnitTest.java | 5 +-
.../management/DistributedSystemDUnitTest.java | 6 --
.../management/LocatorManagementDUnitTest.java | 4 +-
.../gemfire/management/ManagementTestBase.java | 12 +--
.../MemberMBeanAttributesDUnitTest.java | 5 --
.../management/OffHeapManagementDUnitTest.java | 5 +-
.../gemfire/management/QueryDataDUnitTest.java | 6 +-
.../management/RegionManagementDUnitTest.java | 5 --
...ersalMembershipListenerAdapterDUnitTest.java | 2 +-
.../stats/DistributedSystemStatsDUnitTest.java | 4 -
.../internal/cli/CliUtilDUnitTest.java | 2 +-
.../cli/commands/CliCommandTestBase.java | 6 +-
.../cli/commands/DeployCommandsDUnitTest.java | 4 +-
...WithCacheLoaderDuringCacheMissDUnitTest.java | 4 +-
...stAndDescribeDiskStoreCommandsDUnitTest.java | 3 +-
.../cli/commands/ListIndexCommandDUnitTest.java | 3 +-
.../cli/commands/MemberCommandsDUnitTest.java | 5 +-
.../cli/commands/QueueCommandsDUnitTest.java | 4 +-
.../SharedConfigurationCommandsDUnitTest.java | 2 +-
.../cli/commands/ShellCommandsDUnitTest.java | 4 +-
.../cli/commands/ShowDeadlockDUnitTest.java | 5 +-
.../cli/commands/UserCommandsDUnitTest.java | 5 +-
.../SharedConfigurationDUnitTest.java | 2 +-
.../internal/pulse/TestClientIdsDUnitTest.java | 6 +-
.../internal/pulse/TestFunctionsDUnitTest.java | 5 --
.../internal/pulse/TestHeapDUnitTest.java | 7 +-
.../internal/pulse/TestLocatorsDUnitTest.java | 5 --
.../pulse/TestSubscriptionsDUnitTest.java | 6 +-
.../ClientsWithVersioningRetryDUnitTest.java | 5 +-
.../pdx/JSONPdxClientServerDUnitTest.java | 2 +-
.../gemfire/pdx/PdxSerializableDUnitTest.java | 6 --
.../gemfire/pdx/PdxTypeExportDUnitTest.java | 6 +-
.../gemfire/redis/RedisDistDUnitTest.java | 5 +-
.../security/ClientAuthenticationDUnitTest.java | 6 +-
.../security/ClientAuthorizationDUnitTest.java | 6 +-
.../security/ClientMultiUserAuthzDUnitTest.java | 7 +-
.../DeltaClientAuthorizationDUnitTest.java | 6 +-
.../DeltaClientPostAuthorizationDUnitTest.java | 7 +-
.../security/P2PAuthenticationDUnitTest.java | 5 +-
.../gemfire/test/dunit/DistributedTestCase.java | 68 +++++++--------
.../cache/internal/JUnit3CacheTestCase.java | 46 ++--------
.../cache/internal/JUnit4CacheTestCase.java | 10 ++-
.../dunit/internal/DistributedTestFixture.java | 4 -
.../internal/JUnit3DistributedTestCase.java | 60 +++++++------
.../internal/JUnit4DistributedTestCase.java | 69 +++++++--------
.../cache/query/cq/dunit/CqDataDUnitTest.java | 12 +--
.../dunit/CqDataOptimizedExecuteDUnitTest.java | 8 +-
.../cq/dunit/CqDataUsingPoolDUnitTest.java | 11 ++-
...qDataUsingPoolOptimizedExecuteDUnitTest.java | 12 ++-
.../cache/query/cq/dunit/CqPerfDUnitTest.java | 9 +-
.../cq/dunit/CqPerfUsingPoolDUnitTest.java | 9 +-
.../cache/query/cq/dunit/CqQueryDUnitTest.java | 12 +--
.../dunit/CqQueryOptimizedExecuteDUnitTest.java | 8 +-
.../cq/dunit/CqQueryUsingPoolDUnitTest.java | 12 +--
...QueryUsingPoolOptimizedExecuteDUnitTest.java | 6 +-
.../cq/dunit/CqResultSetUsingPoolDUnitTest.java | 16 ++--
...ltSetUsingPoolOptimizedExecuteDUnitTest.java | 8 +-
.../cache/query/cq/dunit/CqStatsDUnitTest.java | 12 +--
.../dunit/CqStatsOptimizedExecuteDUnitTest.java | 8 +-
.../cq/dunit/CqStatsUsingPoolDUnitTest.java | 12 +--
...StatsUsingPoolOptimizedExecuteDUnitTest.java | 8 +-
...dRegionCqQueryOptimizedExecuteDUnitTest.java | 6 +-
.../PrCqUsingPoolOptimizedExecuteDUnitTest.java | 8 +-
.../cache/query/dunit/PdxQueryCQTestBase.java | 2 +-
.../query/dunit/QueryMonitorDUnitTest.java | 2 +-
.../cache/snapshot/ClientSnapshotDUnitTest.java | 6 +-
.../cache/PRDeltaPropagationDUnitTest.java | 6 +-
.../cache/RemoteCQTransactionDUnitTest.java | 2 +-
.../internal/cache/ha/CQListGIIDUnitTest.java | 7 +-
.../cache/ha/HADispatcherDUnitTest.java | 8 +-
.../sockets/ClientToServerDeltaDUnitTest.java | 5 +-
.../DeltaPropagationWithCQDUnitTest.java | 6 +-
...ToRegionRelationCQRegistrationDUnitTest.java | 6 +-
.../sockets/DurableClientCrashDUnitTest.java | 4 +-
.../tier/sockets/DurableClientTestCase.java | 9 +-
.../CacheServerManagementDUnitTest.java | 4 +-
.../cli/commands/ClientCommandsDUnitTest.java | 2 +-
.../DurableClientCommandsDUnitTest.java | 2 +-
.../internal/pulse/TestCQDUnitTest.java | 5 --
.../internal/pulse/TestClientsDUnitTest.java | 5 --
.../internal/pulse/TestServerDUnitTest.java | 5 --
.../ClientAuthorizationTwoDUnitTest.java | 6 +-
.../security/ClientAuthzObjectModDUnitTest.java | 5 +-
.../ClientCQPostAuthorizationDUnitTest.java | 7 +-
.../ClientPostAuthorizationDUnitTest.java | 7 +-
.../gemfire/security/MultiuserAPIDUnitTest.java | 6 +-
.../MultiuserDurableCQAuthzDUnitTest.java | 4 +-
.../LuceneFunctionReadPathDUnitTest.java | 3 +-
.../internal/cache/UpdateVersionDUnitTest.java | 2 +-
.../gemfire/internal/cache/wan/WANTestBase.java | 20 +++--
...oncurrentParallelGatewaySenderDUnitTest.java | 4 -
...allelGatewaySenderOperation_1_DUnitTest.java | 6 +-
...allelGatewaySenderOperation_2_DUnitTest.java | 6 +-
.../cache/wan/disttx/DistTXWANDUnitTest.java | 6 +-
...wWANConcurrencyCheckForDestroyDUnitTest.java | 4 -
.../cache/wan/misc/PDXNewWanDUnitTest.java | 4 -
.../SenderWithTransportFilterDUnitTest.java | 4 -
...downAllPersistentGatewaySenderDUnitTest.java | 3 +-
.../wan/misc/WANLocatorServerDUnitTest.java | 5 +-
.../cache/wan/misc/WANSSLDUnitTest.java | 4 -
.../wan/misc/WanAutoDiscoveryDUnitTest.java | 5 +-
.../cache/wan/misc/WanValidationsDUnitTest.java | 4 -
...arallelGatewaySenderOperationsDUnitTest.java | 6 +-
...llelGatewaySenderQueueOverflowDUnitTest.java | 4 -
.../ParallelWANConflationDUnitTest.java | 4 +-
...ersistenceEnabledGatewaySenderDUnitTest.java | 6 +-
...llelWANPropagationClientServerDUnitTest.java | 4 -
...lelWANPropagationConcurrentOpsDUnitTest.java | 4 -
.../ParallelWANPropagationDUnitTest.java | 4 -
...ParallelWANPropagationLoopBackDUnitTest.java | 4 -
.../wan/parallel/ParallelWANStatsDUnitTest.java | 4 +-
...tewaySenderDistributedDeadlockDUnitTest.java | 4 -
...rialGatewaySenderEventListenerDUnitTest.java | 4 -
.../SerialGatewaySenderOperationsDUnitTest.java | 4 +-
.../SerialGatewaySenderQueueDUnitTest.java | 5 --
...ersistenceEnabledGatewaySenderDUnitTest.java | 4 -
.../SerialWANPropagationLoopBackDUnitTest.java | 4 -
.../serial/SerialWANPropogationDUnitTest.java | 4 +-
...NPropogation_PartitionedRegionDUnitTest.java | 5 --
.../SerialWANPropogationsFeatureDUnitTest.java | 4 -
.../wan/serial/SerialWANStatsDUnitTest.java | 4 +-
.../wan/wancommand/WANCommandTestBase.java | 6 +-
...anCommandCreateGatewayReceiverDUnitTest.java | 4 -
.../WanCommandCreateGatewaySenderDUnitTest.java | 4 -
...WanCommandGatewayReceiverStartDUnitTest.java | 4 -
.../WanCommandGatewayReceiverStopDUnitTest.java | 4 -
.../WanCommandGatewaySenderStartDUnitTest.java | 4 -
.../WanCommandGatewaySenderStopDUnitTest.java | 4 -
.../wan/wancommand/WanCommandListDUnitTest.java | 4 -
.../WanCommandPauseResumeDUnitTest.java | 4 -
.../wancommand/WanCommandStatusDUnitTest.java | 4 -
390 files changed, 1060 insertions(+), 1536 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
index 7c6929c..89925a2 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
@@ -144,12 +144,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
}
@Override
- public void setUp() throws Exception {
- super.setUp();
- }
-
- @Override
- protected final void postTearDown() throws Exception {
+ public final void postTearDown() throws Exception {
LauncherLifecycleCommands launcherLifecycleCommands = new LauncherLifecycleCommands();
Integer pid;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
index 4a958ce..46bf4a5 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
@@ -90,8 +90,8 @@ public class RestAPIOnRegionFunctionExecutionDUnitTest extends RestAPITestBase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ protected final void postSetUpRestAPITestBase() throws Exception {
final Host host = Host.getHost(0);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
index 3709475..814063b 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
@@ -47,8 +47,7 @@ public class RestAPITestBase extends DistributedTestCase {
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
AgentUtil agentUtil = new AgentUtil(GemFireVersion.getGemFireVersion());
if (agentUtil.findWarLocation("geode-web-api") == null) {
@@ -63,13 +62,17 @@ public class RestAPITestBase extends DistributedTestCase {
// gradle sets a property telling us where the build is located
final String buildDir = System.getProperty("geode.build.dir", System.getProperty("user.dir"));
Invoke.invokeInEveryVM(()-> System.setProperty("geode.build.dir", buildDir));
- }
+ postSetUpRestAPITestBase();
+ }
+
+ protected void postSetUpRestAPITestBase() throws Exception {
+ }
/**
* close the clients and teh servers
*/
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
vm0.invoke(() -> closeCache());
vm1.invoke(() -> closeCache());
vm2.invoke(() -> closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
index 0245fa0..d1ec00f 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
@@ -170,9 +170,9 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
}
- public void setUp() throws Exception {
+ @Override
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
- super.setUp();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
index 1ae3810..58a22b0 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
@@ -46,9 +46,9 @@ public class RestAPIsOnGroupsFunctionExecutionDUnitTest extends RestAPITestBase
public RestAPIsOnGroupsFunctionExecutionDUnitTest(String name) {
super(name);
}
-
- public void setUp() throws Exception {
- super.setUp();
+
+ @Override
+ protected final void postSetUpRestAPITestBase() throws Exception {
final Host host = Host.getHost(0);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
index adb2b55..68916fc 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
@@ -68,8 +68,7 @@ public class RestAPIsOnMembersFunctionExecutionDUnitTest extends CacheTestCase {
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
member1 = host.getVM(0);
member2 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
index 29aab32..24224c6 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
@@ -89,9 +89,9 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
}
- public void setUp() throws Exception {
+ @Override
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
- super.setUp();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
index 88a32a3..18e7505 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
@@ -61,8 +61,7 @@ public class CacheRegionClearStatsDUnitTest extends DistributedTestCase {
super(name);
}
- 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);
@@ -187,7 +186,7 @@ public class CacheRegionClearStatsDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
client1.invoke(() -> CacheRegionClearStatsDUnitTest.closeCache());
// then close the servers
server1.invoke(() -> CacheRegionClearStatsDUnitTest.closeCache());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
index ee382ab..9ce5bed 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
@@ -48,12 +48,8 @@ public class ConnectionPoolAndLoaderDUnitTest extends CacheTestCase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
@Override
- protected final void preTearDownCacheTestCase() {
+ public final void preTearDownCacheTestCase() {
//TODO grid. This is a hack. The next dunit test to run after
//this one is the ConnectionPoolAutoDUnit test. That ends up calling
//getSystem() with no arguments and expects to get a system without
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
index 58844b0..1b7eb78 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
@@ -65,15 +65,14 @@ public class ClientServerRegisterInterestsDUnitTest extends DistributedTestCase
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
setupGemFireCacheServer();
IgnoredException.addIgnoredException("java.net.ConnectException");
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
serverPort.set(0);
entryEvents.clear();
gemfireServerVm.invoke(new SerializableRunnable() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
index 03368de..a38bc05 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
@@ -55,9 +55,9 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
protected static final Object BRIDGE_LISTENER = "BRIDGE_LISTENER";
private static final long MAX_WAIT = 60000;
-
- public void setUp() throws Exception {
- super.setUp();
+
+ @Override
+ public final void postSetUp() throws Exception {
IgnoredException.addIgnoredException("NoAvailableLocatorsException");
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
index 5fa4fc4..69831e7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
@@ -61,10 +61,9 @@ public class CacheServerSSLConnectionDUnitTest extends DistributedTestCase {
private static CacheServerSSLConnectionDUnitTest instance = new CacheServerSSLConnectionDUnitTest("CacheServerSSLConnectionDUnit");
-
- public void setUp() throws Exception {
+ @Override
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
- super.setUp();
}
public CacheServerSSLConnectionDUnitTest(String name) {
@@ -413,7 +412,7 @@ public class CacheServerSSLConnectionDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
final Host host = Host.getHost(0);
VM serverVM = host.getVM(1);
VM clientVM = host.getVM(2);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
index a89d648..74822d5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
@@ -72,7 +72,7 @@ public abstract class LocatorTestBase extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
SerializableRunnable tearDown = new SerializableRunnable("tearDown") {
public void run() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
index e23fb76..321cde0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
@@ -54,10 +54,9 @@ public class SSLNoClientAuthDUnitTest extends DistributedTestCase {
private static SSLNoClientAuthDUnitTest instance = new SSLNoClientAuthDUnitTest("SSLNoClientAuthDUnitTest");
-
- public void setUp() throws Exception {
+ @Override
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
- super.setUp();
}
public SSLNoClientAuthDUnitTest(String name) {
@@ -267,7 +266,7 @@ public class SSLNoClientAuthDUnitTest extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
final Host host = Host.getHost(0);
VM serverVM = host.getVM(1);
VM clientVM = host.getVM(2);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
index c93848b..17529b8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
@@ -135,8 +135,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ protected final void postSetUpClientServerTestCase() throws Exception {
Invoke.invokeInEveryVM(this.setHeapMemoryMonitorTestMode);
IgnoredException.addIgnoredException(expectedEx);
IgnoredException.addIgnoredException(expectedBelow);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
index 3cf7b09..7c61788 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
@@ -105,16 +105,12 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
super(name);
}
-
-
@Override
- public void setUp() throws Exception {
+ public final void postSetUpClientServerTestCase() throws Exception {
IgnoredException.addIgnoredException(expectedEx);
IgnoredException.addIgnoredException(expectedBelow);
}
-
-
@Override
protected void preTearDownClientServerTestCase() throws Exception {
Invoke.invokeInEveryVM(this.resetResourceManager);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java
index 81b545f..5a8eee1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java
@@ -44,8 +44,8 @@ public class CompactRangeIndexDUnitTest extends DistributedTestCase{
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
getSystem();
Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
public void run() {
@@ -59,8 +59,7 @@ public class CompactRangeIndexDUnitTest extends DistributedTestCase{
utils.createReplicateRegion("exampleRegion", vm0);
utils.createIndex(vm0,"type", "\"type\"", "/exampleRegion");
}
-
-
+
/*
* Tests that the message component of the exception is not null
*/
@@ -169,7 +168,7 @@ public class CompactRangeIndexDUnitTest extends DistributedTestCase{
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
Thread.sleep(5000);
removeHook();
utils.closeServer(vm0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java
index 38721be..718670d 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java
@@ -37,8 +37,8 @@ public class HashIndexDUnitTest extends DistributedTestCase{
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
getSystem();
Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
public void run() {
@@ -125,7 +125,7 @@ public class HashIndexDUnitTest extends DistributedTestCase{
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
Thread.sleep(5000);
utils.closeServer(vm0);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
index 0227836..a11c5de 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
@@ -95,18 +95,17 @@ public class QueryDataInconsistencyDUnitTest extends CacheTestCase {
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM(CacheTestCase.class, "disconnectFromDS");
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM(QueryObserverHolder.class, "reset");
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
server = host.getVM(0);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
index 775ea29..0731ae2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
@@ -58,6 +58,7 @@ import com.gemstone.gemfire.cache30.CertifiableTestCacheListener;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.internal.FileUtil;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
@@ -132,27 +133,47 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void preSetUp() throws Exception {
+ System.out.println("KIRK:preSetUp");
+ }
+
+ @Override
+ public final void postSetUp() throws Exception {
//Workaround for #52008
IgnoredException.addIgnoredException("Failed to create index");
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
- // Get the disk store name.
- GemFireCacheImpl cache = (GemFireCacheImpl)getCache();
- String diskStoreName = cache.getDefaultDiskStoreName();
-
- //reset TestHook
+ public final void preTearDownCacheTestCase() throws Exception {
+ System.out.println("KIRK:preTearDownCacheTestCase");
+ }
+
+ @Override
+ public final void postTearDownCacheTestCase() throws Exception {
+ resetTestHook();
Invoke.invokeInEveryVM(resetTestHook());
- // close the cache.
- closeCache();
- disconnectFromDS();
-
- // remove the disk store.
- File diskDir = new File(diskStoreName).getAbsoluteFile();
- com.gemstone.gemfire.internal.FileUtil.delete(diskDir);
+
+ disconnectAllFromDS();
+
+ FileUtil.delete(new File(GemFireCacheImpl.DEFAULT_DS_NAME).getAbsoluteFile());
+ Invoke.invokeInEveryVM(()->FileUtil.delete(new File(GemFireCacheImpl.DEFAULT_DS_NAME).getAbsoluteFile()));
+
+// // Get the disk store name.
+// GemFireCacheImpl cache = (GemFireCacheImpl)getCache(); // TODO: don't create a new Cache just to get the diskStoreName
+// String diskStoreName = cache.getDefaultDiskStoreName();
+//
+// assertEquals(GemFireCacheImpl.DEFAULT_DS_NAME, diskStoreName);
+//
+// //reset TestHook
+// Invoke.invokeInEveryVM(resetTestHook());
+// // close the cache.
+// closeCache();
+// disconnectFromDS();
+//
+// // remove the disk store.
+// File diskDir = new File(diskStoreName).getAbsoluteFile();
+// com.gemstone.gemfire.internal.FileUtil.delete(diskDir);
}
/**
@@ -339,7 +360,7 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info(
"Creating index using an xml file name : " + fileName);
- vm0.invoke(createIndexThrougXML("vm0testPersistentPRRegion", persistentRegName, fileName));
+ vm0.invoke(createIndexThrougXML("vm0testPersistentPRRegion", persistentRegName, fileName)); // TODO: hangs
// LoadRegion
vm0.invoke(loadRegion(this.persistentRegName));
vm0.invoke(loadRegion(noIndexRepReg));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
index 1e3e973..0b76efd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
@@ -135,20 +135,19 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM(CacheTestCase.class, "disconnectFromDS");
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM(QueryObserverHolder.class, "reset");
cache = null;
Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } });
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
server1 = host.getVM(0);
server2 = host.getVM(1);
@@ -159,7 +158,6 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
registerFunctionOnServers();
}
-
/**
* Test on Replicated Region.
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
index 1bffce5..cddfa83 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
@@ -97,15 +97,14 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
//////// Test Methods
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
IgnoredException.addIgnoredException("Connection reset");
IgnoredException.addIgnoredException("Socket input is shutdown");
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
disconnectAllFromDS();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
index c0de700..d144c00 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
@@ -73,13 +73,12 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
//////// Test Methods
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
disconnectAllFromDS();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
index 85ae9aa..8b392cb 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
@@ -86,8 +86,7 @@ public class ResourceManagerWithQueryMonitorDUnitTest extends ClientServerTestCa
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUpClientServerTestCase() throws Exception {
Invoke.invokeInEveryVM(this.setHeapMemoryMonitorTestMode);
IgnoredException.addIgnoredException("above heap critical threshold");
IgnoredException.addIgnoredException("below heap critical threshold");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
index 6cbbef2..88326bd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
@@ -91,7 +91,7 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends
}
@Override
- public void setUp() throws Exception {
+ public final void postSetUp() throws Exception {
Invoke.invokeInEveryVM(new CacheSerializableRunnable("Set INPLACE_OBJECT_MODIFICATION false") {
@Override
@@ -100,7 +100,6 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends
IndexManager.INPLACE_OBJECT_MODIFICATION_FOR_TEST = true;
}
});
- super.setUp();
}
/**
@@ -108,7 +107,7 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends
* (mainly because we want to destroy any existing PartitionedRegions)
*/
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
Invoke.invokeInEveryVM(new CacheSerializableRunnable("Set INPLACE_OBJECT_MODIFICATION false") {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
index 2ac564a..1036106 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
@@ -93,7 +93,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest extends
* (mainly because we want to destroy any existing PartitionedRegions)
*/
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
Invoke.invokeInEveryVM(ConcurrentIndexUpdateWithoutWLDUnitTest.class, "destroyRegions");
Invoke.invokeInEveryVM(CacheTestCase.class, "closeCache");
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
index d44c7f6..18c73dc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
@@ -59,13 +59,12 @@ public class CopyOnReadIndexDUnitTest extends CacheTestCase {
VM vm1;
VM vm2;
-
public CopyOnReadIndexDUnitTest(String name) {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
getSystem();
Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
public void run() {
@@ -79,11 +78,10 @@ public class CopyOnReadIndexDUnitTest extends CacheTestCase {
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
disconnectAllFromDS();
}
-
-
+
//test different queries against partitioned region
public void testPRQueryOnLocalNode() throws Exception {
QueryTestUtils utils = new QueryTestUtils();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MultiIndexCreationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MultiIndexCreationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MultiIndexCreationDUnitTest.java
index cea00c1..90d5171 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MultiIndexCreationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MultiIndexCreationDUnitTest.java
@@ -172,13 +172,13 @@ public class MultiIndexCreationDUnitTest extends CacheTestCase {
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
hooked = false;
Invoke.invokeInEveryVM(CacheTestCase.class, "disconnectFromDS");
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM(QueryObserverHolder.class, "reset");
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
index 960bd4e..053f87a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
@@ -63,13 +63,13 @@ public class PutAllWithIndexPerfDUnitTest extends CacheTestCase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
disconnectAllFromDS();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/ParallelSnapshotDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/ParallelSnapshotDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/ParallelSnapshotDUnitTest.java
index ea95558..5b123f2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/ParallelSnapshotDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/ParallelSnapshotDUnitTest.java
@@ -155,14 +155,14 @@ public class ParallelSnapshotDUnitTest extends CacheTestCase {
}
return null;
}
-
- public void setUp() throws Exception {
- super.setUp();
+
+ @Override
+ public final void postSetUp() throws Exception {
loadCache();
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
File[] snaps = new File(".").listFiles(new FilenameFilter() {
@Override
public boolean accept(File dir, String name) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotByteArrayDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotByteArrayDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotByteArrayDUnitTest.java
index 43fc2e3..eae745a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotByteArrayDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotByteArrayDUnitTest.java
@@ -105,13 +105,13 @@ public class SnapshotByteArrayDUnitTest extends CacheTestCase {
}
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
loadCache();
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
if (snap.exists()) {
snap.delete();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotDUnitTest.java
index 764f276..06bfecc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotDUnitTest.java
@@ -158,9 +158,9 @@ public class SnapshotDUnitTest extends CacheTestCase {
assertTrue(caughtException);
}
-
- public void setUp() throws Exception {
- super.setUp();
+
+ @Override
+ public final void postSetUp() throws Exception {
loadCache();
RegionGenerator rgen = new RegionGenerator();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotPerformanceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotPerformanceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotPerformanceDUnitTest.java
index 83fc231..c5b0e55 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotPerformanceDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotPerformanceDUnitTest.java
@@ -100,9 +100,9 @@ public class SnapshotPerformanceDUnitTest extends CacheTestCase {
LogWriterUtils.getLogWriter().info("SNP: Import entry rate: " + eps + " entries / sec");
LogWriterUtils.getLogWriter().info("SNP: Import data rate: " + mbps + " MB / sec");
}
-
- public void setUp() throws Exception {
- super.setUp();
+
+ @Override
+ public final void postSetUp() throws Exception {
createCache();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheCloseDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheCloseDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheCloseDUnitTest.java
index ea17a4d..1938483 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheCloseDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheCloseDUnitTest.java
@@ -26,7 +26,6 @@ import com.gemstone.gemfire.cache.CacheLoaderException;
import com.gemstone.gemfire.cache.LoaderHelper;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionAttributes;
-import com.gemstone.gemfire.test.dunit.cache.internal.JUnit3CacheTestCase;
/**
* Test to make sure cache close is working.
@@ -34,7 +33,7 @@ import com.gemstone.gemfire.test.dunit.cache.internal.JUnit3CacheTestCase;
* @author darrel
* @since 3.0
*/
-public class CacheCloseDUnitTest extends JUnit3CacheTestCase {
+public class CacheCloseDUnitTest extends CacheTestCase {
public CacheCloseDUnitTest(String name) {
super(name);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java
index f7e1739..0be86e2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java
@@ -57,17 +57,20 @@ public class CacheMapTxnDUnitTest extends DistributedTestCase{
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
vm0.invoke(() -> CacheMapTxnDUnitTest.createCache());
vm1.invoke(() -> CacheMapTxnDUnitTest.createCache());
+ postSetUpCacheMapTxnDUnitTest();
+ }
+
+ protected void postSetUpCacheMapTxnDUnitTest() throws Exception {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java
index 561209a..95a861b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java
@@ -25,6 +25,7 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
+import com.gemstone.gemfire.test.dunit.cache.internal.CacheTestFixture;
import org.apache.logging.log4j.Logger;
import com.gemstone.gemfire.InternalGemFireError;
@@ -63,6 +64,7 @@ import com.gemstone.gemfire.test.dunit.LogWriterUtils;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.internal.JUnit3DistributedTestCase;
/**
* The abstract superclass of tests that require the creation of a
@@ -71,23 +73,22 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
* @author David Whitlock
* @since 3.0
*/
-public abstract class CacheTestCase extends DistributedTestCase {
+public abstract class CacheTestCase extends DistributedTestCase implements CacheTestFixture {
private static final Logger logger = LogService.getLogger();
- /** The Cache from which regions are obtained
- *
- * All references synchronized via <code>CacheTestCase.class</code>
- * */
- // static so it doesn't get serialized with SerializableRunnable inner classes
+ /**
+ * The Cache from which regions are obtained.
+ *
+ * <p>All references synchronized via {@code JUnit4CacheTestCase.class}.
+ *
+ * <p>Field is static so it doesn't get serialized with SerializableRunnable inner classes.
+ */
private static Cache cache;
- //////// Constructors
-
public CacheTestCase(String name) {
super(name);
}
- //////// Helper methods
/**
* Creates the <code>Cache</code> for this test
*/
@@ -162,12 +163,10 @@ public abstract class CacheTestCase extends DistributedTestCase {
* Any existing cache is closed. Whoever calls this must also call finishCacheXml
*/
public static final synchronized void beginCacheXml() {
-// getLogWriter().info("before closeCache");
closeCache();
-// getLogWriter().info("before TestCacheCreation");
cache = new TestCacheCreation();
-// getLogWriter().info("after TestCacheCreation");
}
+
/**
* Finish what beginCacheXml started. It does this be generating a cache.xml
* file and then creating a real cache using that cache.xml.
@@ -272,11 +271,11 @@ public abstract class CacheTestCase extends DistributedTestCase {
if (gfCache != null && !gfCache.isClosed()
&& gfCache.getCancelCriterion().cancelInProgress() != null) {
Wait.waitForCriterion(new WaitCriterion() {
-
+ @Override
public boolean done() {
return gfCache.isClosed();
}
-
+ @Override
public String description() {
return "waiting for cache to close";
}
@@ -300,15 +299,16 @@ public abstract class CacheTestCase extends DistributedTestCase {
public final GemFireCacheImpl getGemfireCache() {
return (GemFireCacheImpl)getCache();
}
+
public static synchronized final boolean hasCache() {
- return cache != null;
+ return cache != null;
}
/**
* Return current cache without creating one.
*/
public static synchronized final Cache basicGetCache() {
- return cache;
+ return cache;
}
/** Close the cache */
@@ -356,7 +356,7 @@ public abstract class CacheTestCase extends DistributedTestCase {
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
preTearDownCacheTestCase();
// locally destroy all root regions and close the cache
@@ -373,10 +373,10 @@ public abstract class CacheTestCase extends DistributedTestCase {
postTearDownCacheTestCase();
}
- protected void preTearDownCacheTestCase() throws Exception {
+ public void preTearDownCacheTestCase() throws Exception {
}
- protected void postTearDownCacheTestCase() throws Exception {
+ public void postTearDownCacheTestCase() throws Exception {
}
/**
@@ -480,6 +480,7 @@ public abstract class CacheTestCase extends DistributedTestCase {
throws RegionExistsException, TimeoutException {
return getCache().createRegion(rootName, attrs);
}
+
public final Region createExpiryRootRegion(String rootName, RegionAttributes attrs)
throws RegionExistsException, TimeoutException {
System.setProperty(LocalRegion.EXPIRY_MS_PROPERTY, "true");
@@ -490,55 +491,6 @@ public abstract class CacheTestCase extends DistributedTestCase {
}
}
-
-// /**
-// * send an unordered message requiring an ack to all connected members
-// * in order to flush the unordered communication channel
-// */
-// public final void sendUnorderedMessageToAll() {
-// //if (getCache() instanceof distcache.gemfire.GemFireCacheImpl) {
-// try {
-// com.gemstone.gemfire.distributed.internal.HighPriorityAckedMessage msg = new com.gemstone.gemfire.distributed.internal.HighPriorityAckedMessage();
-// msg.send(InternalDistributedSystem.getConnectedInstance().getDM().getNormalDistributionManagerIds(), false);
-// }
-// catch (Exception e) {
-// throw new RuntimeException("Unable to send unordered message due to exception", e);
-// }
-// //}
-// }
-
- /**
- * send an unordered message requiring an ack to all connected admin members
- * in order to flush the unordered communication channel
- */
-// public void sendUnorderedMessageToAdminMembers() {
-// //if (getCache() instanceof distcache.gemfire.GemFireCacheImpl) {
-// try {
-// com.gemstone.gemfire.distributed.internal.HighPriorityAckedMessage msg = new com.gemstone.gemfire.distributed.internal.HighPriorityAckedMessage();
-// msg.send(DistributedSystemHelper.getAdminMembers(), false);
-// }
-// catch (Exception e) {
-// throw new RuntimeException("Unable to send unordered message due to exception", e);
-// }
-// //}
-// }
-
-// /**
-// * send an ordered message requiring an ack to all connected members
-// * in order to flush the ordered communication channel
-// */
-// public final void sendSerialMessageToAll() {
-// if (getCache() instanceof GemFireCacheImpl) {
-// try {
-// com.gemstone.gemfire.distributed.internal.SerialAckedMessage msg = new com.gemstone.gemfire.distributed.internal.SerialAckedMessage();
-// msg.send(InternalDistributedSystem.getConnectedInstance().getDM().getNormalDistributionManagerIds(), false);
-// }
-// catch (Exception e) {
-// throw new RuntimeException("Unable to send serial message due to exception", e);
-// }
-// }
-// }
-
/**
* @deprecated Use DistributedTestCase.addExpectedException
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
index dd127cb..8c9776e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
@@ -44,18 +44,18 @@ public class CacheXmlTestCase extends CacheTestCase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
+ @Override
+ public final void postSetUp() throws Exception {
disconnectAllFromDS();
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
this.xmlFile = null;
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
disconnectAllFromDS();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/CachedAllEventsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CachedAllEventsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CachedAllEventsDUnitTest.java
index 68f1305..6ffc53d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CachedAllEventsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CachedAllEventsDUnitTest.java
@@ -30,7 +30,9 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Make sure that create are distributed and done in
@@ -39,6 +41,7 @@ import org.junit.Test;
* @author darrel
* @since 5.0
*/
+@Category(DistributedTest.class)
public class CachedAllEventsDUnitTest extends JUnit4CacheTestCase {
private VM getOtherVm() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java
index e748a42..031fd76 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java
@@ -60,10 +60,8 @@ public class ClearMultiVmCallBkDUnitTest extends DistributedTestCase{
static CacheTransactionManager cacheTxnMgr;
static boolean afterClear=false;
-
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
@@ -73,7 +71,7 @@ public class ClearMultiVmCallBkDUnitTest extends DistributedTestCase{
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java
index 5f9450b..9aa4e95 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java
@@ -66,8 +66,7 @@ public class ClearMultiVmDUnitTest extends DistributedTestCase{
static CacheTransactionManager cacheTxnMgr;
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
@@ -76,7 +75,7 @@ public class ClearMultiVmDUnitTest extends DistributedTestCase{
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
index 23386a7..e6be910 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
@@ -82,12 +82,8 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- }
-
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
InternalClientMembership.unregisterAllListeners();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
index f7e2277..ce8783b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
@@ -46,7 +46,7 @@ public class ClientRegisterInterestDUnitTest extends ClientServerTestCase {
}
@Override
- protected final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() throws Exception {
disconnectAllFromDS(); // cleans up bridge server and client and lonerDS
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
index fb319b6..1355571 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
@@ -69,7 +69,7 @@ public class ClientServerCCEDUnitTest extends CacheTestCase {
}
@Override
- protected final void preTearDownCacheTestCase() {
+ public final void preTearDownCacheTestCase() {
disconnectAllFromDS();
HARegionQueue.setMessageSyncInterval(HARegionQueue.DEFAULT_MESSAGE_SYNC_INTERVAL);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
index 5c2f8a2..b37c60a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
@@ -55,14 +55,17 @@ public class ClientServerTestCase extends CacheTestCase {
public static boolean AUTO_LOAD_BALANCE = false;
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
// this makes sure we don't have any connection left over from previous tests
disconnectAllFromDS();
+ postSetUpClientServerTestCase();
+ }
+
+ protected void postSetUpClientServerTestCase() throws Exception {
}
@Override
- protected final void preTearDownCacheTestCase() throws Exception {
+ public final void preTearDownCacheTestCase() throws Exception {
preTearDownClientServerTestCase();
// this makes sure we don't leave anything for the next tests
disconnectAllFromDS();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java
index cf6226d..9284e26 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java
@@ -71,8 +71,7 @@ public class DistAckMapMethodsDUnitTest extends DistributedTestCase{
}
@Override
- public void setUp() throws Exception {
- super.setUp();
+ public final void postSetUp() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
@@ -81,7 +80,7 @@ public class DistAckMapMethodsDUnitTest extends DistributedTestCase{
}
@Override
- protected final void preTearDown() throws Exception {
+ public final void preTearDown() throws Exception {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);