http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java index 7fbbdcf..02cd880 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java @@ -104,15 +104,13 @@ public class HABugInPutDUnitTest extends DistributedTestCase } - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { client1.invoke(HABugInPutDUnitTest.class, "closeCache"); client2.invoke(HABugInPutDUnitTest.class, "closeCache"); // close server server1.invoke(HABugInPutDUnitTest.class, "closeCache"); server2.invoke(HABugInPutDUnitTest.class, "closeCache"); - } public static void closeCache()
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java index 3eeed6b..58e54ed 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java @@ -108,15 +108,13 @@ public class HAClearDUnitTest extends DistributedTestCase } - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { client1.invoke(HAClearDUnitTest.class, "closeCache"); client2.invoke(HAClearDUnitTest.class, "closeCache"); server1.invoke(HAClearDUnitTest.class, "closeCache"); server2.invoke(HAClearDUnitTest.class, "closeCache"); closeCache(); - } /* The test perorms following operations http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java index 22310cf..732e22a 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java @@ -107,15 +107,13 @@ public class HADuplicateDUnitTest extends DistributedTestCase client2 = host.getVM(3); } - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { client1.invoke(HADuplicateDUnitTest.class, "closeCache"); // close server server1.invoke(HADuplicateDUnitTest.class, "reSetQRMslow"); server1.invoke(HADuplicateDUnitTest.class, "closeCache"); server2.invoke(HADuplicateDUnitTest.class, "closeCache"); - } public void _testDuplicate() throws Exception http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java index b77af55..af1eb8b 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java @@ -97,9 +97,8 @@ public class HAEventIdPropagationDUnitTest extends DistributedTestCase } /** close the caches* */ - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { client1.invoke(HAEventIdPropagationDUnitTest.class, "closeCache"); // close server server1.invoke(HAEventIdPropagationDUnitTest.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAExpiryDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAExpiryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAExpiryDUnitTest.java index 9366acb..92ee889 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAExpiryDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAExpiryDUnitTest.java @@ -96,16 +96,14 @@ public class HAExpiryDUnitTest extends DistributedTestCase } - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { vm0.invoke(HAExpiryDUnitTest.class, "closeCache"); vm1.invoke(HAExpiryDUnitTest.class, "closeCache"); vm2.invoke(HAExpiryDUnitTest.class, "closeCache"); vm3.invoke(HAExpiryDUnitTest.class, "closeCache"); cache = null; Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } }); - } public void testExpiryPeriod() throws Exception http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java index cfcb074..df754d0 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java @@ -116,9 +116,8 @@ public class HAGIIBugDUnitTest extends DistributedTestCase } - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { vm0.invoke(HAGIIBugDUnitTest.class, "closeCache"); vm1.invoke(HAGIIBugDUnitTest.class, "closeCache"); vm2.invoke(HAGIIBugDUnitTest.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java index 74ac4de..40d44b4 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java @@ -451,9 +451,9 @@ public class HAGIIDUnitTest extends DistributedTestCase { System.setProperty("slowStartTimeForTesting", "120000"); } - public void preTearDown() throws Exception - { - super.preTearDown(); + + @Override + protected 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/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java index e48516c..3691ba1 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java @@ -133,8 +133,8 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase { /** * Tears down the test. */ - public void preTearDown() throws Exception { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { closeCache(); clientVM1.invoke(HARQueueNewImplDUnitTest.class, "closeCache"); clientVM2.invoke(HARQueueNewImplDUnitTest.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionDUnitTest.java index 24dee4c..d553d1c 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionDUnitTest.java @@ -71,9 +71,8 @@ public class HARegionDUnitTest extends DistributedTestCase /** * close the cache in tearDown */ - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { vm0.invoke(HARegionDUnitTest.class, "closeCache"); vm1.invoke(HARegionDUnitTest.class, "closeCache"); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java index 7b410d6..da57b86 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java @@ -101,9 +101,8 @@ public class HARegionQueueDUnitTest extends DistributedTestCase /** * close the cache in tearDown */ - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { vm0.invoke(HARegionQueueDUnitTest.class, "closeCache"); vm1.invoke(HARegionQueueDUnitTest.class, "closeCache"); vm2.invoke(HARegionQueueDUnitTest.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java index 6dfcc02..6b805ad 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java @@ -91,8 +91,7 @@ public class HASlowReceiverDUnitTest extends DistributedTestCase { } @Override - public void preTearDown() throws Exception { - super.preTearDown(); + protected final void preTearDown() throws Exception { clientVM.invoke(HASlowReceiverDUnitTest.class, "closeCache"); // then close the servers http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java index 1aa3642..154f9cc 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java @@ -125,13 +125,11 @@ public class OperationsPropagationDUnitTest extends DistributedTestCase /** * close the caches of the client and the servers */ - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { client1.invoke(OperationsPropagationDUnitTest.class, "closeCache"); server1.invoke(OperationsPropagationDUnitTest.class, "closeCache"); server2.invoke(OperationsPropagationDUnitTest.class, "closeCache"); - } /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java index 9201a5f..ef75a38 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java @@ -102,9 +102,8 @@ public class PutAllDUnitTest extends DistributedTestCase } /** close the caches**/ - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { client1.invoke(PutAllDUnitTest.class, "closeCache"); client2.invoke(PutAllDUnitTest.class, "closeCache"); // close server http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java index 7ab929e..dd8cf87 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java @@ -153,9 +153,8 @@ public class StatsBugDUnitTest extends DistributedTestCase * @throws Exception * thrown if any problem occurs in closing cache */ - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { // close client client1.invoke(StatsBugDUnitTest.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java index 934772c..01e7eca 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java @@ -88,7 +88,8 @@ public class TXLockServiceDUnitTest extends DistributedTestCase { com.gemstone.gemfire.internal.OSProcess.printStacks(0); } - public void preTearDown() throws Exception { + @Override + protected final void preTearDown() throws Exception { // invokeInEveryVM(TXLockServiceDUnitTest.class, // "remoteDumpAllDLockServices"); @@ -105,9 +106,6 @@ public class TXLockServiceDUnitTest extends DistributedTestCase { testTXRecoverGrantor_replyCode_PASS = false; testTXRecoverGrantor_heldLocks_PASS = false; - - // Disconnects from GemFire if using shared memory - super.preTearDown(); } // ------------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java index d7e6a16..eca9bca 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java @@ -81,7 +81,8 @@ public class Bug43684DUnitTest extends DistributedTestCase { IgnoredException.addIgnoredException("Connection refused: connect"); } - public void preTearDown() throws Exception { + @Override + protected final void preTearDown() throws Exception { closeCache(); client1.invoke(Bug43684DUnitTest.class, "closeCache"); server1.invoke(Bug43684DUnitTest.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug47388DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug47388DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug47388DUnitTest.java index 785dde5..1a02b90 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug47388DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug47388DUnitTest.java @@ -103,7 +103,8 @@ public class Bug47388DUnitTest extends DistributedTestCase { } - public void preTearDown() throws Exception { + @Override + protected final void preTearDown() throws Exception { closeCache(); vm2.invoke(Bug47388DUnitTest.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java index 0f9a3b7..5b08a3e 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java @@ -75,7 +75,8 @@ public class Bug51400DUnitTest extends DistributedTestCase { } - public void preTearDown() throws Exception { + @Override + protected final void preTearDown() throws Exception { closeCache(); client0.invoke(Bug51400DUnitTest.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java index fd1a119..ce42945 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java @@ -55,10 +55,6 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase { } - public void preTearDown() throws Exception { - super.preTearDown(); - } - /** * This test validates that null partition name cannot be added in * FixedPartitionAttributes http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java index 1b00b8c..95ea49f 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java @@ -1317,7 +1317,8 @@ public class FixedPartitioningTestBase extends DistributedTestCase { PartitionedRegion.BEFORE_CALCULATE_STARTING_BUCKET_FLAG = false; } - public void preTearDown() throws Exception { + @Override + protected final void preTearDown() throws Exception { try { closeCache(); member1.invoke(FixedPartitioningTestBase.class, "closeCache"); @@ -1336,7 +1337,6 @@ public class FixedPartitioningTestBase extends DistributedTestCase { vm.invoke(FixedPartitioningTestBase.class, "remoteTearDown"); } } - super.preTearDown(); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java index b344ddb..8a06f7e 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java @@ -44,10 +44,6 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends } - public void preTearDown() throws Exception { - super.preTearDown(); - } - /** * This tests validates that in colocation of FPRs child region cannot specify * FixedPartitionAttributes http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/Bug40396DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/Bug40396DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/Bug40396DUnitTest.java index a3d45bb..c28f9e7 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/Bug40396DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/Bug40396DUnitTest.java @@ -202,8 +202,8 @@ public class Bug40396DUnitTest extends DistributedTestCase { assertTrue("pattern not found", matched); } - public void preTearDown() throws Exception { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { // then close the servers server.invoke(Bug40396DUnitTest.class, "removeExceptions"); server.invoke(Bug40396DUnitTest.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java index a3976a7..3d53df9 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java @@ -135,8 +135,7 @@ public class BackwardCompatibilityHigherVersionClientDUnitTest extends } @Override - public void preTearDown() throws Exception { - super.preTearDown(); + protected final void postTearDown() throws Exception { client1.invoke(BackwardCompatibilityHigherVersionClientDUnitTest.class, "unsetHandshakeVersionForTesting"); client1.invoke(BackwardCompatibilityHigherVersionClientDUnitTest.class, http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java index 94ffa6f..c8ac91e 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java @@ -218,13 +218,11 @@ public class Bug36269DUnitTest extends DistributedTestCase } } - public void preTearDown() throws Exception - { + @Override + protected final void preTearDown() throws Exception { closeCache(); // close server server1.invoke(Bug36269DUnitTest.class, "closeCache"); server2.invoke(Bug36269DUnitTest.class, "closeCache"); - } - } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java index 22a4eae..cff2266 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java @@ -139,9 +139,8 @@ public class Bug36457DUnitTest extends DistributedTestCase return new Integer(server1.getPort()); } - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { // close the clients first client1.invoke(Bug36457DUnitTest.class, "closeCache"); client2.invoke(Bug36457DUnitTest.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java index 236c8fa..d9f1a2e 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java @@ -133,9 +133,8 @@ public class Bug36805DUnitTest extends DistributedTestCase return new Integer(server1.getPort()); } - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { // close the clients first client1.invoke(Bug36805DUnitTest.class, "closeCache"); client2.invoke(Bug36805DUnitTest.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java index 96bca47..ceac13b 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java @@ -168,9 +168,8 @@ public class Bug36829DUnitTest extends DistributedTestCase { return properties; } - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { CacheServerTestUtil.resetDisableShufflingOfEndpointsFlag(); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java index d9ed901..872f95c 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java @@ -139,9 +139,8 @@ public class Bug36995DUnitTest extends DistributedTestCase return new Integer(server1.getPort()); } - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { closeCache(); server1.invoke(Bug36995DUnitTest.class, "closeCache"); server2.invoke(Bug36995DUnitTest.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java index eddbda5..050a8fc 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java @@ -123,9 +123,8 @@ public class Bug37210DUnitTest extends DistributedTestCase * @throws Exception * thrown if any problem occurs in closing cache */ - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { // close client client.invoke(Bug37210DUnitTest.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java index b135e61..f7adf6a 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java @@ -65,7 +65,8 @@ public class Bug37805DUnitTest extends DistributedTestCase{ CacheServerTestUtil.disableShufflingOfEndpoints(); } - public void preTearDown() throws Exception { + @Override + protected final void preTearDown() throws Exception { // Stop server 1 this.server1VM.invoke(CacheServerTestUtil.class, "closeCache"); CacheServerTestUtil.resetDisableShufflingOfEndpointsFlag(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java index 18811ee..236076a 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java @@ -843,9 +843,8 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase } } - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { // close the clients first client1.invoke(CacheServerTransactionsDUnitTest.class, "closeCache"); client2.invoke(CacheServerTransactionsDUnitTest.class, "closeCache"); @@ -853,5 +852,4 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase server1.invoke(CacheServerTransactionsDUnitTest.class, "closeCache"); server2.invoke(CacheServerTransactionsDUnitTest.class, "closeCache"); } - } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java index 626d9e2..15beecd 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java @@ -476,14 +476,13 @@ public class ClearPropagationDUnitTest extends DistributedTestCase } } - public void preTearDown() throws Exception - { + @Override + protected final void preTearDown() throws Exception { //close client client1.invoke(ClearPropagationDUnitTest.class, "closeCache"); client2.invoke(ClearPropagationDUnitTest.class, "closeCache"); //close server server1.invoke(ClearPropagationDUnitTest.class, "closeCache"); server2.invoke(ClearPropagationDUnitTest.class, "closeCache"); - } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java index 2cf340e..3a7c246 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java @@ -528,8 +528,8 @@ public class ClientConflationDUnitTest extends DistributedTestCase /** * close the cache in tearDown */ - public void preTearDown() throws Exception - { + @Override + protected final void preTearDown() throws Exception { // close client closeCacheFeeder(); vm1.invoke(ClientConflationDUnitTest.class, "closeCacheClient"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java index 404d47f..22f36cd 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java @@ -637,8 +637,8 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase /** * close the caches in tearDown */ - public void preTearDown() throws Exception - { + @Override + protected final void preTearDown() throws Exception { vm0.invoke(ClientInterestNotifyDUnitTest.class, "closeCache"); vm1.invoke(ClientInterestNotifyDUnitTest.class, "closeCache"); /* http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java index 26411b4..88bdb20 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java @@ -908,8 +908,8 @@ public class ConflationDUnitTest extends DistributedTestCase /** * close the cache in tearDown */ - public void preTearDown() throws Exception - { + @Override + protected final void preTearDown() throws Exception { // close client closeCache(); vm2.invoke(ConflationDUnitTest.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java index 27359a6..06abd14 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java @@ -156,7 +156,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase { } @Override - public void preTearDown() throws Exception { + protected final void preTearDown() throws Exception { try { // close the clients first client1.invoke(DataSerializerPropogationDUnitTest.class, "closeCache"); @@ -166,8 +166,6 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase { server1.invoke(DataSerializerPropogationDUnitTest.class, "closeCache"); server2.invoke(DataSerializerPropogationDUnitTest.class, "closeCache"); - super.preTearDown(); - client1 = null; client2 = null; server1 = null; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java index dfe2fe3..5ba03bd 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java @@ -499,15 +499,13 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase } } - public void preTearDown() throws Exception - { + @Override + protected final void preTearDown() throws Exception { //close client vm2.invoke(DestroyEntryPropagationDUnitTest.class, "closeCache"); vm3.invoke(DestroyEntryPropagationDUnitTest.class, "closeCache"); //close server vm0.invoke(DestroyEntryPropagationDUnitTest.class, "closeCache"); vm1.invoke(DestroyEntryPropagationDUnitTest.class, "closeCache"); - } - } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java index b00c536..dbe2355 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java @@ -91,7 +91,8 @@ public class DurableClientQueueSizeDUnitTest extends DistributedTestCase { IgnoredException.addIgnoredException("Unexpected IOException"); } - public void preTearDown() throws Exception { + @Override + protected final void preTearDown() throws Exception { closeCache(); vm2.invoke(DurableClientQueueSizeDUnitTest.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java index f642733..6ade4bd 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java @@ -732,8 +732,7 @@ public class DurableClientReconnectDUnitTest extends DistributedTestCase } @Override - public void preTearDown() throws Exception { - super.preTearDown(); + protected final void preTearDown() throws Exception { // close the clients first closeCache(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java index d491513..97cb31c 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java @@ -80,7 +80,7 @@ public class DurableClientStatsDUnitTest extends DistributedTestCase { } @Override - public void preTearDown() throws Exception { + protected final void preTearDown() throws Exception { // Stop server 1 this.server1VM.invoke(CacheServerTestUtil.class, "closeCache"); CacheServerTestUtil.resetDisableShufflingOfEndpointsFlag(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java index 132ab16..141bb0b 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java @@ -863,9 +863,8 @@ public class DurableRegistrationDUnitTest extends DistributedTestCase { this.regionName = regionName; } - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { CacheServerTestUtil.resetDisableShufflingOfEndpointsFlag(); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java index 4ee36bd..4f1028c 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java @@ -508,9 +508,8 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase return properties; } - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected 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/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java index 61c6c78..78e0f41 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java @@ -488,9 +488,8 @@ public class EventIDVerificationDUnitTest extends DistributedTestCase assertEquals(eventId, ((RegionEventImpl)event).getEventId()); } - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected 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/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java index 74e28c8..15a709b 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java @@ -318,9 +318,8 @@ public class EventIDVerificationInP2PDUnitTest extends DistributedTestCase assertTrue(pass.booleanValue()); } - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { closeCache(); vm0.invoke(EventIDVerificationInP2PDUnitTest.class, "closeCache"); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HABug36738DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HABug36738DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HABug36738DUnitTest.java index 65d7a7c..08175dd 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HABug36738DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HABug36738DUnitTest.java @@ -87,12 +87,10 @@ public class HABug36738DUnitTest extends DistributedTestCase } - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { server1.invoke(HABug36738DUnitTest.class, "closeCache"); server2.invoke(HABug36738DUnitTest.class, "closeCache"); - } public void testBug36768() throws Exception http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java index 852a5bd..d5b6252 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java @@ -116,7 +116,7 @@ public class HAInterestTestCase extends DistributedTestCase { } @Override - public void preTearDown() throws Exception { + protected final void preTearDown() throws Exception { // close the clients first closeCache(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java index 5cc561c..01c595c 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java @@ -717,9 +717,8 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase } - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { // close the clients first closeCache(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java index 11482e5..c6f71e2 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java @@ -151,8 +151,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase { } @Override - public void preTearDown() throws Exception { - super.preTearDown(); + protected final void preTearDown() throws Exception { // close the clients first closeCache(); client1.invoke(InstantiatorPropagationDUnitTest.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java index 252916e..06f599f 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java @@ -1077,8 +1077,8 @@ public class InterestListDUnitTest extends DistributedTestCase } } - public void preTearDown() throws Exception - { + @Override + protected final void preTearDown() throws Exception { // close the clients first vm1.invoke(InterestListDUnitTest.class, "closeCache"); vm2.invoke(InterestListDUnitTest.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java index c0494d3..b8db844 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java @@ -490,8 +490,8 @@ public class InterestListEndpointDUnitTest extends DistributedTestCase } } - public void preTearDown() throws Exception - { + @Override + protected final void preTearDown() throws Exception { // Close client cache first, then server caches client1.invoke(impl.getClass(), "closeCache"); server2.invoke(impl.getClass(), "closeCache"); @@ -500,5 +500,4 @@ public class InterestListEndpointDUnitTest extends DistributedTestCase cache = null; Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } }); } - } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java index a3ec211..d5e32bd 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java @@ -302,7 +302,8 @@ public class InterestListFailoverDUnitTest extends DistributedTestCase } } - public void preTearDown() throws Exception { + @Override + protected final void preTearDown() throws Exception { closeAll(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java index 5785baf..19e7e16 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java @@ -481,9 +481,8 @@ public class InterestListRecoveryDUnitTest extends DistributedTestCase .getProfile(regionName).getKeysOfInterestFor(proxy.getProxyID()); } - @Override - public void preTearDown() throws Exception - { + @Override + protected final void preTearDown() throws Exception { // close the clients first server2.invoke(InterestListRecoveryDUnitTest.class, "closeCache"); closeCache(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java index 85c6727..597da3d 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java @@ -94,8 +94,7 @@ public class InterestResultPolicyDUnitTest extends DistributedTestCase * Closes the cache on server and client */ @Override - public void preTearDown() throws Exception - { + protected final void preTearDown() throws Exception { // might get ServerConnectivityExceptions during shutdown this.expectedEx = IgnoredException.addIgnoredException(ServerConnectivityException.class .getName()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java index be73f0c..97bef89 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java @@ -99,8 +99,8 @@ public class NewRegionAttributesDUnitTest extends DistributedTestCase * @throws Exception * thrown if any problem occurs while closing the cache */ - public void preTearDown() throws Exception - { + @Override + protected final void preTearDown() throws Exception { vm0.invoke(NewRegionAttributesDUnitTest.class, "closeCache"); vm1.invoke(NewRegionAttributesDUnitTest.class, "closeCache"); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java index b110870..03ed215 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java @@ -624,11 +624,9 @@ public class RedundancyLevelTestBase extends DistributedTestCase // } } - public void preTearDown() throws Exception - { + @Override + protected final void preTearDown() throws Exception { try { - super.preTearDown(); - if(!FailOverDetectionByCCU) ClientServerObserverHolder.setInstance(oldBo); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java index b00c85b..a6ee5ba 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java @@ -236,13 +236,11 @@ public class RegionCloseDUnitTest extends DistributedTestCase } } - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { //close client client1.invoke(RegionCloseDUnitTest.class, "closeCache"); //close server server1.invoke(RegionCloseDUnitTest.class, "closeCache"); } - } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java index f705664..fd50d6e 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java @@ -105,9 +105,8 @@ public class RegisterInterestBeforeRegionCreationDUnitTest extends DistributedTe * close the cache on all the vms * @throws Exception */ - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { client1.invoke(RegisterInterestBeforeRegionCreationDUnitTest.class, "closeCache"); client2.invoke(RegisterInterestBeforeRegionCreationDUnitTest.class, "closeCache"); server1.invoke(RegisterInterestBeforeRegionCreationDUnitTest.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java index 5541a6a..203a742 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java @@ -236,15 +236,13 @@ public class RegisterInterestKeysDUnitTest extends DistributedTestCase } } - public void preTearDown() throws Exception - { + @Override + protected final void preTearDown() throws Exception { //close client client1.invoke(impl.getClass(), "closeCache"); client2.invoke(impl.getClass(), "closeCache"); //close server server1.invoke(impl.getClass(), "closeCache"); server2.invoke(impl.getClass(), "closeCache"); - } - } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java index e0fc7ac..ece92d7 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java @@ -414,10 +414,9 @@ public class ReliableMessagingDUnitTest extends DistributedTestCase pool = p; } - public void preTearDown() throws Exception - { + @Override + protected final void preTearDown() throws Exception { creationTime = 0; - super.preTearDown(); closeCache(); server1.invoke(ReliableMessagingDUnitTest.class, "closeCache"); server2.invoke(ReliableMessagingDUnitTest.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java index 6078f58..dedd915 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java @@ -82,7 +82,8 @@ public class UnregisterInterestDUnitTest extends DistributedTestCase { client2.invoke(UnregisterInterestDUnitTest.class, "createClientCache", new Object[]{client2.getHost(), port}); } - public void preTearDown() throws Exception { + @Override + protected final void preTearDown() throws Exception { closeCache(); server0.invoke(UnregisterInterestDUnitTest.class, "closeCache"); client1.invoke(UnregisterInterestDUnitTest.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java index f9c2160..0c60c46 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java @@ -588,17 +588,15 @@ public class UpdatePropagationDUnitTest extends DistributedTestCase } } - public void preTearDown() throws Exception - { + @Override + protected final void preTearDown() throws Exception { //close client client1.invoke(getClass(), "closeCache"); client2.invoke(getClass(), "closeCache"); //close server server1.invoke(getClass(), "closeCache"); server2.invoke(getClass(), "closeCache"); - } - } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java index 7c55044..83df124 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java @@ -172,9 +172,8 @@ public class VerifyEventIDGenerationInP2PDUnitTest extends DistributedTestCase return new Boolean(temp); } - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { closeCache(); vm0.invoke(VerifyEventIDGenerationInP2PDUnitTest.class, "closeCache"); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java index d402c4a..c2a0016 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java @@ -246,14 +246,12 @@ public class VerifyUpdatesFromNonInterestEndPointDUnitTest extends DistributedTe } } - public void preTearDown() throws Exception - { + @Override + protected final void preTearDown() throws Exception { //close client vm2.invoke(VerifyUpdatesFromNonInterestEndPointDUnitTest.class, "closeCache"); //close server vm0.invoke(VerifyUpdatesFromNonInterestEndPointDUnitTest.class, "closeCache"); vm1.invoke(VerifyUpdatesFromNonInterestEndPointDUnitTest.class, "closeCache"); - } - } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java index 17c4558..ff918b8 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java @@ -1571,8 +1571,8 @@ public class AsyncEventQueueTestBase extends DistributedTestCase { } } - public void preTearDown() throws Exception { - super.preTearDown(); + @Override + protected final void postTearDown() throws Exception { cleanupVM(); vm0.invoke(AsyncEventQueueTestBase.class, "cleanupVM"); vm1.invoke(AsyncEventQueueTestBase.class, "cleanupVM"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java index 3f2a0bc..492ec61 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java @@ -185,7 +185,8 @@ public class ExceptionsDUnitTest extends DistributedTestCase { vm0.invoke(ExceptionsDUnitTest.class, "init"); } - public void preTearDown() throws NamingException, SQLException { + @Override + protected final void preTearDown() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); vm0.invoke(ExceptionsDUnitTest.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java index 02d2531..96e5a8d 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java @@ -253,11 +253,9 @@ public class IdleTimeOutDUnitTest extends DistributedTestCase { vm0.invoke(IdleTimeOutDUnitTest.class, "init", o); } - public void preTearDown() throws NamingException, SQLException { + @Override + protected final void preTearDown() throws Exception { VM vm0 = Host.getHost(0).getVM(0); - // destroyTable call disabled due to high rate of failure - see internal ticket #52274 -// vm0.invoke(IdleTimeOutDUnitTest.class, "destroyTable"); - // if destroyTable is fixed then this closeCache is not necessary and can be removed vm0.invoke(IdleTimeOutDUnitTest.class, "closeCache"); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java index 40a165b..1ab5b2c 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java @@ -255,7 +255,8 @@ public class MaxPoolSizeDUnitTest extends DistributedTestCase { vm0.invoke(MaxPoolSizeDUnitTest.class, "init", o); } - public void preTearDown() throws NamingException, SQLException { + @Override + protected 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/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java index aeb36ea..fead02e 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java @@ -126,7 +126,8 @@ public class TransactionTimeOutDUnitTest extends DistributedTestCase { vm0.invoke(TransactionTimeOutDUnitTest.class, "init"); } - public void preTearDown() throws NamingException, SQLException { + @Override + protected final void preTearDown() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); vm0.invoke(TransactionTimeOutDUnitTest.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java index ded9cd7..fab159d 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java @@ -355,7 +355,8 @@ public class TxnManagerMultiThreadDUnitTest extends DistributedTestCase { } }//end of delRows - public void preTearDown() throws java.lang.Exception { + @Override + protected 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/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java index 1ea6b54..a9f41ac 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java @@ -122,7 +122,8 @@ public class TxnTimeOutDUnitTest extends DistributedTestCase { vm0.invoke(TxnTimeOutDUnitTest.class, "init"); } - public void preTearDown() throws NamingException, SQLException { + @Override + protected final void preTearDown() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); vm0.invoke(TxnTimeOutDUnitTest.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessLauncherDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessLauncherDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessLauncherDUnitTest.java index dcba69c..cb05740 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessLauncherDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessLauncherDUnitTest.java @@ -49,10 +49,6 @@ public class LocalProcessLauncherDUnitTest extends DistributedTestCase { new File(getClass().getSimpleName()).mkdir(); } - @Override - public void preTearDown() throws Exception { - } - public void testExistingPidFileThrows() throws Exception { final File pidFile = new File(getClass().getSimpleName() + File.separator + "testExistingPidFileThrows.pid"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java index 402ea94..320e20a 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java @@ -101,12 +101,6 @@ public class CacheManagementDUnitTest extends ManagementTestBase { } - public void preTearDown() throws Exception { - super.preTearDown(); - } - - - public void testGemFireConfigData() throws Exception { initManagement(false); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java index e501898..9d42589 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java @@ -107,8 +107,8 @@ public class ClientHealthStatsDUnitTest extends DistributedTestCase { IgnoredException.addIgnoredException("Connection reset"); } - public void preTearDown() throws Exception { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { reset(); helper.closeCache(managingNode); helper.closeCache(client); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/management/CompositeTypeTestDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/CompositeTypeTestDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/CompositeTypeTestDUnitTest.java index 7156f0a..49db7d5 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/CompositeTypeTestDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/CompositeTypeTestDUnitTest.java @@ -48,11 +48,6 @@ public class CompositeTypeTestDUnitTest extends ManagementTestBase { } - public void preTearDown() throws Exception { - super.preTearDown(); - - } - public void testCompositeTypeGetters() throws Exception{ initManagement(false); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/management/DLockManagementDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/DLockManagementDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/DLockManagementDUnitTest.java index 827d9b1..2e08d58 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/DLockManagementDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/DLockManagementDUnitTest.java @@ -58,11 +58,6 @@ public class DLockManagementDUnitTest extends ManagementTestBase { } - public void preTearDown() throws Exception { - super.preTearDown(); - - } - /** * Distributed Lock Service test * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/management/DiskManagementDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/DiskManagementDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/DiskManagementDUnitTest.java index 6d7b799..b850b54 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/DiskManagementDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/DiskManagementDUnitTest.java @@ -92,8 +92,8 @@ public class DiskManagementDUnitTest extends ManagementTestBase { } - public void preTearDown() throws Exception { - super.preTearDown(); + @Override + protected final void postTearDownManagementTestBase() throws Exception { com.gemstone.gemfire.internal.FileUtil.delete(diskDir); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java index 85a92dc..10f628d 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java @@ -116,11 +116,6 @@ public class DistributedSystemDUnitTest extends ManagementTestBase { } - public void preTearDown() throws Exception { - super.preTearDown(); - - } - /** * Tests each and every operations that is defined on the MemberMXBean * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java index 3f1c472..0d2fdbc 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java @@ -73,10 +73,9 @@ public class LocatorManagementDUnitTest extends ManagementTestBase { locator = managedNode1; } - public void preTearDown() throws Exception { + @Override + protected final void preTearDownManagementTestBase() throws Exception { stopLocator(locator); - super.preTearDown(); - } /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java index d5b3178..663abee 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java @@ -124,16 +124,25 @@ public class ManagementTestBase extends DistributedTestCase { } - public void preTearDown() throws Exception { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { + preTearDownManagementTestBase(); + closeAllCache(); managementService = null; mcastPort = 0; disconnectAllFromDS(); props.clear(); + + postTearDownManagementTestBase(); } + protected void preTearDownManagementTestBase() throws Exception { + } + + protected void postTearDownManagementTestBase() throws Exception { + } public void closeAllCache() throws Exception{ closeCache(managingNode);
