http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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 0f25d01..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); @@ -129,7 +128,7 @@ public class InterestListRecoveryDUnitTest extends DistributedTestCase VM serverFirstRegistered = null; VM serverSecondRegistered = null; - LogWriter logger = system.getLogWriter(); + LogWriter logger = basicGetSystem().getLogWriter(); createEntries(); server2.invoke(() -> InterestListRecoveryDUnitTest.createEntries()); server1.invoke(() -> InterestListRecoveryDUnitTest.createEntries()); @@ -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/57c8600b/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..6b48cef 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 preSetUp() throws Exception { disconnectAllFromDS(); - super.setUp(); } public Cache createCache(Properties props) throws Exception http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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..a5b6125 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 preSetUp() throws Exception { final Host host = Host.getHost(0); vm0 = host.getVM(0); vm1 = host.getVM(1); @@ -137,12 +137,14 @@ public class AsyncEventQueueTestBase extends DistributedTestCase { vm5 = host.getVM(5); vm6 = host.getVM(6); vm7 = host.getVM(7); + } + + @Override + public final void postSetUp() throws Exception { // this is done to vary the number of dispatchers for sender // during every test method run shuffleNumDispatcherThreads(); - Invoke.invokeInEveryVM(AsyncEventQueueTestBase.class, - "setNumDispatcherThreadsForTheRun", - new Object[] { dispatcherThreads.get(0) }); + Invoke.invokeInEveryVM(() -> setNumDispatcherThreadsForTheRun(dispatcherThreads.get(0))); } public static void shuffleNumDispatcherThreads() { @@ -159,7 +161,7 @@ public class AsyncEventQueueTestBase extends DistributedTestCase { } AsyncEventQueueTestBase test = new AsyncEventQueueTestBase(getTestMethodName()); int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); //props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "" + dsId); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port @@ -173,7 +175,7 @@ public class AsyncEventQueueTestBase extends DistributedTestCase { public static Integer createFirstRemoteLocator(int dsId, int remoteLocPort) { AsyncEventQueueTestBase test = new AsyncEventQueueTestBase(getTestMethodName()); int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "" + dsId); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port @@ -692,7 +694,7 @@ public class AsyncEventQueueTestBase extends DistributedTestCase { protected static void createCache(Integer locPort) { AsyncEventQueueTestBase test = new AsyncEventQueueTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]"); @@ -702,7 +704,7 @@ public class AsyncEventQueueTestBase extends DistributedTestCase { public static void createCacheWithoutLocator(Integer mCastPort) { AsyncEventQueueTestBase test = new AsyncEventQueueTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "" + mCastPort); InternalDistributedSystem ds = test.getSystem(props); cache = CacheFactory.create(ds); @@ -941,7 +943,7 @@ public class AsyncEventQueueTestBase extends DistributedTestCase { public static int createReceiver(int locPort) { AsyncEventQueueTestBase test = new AsyncEventQueueTestBase(getTestMethodName()); - Properties props = new Properties(); + Properties props = test.getDistributedSystemProperties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]"); @@ -1568,7 +1570,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 +1609,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/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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 { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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 746972a..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()); @@ -211,7 +211,7 @@ public class TxnTimeOutDUnitTest extends DistributedTestCase { public static void runTest1() throws Exception { boolean exceptionOccured = false; try { - system.getLogWriter().fine("<ExpectedException action=add> +" + + getSystemStatic().getLogWriter().fine("<ExpectedException action=add> +" + "DistributedSystemDisconnectedException" + "</ExpectedException>"); Context ctx = cache.getJNDIContext(); @@ -234,7 +234,7 @@ public class TxnTimeOutDUnitTest extends DistributedTestCase { fail("failed in naming lookup: " + e); } finally { - system.getLogWriter().fine("<ExpectedException action=remove> +" + + getSystemStatic().getLogWriter().fine("<ExpectedException action=remove> +" + "DistributedSystemDisconnectedException" + "</ExpectedException>"); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/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 9c2e5e8..4f07f41 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/57c8600b/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/57c8600b/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 9fd18e6..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! } @@ -272,7 +267,7 @@ public class StatisticsDUnitTest extends CacheTestCase { publishers[pubThread] = pubs[pubVM].invokeAsync( new CacheSerializableRunnable("pub-connect-and-put-data-" + pubVM + "-thread-" + pubThread) { public void run2() throws CacheException { - final PubSubStats statistics = new PubSubStats(system, "pub-" + pubThread, pubVM); + final PubSubStats statistics = new PubSubStats(basicGetSystem(), "pub-" + pubThread, pubVM); pubStatsRef.set(pubThread, statistics); final RegionMembershipListener rml = rmlRef.get(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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 9ded958..0938b70 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/57c8600b/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/57c8600b/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/57c8600b/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 d84415a..60ef7ba 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 @@ -89,7 +89,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes } @Override - protected final void postTearDownCacheTestCase() throws Exception { + public final void postTearDownCacheTestCase() throws Exception { InternalClientMembership.unregisterAllListeners(); } @@ -1565,7 +1565,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes Region region = createRegion(name, factory.create()); assertNotNull(region); assertNotNull(getRootRegion().getSubregion(name)); - return system.getDistributedMember(); + return basicGetSystem().getDistributedMember(); } }; @@ -1849,7 +1849,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().error(e); fail(e.getMessage()); } - return system.getDistributedMember(); + return basicGetSystem().getDistributedMember(); } }; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/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 1de93ee..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); @@ -63,7 +59,7 @@ public class DistributedSystemStatsDUnitTest extends ManagementTestBase{ public void run() { MemberMBean bean = (MemberMBean) managementService.getMemberMXBean(); MemberMBeanBridge bridge = bean.getBridge(); - DiskStoreStats diskStoreStats = new DiskStoreStats(system, "test"); + DiskStoreStats diskStoreStats = new DiskStoreStats(basicGetSystem(), "test"); bridge.addDiskStoreStats(diskStoreStats); diskStoreStats.startRead(); diskStoreStats.startWrite(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/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/57c8600b/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/57c8600b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java index dca0f78..b65259d 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java @@ -459,7 +459,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase { getSystem(localProps); assertNotNull(getCache()); - assertEquals("error", system.getConfig().getAttribute(DistributionConfig.LOG_LEVEL_NAME)); + assertEquals("error", basicGetSystem().getConfig().getAttribute(DistributionConfig.LOG_LEVEL_NAME)); return null; } }); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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/57c8600b/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 ba942c6..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; @@ -188,7 +187,7 @@ public class ShowDeadlockDUnitTest extends CacheTestCase { } catch (InterruptedException e) { Assert.fail("interrupted", e); } - ResultCollector collector = FunctionService.onMember(system, member).execute(new TestFunction()); + ResultCollector collector = FunctionService.onMember(basicGetSystem(), member).execute(new TestFunction()); //wait the function to lock the lock on member. collector.getResult(); lock.unlock(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/57c8600b/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/57c8600b/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/57c8600b/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);
