Fix up
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/30f29f44 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/30f29f44 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/30f29f44 Branch: refs/heads/feature/GEODE-773-2 Commit: 30f29f44f8fcf157d888455db0ae552c0f832fec Parents: c05f679 Author: Kirk Lund <[email protected]> Authored: Thu Feb 4 17:37:22 2016 -0800 Committer: Kirk Lund <[email protected]> Committed: Thu Feb 4 17:37:22 2016 -0800 ---------------------------------------------------------------------- .../LauncherLifecycleCommandsDUnitTest.java | 40 ++++++++++---------- .../SharedConfigurationEndToEndDUnitTest.java | 16 +++++--- .../cache/CacheRegionClearStatsDUnitTest.java | 4 +- .../ClientServerRegisterInterestsDUnitTest.java | 3 +- .../CacheServerSSLConnectionDUnitTest.java | 6 +-- .../cache/client/internal/LocatorTestBase.java | 9 ++++- .../internal/SSLNoClientAuthDUnitTest.java | 6 +-- .../query/dunit/CompactRangeIndexDUnitTest.java | 3 +- .../cache/query/dunit/HashIndexDUnitTest.java | 4 +- ...pdateWithInplaceObjectModFalseDUnitTest.java | 27 ++++++------- ...ConcurrentIndexUpdateWithoutWLDUnitTest.java | 11 ++---- .../gemfire/cache30/CacheMapTxnDUnitTest.java | 14 +++---- .../gemstone/gemfire/cache30/CacheTestCase.java | 2 +- .../cache30/ClearMultiVmCallBkDUnitTest.java | 14 +++---- .../gemfire/cache30/ClearMultiVmDUnitTest.java | 18 ++++----- .../cache30/DistAckMapMethodsDUnitTest.java | 17 +++++---- .../gemfire/cache30/DynamicRegionDUnitTest.java | 1 - .../cache30/PutAllCallBkRemoteVMDUnitTest.java | 13 ++++--- .../cache30/PutAllCallBkSingleVMDUnitTest.java | 14 +++---- .../gemfire/cache30/PutAllMultiVmDUnitTest.java | 17 +++++---- .../cache30/RemoveAllMultiVmDUnitTest.java | 17 +++++---- .../distributed/HostedLocatorsDUnitTest.java | 3 +- .../gemfire/distributed/LocatorDUnitTest.java | 2 +- .../distributed/SystemAdminDUnitTest.java | 5 +-- .../internal/DistributionAdvisorDUnitTest.java | 4 +- .../internal/ProductUseLogDUnitTest.java | 3 +- .../TcpServerBackwardCompatDUnitTest.java | 3 +- .../internal/cache/Bug33359DUnitTest.java | 14 +++---- .../internal/cache/Bug33726DUnitTest.java | 3 +- .../internal/cache/Bug37241DUnitTest.java | 5 +-- .../internal/cache/Bug47667DUnitTest.java | 3 +- .../internal/cache/ClearDAckDUnitTest.java | 23 +++++------ .../internal/cache/ClearGlobalDUnitTest.java | 4 +- .../cache/DeltaPropagationDUnitTest.java | 4 +- .../cache/DeltaPropagationStatsDUnitTest.java | 4 +- .../cache/DistributedCacheTestCase.java | 5 +-- .../internal/cache/HABug36773DUnitTest.java | 6 +-- .../HAOverflowMemObjectSizerDUnitTest.java | 4 +- .../cache/P2PDeltaPropagationDUnitTest.java | 6 +-- .../internal/cache/PutAllDAckDUnitTest.java | 13 ++++--- .../internal/cache/PutAllGlobalDUnitTest.java | 17 +++++---- .../internal/cache/RemoveAllDAckDUnitTest.java | 13 ++++--- .../internal/cache/RemoveDAckDUnitTest.java | 14 +++---- .../internal/cache/RemoveGlobalDUnitTest.java | 12 +++--- .../cache/execute/Bug51193DUnitTest.java | 3 +- .../execute/ColocationFailoverDUnitTest.java | 4 +- ...ributedRegionFunctionExecutionDUnitTest.java | 2 +- .../LocalFunctionExecutionDUnitTest.java | 4 +- .../OnGroupsFunctionExecutionDUnitTest.java | 2 +- .../internal/cache/ha/Bug48571DUnitTest.java | 3 +- .../internal/cache/ha/Bug48879DUnitTest.java | 3 +- .../cache/ha/EventIdOptimizationDUnitTest.java | 5 +-- .../internal/cache/ha/FailoverDUnitTest.java | 5 +-- .../internal/cache/ha/HABugInPutDUnitTest.java | 6 +-- .../internal/cache/ha/HAClearDUnitTest.java | 6 +-- .../internal/cache/ha/HADuplicateDUnitTest.java | 6 +-- .../cache/ha/HAEventIdPropagationDUnitTest.java | 5 +-- .../internal/cache/ha/HAExpiryDUnitTest.java | 6 +-- .../internal/cache/ha/HAGIIBugDUnitTest.java | 5 +-- .../internal/cache/ha/HAGIIDUnitTest.java | 6 +-- .../cache/ha/HARQueueNewImplDUnitTest.java | 4 +- .../internal/cache/ha/HARegionDUnitTest.java | 5 +-- .../cache/ha/HARegionQueueDUnitTest.java | 5 +-- .../cache/ha/HASlowReceiverDUnitTest.java | 3 +- .../ha/OperationsPropagationDUnitTest.java | 6 +-- .../internal/cache/ha/PutAllDUnitTest.java | 5 +-- .../internal/cache/ha/StatsBugDUnitTest.java | 5 +-- .../cache/locks/TXLockServiceDUnitTest.java | 6 +-- .../cache/partitioned/Bug43684DUnitTest.java | 3 +- .../cache/partitioned/Bug47388DUnitTest.java | 3 +- .../cache/partitioned/Bug51400DUnitTest.java | 3 +- .../fixed/FixedPartitioningDUnitTest.java | 4 -- .../fixed/FixedPartitioningTestBase.java | 4 +- ...ngWithColocationAndPersistenceDUnitTest.java | 4 -- .../internal/cache/tier/Bug40396DUnitTest.java | 4 +- ...mpatibilityHigherVersionClientDUnitTest.java | 3 +- .../cache/tier/sockets/Bug36269DUnitTest.java | 6 +-- .../cache/tier/sockets/Bug36457DUnitTest.java | 5 +-- .../cache/tier/sockets/Bug36805DUnitTest.java | 5 +-- .../cache/tier/sockets/Bug36829DUnitTest.java | 5 +-- .../cache/tier/sockets/Bug36995DUnitTest.java | 5 +-- .../cache/tier/sockets/Bug37210DUnitTest.java | 5 +-- .../cache/tier/sockets/Bug37805DUnitTest.java | 3 +- .../CacheServerTransactionsDUnitTest.java | 6 +-- .../tier/sockets/ClearPropagationDUnitTest.java | 5 +-- .../tier/sockets/ClientConflationDUnitTest.java | 4 +- .../sockets/ClientInterestNotifyDUnitTest.java | 4 +- .../cache/tier/sockets/ConflationDUnitTest.java | 4 +- .../DataSerializerPropogationDUnitTest.java | 4 +- .../DestroyEntryPropagationDUnitTest.java | 6 +-- .../DurableClientQueueSizeDUnitTest.java | 3 +- .../DurableClientReconnectDUnitTest.java | 3 +- .../sockets/DurableClientStatsDUnitTest.java | 2 +- .../sockets/DurableRegistrationDUnitTest.java | 5 +-- .../sockets/DurableResponseMatrixDUnitTest.java | 5 +-- .../sockets/EventIDVerificationDUnitTest.java | 5 +-- .../EventIDVerificationInP2PDUnitTest.java | 5 +-- .../cache/tier/sockets/HABug36738DUnitTest.java | 6 +-- .../cache/tier/sockets/HAInterestTestCase.java | 2 +- .../sockets/HAStartupAndFailoverDUnitTest.java | 5 +-- .../InstantiatorPropagationDUnitTest.java | 3 +- .../tier/sockets/InterestListDUnitTest.java | 4 +- .../sockets/InterestListEndpointDUnitTest.java | 5 +-- .../sockets/InterestListFailoverDUnitTest.java | 3 +- .../sockets/InterestListRecoveryDUnitTest.java | 5 +-- .../sockets/InterestResultPolicyDUnitTest.java | 3 +- .../sockets/NewRegionAttributesDUnitTest.java | 4 +- .../tier/sockets/RedundancyLevelTestBase.java | 6 +-- .../tier/sockets/RegionCloseDUnitTest.java | 6 +-- ...erInterestBeforeRegionCreationDUnitTest.java | 5 +-- .../sockets/RegisterInterestKeysDUnitTest.java | 6 +-- .../sockets/ReliableMessagingDUnitTest.java | 5 +-- .../sockets/UnregisterInterestDUnitTest.java | 3 +- .../sockets/UpdatePropagationDUnitTest.java | 6 +-- .../VerifyEventIDGenerationInP2PDUnitTest.java | 5 +-- ...UpdatesFromNonInterestEndPointDUnitTest.java | 6 +-- .../cache/wan/AsyncEventQueueTestBase.java | 4 +- .../internal/jta/dunit/ExceptionsDUnitTest.java | 3 +- .../jta/dunit/IdleTimeOutDUnitTest.java | 6 +-- .../jta/dunit/MaxPoolSizeDUnitTest.java | 3 +- .../jta/dunit/TransactionTimeOutDUnitTest.java | 3 +- .../dunit/TxnManagerMultiThreadDUnitTest.java | 3 +- .../internal/jta/dunit/TxnTimeOutDUnitTest.java | 3 +- .../process/LocalProcessLauncherDUnitTest.java | 4 -- .../management/CacheManagementDUnitTest.java | 6 --- .../management/ClientHealthStatsDUnitTest.java | 4 +- .../management/CompositeTypeTestDUnitTest.java | 5 --- .../management/DLockManagementDUnitTest.java | 5 --- .../management/DiskManagementDUnitTest.java | 4 +- .../management/DistributedSystemDUnitTest.java | 5 --- .../management/LocatorManagementDUnitTest.java | 5 +-- .../gemfire/management/ManagementTestBase.java | 13 ++++++- .../MemberMBeanAttributesDUnitTest.java | 4 -- .../gemfire/management/QueryDataDUnitTest.java | 5 --- .../management/RegionManagementDUnitTest.java | 5 --- .../stats/DistributedSystemStatsDUnitTest.java | 4 -- .../internal/pulse/TestClientIdsDUnitTest.java | 7 +--- .../internal/pulse/TestFunctionsDUnitTest.java | 4 -- .../internal/pulse/TestHeapDUnitTest.java | 4 -- .../internal/pulse/TestLocatorsDUnitTest.java | 4 -- .../pulse/TestSubscriptionsDUnitTest.java | 5 +-- .../gemfire/redis/RedisDistDUnitTest.java | 3 +- .../web/controllers/RestAPITestBase.java | 3 +- .../security/ClientAuthenticationDUnitTest.java | 5 +-- .../security/ClientAuthorizationDUnitTest.java | 5 +-- .../security/ClientMultiUserAuthzDUnitTest.java | 6 +-- .../DeltaClientAuthorizationDUnitTest.java | 4 +- .../DeltaClientPostAuthorizationDUnitTest.java | 5 +-- .../gemfire/test/dunit/LogWriterUtils.java | 16 ++++++++ .../cache/PRDeltaPropagationDUnitTest.java | 5 +-- .../internal/cache/ha/CQListGIIDUnitTest.java | 4 +- .../cache/ha/HADispatcherDUnitTest.java | 5 +-- .../sockets/ClientToServerDeltaDUnitTest.java | 4 +- .../DeltaPropagationWithCQDUnitTest.java | 4 +- ...ToRegionRelationCQRegistrationDUnitTest.java | 5 --- .../sockets/DurableClientCrashDUnitTest.java | 4 +- .../sockets/DurableClientNetDownDUnitTest.java | 3 +- .../tier/sockets/DurableClientTestCase.java | 8 +++- .../CacheServerManagementDUnitTest.java | 4 +- .../internal/pulse/TestCQDUnitTest.java | 4 -- .../internal/pulse/TestClientsDUnitTest.java | 4 -- .../internal/pulse/TestServerDUnitTest.java | 4 -- .../ClientAuthorizationTwoDUnitTest.java | 5 +-- .../security/ClientAuthzObjectModDUnitTest.java | 4 +- .../ClientCQPostAuthorizationDUnitTest.java | 4 +- .../ClientPostAuthorizationDUnitTest.java | 6 +-- .../gemfire/security/MultiuserAPIDUnitTest.java | 5 +-- .../internal/cache/UpdateVersionDUnitTest.java | 4 +- .../gemfire/internal/cache/wan/WANTestBase.java | 4 +- .../management/WANManagementDUnitTest.java | 5 --- .../pulse/TestRemoteClusterDUnitTest.java | 5 --- 171 files changed, 441 insertions(+), 571 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java b/gemfire-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java index afb2770..7c6929c 100644 --- a/gemfire-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java +++ b/gemfire-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java @@ -16,6 +16,8 @@ */ package com.gemstone.gemfire.management.internal.cli.commands; +import static com.gemstone.gemfire.test.dunit.Wait.*; + import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.client.ClientCache; import com.gemstone.gemfire.cache.client.ClientCacheFactory; @@ -43,6 +45,8 @@ import com.gemstone.gemfire.management.cli.Result; import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings; import com.gemstone.gemfire.management.internal.cli.result.CommandResult; import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder; +import com.gemstone.gemfire.test.dunit.WaitCriterion; + import org.junit.FixMethodOrder; import org.junit.runners.MethodSorters; @@ -145,9 +149,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase { } @Override - protected void tearDownAfter() throws Exception { - super.tearDownAfter(); - + protected final void postTearDown() throws Exception { LauncherLifecycleCommands launcherLifecycleCommands = new LauncherLifecycleCommands(); Integer pid; @@ -302,7 +304,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase { public void test000StartLocatorCapturesOutputOnError() throws IOException { final int locatorPort = AvailablePortHelper.getRandomAvailableTCPPort(); - String pathname = (getClass().getSimpleName() + "_" + testName); + String pathname = (getClass().getSimpleName() + "_" + getTestMethodName()); File workingDirectory = new File(pathname); assertTrue(workingDirectory.isDirectory() || workingDirectory.mkdir()); @@ -364,7 +366,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase { CommandStringBuilder command = new CommandStringBuilder(CliStrings.START_LOCATOR); - command.addOption(CliStrings.START_LOCATOR__MEMBER_NAME, getClass().getSimpleName().concat("_").concat(testName)); + command.addOption(CliStrings.START_LOCATOR__MEMBER_NAME, getClass().getSimpleName().concat("_").concat(getTestMethodName())); command.addOption(CliStrings.START_LOCATOR__PORT, "0"); command.addOption(CliStrings.START_LOCATOR__PROPERTIES, gemfirePropertiesPathname); command.addOption(CliStrings.START_LOCATOR__J, "-Dgemfire.http-service-port=0"); @@ -389,7 +391,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase { CommandStringBuilder command = new CommandStringBuilder(CliStrings.START_LOCATOR); - command.addOption(CliStrings.START_LOCATOR__MEMBER_NAME, getClass().getSimpleName().concat("_").concat(testName)); + command.addOption(CliStrings.START_LOCATOR__MEMBER_NAME, getClass().getSimpleName().concat("_").concat(getTestMethodName())); command.addOption(CliStrings.START_LOCATOR__PORT, "0"); command.addOption(CliStrings.START_LOCATOR__SECURITY_PROPERTIES, gemfireSecurityPropertiesPathname); command.addOption(CliStrings.START_LOCATOR__J, "-Dgemfire.http-service-port=0"); @@ -414,7 +416,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase { CommandStringBuilder command = new CommandStringBuilder(CliStrings.START_SERVER); - command.addOption(CliStrings.START_SERVER__NAME, getClass().getSimpleName().concat("_").concat(testName)); + command.addOption(CliStrings.START_SERVER__NAME, getClass().getSimpleName().concat("_").concat(getTestMethodName())); command.addOption(CliStrings.START_SERVER__CACHE_XML_FILE, cacheXmlPathname); CommandResult result = executeCommand(command.toString()); @@ -433,7 +435,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase { CommandStringBuilder command = new CommandStringBuilder(CliStrings.START_SERVER); - command.addOption(CliStrings.START_SERVER__NAME, getClass().getSimpleName().concat("_").concat(testName)); + command.addOption(CliStrings.START_SERVER__NAME, getClass().getSimpleName().concat("_").concat(getTestMethodName())); command.addOption(CliStrings.START_SERVER__PROPERTIES, gemfirePropertiesFile); CommandResult result = executeCommand(command.toString()); @@ -453,7 +455,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase { CommandStringBuilder command = new CommandStringBuilder(CliStrings.START_SERVER); - command.addOption(CliStrings.START_SERVER__NAME, getClass().getSimpleName().concat("_").concat(testName)); + command.addOption(CliStrings.START_SERVER__NAME, getClass().getSimpleName().concat("_").concat(getTestMethodName())); command.addOption(CliStrings.START_SERVER__SECURITY_PROPERTIES, gemfireSecuritiesPropertiesFile); CommandResult result = executeCommand(command.toString()); @@ -471,7 +473,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase { public void test006StartLocatorInRelativeDirectory() { final int locatorPort = AvailablePortHelper.getRandomAvailableTCPPort(); - String pathname = (getClass().getSimpleName() + "_" + testName); + String pathname = (getClass().getSimpleName() + "_" + getTestMethodName()); File workingDirectory = new File(pathname); assertTrue(workingDirectory.isDirectory() || workingDirectory.mkdir()); @@ -504,7 +506,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase { } public void test007StatusLocatorUsingMemberNameIDWhenGfshIsNotConnected() { - CommandResult result = executeCommand(CliStrings.STATUS_LOCATOR + " --name=" + testName); + CommandResult result = executeCommand(CliStrings.STATUS_LOCATOR + " --name=" + getTestMethodName()); assertNotNull(result); assertEquals(Result.Status.ERROR, result.getStatus()); @@ -518,7 +520,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase { final int jmxManagerPort = ports[0]; final int locatorPort = ports[1]; - String pathname = (getClass().getSimpleName() + "_" + testName); + String pathname = (getClass().getSimpleName() + "_" + getTestMethodName()); File workingDirectory = new File(pathname); assertTrue(workingDirectory.isDirectory() || workingDirectory.mkdir()); @@ -580,7 +582,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase { final int jmxManagerPort = ports[0]; final int locatorPort = ports[1]; - String pathname = (getClass().getSimpleName() + "_" + testName); + String pathname = (getClass().getSimpleName() + "_" + getTestMethodName()); File workingDirectory = new File(pathname); assertTrue(workingDirectory.isDirectory() || workingDirectory.mkdir()); @@ -631,7 +633,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase { } public void test010StopLocatorUsingMemberNameIDWhenGfshIsNotConnected() { - CommandResult result = executeCommand(CliStrings.STOP_LOCATOR + " --name=" + testName); + CommandResult result = executeCommand(CliStrings.STOP_LOCATOR + " --name=" + getTestMethodName()); assertNotNull(result); assertEquals(Result.Status.ERROR, result.getStatus()); @@ -645,7 +647,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase { final int jmxManagerPort = ports[0]; final int locatorPort = ports[1]; - String pathname = (getClass().getSimpleName() + "_" + testName); + String pathname = (getClass().getSimpleName() + "_" + getTestMethodName()); File workingDirectory = new File(pathname); assertTrue(workingDirectory.isDirectory() || workingDirectory.mkdir()); @@ -732,7 +734,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase { final int jmxManagerPort = ports[0]; final int locatorPort = ports[1]; - String pathname = (getClass().getSimpleName() + "_" + testName); + String pathname = (getClass().getSimpleName() + "_" + getTestMethodName()); File workingDirectory = new File(pathname); assertTrue(workingDirectory.isDirectory() || workingDirectory.mkdir()); @@ -803,14 +805,14 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase { } public void test013StartServerWithSpring() { - String pathname = (getClass().getSimpleName() + "_" + testName); + String pathname = (getClass().getSimpleName() + "_" + getTestMethodName()); File workingDirectory = new File(pathname); assertTrue(workingDirectory.isDirectory() || workingDirectory.mkdir()); CommandStringBuilder command = new CommandStringBuilder(CliStrings.START_SERVER); - command.addOption(CliStrings.START_SERVER__NAME, getClass().getSimpleName().concat("_").concat(testName)); + command.addOption(CliStrings.START_SERVER__NAME, getClass().getSimpleName().concat("_").concat(getTestMethodName())); command.addOption(CliStrings.START_SERVER__USE_CLUSTER_CONFIGURATION, Boolean.FALSE.toString()); command.addOption(CliStrings.START_SERVER__LOG_LEVEL, "config"); command.addOption(CliStrings.START_SERVER__INCLUDE_SYSTEM_CLASSPATH); @@ -863,7 +865,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase { final int serverPort = ports[0]; final int locatorPort = ports[1]; - String pathname = getClass().getSimpleName().concat("_").concat(testName); + String pathname = getClass().getSimpleName().concat("_").concat(getTestMethodName()); File workingDirectory = new File(pathname); assertTrue(workingDirectory.isDirectory() || workingDirectory.mkdir()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java b/gemfire-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java index de75927..edd056b 100644 --- a/gemfire-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java +++ b/gemfire-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java @@ -16,6 +16,8 @@ */ package com.gemstone.gemfire.management.internal.configuration; +import static com.gemstone.gemfire.test.dunit.Wait.*; + import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.RegionShortcut; @@ -40,8 +42,12 @@ import com.gemstone.gemfire.management.internal.cli.result.CommandResult; import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder; import com.gemstone.gemfire.test.dunit.DistributedTestCase; import com.gemstone.gemfire.test.dunit.Host; +import com.gemstone.gemfire.test.dunit.IgnoredException; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.SerializableCallable; import com.gemstone.gemfire.test.dunit.VM; +import com.gemstone.gemfire.test.dunit.WaitCriterion; + import org.apache.commons.io.FileUtils; import java.io.File; @@ -88,7 +94,7 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase { } public void testStartServerAndExecuteCommands() throws InterruptedException, ClassNotFoundException, IOException, ExecutionException { - addExpectedException("EntryDestroyedException"); + IgnoredException.addIgnoredException("EntryDestroyedException"); Object[] result = setup(); final int locatorPort = (Integer) result[0]; final String jmxHost = (String) result[1]; @@ -111,7 +117,7 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase { //shutdown everything - getLogWriter().info("Shutting down all the members"); + LogWriterUtils.getLogWriter().info("Shutting down all the members"); shutdownAll(); deleteSavedJarFiles(); } @@ -141,7 +147,7 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase { protected void executeAndVerifyCommand(String commandString) { CommandResult cmdResult = executeCommand(commandString); - getLogWriter().info("Command Result : \n" + commandResultToString(cmdResult)); + LogWriterUtils.getLogWriter().info("Command Result : \n" + commandResultToString(cmdResult)); assertEquals(Status.OK, cmdResult.getStatus()); assertFalse(cmdResult.failedToPersist()); } @@ -332,7 +338,7 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase { try { final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locator1Port, locatorLogFile, null, locatorProps); - DistributedTestCase.WaitCriterion wc = new DistributedTestCase.WaitCriterion() { + WaitCriterion wc = new WaitCriterion() { @Override public boolean done() { return locator.isSharedConfigurationRunning(); @@ -343,7 +349,7 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase { return "Waiting for shared configuration to be started"; } }; - DistributedTestCase.waitForCriterion(wc, TIMEOUT, INTERVAL, true); + waitForCriterion(wc, TIMEOUT, INTERVAL, true); } catch (IOException ioex) { fail("Unable to create a locator with a shared configuration"); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java index 17a3dc8..7ea3565 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java @@ -194,8 +194,8 @@ public class CacheRegionClearStatsDUnitTest extends DistributedTestCase { "validationClearStat"); } - public void preTearDown() throws Exception { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { client1.invoke(CacheRegionClearStatsDUnitTest.class, "closeCache"); // then close the servers server1.invoke(CacheRegionClearStatsDUnitTest.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java index a5dc6fb..58844b0 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java @@ -73,8 +73,7 @@ public class ClientServerRegisterInterestsDUnitTest extends DistributedTestCase } @Override - public void preTearDown() throws Exception { - super.preTearDown(); + protected final void preTearDown() throws Exception { serverPort.set(0); entryEvents.clear(); gemfireServerVm.invoke(new SerializableRunnable() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java index 107dd8b..9bdf56c 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java @@ -412,15 +412,13 @@ public class CacheServerSSLConnectionDUnitTest extends DistributedTestCase { } } - public void preTearDown() throws Exception - { + @Override + protected final void preTearDown() throws Exception { final Host host = Host.getHost(0); VM serverVM = host.getVM(1); VM clientVM = host.getVM(2); clientVM.invoke(CacheServerSSLConnectionDUnitTest.class, "closeClientCacheTask"); serverVM.invoke(CacheServerSSLConnectionDUnitTest.class, "closeCacheTask"); - super.preTearDown(); } - } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java index 88459bf..f35e2fa 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java @@ -71,7 +71,8 @@ public abstract class LocatorTestBase extends DistributedTestCase { super(name); } - public void preTearDown() throws Exception { + @Override + protected final void preTearDown() throws Exception { SerializableRunnable tearDown = new SerializableRunnable("tearDown") { public void run() { @@ -100,7 +101,11 @@ public abstract class LocatorTestBase extends DistributedTestCase { //speed, but lets at least destroy our cache and locator. Invoke.invokeInEveryVM(tearDown); tearDown.run(); - super.preTearDown(); + + postTearDownLocatorTestBase(); + } + + protected void postTearDownLocatorTestBase() throws Exception { } protected void startLocatorInVM(final VM vm, final int locatorPort, final String otherLocators) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java index ac6bf4a..bb1cc09 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java @@ -266,14 +266,12 @@ public class SSLNoClientAuthDUnitTest extends DistributedTestCase { } } - public void preTearDown() throws Exception - { + @Override + protected final void preTearDown() throws Exception { final Host host = Host.getHost(0); VM serverVM = host.getVM(1); VM clientVM = host.getVM(2); clientVM.invoke(SSLNoClientAuthDUnitTest.class, "closeClientCacheTask"); serverVM.invoke(SSLNoClientAuthDUnitTest.class, "closeCacheTask"); - super.preTearDown(); } - } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java index 3ce0ce2..81b545f 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java @@ -168,7 +168,8 @@ public class CompactRangeIndexDUnitTest extends DistributedTestCase{ } - public void preTearDown() throws Exception{ + @Override + protected final void preTearDown() throws Exception { Thread.sleep(5000); removeHook(); utils.closeServer(vm0); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java index c73aa80..38721be 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java @@ -124,9 +124,9 @@ public class HashIndexDUnitTest extends DistributedTestCase{ }); } - public void preTearDown() throws Exception{ + @Override + protected final void preTearDown() throws Exception { Thread.sleep(5000); utils.closeServer(vm0); } - } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java index 4c83562..6cbbef2 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java @@ -107,21 +107,18 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends * Tear down a PartitionedRegionTestCase by cleaning up the existing cache * (mainly because we want to destroy any existing PartitionedRegions) */ - public void preTearDown() throws Exception { - try { - Invoke.invokeInEveryVM(new CacheSerializableRunnable("Set INPLACE_OBJECT_MODIFICATION false") { - - @Override - public void run2() throws CacheException { - //System.setProperty("gemfire.index.INPLACE_OBJECT_MODIFICATION", "false"); - IndexManager.INPLACE_OBJECT_MODIFICATION_FOR_TEST = false; - } - }); - Invoke.invokeInEveryVM(ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.class, "destroyRegions"); - Invoke.invokeInEveryVM(CacheTestCase.class, "closeCache"); - } finally { - super.preTearDown(); - } + @Override + protected final void preTearDown() throws Exception { + Invoke.invokeInEveryVM(new CacheSerializableRunnable("Set INPLACE_OBJECT_MODIFICATION false") { + + @Override + public void run2() throws CacheException { + //System.setProperty("gemfire.index.INPLACE_OBJECT_MODIFICATION", "false"); + IndexManager.INPLACE_OBJECT_MODIFICATION_FOR_TEST = false; + } + }); + Invoke.invokeInEveryVM(ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.class, "destroyRegions"); + Invoke.invokeInEveryVM(CacheTestCase.class, "closeCache"); } public static synchronized void destroyRegions() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java index d5badab..2ac564a 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java @@ -92,13 +92,10 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest extends * Tear down a PartitionedRegionTestCase by cleaning up the existing cache * (mainly because we want to destroy any existing PartitionedRegions) */ - public void preTearDown() throws Exception { - try { - Invoke.invokeInEveryVM(ConcurrentIndexUpdateWithoutWLDUnitTest.class, "destroyRegions"); - Invoke.invokeInEveryVM(CacheTestCase.class, "closeCache"); - } finally { - super.preTearDown(); - } + @Override + protected final void preTearDown() throws Exception { + Invoke.invokeInEveryVM(ConcurrentIndexUpdateWithoutWLDUnitTest.class, "destroyRegions"); + Invoke.invokeInEveryVM(CacheTestCase.class, "closeCache"); } public static synchronized void destroyRegions() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java index eb2c768..b889bc7 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java @@ -66,13 +66,13 @@ public class CacheMapTxnDUnitTest extends DistributedTestCase{ vm1.invoke(CacheMapTxnDUnitTest.class, "createCache"); } - public void preTearDown(){ - Host host = Host.getHost(0); - VM vm0 = host.getVM(0); - VM vm1 = host.getVM(1); - vm0.invoke(CacheMapTxnDUnitTest.class, "closeCache"); - vm1.invoke(CacheMapTxnDUnitTest.class, "closeCache"); - + @Override + protected final void preTearDown() throws Exception { + Host host = Host.getHost(0); + VM vm0 = host.getVM(0); + VM vm1 = host.getVM(1); + vm0.invoke(CacheMapTxnDUnitTest.class, "closeCache"); + vm1.invoke(CacheMapTxnDUnitTest.class, "closeCache"); } public static void createCache(){ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java index 7a372cb..c228e5c 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java @@ -387,7 +387,7 @@ public abstract class CacheTestCase extends DistributedTestCase { } @Override - public final void preTearDown() throws Exception { + protected final void preTearDown() throws Exception { preTearDownCacheTestCase(); // locally destroy all root regions and close the cache http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java index 3579210..1d5b621 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java @@ -72,13 +72,13 @@ public class ClearMultiVmCallBkDUnitTest extends DistributedTestCase{ LogWriterUtils.getLogWriter().fine("Cache created in successfully"); } - public void preTearDown(){ - Host host = Host.getHost(0); - VM vm0 = host.getVM(0); - VM vm1 = host.getVM(1); - vm0.invoke(ClearMultiVmCallBkDUnitTest.class, "closeCache"); - vm1.invoke(ClearMultiVmCallBkDUnitTest.class, "closeCache"); - + @Override + protected final void preTearDown() throws Exception { + Host host = Host.getHost(0); + VM vm0 = host.getVM(0); + VM vm1 = host.getVM(1); + vm0.invoke(ClearMultiVmCallBkDUnitTest.class, "closeCache"); + vm1.invoke(ClearMultiVmCallBkDUnitTest.class, "closeCache"); } public static void createCache(){ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java index fe8371b..8553fe6 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java @@ -75,15 +75,15 @@ public class ClearMultiVmDUnitTest extends DistributedTestCase{ vm1.invoke(ClearMultiVmDUnitTest.class, "createCache"); } - public void preTearDown(){ - Host host = Host.getHost(0); - VM vm0 = host.getVM(0); - VM vm1 = host.getVM(1); - vm0.invoke(ClearMultiVmDUnitTest.class, "closeCache"); - vm1.invoke(ClearMultiVmDUnitTest.class, "closeCache"); - cache = null; - Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } }); - + @Override + protected final void preTearDown() throws Exception { + Host host = Host.getHost(0); + VM vm0 = host.getVM(0); + VM vm1 = host.getVM(1); + vm0.invoke(ClearMultiVmDUnitTest.class, "closeCache"); + vm1.invoke(ClearMultiVmDUnitTest.class, "closeCache"); + cache = null; + Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } }); } public static void createCache(){ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java index 98b997d..44f7f06 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java @@ -80,14 +80,15 @@ public class DistAckMapMethodsDUnitTest extends DistributedTestCase{ vm1.invoke(DistAckMapMethodsDUnitTest.class, "createCache"); } - public void preTearDown(){ - Host host = Host.getHost(0); - VM vm0 = host.getVM(0); - VM vm1 = host.getVM(1); - vm0.invoke(DistAckMapMethodsDUnitTest.class, "closeCache"); - vm1.invoke(DistAckMapMethodsDUnitTest.class, "closeCache"); - cache = null; - Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } }); + @Override + protected final void preTearDown() throws Exception { + Host host = Host.getHost(0); + VM vm0 = host.getVM(0); + VM vm1 = host.getVM(1); + vm0.invoke(DistAckMapMethodsDUnitTest.class, "closeCache"); + vm1.invoke(DistAckMapMethodsDUnitTest.class, "closeCache"); + cache = null; + Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } }); } public static void createCache(){ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DynamicRegionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DynamicRegionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DynamicRegionDUnitTest.java index 3d62b31..19d2bb7 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DynamicRegionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DynamicRegionDUnitTest.java @@ -91,7 +91,6 @@ public class DynamicRegionDUnitTest extends CacheTestCase { if(dr != null) { dr.localDestroyRegion(); } - // TODO: attempted to call super.preTearDown(); here } catch (VirtualMachineError e) { SystemFailure.initiateFailure(e); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkRemoteVMDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkRemoteVMDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkRemoteVMDUnitTest.java index 6e6b6c8..caa8333 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkRemoteVMDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkRemoteVMDUnitTest.java @@ -87,12 +87,13 @@ public class PutAllCallBkRemoteVMDUnitTest extends DistributedTestCase { LogWriterUtils.getLogWriter().info("Cache created successfully"); } - public void preTearDown(){ - Host host = Host.getHost(0); - VM vm0 = host.getVM(0); - VM vm1 = host.getVM(1); - vm0.invoke(PutAllCallBkRemoteVMDUnitTest.class, "closeCache"); - vm1.invoke(PutAllCallBkRemoteVMDUnitTest.class, "closeCache"); + @Override + protected final void preTearDown() throws Exception { + Host host = Host.getHost(0); + VM vm0 = host.getVM(0); + VM vm1 = host.getVM(1); + vm0.invoke(PutAllCallBkRemoteVMDUnitTest.class, "closeCache"); + vm1.invoke(PutAllCallBkRemoteVMDUnitTest.class, "closeCache"); } public static synchronized void createCacheForVM0(){ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkSingleVMDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkSingleVMDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkSingleVMDUnitTest.java index 82f3477..8c85ebd 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkSingleVMDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkSingleVMDUnitTest.java @@ -77,13 +77,13 @@ public class PutAllCallBkSingleVMDUnitTest extends DistributedTestCase{ LogWriterUtils.getLogWriter().fine("Cache created in successfully"); } - public void preTearDown(){ - Host host = Host.getHost(0); - VM vm0 = host.getVM(0); - VM vm1 = host.getVM(1); - vm0.invoke(PutAllCallBkSingleVMDUnitTest.class, "closeCache"); - vm1.invoke(PutAllCallBkSingleVMDUnitTest.class, "closeCache"); - + @Override + protected final void preTearDown() throws Exception { + Host host = Host.getHost(0); + VM vm0 = host.getVM(0); + VM vm1 = host.getVM(1); + vm0.invoke(PutAllCallBkSingleVMDUnitTest.class, "closeCache"); + vm1.invoke(PutAllCallBkSingleVMDUnitTest.class, "closeCache"); } public static synchronized void createCache(){ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllMultiVmDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllMultiVmDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllMultiVmDUnitTest.java index cc618fe..5a37ebf 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllMultiVmDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllMultiVmDUnitTest.java @@ -73,14 +73,15 @@ public class PutAllMultiVmDUnitTest extends DistributedTestCase{ vm1.invoke(PutAllMultiVmDUnitTest.class, "createCache"); } - public void preTearDown(){ - Host host = Host.getHost(0); - VM vm0 = host.getVM(0); - VM vm1 = host.getVM(1); - vm0.invoke(PutAllMultiVmDUnitTest.class, "closeCache"); - vm1.invoke(PutAllMultiVmDUnitTest.class, "closeCache"); - cache = null; - Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } }); + @Override + protected final void preTearDown() throws Exception { + Host host = Host.getHost(0); + VM vm0 = host.getVM(0); + VM vm1 = host.getVM(1); + vm0.invoke(PutAllMultiVmDUnitTest.class, "closeCache"); + vm1.invoke(PutAllMultiVmDUnitTest.class, "closeCache"); + cache = null; + Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } }); } public static void createCache(){ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RemoveAllMultiVmDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RemoveAllMultiVmDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RemoveAllMultiVmDUnitTest.java index 80b25af..f45c403 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RemoveAllMultiVmDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RemoveAllMultiVmDUnitTest.java @@ -71,14 +71,15 @@ public class RemoveAllMultiVmDUnitTest extends DistributedTestCase { vm1.invoke(RemoveAllMultiVmDUnitTest.class, "createCache"); } - public void preTearDown(){ - Host host = Host.getHost(0); - VM vm0 = host.getVM(0); - VM vm1 = host.getVM(1); - vm0.invoke(RemoveAllMultiVmDUnitTest.class, "closeCache"); - vm1.invoke(RemoveAllMultiVmDUnitTest.class, "closeCache"); - cache = null; - Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } }); + @Override + protected final void preTearDown() throws Exception { + Host host = Host.getHost(0); + VM vm0 = host.getVM(0); + VM vm1 = host.getVM(1); + vm0.invoke(RemoveAllMultiVmDUnitTest.class, "closeCache"); + vm1.invoke(RemoveAllMultiVmDUnitTest.class, "closeCache"); + cache = null; + Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } }); } public static void createCache(){ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java index 030b562..fe2202f 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java @@ -55,7 +55,8 @@ public class HostedLocatorsDUnitTest extends DistributedTestCase { disconnectAllFromDS(); } - public void preTearDown() throws Exception { + @Override + 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/distributed/LocatorDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java index 05d7559..545a0ea 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java @@ -98,7 +98,7 @@ public class LocatorDUnitTest extends DistributedTestCase { } @Override - public void preTearDown() { + protected final void preTearDown() throws Exception { if (Locator.hasLocator()) { Locator.getLocator().stop(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/SystemAdminDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/SystemAdminDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/SystemAdminDUnitTest.java index e80142a..64014de 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/SystemAdminDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/SystemAdminDUnitTest.java @@ -45,9 +45,8 @@ public class SystemAdminDUnitTest extends DistributedTestCase { disconnect(); } - @Override - public void preTearDown() throws Exception { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { disconnect(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionAdvisorDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionAdvisorDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionAdvisorDUnitTest.java index 73908c4..8e238ac 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionAdvisorDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionAdvisorDUnitTest.java @@ -82,9 +82,9 @@ public class DistributionAdvisorDUnitTest extends DistributedTestCase { new DistributionAdvisor.Profile[profileList.size()]); } - public void preTearDown() throws Exception { + @Override + protected final void preTearDown() throws Exception { this.advisor.close(); - super.preTearDown(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java index 36515c7..149d6d8 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java @@ -101,7 +101,8 @@ public class ProductUseLogDUnitTest extends DistributedTestCase { return sb.toString(); } - public void preTearDown() { + @Override + 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/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java index e331912..a66367b 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java @@ -75,7 +75,7 @@ public class TcpServerBackwardCompatDUnitTest extends DistributedTestCase { } @Override - public void preTearDown() throws Exception { + protected final void preTearDown() throws Exception { Invoke.invokeInEveryVM(new CacheSerializableRunnable("Set TcpServer.isTesting true") { @Override @@ -83,7 +83,6 @@ public class TcpServerBackwardCompatDUnitTest extends DistributedTestCase { TcpServer.isTesting = false; } }); - super.preTearDown(); } /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33359DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33359DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33359DUnitTest.java index bd0d478..d6ff35c 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33359DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33359DUnitTest.java @@ -71,13 +71,13 @@ public class Bug33359DUnitTest extends DistributedTestCase { LogWriterUtils.getLogWriter().fine("Cache created in successfully"); } - public void preTearDown(){ - Host host = Host.getHost(0); - VM vm0 = host.getVM(0); - VM vm1 = host.getVM(1); - vm0.invoke(Bug33359DUnitTest.class, "closeCache"); - vm1.invoke(Bug33359DUnitTest.class, "closeCache"); - + @Override + protected final void preTearDown(){ + Host host = Host.getHost(0); + VM vm0 = host.getVM(0); + VM vm1 = host.getVM(1); + vm0.invoke(Bug33359DUnitTest.class, "closeCache"); + vm1.invoke(Bug33359DUnitTest.class, "closeCache"); } public static void createCacheVM0(){ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33726DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33726DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33726DUnitTest.java index 087dd7e..5e7903e 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33726DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33726DUnitTest.java @@ -44,7 +44,8 @@ public class Bug33726DUnitTest extends DistributedTestCase { super(name); } - public void preTearDown() { + @Override + protected final void preTearDown() throws Exception { Host host = Host.getHost(0); VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37241DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37241DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37241DUnitTest.java index f736199..3726ae8 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37241DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37241DUnitTest.java @@ -223,12 +223,11 @@ public class Bug37241DUnitTest extends DistributedTestCase } } - public void preTearDown() throws Exception - { + @Override + protected final void preTearDown() throws Exception { server1.invoke(Bug37241DUnitTest.class, "closeCache"); server2.invoke(Bug37241DUnitTest.class, "closeCache"); } - } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug47667DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug47667DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug47667DUnitTest.java index 1c0abe6..097aeb5 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug47667DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug47667DUnitTest.java @@ -44,8 +44,7 @@ public class Bug47667DUnitTest extends LocatorTestBase { } @Override - public void preTearDown() throws Exception { - super.preTearDown(); + protected final void postTearDownLocatorTestBase() throws Exception { disconnectAllFromDS(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java index 321228b..dabc277 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java @@ -76,17 +76,18 @@ public class ClearDAckDUnitTest extends DistributedTestCase { LogWriterUtils.getLogWriter().info("Cache created in successfully"); } - public void preTearDown(){ - Host host = Host.getHost(0); - VM vm0 = host.getVM(0); - VM vm1 = host.getVM(1); - VM vm2 = host.getVM(2); - vm0.invoke(ClearDAckDUnitTest.class, "closeCache"); - vm1.invoke(ClearDAckDUnitTest.class, "resetClearCallBack"); - vm1.invoke(ClearDAckDUnitTest.class, "closeCache"); - vm2.invoke(ClearDAckDUnitTest.class, "closeCache"); - cache = null; - Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } }); + @Override + protected final void preTearDown() throws Exception { + Host host = Host.getHost(0); + VM vm0 = host.getVM(0); + VM vm1 = host.getVM(1); + VM vm2 = host.getVM(2); + vm0.invoke(ClearDAckDUnitTest.class, "closeCache"); + vm1.invoke(ClearDAckDUnitTest.class, "resetClearCallBack"); + vm1.invoke(ClearDAckDUnitTest.class, "closeCache"); + vm2.invoke(ClearDAckDUnitTest.class, "closeCache"); + cache = null; + Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } }); } public static long getRegionVersion(DistributedMember memberID) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearGlobalDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearGlobalDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearGlobalDUnitTest.java index bde9540..54df822 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearGlobalDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearGlobalDUnitTest.java @@ -85,8 +85,8 @@ public class ClearGlobalDUnitTest extends DistributedTestCase LogWriterUtils.getLogWriter().fine("Cache created in successfully"); } - public void preTearDown() - { + @Override + protected final void preTearDown() throws Exception { server1.invoke(ClearGlobalDUnitTest.class, "closeCache"); resetClearCallBack(); closeCache(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java index af35666..9a50146 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java @@ -165,8 +165,8 @@ public class DeltaPropagationDUnitTest extends DistributedTestCase { DeltaPropagationDUnitTest.resetAll(); } - public void preTearDown() throws Exception { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { DeltaPropagationDUnitTest.closeCache(); VM2.invoke(DeltaPropagationDUnitTest.class, "closeCache"); VM3.invoke(DeltaPropagationDUnitTest.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java index bf96b18..8c249be 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java @@ -94,8 +94,8 @@ public class DeltaPropagationStatsDUnitTest extends DistributedTestCase { vm3 = host.getVM(3); } - public void preTearDown() throws Exception { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { lastKeyReceived = false; vm0.invoke(DeltaPropagationStatsDUnitTest.class, "resetLastKeyReceived"); vm1.invoke(DeltaPropagationStatsDUnitTest.class, "resetLastKeyReceived"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java index 309caab..4c46a55 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java @@ -105,7 +105,8 @@ public abstract class DistributedCacheTestCase /** * Closes the cache in this VM and each remote VM */ - public void preTearDown() throws Exception { + @Override + protected final void preTearDown() throws Exception { StringBuffer problems = new StringBuffer(); if (cache != null) { @@ -138,8 +139,6 @@ public abstract class DistributedCacheTestCase assertEquals("Problems while tearing down", "", problems.toString().trim()); - - super.preTearDown(); } /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java index 25672cf..a590aef 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java @@ -357,16 +357,14 @@ public class HABug36773DUnitTest extends DistributedTestCase } - public void preTearDown() throws Exception - { + @Override + protected final void preTearDown() throws Exception { //close client client1.invoke(HABug36773DUnitTest.class, "closeCache"); client2.invoke(HABug36773DUnitTest.class, "closeCache"); //close server server1.invoke(HABug36773DUnitTest.class, "closeCache"); server2.invoke(HABug36773DUnitTest.class, "closeCache"); - } - } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java index 6b07ec7..371d8f9 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java @@ -94,8 +94,8 @@ public class HAOverflowMemObjectSizerDUnitTest extends DistributedTestCase { serverVM = host.getVM(3); } - public void preTearDown() throws Exception { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { serverVM.invoke(ConflationDUnitTest.class, "unsetIsSlowStart"); client.invoke(HAOverflowMemObjectSizerDUnitTest.class, "closeCache"); serverVM.invoke(HAOverflowMemObjectSizerDUnitTest.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java index dc76602..3f814d4 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java @@ -510,14 +510,12 @@ public class P2PDeltaPropagationDUnitTest extends DistributedTestCase } } - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { closeCache(); server1.invoke(P2PDeltaPropagationDUnitTest.class, "closeCache"); server2.invoke(P2PDeltaPropagationDUnitTest.class, "closeCache"); server3.invoke(P2PDeltaPropagationDUnitTest.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/PutAllDAckDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java index 495ad0e..7fd0c16 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java @@ -76,12 +76,13 @@ public class PutAllDAckDUnitTest extends DistributedTestCase { LogWriterUtils.getLogWriter().fine("Cache created successfully"); } - public void preTearDown(){ - Host host = Host.getHost(0); - VM vm0 = host.getVM(0); - VM vm1 = host.getVM(1); - vm0.invoke(PutAllDAckDUnitTest.class, "closeCache"); - vm1.invoke(PutAllDAckDUnitTest.class, "closeCache"); + @Override + protected final void preTearDown() throws Exception { + Host host = Host.getHost(0); + VM vm0 = host.getVM(0); + VM vm1 = host.getVM(1); + vm0.invoke(PutAllDAckDUnitTest.class, "closeCache"); + vm1.invoke(PutAllDAckDUnitTest.class, "closeCache"); } public static void createCacheForVM0() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java index 72e5439..c8f0d39 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java @@ -92,14 +92,15 @@ public class PutAllGlobalDUnitTest extends DistributedTestCase { LogWriterUtils.getLogWriter().fine("Cache created successfully"); } - public void preTearDown(){ - Host host = Host.getHost(0); - VM vm0 = host.getVM(0); - VM vm1 = host.getVM(1); - vm0.invoke(PutAllGlobalDUnitTest.class, "closeCache"); - vm1.invoke(PutAllGlobalDUnitTest.class, "closeCache"); - cache = null; - Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } }); + @Override + protected final void preTearDown() throws Exception { + Host host = Host.getHost(0); + VM vm0 = host.getVM(0); + VM vm1 = host.getVM(1); + vm0.invoke(PutAllGlobalDUnitTest.class, "closeCache"); + vm1.invoke(PutAllGlobalDUnitTest.class, "closeCache"); + cache = null; + Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } }); } public static void createCacheForVM0(){ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java index f4ab8a1..9184d94 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java @@ -73,12 +73,13 @@ public class RemoveAllDAckDUnitTest extends DistributedTestCase { LogWriterUtils.getLogWriter().fine("Cache created successfully"); } - public void preTearDown(){ - Host host = Host.getHost(0); - VM vm0 = host.getVM(0); - VM vm1 = host.getVM(1); - vm0.invoke(RemoveAllDAckDUnitTest.class, "closeCache"); - vm1.invoke(RemoveAllDAckDUnitTest.class, "closeCache"); + @Override + protected final void preTearDown() throws Exception { + Host host = Host.getHost(0); + VM vm0 = host.getVM(0); + VM vm1 = host.getVM(1); + vm0.invoke(RemoveAllDAckDUnitTest.class, "closeCache"); + vm1.invoke(RemoveAllDAckDUnitTest.class, "closeCache"); } public static void createCacheForVM0() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java index 6d5b9d6..4b92161 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveDAckDUnitTest.java @@ -69,13 +69,13 @@ public class RemoveDAckDUnitTest extends DistributedTestCase { LogWriterUtils.getLogWriter().fine("Cache created in successfully"); } - public void preTearDown(){ - Host host = Host.getHost(0); - VM vm0 = host.getVM(0); - VM vm1 = host.getVM(1); - vm0.invoke(RemoveDAckDUnitTest.class, "closeCache"); - vm1.invoke(RemoveDAckDUnitTest.class, "closeCache"); - + @Override + protected final void preTearDown() throws Exception { + Host host = Host.getHost(0); + VM vm0 = host.getVM(0); + VM vm1 = host.getVM(1); + vm0.invoke(RemoveDAckDUnitTest.class, "closeCache"); + vm1.invoke(RemoveDAckDUnitTest.class, "closeCache"); } public static void createCacheVM0(){ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java index b4907ae..5d6131c 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveGlobalDUnitTest.java @@ -73,12 +73,12 @@ public class RemoveGlobalDUnitTest extends DistributedTestCase { vm1.invoke(RemoveGlobalDUnitTest.class, "createCache"); } - public void preTearDown(){ - vm0.invoke(RemoveGlobalDUnitTest.class, "resetFlag"); - vm1.invoke(RemoveGlobalDUnitTest.class, "resetFlag"); - vm0.invoke(RemoveGlobalDUnitTest.class, "closeCache"); - vm1.invoke(RemoveGlobalDUnitTest.class, "closeCache"); - + @Override + protected final void preTearDown() throws Exception { + vm0.invoke(RemoveGlobalDUnitTest.class, "resetFlag"); + vm1.invoke(RemoveGlobalDUnitTest.class, "resetFlag"); + vm0.invoke(RemoveGlobalDUnitTest.class, "closeCache"); + vm1.invoke(RemoveGlobalDUnitTest.class, "closeCache"); } public static void resetFlag() http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java index 0fe4bd0..74f5e7f 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java @@ -70,7 +70,8 @@ public class Bug51193DUnitTest extends DistributedTestCase { } - public void preTearDown() { + @Override + protected final void preTearDown() throws Exception { closeCache(); server0.invoke(Bug51193DUnitTest.class, "closeCache"); client0.invoke(Bug51193DUnitTest.class, "closeCache"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java index 0d6dca5..2ae358d 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java @@ -471,14 +471,14 @@ public class ColocationFailoverDUnitTest extends DistributedTestCase { } } - public void preTearDown() throws Exception { + @Override + protected final void preTearDown() throws Exception { closeCache(); Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { closeCache(); } }); - super.preTearDown(); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java index 0624f0f..66d8ade 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java @@ -99,7 +99,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends } @Override - public void preTearDown() throws Exception { + protected final void preTearDown() throws Exception { // this test creates a cache that is incompatible with CacheTestCase, // so we need to close it and null out the cache variable disconnectAllFromDS(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java index 9d68f8f..33c8f3e 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java @@ -169,8 +169,8 @@ public class LocalFunctionExecutionDUnitTest extends DistributedTestCase{ } } - public void preTearDown() throws Exception { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { if(cache != null) { cache.close(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java index 5feec25..3cc34d8 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java @@ -64,7 +64,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { } @Override - public void preTearDown() throws Exception { + protected final void preTearDown() throws Exception { Invoke.invokeInEveryVM(new SerializableCallable() { @Override public Object call() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java index ccea0f8..66f1a11 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java @@ -69,7 +69,8 @@ public class Bug48571DUnitTest extends DistributedTestCase { client = host.getVM(1); } - public void preTearDown() throws Exception { + @Override + protected final void preTearDown() throws Exception { reset(); server.invoke(Bug48571DUnitTest.class, "reset"); client.invoke(Bug48571DUnitTest.class, "reset"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30f29f44/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java index 4c8fc1b..c7ff13a 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java @@ -67,7 +67,8 @@ public class Bug48879DUnitTest extends DistributedTestCase { createClientCache(host, new Integer[] {port0, port1}, Boolean.TRUE); } - public void preTearDown() throws Exception { + @Override + protected final void preTearDown() throws Exception { closeCache(); vm0.invoke(Bug48879DUnitTest.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/EventIdOptimizationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java index 77459b3..086b956 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java @@ -510,15 +510,14 @@ public class EventIdOptimizationDUnitTest extends DistributedTestCase /** * Closes the caches on clients and servers */ - public void preTearDown() throws Exception - { + @Override + protected final void preTearDown() throws Exception { // close client client1.invoke(EventIdOptimizationDUnitTest.class, "closeCache"); client2.invoke(EventIdOptimizationDUnitTest.class, "closeCache"); // close server server1.invoke(EventIdOptimizationDUnitTest.class, "closeCache"); server2.invoke(EventIdOptimizationDUnitTest.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/FailoverDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java index 8d365c3..1119313 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java @@ -324,9 +324,8 @@ public class FailoverDUnitTest extends DistributedTestCase } - public void preTearDown() throws Exception - { - super.preTearDown(); + @Override + protected final void preTearDown() throws Exception { // close the clients first closeCache(); // then close the servers
