Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-773-2 c05f6798d -> 30f29f44f
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/management/MemberMBeanAttributesDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/MemberMBeanAttributesDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/MemberMBeanAttributesDUnitTest.java index 284e7f8..c3c1c2f 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/MemberMBeanAttributesDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/MemberMBeanAttributesDUnitTest.java @@ -63,10 +63,6 @@ public class MemberMBeanAttributesDUnitTest extends ManagementTestBase { } - public void preTearDown() throws Exception { - super.preTearDown(); - } - 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/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java index f98af24..e52594e 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/QueryDataDUnitTest.java @@ -149,11 +149,6 @@ public class QueryDataDUnitTest extends ManagementTestBase { } - public void preTearDown() throws Exception { - super.preTearDown(); - - } - private void initCommonRegions(){ createRegionsInNodes(); fillValuesInRegions(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java index 4166273..303188a 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java @@ -111,11 +111,6 @@ public class RegionManagementDUnitTest extends ManagementTestBase { } - public void preTearDown() throws Exception { - super.preTearDown(); - - } - /** * Tests all Region MBean related Management APIs * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsDUnitTest.java index 9600582..1de93ee 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsDUnitTest.java @@ -48,10 +48,6 @@ public class DistributedSystemStatsDUnitTest extends ManagementTestBase{ super.setUp(); } - public void preTearDown() throws Exception { - super.preTearDown(); - } - public void testDistributedSystemStats() throws Exception { initManagement(true); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java index 5cbc40b..696de8e 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java @@ -90,17 +90,14 @@ public class TestClientIdsDUnitTest extends DistributedTestCase { client2 = host.getVM(3); } - public void preTearDown() throws Exception { - super.preTearDown(); - + @Override + protected final void preTearDown() throws Exception { helper.closeCache(managingNode); helper.closeCache(server); helper.closeCache(client); helper.closeCache(client2); disconnectFromDS(); - - } private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java index 3bb7162..c2f2b60 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestFunctionsDUnitTest.java @@ -49,10 +49,6 @@ public class TestFunctionsDUnitTest extends ManagementTestBase { } - public void preTearDown() throws Exception { - super.preTearDown(); - } - public static Integer getNumOfRunningFunction() { final WaitCriterion waitCriteria = new WaitCriterion() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java index fd161fd..f8abe35 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestHeapDUnitTest.java @@ -43,10 +43,6 @@ public class TestHeapDUnitTest extends ManagementTestBase { } - public void preTearDown() throws Exception { - super.preTearDown(); - } - public static long getHeapSizeOfClient() { return (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java index 24494ff..e9b976a 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestLocatorsDUnitTest.java @@ -42,10 +42,6 @@ public class TestLocatorsDUnitTest extends ManagementTestBase { } - public void preTearDown() throws Exception { - super.preTearDown(); - } - public static int getNumOfLocatorFromMBean() { final WaitCriterion waitCriteria = new WaitCriterion() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java index 4043ad4..ef491b0 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java @@ -83,14 +83,13 @@ public class TestSubscriptionsDUnitTest extends DistributedTestCase { client2 = host.getVM(3); } - public void preTearDown() throws Exception { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { helper.closeCache(managingNode); helper.closeCache(server); helper.closeCache(client); helper.closeCache(client2); disconnectFromDS(); - } private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java index 476702c..f787909 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java @@ -102,8 +102,7 @@ public class RedisDistDUnitTest extends DistributedTestCase { } @Override - public void preTearDown() throws Exception { - super.preTearDown(); + protected final void preTearDown() throws Exception { disconnectAllFromDS(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java index c8494ff..7cd95fd 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java @@ -59,8 +59,7 @@ public class RestAPITestBase extends DistributedTestCase { * close the clients and teh servers */ @Override - public void preTearDown() throws Exception - { + protected final void preTearDown() throws Exception { vm0.invoke(getClass(), "closeCache"); vm1.invoke(getClass(), "closeCache"); vm2.invoke(getClass(), "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java index 6f57fb6..911454a 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java @@ -956,9 +956,7 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase { ////////////////////////////////////////////////////////////////////////////// @Override - public void preTearDown() throws Exception { - - super.preTearDown(); + protected final void preTearDown() throws Exception { // close the clients first client1.invoke(SecurityTestUtil.class, "closeCache"); client2.invoke(SecurityTestUtil.class, "closeCache"); @@ -966,5 +964,4 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase { server1.invoke(SecurityTestUtil.class, "closeCache"); server2.invoke(SecurityTestUtil.class, "closeCache"); } - } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java index 526f431..2774e35 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java @@ -785,9 +785,7 @@ public class ClientAuthorizationDUnitTest extends ClientAuthorizationTestBase { // End Region: Tests @Override - public void preTearDown() throws Exception { - - super.preTearDown(); + protected final void preTearDown() throws Exception { // close the clients first client1.invoke(SecurityTestUtil.class, "closeCache"); client2.invoke(SecurityTestUtil.class, "closeCache"); @@ -796,5 +794,4 @@ public class ClientAuthorizationDUnitTest extends ClientAuthorizationTestBase { server1.invoke(SecurityTestUtil.class, "closeCache"); server2.invoke(SecurityTestUtil.class, "closeCache"); } - } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientMultiUserAuthzDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientMultiUserAuthzDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientMultiUserAuthzDUnitTest.java index b2b1245..f175d98 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientMultiUserAuthzDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientMultiUserAuthzDUnitTest.java @@ -522,9 +522,8 @@ public class ClientMultiUserAuthzDUnitTest extends ClientAuthorizationTestBase { // End Region: Tests - public void preTearDown() throws Exception { - - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { // close the clients first client1.invoke(SecurityTestUtil.class, "closeCache"); client2.invoke(SecurityTestUtil.class, "closeCache"); @@ -533,5 +532,4 @@ public class ClientMultiUserAuthzDUnitTest extends ClientAuthorizationTestBase { server1.invoke(SecurityTestUtil.class, "closeCache"); server2.invoke(SecurityTestUtil.class, "closeCache"); } - } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java index f4cd68c..2b44631 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java @@ -115,8 +115,8 @@ public class DeltaClientAuthorizationDUnitTest extends SecurityTestUtil.registerExpectedExceptions(clientExpectedExceptions); } - public void preTearDown() throws Exception { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { // close the clients first client1.invoke(SecurityTestUtil.class, "closeCache"); client2.invoke(SecurityTestUtil.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java index bcffeb1..fe3cec6 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java @@ -77,9 +77,8 @@ public class DeltaClientPostAuthorizationDUnitTest extends SecurityTestUtil.registerExpectedExceptions(clientExpectedExceptions); } - public void preTearDown() throws Exception { - - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { // close the clients first client1.invoke(SecurityTestUtil.class, "closeCache"); client2.invoke(SecurityTestUtil.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/LogWriterUtils.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/LogWriterUtils.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/LogWriterUtils.java index 9ecea61..9556af2 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/LogWriterUtils.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/LogWriterUtils.java @@ -1,3 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.gemstone.gemfire.test.dunit; import java.util.Properties; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java index 7dcd120..8a4eeaa 100755 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java @@ -1142,14 +1142,13 @@ public class PRDeltaPropagationDUnitTest extends DistributedTestCase { ConflationDUnitTest.unsetIsSlowStart(); } - public void preTearDown() throws Exception { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { closeCache(); client1.invoke(PRDeltaPropagationDUnitTest.class, "closeCache"); dataStore1.invoke(PRDeltaPropagationDUnitTest.class, "closeCache"); dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "closeCache"); dataStore3.invoke(PRDeltaPropagationDUnitTest.class, "closeCache"); - } public static void closeCache() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java index a252e4c..9b8f28f 100755 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java @@ -175,8 +175,8 @@ public class CQListGIIDUnitTest extends DistributedTestCase { /** * Tears down the test. */ - public void preTearDown() throws Exception { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { serverVM0.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); serverVM1.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); closeCache(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java index a8f23dd..8920afb 100755 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java @@ -160,16 +160,13 @@ public class HADispatcherDUnitTest extends DistributedTestCase } @Override - public void preTearDown() throws Exception - { - super.preTearDown(); + protected final void preTearDown() throws Exception { client1.invoke(HADispatcherDUnitTest.class, "closeCache"); client2.invoke(HADispatcherDUnitTest.class, "closeCache"); // close server server1.invoke(HADispatcherDUnitTest.class, "resetQRMslow"); server1.invoke(HADispatcherDUnitTest.class, "closeCache"); server2.invoke(HADispatcherDUnitTest.class, "closeCache"); - } public static void closeCache() http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java index 1ad1e8f..0449a78 100755 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java @@ -133,8 +133,8 @@ public class ClientToServerDeltaDUnitTest extends DistributedTestCase { client2 = host.getVM(3); } - public void preTearDown() throws Exception { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { // reset all flags DeltaTestImpl.resetDeltaInvokationCounters(); server.invoke(DeltaTestImpl.class, "resetDeltaInvokationCounters"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java index d30b510..8095079 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java @@ -104,8 +104,8 @@ public class DeltaPropagationWithCQDUnitTest extends DistributedTestCase { client2 = host.getVM(3); } - public void preTearDown() throws Exception { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { server1.invoke(DeltaPropagationWithCQDUnitTest.class, "close"); server2.invoke(DeltaPropagationWithCQDUnitTest.class, "close"); client1.invoke(DeltaPropagationWithCQDUnitTest.class, "close"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java index 4a7a17e..886e671 100755 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java @@ -590,11 +590,6 @@ public class DeltaToRegionRelationCQRegistrationDUnitTest extends DistributedTes return new Integer(p.getPrimaryPort()); } - public void preTearDown() throws Exception - { - // donot do any thing as we handling closing cache in test case - } - /* * close cache */ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java index 0786be0..753fe67 100755 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java @@ -43,9 +43,9 @@ public class DurableClientCrashDUnitTest extends DurableClientTestCase { this.durableClientVM.invoke(CacheServerTestUtil.class, "setClientCrash", new Object[] {new Boolean(true)}); } - public void preTearDown() throws Exception { + @Override + protected void preTearDownDurableClientTestCase() throws Exception { configureClientStop2(); - super.preTearDown(); } public void configureClientStop2() http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java index f58a8a4..96781f9 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java @@ -32,10 +32,9 @@ public class DurableClientNetDownDUnitTest extends DurableClientCrashDUnitTest { } @Override - public void preTearDown() throws Exception { + protected final void preTearDownDurableClientTestCase() throws Exception { //ensure that the test flag is no longer set in this vm this.durableClientVM.invoke(CacheServerTestUtil.class, "reconnectClient"); - super.preTearDown(); } public void setPrimaryRecoveryCheck() {} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java index c0aba3c..f9d73e0 100755 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java @@ -106,12 +106,18 @@ public class DurableClientTestCase extends DistributedTestCase { System.out.println("\n\n[setup] START TEST " + getClass().getSimpleName()+"."+ getTestMethodName()+"\n\n"); } - public void preTearDown() throws Exception { + @Override + protected final void preTearDown() throws Exception { + preTearDownDurableClientTestCase(); + this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache"); this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache"); this.server1VM.invoke(CacheServerTestUtil.class, "closeCache"); this.server2VM.invoke(CacheServerTestUtil.class, "closeCache"); } + + protected void preTearDownDurableClientTestCase() throws Exception { + } /** * Test that starting a durable client is correctly processed by the server. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java index a66da0b..b4e589f 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java @@ -93,8 +93,8 @@ public class CacheServerManagementDUnitTest extends LocatorTestBase { super.setUp(); } - public void preTearDown() throws Exception { - super.preTearDown(); + @Override + protected final void postTearDownLocatorTestBase() throws Exception { disconnectAllFromDS(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java index 03f19c3..4ba48df 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java @@ -51,10 +51,6 @@ public class TestCQDUnitTest extends ManagementTestBase { } - public void preTearDown() throws Exception { - super.preTearDown(); - } - public static long getNumOfCQ() { final WaitCriterion waitCriteria = new WaitCriterion() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java index 9cfec67..1659731 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java @@ -48,10 +48,6 @@ public class TestClientsDUnitTest extends ManagementTestBase { } - public void preTearDown() throws Exception { - super.preTearDown(); - } - public static Integer getNumOfClients() { final WaitCriterion waitCriteria = new WaitCriterion() { @Override http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java index 9d880a7..8fa29a7 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java @@ -45,10 +45,6 @@ public class TestServerDUnitTest extends ManagementTestBase { } - public void preTearDown() throws Exception { - super.preTearDown(); - } - public static int getNumOfServersFromMBean() { final WaitCriterion waitCriteria = new WaitCriterion() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java index b464451..86e38f3 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java @@ -231,9 +231,7 @@ public class ClientAuthorizationTwoDUnitTest extends // End Region: Tests @Override - public void preTearDown() throws Exception { - - super.preTearDown(); + protected final void preTearDown() throws Exception { // close the clients first client1.invoke(SecurityTestUtil.class, "closeCache"); client2.invoke(SecurityTestUtil.class, "closeCache"); @@ -242,5 +240,4 @@ public class ClientAuthorizationTwoDUnitTest extends server1.invoke(SecurityTestUtil.class, "closeCache"); server2.invoke(SecurityTestUtil.class, "closeCache"); } - } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java index 020c37b..e26db30 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java @@ -140,8 +140,8 @@ public class ClientAuthzObjectModDUnitTest extends ClientAuthorizationTestBase { server2.invoke(registerInstantiator); } - public void preTearDown() throws Exception { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { DistributedTestCase.cleanupAllVms(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java index bf6eec4..e17acc0 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java @@ -95,8 +95,8 @@ public class ClientCQPostAuthorizationDUnitTest extends SecurityTestUtil.registerExpectedExceptions(clientExpectedExceptions); } - public void preTearDown() throws Exception { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { client1.invoke(SecurityTestUtil.class, "closeCache"); client2.invoke(SecurityTestUtil.class, "closeCache"); server1.invoke(SecurityTestUtil.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java index 3cb3443..78a45b1 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java @@ -384,9 +384,8 @@ public class ClientPostAuthorizationDUnitTest extends // End Region: Tests - public void preTearDown() throws Exception { - - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { // close the clients first client1.invoke(SecurityTestUtil.class, "closeCache"); client2.invoke(SecurityTestUtil.class, "closeCache"); @@ -395,5 +394,4 @@ public class ClientPostAuthorizationDUnitTest extends server1.invoke(SecurityTestUtil.class, "closeCache"); server2.invoke(SecurityTestUtil.class, "closeCache"); } - } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java index ec85a1e..e3931b0 100644 --- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java +++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java @@ -380,8 +380,8 @@ public class MultiuserAPIDUnitTest extends ClientAuthorizationTestBase { } } - public void preTearDown() throws Exception { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { // close the clients first client1.invoke(SecurityTestUtil.class, "closeCache"); client2.invoke(SecurityTestUtil.class, "closeCache"); @@ -389,5 +389,4 @@ public class MultiuserAPIDUnitTest extends ClientAuthorizationTestBase { server1.invoke(SecurityTestUtil.class, "closeCache"); server2.invoke(SecurityTestUtil.class, "closeCache"); } - } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java index 8c329ef..2d1e2cd 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java @@ -80,8 +80,8 @@ public class UpdateVersionDUnitTest extends DistributedTestCase { super(name); } - public void preTearDown() throws Exception { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { closeCache(); Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { closeCache(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java index 28f370f..611b0de 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java @@ -5119,8 +5119,8 @@ public class WANTestBase extends DistributedTestCase{ } }*/ - public void preTearDown() throws Exception { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { cleanupVM(); vm0.invoke(WANTestBase.class, "cleanupVM"); vm1.invoke(WANTestBase.class, "cleanupVM"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java index 675e15b..0fe7b18 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java @@ -51,11 +51,6 @@ public class WANManagementDUnitTest extends ManagementTestBase { super(name); } - public void preTearDown() throws Exception { - super.preTearDown(); - - } - public void testMBeanCallback() throws Exception { VM nyLocator = getManagedNodeList().get(0); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java index 4d7882f..44a4db2 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java @@ -59,11 +59,6 @@ public class TestRemoteClusterDUnitTest extends ManagementTestBase { super(name); } - public void preTearDown() throws Exception { - super.preTearDown(); - - } - public void testMBeanCallback() throws Exception { VM nyLocator = getManagedNodeList().get(0);
