geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [15/15] incubator-geode git commit: Refactor dunit
Date Wed, 03 Feb 2016 02:32:51 GMT
Refactor dunit


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/c0552f26
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/c0552f26
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/c0552f26

Branch: refs/heads/feature/GEODE-773-2
Commit: c0552f267631c19b416908e22054413bb56b9921
Parents: 76e324b
Author: Kirk Lund <klund@pivotal.io>
Authored: Tue Feb 2 18:32:14 2016 -0800
Committer: Kirk Lund <klund@pivotal.io>
Committed: Tue Feb 2 18:32:14 2016 -0800

----------------------------------------------------------------------
 .../cache/CacheRegionClearStatsDUnitTest.java   |   4 +-
 .../cache/ConnectionPoolAndLoaderDUnitTest.java |   3 +-
 .../ClientServerRegisterInterestsDUnitTest.java |   4 +-
 .../CacheServerSSLConnectionDUnitTest.java      |   4 +-
 .../cache/client/internal/LocatorTestBase.java  |   4 +-
 .../internal/SSLNoClientAuthDUnitTest.java      |   4 +-
 .../management/MemoryThresholdsDUnitTest.java   |   3 +-
 .../MemoryThresholdsOffHeapDUnitTest.java       |   3 +-
 .../query/dunit/CompactRangeIndexDUnitTest.java |   2 +-
 .../cache/query/dunit/HashIndexDUnitTest.java   |   2 +-
 .../dunit/QueryDataInconsistencyDUnitTest.java  |   7 +-
 .../dunit/QueryIndexUsingXMLDUnitTest.java      |   4 +-
 .../QueryUsingFunctionContextDUnitTest.java     |   7 +-
 .../query/dunit/QueryUsingPoolDUnitTest.java    |  11 +-
 .../cache/query/dunit/RemoteQueryDUnitTest.java |   9 +-
 ...esourceManagerWithQueryMonitorDUnitTest.java |   3 +-
 ...pdateWithInplaceObjectModFalseDUnitTest.java |   4 +-
 ...ConcurrentIndexUpdateWithoutWLDUnitTest.java |   4 +-
 .../index/CopyOnReadIndexDUnitTest.java         |   3 +-
 .../index/MultiIndexCreationDUnitTest.java      |   7 +-
 .../index/PutAllWithIndexPerfDUnitTest.java     |  10 +-
 .../PRQueryRemoteNodeExceptionDUnitTest.java    |   3 +-
 .../snapshot/ParallelSnapshotDUnitTest.java     |   5 +-
 .../snapshot/SnapshotByteArrayDUnitTest.java    |   4 +-
 .../snapshot/SnapshotPerformanceDUnitTest.java  |   4 -
 .../gemfire/cache30/CacheMapTxnDUnitTest.java   |   2 +-
 .../gemstone/gemfire/cache30/CacheTestCase.java |  15 +-
 .../gemfire/cache30/CacheXml45DUnitTest.java    |   2 +-
 .../gemfire/cache30/CacheXmlTestCase.java       |   8 +-
 .../cache30/ClearMultiVmCallBkDUnitTest.java    |   2 +-
 .../gemfire/cache30/ClearMultiVmDUnitTest.java  |   2 +-
 .../cache30/ClientMembershipDUnitTest.java      |   4 +-
 .../ClientRegisterInterestDUnitTest.java        |   4 +-
 .../cache30/ClientServerCCEDUnitTest.java       |   3 +-
 .../gemfire/cache30/ClientServerTestCase.java   |   6 +-
 .../cache30/DistAckMapMethodsDUnitTest.java     |   2 +-
 ...tedAckOverflowRegionCCEOffHeapDUnitTest.java |   3 +-
 ...dAckPersistentRegionCCEOffHeapDUnitTest.java |   8 +-
 ...DistributedAckRegionCCEOffHeapDUnitTest.java |   8 +-
 .../DistributedAckRegionOffHeapDUnitTest.java   |   8 +-
 .../DistributedMulticastRegionDUnitTest.java    |   5 +-
 ...stributedNoAckRegionCCEOffHeapDUnitTest.java |   8 +-
 .../DistributedNoAckRegionOffHeapDUnitTest.java |   8 +-
 .../gemfire/cache30/DynamicRegionDUnitTest.java |   6 +-
 .../GlobalRegionCCEOffHeapDUnitTest.java        |   8 +-
 .../cache30/GlobalRegionOffHeapDUnitTest.java   |  10 +-
 .../gemfire/cache30/MultiVMRegionTestCase.java  |   4 +-
 .../OffHeapLRUEvictionControllerDUnitTest.java  |   8 +-
 .../PartitionedRegionOffHeapDUnitTest.java      |   8 +-
 .../cache30/PutAllCallBkRemoteVMDUnitTest.java  |   2 +-
 .../cache30/PutAllCallBkSingleVMDUnitTest.java  |   2 +-
 .../gemfire/cache30/PutAllMultiVmDUnitTest.java |   2 +-
 .../gemfire/cache30/ReconnectDUnitTest.java     |   5 +-
 .../ReconnectedCacheServerDUnitTest.java        |   2 +-
 .../RegionMembershipListenerDUnitTest.java      |   3 +-
 .../cache30/RegionReliabilityTestCase.java      |   3 +-
 .../gemfire/cache30/RegionTestCase.java         |  21 +-
 .../cache30/RemoveAllMultiVmDUnitTest.java      |   2 +-
 .../gemfire/cache30/SearchAndLoadDUnitTest.java |   6 +-
 .../gemfire/cache30/SlowRecDUnitTest.java       |  10 +-
 .../gemfire/cache30/TXOrderDUnitTest.java       |   6 +-
 .../distributed/HostedLocatorsDUnitTest.java    |   2 +-
 .../gemfire/distributed/LocatorDUnitTest.java   |   2 +-
 .../distributed/SystemAdminDUnitTest.java       |   4 +-
 .../distributed/internal/Bug40751DUnitTest.java |   4 +-
 .../ConsoleDistributionManagerDUnitTest.java    |  22 +-
 .../internal/DistributionAdvisorDUnitTest.java  |   4 +-
 .../internal/ProductUseLogDUnitTest.java        |   2 +-
 .../GemFireDeadlockDetectorDUnitTest.java       |   2 +-
 .../TcpServerBackwardCompatDUnitTest.java       |   4 +-
 .../gemfire/disttx/DistTXDebugDUnitTest.java    |   3 +-
 .../disttx/DistTXPersistentDebugDUnitTest.java  |   3 +-
 .../disttx/DistributedTransactionDUnitTest.java |   5 +-
 ...wardCompatibilitySerializationDUnitTest.java |   2 +-
 .../gemfire/internal/JarDeployerDUnitTest.java  |   3 +-
 .../internal/PdxDeleteFieldDUnitTest.java       |   3 +-
 .../gemfire/internal/PdxRenameDUnitTest.java    |   3 +-
 .../gemfire/internal/cache/BackupDUnitTest.java |   3 +-
 .../internal/cache/Bug33359DUnitTest.java       |   2 +-
 .../internal/cache/Bug33726DUnitTest.java       |   2 +-
 .../internal/cache/Bug37241DUnitTest.java       |   2 +-
 .../internal/cache/Bug37377DUnitTest.java       |   5 +-
 .../internal/cache/Bug39079DUnitTest.java       |   7 +-
 .../internal/cache/Bug40299DUnitTest.java       |   4 +-
 .../internal/cache/Bug41091DUnitTest.java       |   3 +-
 .../internal/cache/Bug41733DUnitTest.java       |   3 +-
 .../internal/cache/Bug41957DUnitTest.java       |   4 +-
 .../internal/cache/Bug47667DUnitTest.java       |   4 +-
 .../internal/cache/ClearDAckDUnitTest.java      |   2 +-
 .../internal/cache/ClearGlobalDUnitTest.java    |   2 +-
 .../cache/ClientServerGetAllDUnitTest.java      |   3 +-
 .../cache/ConnectDisconnectDUnitTest.java       |   5 +-
 .../cache/DeltaPropagationDUnitTest.java        |   4 +-
 .../cache/DeltaPropagationStatsDUnitTest.java   |   4 +-
 .../cache/DiskRegByteArrayDUnitTest.java        |   4 +-
 ...DistrbutedRegionProfileOffHeapDUnitTest.java |  18 +-
 .../cache/DistributedCacheTestCase.java         |   4 +-
 .../internal/cache/EventTrackerDUnitTest.java   |  10 +-
 .../cache/EvictionObjectSizerDUnitTest.java     |   5 -
 .../internal/cache/EvictionTestBase.java        |  12 -
 .../internal/cache/GIIDeltaDUnitTest.java       |   9 +-
 .../internal/cache/GIIFlowControlDUnitTest.java |   3 +-
 .../internal/cache/HABug36773DUnitTest.java     |   2 +-
 .../HAOverflowMemObjectSizerDUnitTest.java      |   4 +-
 .../cache/IncrementalBackupDUnitTest.java       |   4 +-
 .../cache/InterruptClientServerDUnitTest.java   |   3 +-
 .../internal/cache/InterruptsDUnitTest.java     |   3 +-
 .../cache/OffHeapEvictionDUnitTest.java         |   8 +-
 .../cache/OffHeapEvictionStatsDUnitTest.java    |   8 +-
 .../gemfire/internal/cache/OffHeapTestUtil.java |   2 +-
 .../cache/P2PDeltaPropagationDUnitTest.java     |   4 +-
 .../cache/PartitionedRegionDUnitTestCase.java   |  17 +-
 ...rtitionedRegionDelayedRecoveryDUnitTest.java |   5 +-
 ...nedRegionLocalMaxMemoryOffHeapDUnitTest.java |   8 +-
 ...rtitionedRegionOffHeapEvictionDUnitTest.java |   8 +-
 ...artitionedRegionRedundancyZoneDUnitTest.java |   3 +-
 .../PartitionedRegionSingleHopDUnitTest.java    |  13 +-
 ...RegionSingleHopWithServerGroupDUnitTest.java |  23 +-
 .../internal/cache/PutAllDAckDUnitTest.java     |   2 +-
 .../internal/cache/PutAllGlobalDUnitTest.java   |   2 +-
 .../cache/RemoteTransactionDUnitTest.java       |   3 +-
 .../internal/cache/RemoveAllDAckDUnitTest.java  |   2 +-
 .../internal/cache/RemoveDAckDUnitTest.java     |   2 +-
 .../internal/cache/RemoveGlobalDUnitTest.java   |   2 +-
 .../internal/cache/SingleHopStatsDUnitTest.java |  23 +-
 .../control/RebalanceOperationDUnitTest.java    |   5 +-
 .../cache/execute/Bug51193DUnitTest.java        |   2 +-
 .../ClientServerFunctionExecutionDUnitTest.java |   4 -
 .../execute/ColocationFailoverDUnitTest.java    |   4 +-
 ...ributedRegionFunctionExecutionDUnitTest.java |   2 +-
 .../execute/FunctionServiceStatsDUnitTest.java  |   7 -
 .../LocalFunctionExecutionDUnitTest.java        |   4 +-
 .../MemberFunctionExecutionDUnitTest.java       |   7 +-
 .../MultiRegionFunctionExecutionDUnitTest.java  |   4 +-
 .../OnGroupsFunctionExecutionDUnitTest.java     |   2 +-
 ...ntServerFunctionExecutionNoAckDUnitTest.java |   5 -
 ...tServerRegionFunctionExecutionDUnitTest.java |   5 -
 ...egionFunctionExecutionFailoverDUnitTest.java |   5 -
 ...onFunctionExecutionNoSingleHopDUnitTest.java |   5 -
 ...onExecutionSelectorNoSingleHopDUnitTest.java |   5 -
 ...gionFunctionExecutionSingleHopDUnitTest.java |   7 -
 .../cache/execute/PRClientServerTestBase.java   |   4 +-
 .../cache/execute/PRColocationDUnitTest.java    |   3 +-
 .../cache/execute/PRTransactionDUnitTest.java   |   9 +-
 .../execute/SingleHopGetAllPutAllDUnitTest.java |   5 -
 .../cache/ha/Bug36853EventsExpiryDUnitTest.java |   3 +-
 .../internal/cache/ha/Bug48571DUnitTest.java    |   2 +-
 .../internal/cache/ha/Bug48879DUnitTest.java    |   2 +-
 .../cache/ha/EventIdOptimizationDUnitTest.java  |   2 +-
 .../internal/cache/ha/FailoverDUnitTest.java    |   4 +-
 .../internal/cache/ha/HABugInPutDUnitTest.java  |   4 +-
 .../internal/cache/ha/HAClearDUnitTest.java     |   4 +-
 .../cache/ha/HAConflationDUnitTest.java         |   6 +-
 .../internal/cache/ha/HADuplicateDUnitTest.java |   4 +-
 .../cache/ha/HAEventIdPropagationDUnitTest.java |   4 +-
 .../internal/cache/ha/HAExpiryDUnitTest.java    |   4 +-
 .../internal/cache/ha/HAGIIBugDUnitTest.java    |   4 +-
 .../internal/cache/ha/HAGIIDUnitTest.java       |   4 +-
 .../cache/ha/HARQueueNewImplDUnitTest.java      |   4 +-
 .../internal/cache/ha/HARegionDUnitTest.java    |   4 +-
 .../cache/ha/HARegionQueueDUnitTest.java        |   4 +-
 .../cache/ha/HASlowReceiverDUnitTest.java       |   4 +-
 .../ha/OperationsPropagationDUnitTest.java      |   4 +-
 .../internal/cache/ha/PutAllDUnitTest.java      |   4 +-
 .../internal/cache/ha/StatsBugDUnitTest.java    |   4 +-
 .../cache/locks/TXLockServiceDUnitTest.java     |   4 +-
 .../cache/partitioned/Bug43684DUnitTest.java    |   2 +-
 .../cache/partitioned/Bug47388DUnitTest.java    |   2 +-
 .../cache/partitioned/Bug51400DUnitTest.java    |   2 +-
 .../partitioned/PartitionResolverDUnitTest.java |   5 +-
 .../PartitionedRegionLoaderWriterDUnitTest.java |   5 -
 ...tentColocatedPartitionedRegionDUnitTest.java |   3 +-
 ...rtitionedRegionWithTransactionDUnitTest.java |   7 +-
 .../fixed/FixedPartitioningDUnitTest.java       |   4 +-
 .../fixed/FixedPartitioningTestBase.java        |   4 +-
 ...ngWithColocationAndPersistenceDUnitTest.java |   4 +-
 .../PersistentRVVRecoveryDUnitTest.java         |   3 +-
 .../PersistentReplicatedTestBase.java           |   7 +-
 .../internal/cache/tier/Bug40396DUnitTest.java  |   4 +-
 ...mpatibilityHigherVersionClientDUnitTest.java |   4 +-
 .../cache/tier/sockets/Bug36269DUnitTest.java   |   2 +-
 .../cache/tier/sockets/Bug36457DUnitTest.java   |   4 +-
 .../cache/tier/sockets/Bug36805DUnitTest.java   |   4 +-
 .../cache/tier/sockets/Bug36829DUnitTest.java   |   4 +-
 .../cache/tier/sockets/Bug36995DUnitTest.java   |   4 +-
 .../cache/tier/sockets/Bug37210DUnitTest.java   |   4 +-
 .../cache/tier/sockets/Bug37805DUnitTest.java   |   2 +-
 .../CacheServerTransactionsDUnitTest.java       |   4 +-
 .../tier/sockets/ClearPropagationDUnitTest.java |   2 +-
 .../tier/sockets/ClientConflationDUnitTest.java |   2 +-
 .../sockets/ClientInterestNotifyDUnitTest.java  |   2 +-
 .../tier/sockets/ClientServerMiscDUnitTest.java |   6 +-
 .../cache/tier/sockets/ConflationDUnitTest.java |   2 +-
 .../DataSerializerPropogationDUnitTest.java     |   4 +-
 .../DestroyEntryPropagationDUnitTest.java       |   2 +-
 .../DurableClientQueueSizeDUnitTest.java        |   2 +-
 .../DurableClientReconnectDUnitTest.java        |   4 +-
 .../sockets/DurableClientStatsDUnitTest.java    |   2 +-
 .../sockets/DurableRegistrationDUnitTest.java   |   4 +-
 .../sockets/DurableResponseMatrixDUnitTest.java |   4 +-
 .../sockets/EventIDVerificationDUnitTest.java   |   4 +-
 .../EventIDVerificationInP2PDUnitTest.java      |   4 +-
 ...ForceInvalidateOffHeapEvictionDUnitTest.java |   8 +-
 .../cache/tier/sockets/HABug36738DUnitTest.java |   4 +-
 .../cache/tier/sockets/HAInterestTestCase.java  |   2 +-
 .../sockets/HAStartupAndFailoverDUnitTest.java  |   4 +-
 .../InstantiatorPropagationDUnitTest.java       |   4 +-
 .../tier/sockets/InterestListDUnitTest.java     |   2 +-
 .../sockets/InterestListEndpointDUnitTest.java  |   2 +-
 .../sockets/InterestListFailoverDUnitTest.java  |   2 +-
 .../sockets/InterestListRecoveryDUnitTest.java  |   2 +-
 .../sockets/InterestResultPolicyDUnitTest.java  |   5 +-
 .../sockets/NewRegionAttributesDUnitTest.java   |   2 +-
 .../tier/sockets/RedundancyLevelTestBase.java   |   4 +-
 .../tier/sockets/RegionCloseDUnitTest.java      |   4 +-
 ...erInterestBeforeRegionCreationDUnitTest.java |   4 +-
 .../sockets/RegisterInterestKeysDUnitTest.java  |   2 +-
 .../sockets/ReliableMessagingDUnitTest.java     |   4 +-
 .../sockets/UnregisterInterestDUnitTest.java    |   2 +-
 .../sockets/UpdatePropagationDUnitTest.java     |   2 +-
 .../VerifyEventIDGenerationInP2PDUnitTest.java  |   4 +-
 ...UpdatesFromNonInterestEndPointDUnitTest.java |   2 +-
 .../cache/wan/AsyncEventQueueTestBase.java      |  18 +-
 .../asyncqueue/AsyncEventListenerDUnitTest.java | 320 +++++++-------
 .../AsyncEventQueueStatsDUnitTest.java          |  64 +--
 .../ConcurrentAsyncEventQueueDUnitTest.java     |  44 +-
 .../CommonParallelAsyncEventQueueDUnitTest.java |   4 +-
 .../CompressionCacheConfigDUnitTest.java        |   5 -
 .../CompressionCacheListenerDUnitTest.java      |   9 +-
 ...ompressionCacheListenerOffHeapDUnitTest.java |   8 +-
 .../CompressionRegionConfigDUnitTest.java       |   5 -
 .../CompressionRegionFactoryDUnitTest.java      |   5 -
 .../CompressionRegionOperationsDUnitTest.java   |  25 +-
 ...ressionRegionOperationsOffHeapDUnitTest.java |   9 +-
 .../internal/jta/dunit/ExceptionsDUnitTest.java |   2 +-
 .../jta/dunit/IdleTimeOutDUnitTest.java         |   2 +-
 .../jta/dunit/MaxPoolSizeDUnitTest.java         |   2 +-
 .../jta/dunit/TransactionTimeOutDUnitTest.java  |   2 +-
 .../dunit/TxnManagerMultiThreadDUnitTest.java   |   2 +-
 .../internal/jta/dunit/TxnTimeOutDUnitTest.java |   2 +-
 .../offheap/OutOfOffHeapMemoryDUnitTest.java    |   9 +-
 .../process/LocalProcessLauncherDUnitTest.java  |   2 +-
 .../statistics/StatisticsDUnitTest.java         |   2 +-
 .../management/CacheManagementDUnitTest.java    |   4 +-
 .../management/ClientHealthStatsDUnitTest.java  |   8 +-
 .../management/CompositeTypeTestDUnitTest.java  |   4 +-
 .../management/DLockManagementDUnitTest.java    |   4 +-
 .../management/DiskManagementDUnitTest.java     |   4 +-
 .../management/DistributedSystemDUnitTest.java  |   4 +-
 .../management/LocatorManagementDUnitTest.java  |   6 +-
 .../gemfire/management/ManagementTestBase.java  |   8 +-
 .../MemberMBeanAttributesDUnitTest.java         |   4 +-
 .../management/OffHeapManagementDUnitTest.java  |   2 +-
 .../gemfire/management/QueryDataDUnitTest.java  |   4 +-
 .../management/RegionManagementDUnitTest.java   |   4 +-
 ...ersalMembershipListenerAdapterDUnitTest.java |   3 +-
 .../stats/DistributedSystemStatsDUnitTest.java  |   4 +-
 .../internal/cli/CliUtilDUnitTest.java          |   4 +-
 .../cli/commands/CliCommandTestBase.java        |   7 +-
 .../cli/commands/ConfigCommandsDUnitTest.java   |   4 +-
 ...eateAlterDestroyRegionCommandsDUnitTest.java |   3 +-
 .../cli/commands/DeployCommandsDUnitTest.java   |   4 +-
 .../commands/DiskStoreCommandsDUnitTest.java    |   3 +-
 .../commands/GemfireDataCommandsDUnitTest.java  |   4 -
 .../cli/commands/IndexCommandsDUnitTest.java    |   7 +-
 ...stAndDescribeDiskStoreCommandsDUnitTest.java |   5 -
 .../cli/commands/ListIndexCommandDUnitTest.java |   5 -
 .../cli/commands/MemberCommandsDUnitTest.java   |   3 +-
 .../MiscellaneousCommandsDUnitTest.java         |   2 +-
 ...laneousCommandsExportLogsPart2DUnitTest.java |   5 -
 ...laneousCommandsExportLogsPart4DUnitTest.java |   5 -
 .../cli/commands/QueueCommandsDUnitTest.java    |   3 +-
 .../SharedConfigurationCommandsDUnitTest.java   |   3 +-
 .../cli/commands/ShellCommandsDUnitTest.java    |   2 +-
 .../cli/commands/ShowDeadlockDUnitTest.java     |   2 +-
 .../cli/commands/UserCommandsDUnitTest.java     |   3 +-
 .../SharedConfigurationDUnitTest.java           |   4 +-
 .../internal/pulse/TestClientIdsDUnitTest.java  |   4 +-
 .../internal/pulse/TestFunctionsDUnitTest.java  |   4 +-
 .../internal/pulse/TestHeapDUnitTest.java       |   4 +-
 .../internal/pulse/TestLocatorsDUnitTest.java   |   4 +-
 .../pulse/TestSubscriptionsDUnitTest.java       |   4 +-
 .../ClientsWithVersioningRetryDUnitTest.java    |   8 +-
 .../pdx/JSONPdxClientServerDUnitTest.java       |   2 +-
 .../gemfire/redis/RedisDistDUnitTest.java       |   4 +-
 .../web/controllers/RestAPITestBase.java        |   6 +-
 .../security/ClientAuthenticationDUnitTest.java |   4 +-
 .../security/ClientAuthorizationDUnitTest.java  |   4 +-
 .../security/ClientMultiUserAuthzDUnitTest.java |   4 +-
 .../DeltaClientAuthorizationDUnitTest.java      |   4 +-
 .../DeltaClientPostAuthorizationDUnitTest.java  |   4 +-
 .../gemfire/test/dunit/DistributedTestCase.java | 417 ++++++++++---------
 .../com/gemstone/gemfire/test/dunit/Invoke.java |   4 +-
 .../tests/GetDefaultDiskStoreNameDUnitTest.java |  67 +++
 .../dunit/tests/GetTestMethodNameDUnitTest.java |  54 +++
 .../test/examples/AssertJExampleJUnitTest.java  | 135 ------
 .../CatchExceptionExampleJUnitTest.java         | 115 -----
 .../examples/JUnitParamsExampleJUnitTest.java   |  52 ---
 .../dunit/CqDataOptimizedExecuteDUnitTest.java  |   3 +-
 ...qDataUsingPoolOptimizedExecuteDUnitTest.java |   3 +-
 .../dunit/CqQueryOptimizedExecuteDUnitTest.java |   3 +-
 ...QueryUsingPoolOptimizedExecuteDUnitTest.java |   3 +-
 ...ltSetUsingPoolOptimizedExecuteDUnitTest.java |   3 +-
 .../dunit/CqStatsOptimizedExecuteDUnitTest.java |   3 +-
 ...StatsUsingPoolOptimizedExecuteDUnitTest.java |   3 +-
 ...dRegionCqQueryOptimizedExecuteDUnitTest.java |   3 +-
 .../PrCqUsingPoolOptimizedExecuteDUnitTest.java |   3 +-
 .../cache/query/dunit/PdxQueryCQTestBase.java   |   3 +-
 .../query/dunit/QueryMonitorDUnitTest.java      |   3 +-
 .../cache/PRDeltaPropagationDUnitTest.java      |   4 +-
 .../cache/RemoteCQTransactionDUnitTest.java     |   3 +-
 .../internal/cache/ha/CQListGIIDUnitTest.java   |   4 +-
 .../cache/ha/HADispatcherDUnitTest.java         |   4 +-
 .../sockets/ClientToServerDeltaDUnitTest.java   |   4 +-
 .../DeltaPropagationWithCQDUnitTest.java        |   4 +-
 ...ToRegionRelationCQRegistrationDUnitTest.java |   2 +-
 .../sockets/DurableClientCrashDUnitTest.java    |   4 +-
 .../sockets/DurableClientNetDownDUnitTest.java  |   4 +-
 .../tier/sockets/DurableClientTestCase.java     |   7 +-
 .../CacheServerManagementDUnitTest.java         |   4 +-
 .../cli/commands/ClientCommandsDUnitTest.java   |   4 +-
 .../DurableClientCommandsDUnitTest.java         |   4 +-
 .../internal/pulse/TestCQDUnitTest.java         |   4 +-
 .../internal/pulse/TestClientsDUnitTest.java    |   4 +-
 .../internal/pulse/TestServerDUnitTest.java     |   4 +-
 .../ClientAuthorizationTwoDUnitTest.java        |   4 +-
 .../security/ClientAuthzObjectModDUnitTest.java |   4 +-
 .../ClientCQPostAuthorizationDUnitTest.java     |   4 +-
 .../ClientPostAuthorizationDUnitTest.java       |   4 +-
 .../gemfire/security/MultiuserAPIDUnitTest.java |   4 +-
 .../internal/cache/UpdateVersionDUnitTest.java  |  12 +-
 .../gemfire/internal/cache/wan/WANTestBase.java |  68 +--
 ...oncurrentParallelGatewaySenderDUnitTest.java | 174 ++++----
 ...allelGatewaySenderOperation_1_DUnitTest.java | 192 ++++-----
 ...allelGatewaySenderOperation_2_DUnitTest.java |  42 +-
 .../ConcurrentWANPropogation_1_DUnitTest.java   | 184 ++++----
 .../ConcurrentWANPropogation_2_DUnitTest.java   | 156 +++----
 .../cache/wan/disttx/DistTXWANDUnitTest.java    |  48 +--
 .../CommonParallelGatewaySenderDUnitTest.java   | 120 +++---
 .../cache/wan/misc/PDXNewWanDUnitTest.java      | 186 ++++-----
 ...dRegion_ParallelWANPersistenceDUnitTest.java | 176 ++++----
 ...dRegion_ParallelWANPropogationDUnitTest.java | 200 ++++-----
 .../SenderWithTransportFilterDUnitTest.java     |  18 +-
 ...downAllPersistentGatewaySenderDUnitTest.java |  20 +-
 .../wan/misc/WANLocatorServerDUnitTest.java     |   8 +-
 .../cache/wan/misc/WANSSLDUnitTest.java         |  24 +-
 .../wan/misc/WanAutoDiscoveryDUnitTest.java     |   4 +-
 .../cache/wan/misc/WanValidationsDUnitTest.java | 272 ++++++------
 ...arallelGatewaySenderOperationsDUnitTest.java |  94 ++---
 ...llelGatewaySenderQueueOverflowDUnitTest.java |  76 ++--
 .../ParallelWANConflationDUnitTest.java         |  52 +--
 ...ersistenceEnabledGatewaySenderDUnitTest.java | 354 ++++++++--------
 ...llelWANPropagationClientServerDUnitTest.java |  28 +-
 ...lelWANPropagationConcurrentOpsDUnitTest.java |  74 ++--
 .../ParallelWANPropagationDUnitTest.java        | 346 +++++++--------
 ...ParallelWANPropagationLoopBackDUnitTest.java |  70 ++--
 .../wan/parallel/ParallelWANStatsDUnitTest.java | 120 +++---
 ...tewaySenderDistributedDeadlockDUnitTest.java |  96 ++---
 ...rialGatewaySenderEventListenerDUnitTest.java |  68 +--
 .../SerialGatewaySenderOperationsDUnitTest.java | 104 ++---
 .../SerialGatewaySenderQueueDUnitTest.java      |  44 +-
 ...ersistenceEnabledGatewaySenderDUnitTest.java | 140 +++----
 .../SerialWANPropagationLoopBackDUnitTest.java  |  86 ++--
 .../serial/SerialWANPropogationDUnitTest.java   | 408 +++++++++---------
 ...NPropogation_PartitionedRegionDUnitTest.java | 166 ++++----
 .../SerialWANPropogationsFeatureDUnitTest.java  | 124 +++---
 .../wan/serial/SerialWANStatsDUnitTest.java     | 152 +++----
 .../wan/wancommand/WANCommandTestBase.java      |  28 +-
 .../management/WANManagementDUnitTest.java      |  26 +-
 .../pulse/TestRemoteClusterDUnitTest.java       |  14 +-
 370 files changed, 3459 insertions(+), 3851 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/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 a1af48c..8908abc 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 tearDown2() throws Exception {
-    super.tearDown2();
+  public void preTearDown() throws Exception {
+    super.preTearDown();
     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/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
index bec1c1e..ba6412a 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
@@ -52,7 +52,8 @@ public class ConnectionPoolAndLoaderDUnitTest  extends CacheTestCase {
     super.setUp();
   }
   
-  public void tearDown2() {
+  @Override
+  protected final void preTearDownCacheTestCase() {
     //TODO grid. This is a hack. The next dunit test to run after
     //this one is the ConnectionPoolAutoDUnit test. That ends up calling
     //getSystem() with no arguments and expects to get a system without

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/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 80ed952..a5dc6fb 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,8 @@ public class ClientServerRegisterInterestsDUnitTest extends DistributedTestCase
   }
 
   @Override
-  public void tearDown2() throws Exception {
-    super.tearDown2();
+  public void preTearDown() throws Exception {
+    super.preTearDown();
     serverPort.set(0);
     entryEvents.clear();
     gemfireServerVm.invoke(new SerializableRunnable() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/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 58e5620..107dd8b 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,14 +412,14 @@ public class CacheServerSSLConnectionDUnitTest extends DistributedTestCase {
     }
   }
   
-  public void tearDown2() throws Exception
+  public 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.tearDown2();
+    super.preTearDown();
   }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/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 fb16ce2..fb2411d 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,7 @@ public abstract class LocatorTestBase  extends DistributedTestCase {
     super(name);
   }
   
-  public void tearDown2() throws Exception {
+  public void preTearDown() throws Exception {
     
     SerializableRunnable tearDown = new SerializableRunnable("tearDown") {
       public void run() {
@@ -100,7 +100,7 @@ public abstract class LocatorTestBase  extends DistributedTestCase {
     //speed, but lets at least destroy our cache and locator.
     Invoke.invokeInEveryVM(tearDown);
     tearDown.run();
-    super.tearDown2();
+    super.preTearDown();
   }
   
   protected void startLocatorInVM(final VM vm, final int locatorPort, final String otherLocators) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/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 1c79129..ac6bf4a 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,14 @@ public class SSLNoClientAuthDUnitTest extends DistributedTestCase {
     }
   }
   
-  public void tearDown2() throws Exception
+  public 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.tearDown2();
+    super.preTearDown();
   }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
index 2e8f974..4c10044 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
@@ -143,9 +143,8 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
   }
 
   @Override
-  public void tearDown2() throws Exception {
+  protected void preTearDownClientServerTestCase() throws Exception {
     Invoke.invokeInEveryVM(resetResourceManager);
-    super.tearDown2();
   }
 
   public void testPRClientPutRejection() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
index f0600eb..d67d8bc 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
@@ -116,9 +116,8 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
 
 
   @Override
-  public void tearDown2() throws Exception {
+  protected void preTearDownClientServerTestCase() throws Exception {
     Invoke.invokeInEveryVM(this.resetResourceManager);
-    super.tearDown2();
   }
 
   private SerializableCallable resetResourceManager = new SerializableCallable() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/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 35c9324..b4988c0 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,7 @@ public class CompactRangeIndexDUnitTest extends DistributedTestCase{
    
   }
   
-  public void tearDown2() throws Exception{
+  public void preTearDown() throws Exception{
     Thread.sleep(5000);
     removeHook();
     utils.closeServer(vm0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/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 a81bd54..a5ed9a2 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,7 +124,7 @@ public class HashIndexDUnitTest extends DistributedTestCase{
     });
   }
   
-  public void tearDown2() throws Exception{
+  public void preTearDown() throws Exception{
     Thread.sleep(5000);
     utils.closeServer(vm0);
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
index 02ab55f..fb7dd63 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
@@ -95,9 +95,12 @@ public class QueryDataInconsistencyDUnitTest extends CacheTestCase {
   }
 
   @Override
-  public void tearDown2() throws Exception {
+  protected final void preTearDownCacheTestCase() throws Exception {
     Invoke.invokeInEveryVM(CacheTestCase.class, "disconnectFromDS");
-    super.tearDown2();
+  }
+  
+  @Override
+  protected final void postTearDownCacheTestCase() throws Exception {
     Invoke.invokeInEveryVM(QueryObserverHolder.class, "reset");
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
index de56700..5d55dbb 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
@@ -138,8 +138,8 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
     IgnoredException.addIgnoredException("Failed to create index");
   }
 
-  public void tearDown2() throws Exception {
-    super.tearDown2();
+  @Override
+  protected final void postTearDownCacheTestCase() throws Exception {
     // Get the disk store name.
     GemFireCacheImpl cache = (GemFireCacheImpl)getCache();
     String diskStoreName = cache.getDefaultDiskStoreName();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
index 5a78b8d..3f36c18 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
@@ -135,9 +135,12 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
   }
 
   @Override
-  public void tearDown2() throws Exception {
+  protected final void preTearDownCacheTestCase() throws Exception {
     Invoke.invokeInEveryVM(CacheTestCase.class, "disconnectFromDS");
-    super.tearDown2();
+  }
+  
+  @Override
+  protected final void postTearDownCacheTestCase() throws Exception {
     Invoke.invokeInEveryVM(QueryObserverHolder.class, "reset");
     cache = null;
     Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } });

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
index c40be0e..dba995e 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
@@ -104,16 +104,11 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
     IgnoredException.addIgnoredException("Socket input is shutdown");
   }
 
-  public void tearDown2() throws Exception {
-    try {
-      super.tearDown2();
-    }
-    finally {
-      disconnectAllFromDS();
-    }
+  @Override
+  protected final void postTearDownCacheTestCase() throws Exception {
+    disconnectAllFromDS();
   }
 
-
   public void createPool(VM vm, String poolName, String server, int port, boolean subscriptionEnabled) {
     createPool(vm, poolName, new String[]{server}, new int[]{port}, subscriptionEnabled);  
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
index 3944c01..4be7218 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
@@ -79,13 +79,8 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
   }
 
   @Override
-  public void tearDown2() throws Exception {
-    try {
-      super.tearDown2();
-    }
-    finally {
-      disconnectAllFromDS();
-    }
+  protected final void postTearDownCacheTestCase() throws Exception {
+    disconnectAllFromDS();
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
index 059272c..f889d21 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
@@ -95,10 +95,9 @@ public class ResourceManagerWithQueryMonitorDUnitTest extends ClientServerTestCa
   }
   
   @Override
-  public void tearDown2() throws Exception {
+  protected void preTearDownClientServerTestCase() throws Exception {
     Invoke.invokeInEveryVM(resetQueryMonitor);
     Invoke.invokeInEveryVM(resetResourceManager);
-    super.tearDown2();
   }
 
   private SerializableCallable setHeapMemoryMonitorTestMode = new SerializableCallable() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/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 9e32435..0b3b194 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,7 +107,7 @@ 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 tearDown2() throws Exception {
+  public void preTearDown() throws Exception {
     try {
       Invoke.invokeInEveryVM(new CacheSerializableRunnable("Set INPLACE_OBJECT_MODIFICATION false") {
         
@@ -120,7 +120,7 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends
       Invoke.invokeInEveryVM(ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.class, "destroyRegions");
       Invoke.invokeInEveryVM(CacheTestCase.class, "closeCache");
     } finally {
-      super.tearDown2();
+      super.preTearDown();
     }
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/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 e7f9102..0cbede3 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,12 +92,12 @@ 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 tearDown2() throws Exception {
+  public void preTearDown() throws Exception {
     try {
       Invoke.invokeInEveryVM(ConcurrentIndexUpdateWithoutWLDUnitTest.class, "destroyRegions");
       Invoke.invokeInEveryVM(CacheTestCase.class, "closeCache");
     } finally {
-      super.tearDown2();
+      super.preTearDown();
     }
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
index dddbc21..ab10a18 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
@@ -78,7 +78,8 @@ public class CopyOnReadIndexDUnitTest extends CacheTestCase {
     vm2 = host.getVM(2);
   }
   
-  public void tearDown2() throws Exception {
+  @Override
+  protected final void preTearDownCacheTestCase() throws Exception {
     disconnectAllFromDS();
   }
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MultiIndexCreationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MultiIndexCreationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MultiIndexCreationDUnitTest.java
index af47fb2..5cad45b 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MultiIndexCreationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/MultiIndexCreationDUnitTest.java
@@ -172,10 +172,13 @@ public class MultiIndexCreationDUnitTest extends CacheTestCase {
   }
 
   @Override
-  public void tearDown2() throws Exception {
+  protected final void preTearDownCacheTestCase() throws Exception {
     hooked = false;
     Invoke.invokeInEveryVM(CacheTestCase.class, "disconnectFromDS");
-    super.tearDown2();
+  }
+  
+  @Override
+  protected final void postTearDownCacheTestCase() throws Exception {
     Invoke.invokeInEveryVM(QueryObserverHolder.class, "reset");
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
index 7c58e3f..098c814 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
@@ -68,13 +68,9 @@ public class PutAllWithIndexPerfDUnitTest extends CacheTestCase {
     disconnectAllFromDS();
   }
 
-  public void tearDown2() throws Exception {
-    try {
-      super.tearDown2();
-    }
-    finally {
-      disconnectAllFromDS();
-    }
+  @Override
+  protected final void postTearDownCacheTestCase() throws Exception {
+    disconnectAllFromDS();
   }
 
   public void testPutAllWithIndexes() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java
index e232616..76da571 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java
@@ -90,9 +90,8 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT
   private int numOfBuckets = 10;
 
   @Override
-  public void tearDown2() throws Exception {
+  protected final void preTearDownPartitionedRegionDUnitTest() throws Exception {
     Invoke.invokeInEveryVM(QueryObserverHolder.class, "reset");
-    super.tearDown2();
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache/snapshot/ParallelSnapshotDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/snapshot/ParallelSnapshotDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/snapshot/ParallelSnapshotDUnitTest.java
index ea1195e..ea95558 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/snapshot/ParallelSnapshotDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/snapshot/ParallelSnapshotDUnitTest.java
@@ -161,9 +161,8 @@ public class ParallelSnapshotDUnitTest extends CacheTestCase {
     loadCache();
   }
   
-  public void tearDown2() throws Exception {
-    super.tearDown2();
-    
+  @Override
+  protected final void postTearDownCacheTestCase() throws Exception {
     File[] snaps = new File(".").listFiles(new FilenameFilter() {
       @Override
       public boolean accept(File dir, String name) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotByteArrayDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotByteArrayDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotByteArrayDUnitTest.java
index c528f35..b464f9a 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotByteArrayDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotByteArrayDUnitTest.java
@@ -110,11 +110,11 @@ public class SnapshotByteArrayDUnitTest extends CacheTestCase {
     loadCache();
   }
   
-  public void tearDown2() throws Exception {
+  @Override
+  protected final void preTearDownCacheTestCase() throws Exception {
     if (snap.exists()) {
       snap.delete();
     }
-    super.tearDown2();
   }
   
   public void loadCache() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotPerformanceDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotPerformanceDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotPerformanceDUnitTest.java
index 3905feb..1c1829a 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotPerformanceDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotPerformanceDUnitTest.java
@@ -106,10 +106,6 @@ public class SnapshotPerformanceDUnitTest extends CacheTestCase {
     createCache();
   }
   
-  public void tearDown2() throws Exception {
-    super.tearDown2();
-  }
-  
   private void createCache() throws Exception {
     SerializableCallable setup = new SerializableCallable() {
       @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/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 49f73c0..72fe9db 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
@@ -67,7 +67,7 @@ public class CacheMapTxnDUnitTest extends DistributedTestCase{
       vm1.invoke(CacheMapTxnDUnitTest.class, "createCache");
     }
     
-    public void tearDown2(){
+    public void preTearDown(){
         Host host = Host.getHost(0);
         VM vm0 = host.getVM(0);
         VM vm1 = host.getVM(1);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/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 e054e0b..6bbd810 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,9 @@ public abstract class CacheTestCase extends DistributedTestCase {
   }
 
   @Override
-  public void tearDown2() throws Exception {
+  public final void preTearDown() throws Exception {
+    preTearDownCacheTestCase();
+    
     // locally destroy all root regions and close the cache
     remoteTearDown();
     // Now invoke it in every VM
@@ -395,10 +397,17 @@ public abstract class CacheTestCase extends DistributedTestCase {
       Host host = Host.getHost(h);
       for (int v = 0; v < host.getVMCount(); v++) {
         VM vm = host.getVM(v);
-        vm.invoke(CacheTestCase.class, "remoteTearDown");
+        vm.invoke(()->remoteTearDown());
       }
     }
-    super.tearDown2(); 
+    
+    postTearDownCacheTestCase();
+  }
+  
+  protected void preTearDownCacheTestCase() throws Exception {
+  }
+
+  protected void postTearDownCacheTestCase() throws Exception {
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java
index 30284a4..19dc89f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java
@@ -169,7 +169,7 @@ public class CacheXml45DUnitTest extends CacheXml41DUnitTest {
     } finally {
       this.xmlProps = null;
       try {
-        tearDown2();
+        preTearDown();
       } finally {
         DistributedRegion.ignoreReconnect = false;
       }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
index 8615899..dd127cb 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
@@ -49,9 +49,13 @@ public class CacheXmlTestCase extends CacheTestCase {
     disconnectAllFromDS();
   }
 
-  public void tearDown2() throws Exception {
+  @Override
+  protected final void preTearDownCacheTestCase() throws Exception {
     this.xmlFile = null;    
-    super.tearDown2();
+  }
+  
+  @Override
+  protected final void postTearDownCacheTestCase() throws Exception {
     disconnectAllFromDS();
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/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 6a20d38..d98d752 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,7 +72,7 @@ public class ClearMultiVmCallBkDUnitTest extends DistributedTestCase{
       LogWriterSupport.getLogWriter().fine("Cache created in successfully");
     }
     
-    public void tearDown2(){
+    public void preTearDown(){
         Host host = Host.getHost(0);
         VM vm0 = host.getVM(0);
         VM vm1 = host.getVM(1);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/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 e78f58b..4cfe5bf 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
@@ -76,7 +76,7 @@ public class ClearMultiVmDUnitTest extends DistributedTestCase{
       vm1.invoke(ClearMultiVmDUnitTest.class, "createCache");
     }
     
-    public void tearDown2(){
+    public void preTearDown(){
         Host host = Host.getHost(0);
         VM vm0 = host.getVM(0);
         VM vm1 = host.getVM(1);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
index 0619547..221d285 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
@@ -86,8 +86,8 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
     getSystem();
   }
   
-  public void tearDown2() throws Exception {
-    super.tearDown2();
+  @Override
+  protected final void postTearDownCacheTestCase() throws Exception {
     InternalClientMembership.unregisterAllListeners();
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
index 021c2f1..da155f1 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
@@ -45,8 +45,8 @@ public class ClientRegisterInterestDUnitTest extends ClientServerTestCase {
     super(name);
   }
   
-  public void tearDown2() throws Exception {
-    super.tearDown2();
+  @Override
+  protected final void postTearDownCacheTestCase() throws Exception {
     disconnectAllFromDS(); // cleans up bridge server and client and lonerDS
   }
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
index 3c20498..7fdd975 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
@@ -68,7 +68,8 @@ public class ClientServerCCEDUnitTest extends CacheTestCase {
     HARegionQueue.setMessageSyncInterval(5);
   }
   
-  public void tearDown2() {
+  @Override
+  protected final void preTearDownCacheTestCase() {
     disconnectAllFromDS();
     HARegionQueue.setMessageSyncInterval(HARegionQueue.DEFAULT_MESSAGE_SYNC_INTERVAL);
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
index 27c00fb..c3c0a8c 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
@@ -62,10 +62,14 @@ public class ClientServerTestCase extends CacheTestCase {
   }
   
   @Override
-  public void tearDown2() throws Exception {
+  protected final void preTearDownCacheTestCase() throws Exception {
+    preTearDownClientServerTestCase();
     // this makes sure we don't leave anything for the next tests
     disconnectAllFromDS();
   }
+  
+  protected void preTearDownClientServerTestCase() throws Exception {
+  }
 
   public ClientServerTestCase(String name) {
     super(name);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/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 91f3ccb..10abe4e 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,7 +80,7 @@ public class DistAckMapMethodsDUnitTest extends DistributedTestCase{
       vm1.invoke(DistAckMapMethodsDUnitTest.class, "createCache");
     }
     
-    public void tearDown2(){
+    public void preTearDown(){
         Host host = Host.getHost(0);
         VM vm0 = host.getVM(0);
         VM vm1 = host.getVM(1);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
index 8d25245..2323b0e 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
@@ -39,7 +39,7 @@ public class DistributedAckOverflowRegionCCEOffHeapDUnitTest extends Distributed
   }
   
   @Override
-  public void tearDown2() throws Exception {
+  protected final void preTearDownCacheTestCase() throws Exception {
     SerializableRunnable checkOrphans = new SerializableRunnable() {
 
       @Override
@@ -51,7 +51,6 @@ public class DistributedAckOverflowRegionCCEOffHeapDUnitTest extends Distributed
     };
     checkOrphans.run();
     Invoke.invokeInEveryVM(checkOrphans);
-    super.tearDown2();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
index b7cf2aa..52a4313 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
@@ -39,7 +39,7 @@ public class DistributedAckPersistentRegionCCEOffHeapDUnitTest extends Distribut
   }
 
   @Override
-  public void tearDown2() throws Exception {
+  protected final void preTearDownCacheTestCase() throws Exception {
     SerializableRunnable checkOrphans = new SerializableRunnable() {
 
       @Override
@@ -50,11 +50,7 @@ public class DistributedAckPersistentRegionCCEOffHeapDUnitTest extends Distribut
       }
     };
     Invoke.invokeInEveryVM(checkOrphans);
-    try {
-      checkOrphans.run();
-    } finally {
-      super.tearDown2();
-    }
+    checkOrphans.run();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
index 4f4a5ec..1c1cbaf 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
@@ -39,7 +39,7 @@ public class DistributedAckRegionCCEOffHeapDUnitTest extends DistributedAckRegio
   }
   
   @Override
-  public void tearDown2() throws Exception {
+  protected final void preTearDownCacheTestCase() throws Exception {
     SerializableRunnable checkOrphans = new SerializableRunnable() {
 
       @Override
@@ -50,11 +50,7 @@ public class DistributedAckRegionCCEOffHeapDUnitTest extends DistributedAckRegio
       }
     };
     Invoke.invokeInEveryVM(checkOrphans);
-    try {
-      checkOrphans.run();
-    } finally {
-      super.tearDown2();
-    }
+    checkOrphans.run();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
index ef0a7d2..cbf8367 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
@@ -39,7 +39,7 @@ public class DistributedAckRegionOffHeapDUnitTest extends DistributedAckRegionDU
   }
   
   @Override
-  public void tearDown2() throws Exception {
+  protected final void preTearDownCacheTestCase() throws Exception {
     SerializableRunnable checkOrphans = new SerializableRunnable() {
 
       @Override
@@ -50,11 +50,7 @@ public class DistributedAckRegionOffHeapDUnitTest extends DistributedAckRegionDU
       }
     };
     Invoke.invokeInEveryVM(checkOrphans);
-    try {
-      checkOrphans.run();
-    } finally {
-      super.tearDown2();
-    }
+    checkOrphans.run();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
index a61b84f..77e8253 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
@@ -61,9 +61,8 @@ public class DistributedMulticastRegionDUnitTest extends CacheTestCase {
   }
   
   @Override
-  public void tearDown2() throws Exception {
+  protected final void preTearDownCacheTestCase() throws Exception {
     clean();
-    super.tearDown2();
   }
   
   private void clean(){
@@ -173,7 +172,7 @@ public class DistributedMulticastRegionDUnitTest extends CacheTestCase {
     locator1Vm.invoke(new SerializableCallable() {
       @Override
       public Object call() {
-        final File locatorLogFile = new File(testName + "-locator-" + locatorPort + ".log");
+        final File locatorLogFile = new File(getTestMethodName() + "-locator-" + locatorPort + ".log");
         final Properties locatorProps = new Properties();
         locatorProps.setProperty(DistributionConfig.NAME_NAME, "LocatorWithMcast");
         locatorProps.setProperty(DistributionConfig.MCAST_PORT_NAME, mcastport);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
index 48929ca..c068876 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
@@ -39,7 +39,7 @@ public class DistributedNoAckRegionCCEOffHeapDUnitTest extends DistributedNoAckR
   }
   
   @Override
-  public void tearDown2() throws Exception {
+  protected final void preTearDownCacheTestCase() throws Exception {
     SerializableRunnable checkOrphans = new SerializableRunnable() {
 
       @Override
@@ -50,11 +50,7 @@ public class DistributedNoAckRegionCCEOffHeapDUnitTest extends DistributedNoAckR
       }
     };
     Invoke.invokeInEveryVM(checkOrphans);
-    try {
-      checkOrphans.run();
-    } finally {
-      super.tearDown2();
-    }
+    checkOrphans.run();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
index 3e0152d..e668d3f 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
@@ -39,7 +39,7 @@ public class DistributedNoAckRegionOffHeapDUnitTest extends DistributedNoAckRegi
   }
   
   @Override
-  public void tearDown2() throws Exception {
+  protected final void preTearDownCacheTestCase() throws Exception {
     SerializableRunnable checkOrphans = new SerializableRunnable() {
 
       @Override
@@ -50,11 +50,7 @@ public class DistributedNoAckRegionOffHeapDUnitTest extends DistributedNoAckRegi
       }
     };
     Invoke.invokeInEveryVM(checkOrphans);
-    try {
-      checkOrphans.run();
-    } finally {
-      super.tearDown2();
-    }
+    checkOrphans.run();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/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 c0b799e..c507437 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
@@ -72,7 +72,8 @@ public class DynamicRegionDUnitTest extends CacheTestCase {
    * in a test.
    * </p>
    */
-  public void tearDown2() throws Exception {
+  @Override
+  protected final void preTearDownCacheTestCase() throws Exception {
     LogWriterSupport.getLogWriter().info("Running tearDown in " + this);
     try {
       //Asif destroy dynamic regions at the end of the test
@@ -90,8 +91,7 @@ public class DynamicRegionDUnitTest extends CacheTestCase {
       if(dr != null) {
           dr.localDestroyRegion();      
       }
-
-      super.tearDown2();
+      // TODO: attempted to call super.preTearDown(); here
     } 
     catch (VirtualMachineError e) {
       SystemFailure.initiateFailure(e);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java
index 7bab963..653cab2 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java
@@ -39,7 +39,7 @@ public class GlobalRegionCCEOffHeapDUnitTest extends GlobalRegionCCEDUnitTest {
   }
   
   @Override
-  public void tearDown2() throws Exception {
+  protected final void preTearDownCacheTestCase() throws Exception {
     SerializableRunnable checkOrphans = new SerializableRunnable() {
 
       @Override
@@ -50,11 +50,7 @@ public class GlobalRegionCCEOffHeapDUnitTest extends GlobalRegionCCEDUnitTest {
       }
     };
     Invoke.invokeInEveryVM(checkOrphans);
-    try {
-      checkOrphans.run();
-    } finally {
-      super.tearDown2();
-    }
+    checkOrphans.run();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
index db822aa..c652c55 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
@@ -39,7 +39,7 @@ public class GlobalRegionOffHeapDUnitTest extends GlobalRegionDUnitTest {
   }
   
   @Override
-  public void tearDown2() throws Exception {
+  protected final void preTearDownCacheTestCase() throws Exception {
     SerializableRunnable checkOrphans = new SerializableRunnable() {
 
       @Override
@@ -50,14 +50,8 @@ public class GlobalRegionOffHeapDUnitTest extends GlobalRegionDUnitTest {
       }
     };
     Invoke.invokeInEveryVM(checkOrphans);
-    try {
-      checkOrphans.run();
-    } finally {
-      super.tearDown2();
-    }
+    checkOrphans.run();
   }
-
-  
   
   @Override
   public void DISABLED_testNBRegionInvalidationDuringGetInitialImage() throws Throwable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
index 973c340..9a29df0 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
@@ -169,8 +169,8 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
     disconnectAllFromDS();
   }
   
-  public void tearDown2() throws Exception {
-    super.tearDown2();
+  @Override
+  protected final void postTearDownRegionTestCase() throws Exception {
     DistributedTestCase.cleanupAllVms();
     CCRegion = null;
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
index 7ae1bf7..0caa7bd 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
@@ -41,7 +41,7 @@ public class OffHeapLRUEvictionControllerDUnitTest extends
   }
 
   @Override
-  public void tearDown2() throws Exception {
+  protected final void preTearDownCacheTestCase() throws Exception {
     SerializableRunnable checkOrphans = new SerializableRunnable() {
 
       @Override
@@ -52,11 +52,7 @@ public class OffHeapLRUEvictionControllerDUnitTest extends
       }
     };
     Invoke.invokeInEveryVM(checkOrphans);
-    try {
-      checkOrphans.run();
-    } finally {
-      super.tearDown2();
-    }
+    checkOrphans.run();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java
index 9826eab..efd42ad 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java
@@ -38,7 +38,7 @@ public class PartitionedRegionOffHeapDUnitTest extends PartitionedRegionDUnitTes
   }
   
   @Override
-  public void tearDown2() throws Exception {
+  protected final void preTearDownCacheTestCase() throws Exception {
     SerializableRunnable checkOrphans = new SerializableRunnable() {
 
       @Override
@@ -49,11 +49,7 @@ public class PartitionedRegionOffHeapDUnitTest extends PartitionedRegionDUnitTes
       }
     };
     Invoke.invokeInEveryVM(checkOrphans);
-    try {
-      checkOrphans.run();
-    } finally {
-      super.tearDown2();
-    }
+    checkOrphans.run();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/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 fa26c78..cec5032 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,7 +87,7 @@ public class PutAllCallBkRemoteVMDUnitTest extends DistributedTestCase {
       LogWriterSupport.getLogWriter().info("Cache created successfully");
     }
     
-    public void tearDown2(){
+    public void preTearDown(){
         Host host = Host.getHost(0);
         VM vm0 = host.getVM(0);
         VM vm1 = host.getVM(1);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/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 42d98e3..f7e9fc3 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,7 +77,7 @@ public class PutAllCallBkSingleVMDUnitTest extends DistributedTestCase{
       LogWriterSupport.getLogWriter().fine("Cache created in successfully");
     }
     
-    public void tearDown2(){
+    public void preTearDown(){
         Host host = Host.getHost(0);
         VM vm0 = host.getVM(0);
         VM vm1 = host.getVM(1);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/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 48c259a..cc618fe 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,7 +73,7 @@ public class PutAllMultiVmDUnitTest extends DistributedTestCase{
       vm1.invoke(PutAllMultiVmDUnitTest.class, "createCache");
     }
     
-    public void tearDown2(){
+    public void preTearDown(){
         Host host = Host.getHost(0);
         VM vm0 = host.getVM(0);
         VM vm1 = host.getVM(1);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
index b6e12da..55df06f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
@@ -132,10 +132,9 @@ public class ReconnectDUnitTest extends CacheTestCase
     return dsProperties;
   }
   
-  public void tearDown2() throws Exception
-  {
+  @Override
+  protected final void postTearDownCacheTestCase() throws Exception {
     try {
-      super.tearDown2();
       Host.getHost(0).getVM(locatorVMNumber).invoke(new SerializableRunnable("stop locator") {
         public void run() {
           if (locator != null) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectedCacheServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectedCacheServerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectedCacheServerDUnitTest.java
index e408a6d..2b97a9a 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectedCacheServerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectedCacheServerDUnitTest.java
@@ -41,7 +41,7 @@ public class ReconnectedCacheServerDUnitTest extends CacheTestCase {
   }
   
   @Override
-  public void tearDown2() {
+  protected final void preTearDownCacheTestCase() throws Exception {
     if (addedCacheServer && cache != null && !cache.isClosed()) {
       // since I polluted the cache I should shut it down in order
       // to avoid affecting other tests

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionMembershipListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionMembershipListenerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionMembershipListenerDUnitTest.java
index c87fff4..055bf36 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionMembershipListenerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionMembershipListenerDUnitTest.java
@@ -68,8 +68,7 @@ public class RegionMembershipListenerDUnitTest extends CacheTestCase {
   }
   
   @Override
-  public void tearDown2() throws Exception {
-    super.tearDown2();
+  protected final void postTearDownCacheTestCase() throws Exception {
     DistributedRegion.TEST_HOOK_ADD_PROFILE = false;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
index 56f2f41..5399b4b 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
@@ -85,9 +85,8 @@ public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
   }
 
   @Override
-  public void tearDown2() throws java.lang.Exception {
+  protected final void preTearDownCacheTestCase() throws Exception {
     DistributedCacheOperation.setBeforePutOutgoing(null);
-    super.tearDown2();
   }
 
   // -------------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionTestCase.java
index 85119fd..326bc73 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionTestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionTestCase.java
@@ -110,23 +110,14 @@ public abstract class RegionTestCase extends CacheTestCase {
     super(name);
   }
   
-  public void tearDown2() throws Exception {
-    super.tearDown2();
+  @Override
+  protected final void postTearDownCacheTestCase() throws Exception {
     cleanup();
     Invoke.invokeInEveryVM(getClass(), "cleanup");
-    /*for (int h = 0; h < Host.getHostCount(); h++) {
-      Host host = Host.getHost(h);
-      for (int v = 0; v < host.getVMCount(); v++) {
-        host.getVM(v).invoke(new SerializableRunnable("Clean up") {
-            public void run() {
-              cleanup();
-            }
-          });
-// already called in every VM in super.tearDown
-// host.getVM(v).invoke(this.getClass(), "remoteTearDown");
-      }
-    }*/
-    super.tearDown2();
+    postTearDownRegionTestCase();
+  }
+  
+  protected void postTearDownRegionTestCase() throws Exception {
   }
   
   ////////  Helper methods

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c0552f26/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 d8f98d7..80b25af 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,7 +71,7 @@ public class RemoveAllMultiVmDUnitTest extends DistributedTestCase {
       vm1.invoke(RemoveAllMultiVmDUnitTest.class, "createCache");
     }
     
-    public void tearDown2(){
+    public void preTearDown(){
         Host host = Host.getHost(0);
         VM vm0 = host.getVM(0);
         VM vm1 = host.getVM(1);



Mime
View raw message