geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [7/7] incubator-geode git commit: Cleaning up dunit
Date Fri, 11 Mar 2016 17:19:41 GMT
Cleaning up 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/3543e224
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3543e224
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3543e224

Branch: refs/heads/feature/GEODE-1050
Commit: 3543e224c719cfcfa31278f8e626c467495bed59
Parents: 680ab28
Author: Kirk Lund <klund@apache.org>
Authored: Fri Mar 11 09:19:06 2016 -0800
Committer: Kirk Lund <klund@apache.org>
Committed: Fri Mar 11 09:19:06 2016 -0800

----------------------------------------------------------------------
 .../LauncherLifecycleCommandsDUnitTest.java     |  7 +-
 ...stAPIOnRegionFunctionExecutionDUnitTest.java |  4 +-
 .../web/controllers/RestAPITestBase.java        | 11 ++-
 .../RestAPIsAndInterOpsDUnitTest.java           |  4 +-
 ...tAPIsOnGroupsFunctionExecutionDUnitTest.java |  6 +-
 ...APIsOnMembersFunctionExecutionDUnitTest.java |  3 +-
 .../controllers/RestAPIsWithSSLDUnitTest.java   |  4 +-
 .../cache/CacheRegionClearStatsDUnitTest.java   |  5 +-
 .../cache/ConnectionPoolAndLoaderDUnitTest.java |  6 +-
 .../ClientServerRegisterInterestsDUnitTest.java |  5 +-
 .../internal/AutoConnectionSourceDUnitTest.java |  6 +-
 .../CacheServerSSLConnectionDUnitTest.java      |  7 +-
 .../cache/client/internal/LocatorTestBase.java  |  2 +-
 .../internal/SSLNoClientAuthDUnitTest.java      |  7 +-
 .../management/MemoryThresholdsDUnitTest.java   |  3 +-
 .../MemoryThresholdsOffHeapDUnitTest.java       |  6 +-
 .../query/dunit/CompactRangeIndexDUnitTest.java |  9 +-
 .../cache/query/dunit/HashIndexDUnitTest.java   |  6 +-
 .../dunit/QueryDataInconsistencyDUnitTest.java  |  7 +-
 .../dunit/QueryIndexUsingXMLDUnitTest.java      | 53 ++++++++----
 .../QueryUsingFunctionContextDUnitTest.java     |  8 +-
 .../query/dunit/QueryUsingPoolDUnitTest.java    |  5 +-
 .../cache/query/dunit/RemoteQueryDUnitTest.java |  5 +-
 ...esourceManagerWithQueryMonitorDUnitTest.java |  3 +-
 ...pdateWithInplaceObjectModFalseDUnitTest.java |  5 +-
 ...ConcurrentIndexUpdateWithoutWLDUnitTest.java |  2 +-
 .../index/CopyOnReadIndexDUnitTest.java         | 10 +--
 .../index/MultiIndexCreationDUnitTest.java      |  4 +-
 .../index/PutAllWithIndexPerfDUnitTest.java     |  6 +-
 .../snapshot/ParallelSnapshotDUnitTest.java     |  8 +-
 .../snapshot/SnapshotByteArrayDUnitTest.java    |  6 +-
 .../cache/snapshot/SnapshotDUnitTest.java       |  6 +-
 .../snapshot/SnapshotPerformanceDUnitTest.java  |  6 +-
 .../gemfire/cache30/CacheCloseDUnitTest.java    |  3 +-
 .../gemfire/cache30/CacheMapTxnDUnitTest.java   |  9 +-
 .../gemstone/gemfire/cache30/CacheTestCase.java | 88 +++++---------------
 .../gemfire/cache30/CacheXmlTestCase.java       |  8 +-
 .../cache30/CachedAllEventsDUnitTest.java       |  3 +
 .../cache30/ClearMultiVmCallBkDUnitTest.java    |  6 +-
 .../gemfire/cache30/ClearMultiVmDUnitTest.java  |  5 +-
 .../cache30/ClientMembershipDUnitTest.java      |  6 +-
 .../ClientRegisterInterestDUnitTest.java        |  2 +-
 .../cache30/ClientServerCCEDUnitTest.java       |  2 +-
 .../gemfire/cache30/ClientServerTestCase.java   |  9 +-
 .../cache30/DistAckMapMethodsDUnitTest.java     |  5 +-
 ...tedAckOverflowRegionCCEOffHeapDUnitTest.java |  2 +-
 ...dAckPersistentRegionCCEOffHeapDUnitTest.java |  2 +-
 ...DistributedAckRegionCCEOffHeapDUnitTest.java |  2 +-
 .../DistributedAckRegionOffHeapDUnitTest.java   |  2 +-
 .../DistributedMulticastRegionDUnitTest.java    |  5 +-
 ...stributedNoAckRegionCCEOffHeapDUnitTest.java |  2 +-
 .../DistributedNoAckRegionOffHeapDUnitTest.java |  2 +-
 .../gemfire/cache30/DynamicRegionDUnitTest.java |  8 +-
 .../GlobalRegionCCEOffHeapDUnitTest.java        |  2 +-
 .../cache30/GlobalRegionOffHeapDUnitTest.java   |  2 +-
 .../OffHeapLRUEvictionControllerDUnitTest.java  |  2 +-
 .../PartitionedRegionOffHeapDUnitTest.java      |  2 +-
 .../cache30/PutAllCallBkRemoteVMDUnitTest.java  |  5 +-
 .../cache30/PutAllCallBkSingleVMDUnitTest.java  |  5 +-
 .../gemfire/cache30/PutAllMultiVmDUnitTest.java |  5 +-
 .../gemfire/cache30/ReconnectDUnitTest.java     |  5 +-
 .../ReconnectedCacheServerDUnitTest.java        |  4 +-
 .../RegionMembershipListenerDUnitTest.java      |  5 +-
 .../cache30/RegionReliabilityTestCase.java      |  2 +-
 .../gemfire/cache30/RegionTestCase.java         |  2 +-
 .../cache30/RemoveAllMultiVmDUnitTest.java      |  5 +-
 .../gemfire/cache30/SearchAndLoadDUnitTest.java |  2 +-
 .../gemfire/cache30/SlowRecDUnitTest.java       | 13 ++-
 .../distributed/HostedLocatorsDUnitTest.java    |  7 +-
 .../gemfire/distributed/LocatorDUnitTest.java   |  7 +-
 .../distributed/SystemAdminDUnitTest.java       |  5 +-
 .../distributed/internal/Bug40751DUnitTest.java |  2 +-
 .../ConsoleDistributionManagerDUnitTest.java    |  8 +-
 .../internal/DistributionAdvisorDUnitTest.java  |  8 +-
 .../internal/ProductUseLogDUnitTest.java        | 66 +++++++--------
 .../GemFireDeadlockDetectorDUnitTest.java       |  2 +-
 .../TcpServerBackwardCompatDUnitTest.java       |  5 +-
 .../gemfire/disttx/CacheMapDistTXDUnitTest.java |  5 +-
 .../gemfire/disttx/DistTXDebugDUnitTest.java    |  9 +-
 .../disttx/DistTXPersistentDebugDUnitTest.java  |  5 +-
 .../disttx/DistributedTransactionDUnitTest.java | 13 +--
 ...wardCompatibilitySerializationDUnitTest.java |  6 +-
 .../gemfire/internal/JarDeployerDUnitTest.java  |  2 +-
 .../gemfire/internal/cache/BackupDUnitTest.java |  2 +-
 .../internal/cache/Bug33359DUnitTest.java       |  5 +-
 .../internal/cache/Bug33726DUnitTest.java       |  2 +-
 .../internal/cache/Bug37241DUnitTest.java       |  8 +-
 .../internal/cache/Bug37377DUnitTest.java       | 10 +--
 .../internal/cache/Bug39079DUnitTest.java       |  7 +-
 .../internal/cache/Bug40299DUnitTest.java       |  8 +-
 .../internal/cache/Bug41091DUnitTest.java       |  2 +-
 .../internal/cache/Bug41733DUnitTest.java       |  2 +-
 .../internal/cache/Bug41957DUnitTest.java       |  2 +-
 .../internal/cache/Bug45164DUnitTest.java       |  6 +-
 .../internal/cache/Bug47667DUnitTest.java       |  3 +-
 .../internal/cache/CacheAdvisorDUnitTest.java   |  6 +-
 .../internal/cache/ClearDAckDUnitTest.java      |  5 +-
 .../internal/cache/ClearGlobalDUnitTest.java    |  6 +-
 .../cache/ClientServerGetAllDUnitTest.java      |  2 +-
 ...ServerInvalidAndDestroyedEntryDUnitTest.java |  6 +-
 .../ClientServerTransactionCCEDUnitTest.java    |  7 +-
 .../cache/ClientServerTransactionDUnitTest.java | 10 ++-
 .../ConcurrentDestroySubRegionDUnitTest.java    |  3 +-
 .../cache/ConnectDisconnectDUnitTest.java       |  2 +-
 .../cache/DeltaPropagationDUnitTest.java        |  7 +-
 .../cache/DeltaPropagationStatsDUnitTest.java   |  6 +-
 .../cache/DiskRegByteArrayDUnitTest.java        |  9 +-
 ...DistrbutedRegionProfileOffHeapDUnitTest.java |  2 +-
 .../cache/DistributedCacheTestCase.java         | 10 +--
 .../internal/cache/EventTrackerDUnitTest.java   |  2 +-
 .../cache/EvictionObjectSizerDUnitTest.java     |  5 --
 .../internal/cache/EvictionStatsDUnitTest.java  |  4 +-
 .../internal/cache/EvictionTestBase.java        |  4 +-
 .../internal/cache/GIIDeltaDUnitTest.java       |  8 +-
 .../internal/cache/GIIFlowControlDUnitTest.java |  2 +-
 .../HAOverflowMemObjectSizerDUnitTest.java      |  6 +-
 .../cache/IncrementalBackupDUnitTest.java       |  6 +-
 .../cache/InterruptClientServerDUnitTest.java   |  2 +-
 .../internal/cache/InterruptsDUnitTest.java     |  2 +-
 .../cache/OffHeapEvictionDUnitTest.java         |  2 +-
 .../cache/OffHeapEvictionStatsDUnitTest.java    |  2 +-
 .../cache/P2PDeltaPropagationDUnitTest.java     |  9 +-
 .../cache/PartitionedRegionDUnitTestCase.java   |  2 +-
 ...rtitionedRegionDelayedRecoveryDUnitTest.java |  2 +-
 ...rtitionedRegionOffHeapEvictionDUnitTest.java |  2 +-
 ...artitionedRegionRedundancyZoneDUnitTest.java |  2 +-
 .../PartitionedRegionSingleHopDUnitTest.java    |  6 +-
 ...RegionSingleHopWithServerGroupDUnitTest.java |  9 +-
 .../internal/cache/PutAllDAckDUnitTest.java     |  5 +-
 .../internal/cache/PutAllGlobalDUnitTest.java   |  5 +-
 .../cache/RemoteTransactionDUnitTest.java       |  2 +-
 .../internal/cache/RemoveAllDAckDUnitTest.java  |  5 +-
 .../internal/cache/RemoveDAckDUnitTest.java     |  5 +-
 .../internal/cache/RemoveGlobalDUnitTest.java   |  5 +-
 .../internal/cache/SingleHopStatsDUnitTest.java |  8 +-
 .../control/RebalanceOperationDUnitTest.java    |  2 +-
 .../cache/execute/Bug51193DUnitTest.java        |  6 +-
 .../ClientServerFunctionExecutionDUnitTest.java |  5 +-
 .../execute/ColocationFailoverDUnitTest.java    |  6 +-
 ...ributedRegionFunctionExecutionDUnitTest.java |  5 +-
 .../execute/FunctionServiceStatsDUnitTest.java  |  4 +-
 .../cache/execute/LocalDataSetDUnitTest.java    |  4 +-
 .../execute/LocalDataSetIndexingDUnitTest.java  |  3 +-
 .../LocalFunctionExecutionDUnitTest.java        |  9 +-
 .../MemberFunctionExecutionDUnitTest.java       |  7 +-
 .../MultiRegionFunctionExecutionDUnitTest.java  |  7 +-
 .../OnGroupsFunctionExecutionDUnitTest.java     |  2 +-
 ...ntServerFunctionExecutionNoAckDUnitTest.java |  3 -
 ...tServerRegionFunctionExecutionDUnitTest.java |  5 --
 ...egionFunctionExecutionFailoverDUnitTest.java |  3 +-
 ...onFunctionExecutionNoSingleHopDUnitTest.java |  4 -
 ...onExecutionSelectorNoSingleHopDUnitTest.java |  4 -
 ...gionFunctionExecutionSingleHopDUnitTest.java |  3 +-
 .../cache/execute/PRClientServerTestBase.java   | 10 ++-
 .../cache/execute/PRColocationDUnitTest.java    |  5 +-
 .../cache/execute/PRTransactionDUnitTest.java   |  2 +-
 .../execute/SingleHopGetAllPutAllDUnitTest.java |  5 --
 .../cache/ha/Bug36853EventsExpiryDUnitTest.java | 12 +--
 .../internal/cache/ha/Bug48571DUnitTest.java    |  6 +-
 .../internal/cache/ha/Bug48879DUnitTest.java    |  6 +-
 .../cache/ha/EventIdOptimizationDUnitTest.java  |  7 +-
 .../internal/cache/ha/FailoverDUnitTest.java    |  7 +-
 .../internal/cache/ha/HABugInPutDUnitTest.java  | 11 +--
 .../internal/cache/ha/HAClearDUnitTest.java     |  8 +-
 .../cache/ha/HAConflationDUnitTest.java         |  8 +-
 .../internal/cache/ha/HADuplicateDUnitTest.java |  7 +-
 .../cache/ha/HAEventIdPropagationDUnitTest.java |  7 +-
 .../internal/cache/ha/HAExpiryDUnitTest.java    |  8 +-
 .../internal/cache/ha/HAGIIBugDUnitTest.java    |  8 +-
 .../internal/cache/ha/HAGIIDUnitTest.java       |  7 +-
 .../cache/ha/HARQueueNewImplDUnitTest.java      |  7 +-
 .../internal/cache/ha/HARegionDUnitTest.java    |  7 +-
 .../cache/ha/HARegionQueueDUnitTest.java        |  7 +-
 .../cache/ha/HASlowReceiverDUnitTest.java       |  7 +-
 .../ha/OperationsPropagationDUnitTest.java      |  8 +-
 .../internal/cache/ha/PutAllDUnitTest.java      |  7 +-
 .../internal/cache/ha/StatsBugDUnitTest.java    |  7 +-
 .../cache/locks/TXLockServiceDUnitTest.java     |  7 +-
 .../cache/partitioned/Bug43684DUnitTest.java    |  6 +-
 .../cache/partitioned/Bug47388DUnitTest.java    |  6 +-
 .../cache/partitioned/Bug51400DUnitTest.java    |  7 +-
 .../partitioned/PartitionResolverDUnitTest.java |  6 +-
 .../PartitionedRegionLoaderWriterDUnitTest.java |  5 --
 ...tentColocatedPartitionedRegionDUnitTest.java |  2 +-
 .../PersistentPartitionedRegionTestBase.java    |  7 +-
 ...rtitionedRegionWithTransactionDUnitTest.java |  6 +-
 .../cache/partitioned/ShutdownAllDUnitTest.java |  4 +-
 .../fixed/FixedPartitioningDUnitTest.java       |  5 +-
 .../fixed/FixedPartitioningTestBase.java        |  2 +-
 ...ngWithColocationAndPersistenceDUnitTest.java |  5 +-
 .../PersistentReplicatedTestBase.java           |  5 +-
 .../internal/cache/tier/Bug40396DUnitTest.java  |  6 +-
 ...mpatibilityHigherVersionClientDUnitTest.java |  5 +-
 .../cache/tier/sockets/Bug36269DUnitTest.java   |  7 +-
 .../cache/tier/sockets/Bug36457DUnitTest.java   |  8 +-
 .../cache/tier/sockets/Bug36805DUnitTest.java   |  8 +-
 .../cache/tier/sockets/Bug36829DUnitTest.java   |  6 +-
 .../cache/tier/sockets/Bug36995DUnitTest.java   |  8 +-
 .../cache/tier/sockets/Bug37210DUnitTest.java   |  8 +-
 .../cache/tier/sockets/Bug37805DUnitTest.java   |  6 +-
 .../CacheServerTransactionsDUnitTest.java       |  7 +-
 .../tier/sockets/ClearPropagationDUnitTest.java |  7 +-
 .../tier/sockets/ClientConflationDUnitTest.java |  6 +-
 .../sockets/ClientInterestNotifyDUnitTest.java  | 10 +--
 .../tier/sockets/ClientServerMiscDUnitTest.java |  7 +-
 .../cache/tier/sockets/ConflationDUnitTest.java |  6 +-
 .../DataSerializerPropogationDUnitTest.java     |  5 +-
 .../DestroyEntryPropagationDUnitTest.java       |  8 +-
 .../DurableClientQueueSizeDUnitTest.java        |  5 +-
 .../DurableClientReconnectDUnitTest.java        |  8 +-
 .../sockets/DurableClientStatsDUnitTest.java    |  5 +-
 .../sockets/DurableRegistrationDUnitTest.java   |  6 +-
 .../sockets/DurableResponseMatrixDUnitTest.java |  7 +-
 .../sockets/EventIDVerificationDUnitTest.java   |  8 +-
 .../EventIDVerificationInP2PDUnitTest.java      |  7 +-
 ...ForceInvalidateOffHeapEvictionDUnitTest.java |  2 +-
 .../cache/tier/sockets/HABug36738DUnitTest.java |  8 +-
 .../cache/tier/sockets/HAInterestTestCase.java  |  5 +-
 .../sockets/HAStartupAndFailoverDUnitTest.java  |  9 +-
 .../InstantiatorPropagationDUnitTest.java       |  6 +-
 .../tier/sockets/InterestListDUnitTest.java     |  8 +-
 .../sockets/InterestListEndpointDUnitTest.java  |  7 +-
 .../sockets/InterestListFailoverDUnitTest.java  |  6 +-
 .../sockets/InterestListRecoveryDUnitTest.java  |  5 +-
 .../sockets/InterestRegrListenerDUnitTest.java  |  6 +-
 .../sockets/InterestResultPolicyDUnitTest.java  |  7 +-
 .../sockets/NewRegionAttributesDUnitTest.java   |  6 +-
 .../tier/sockets/RedundancyLevelTestBase.java   |  8 +-
 .../tier/sockets/RegionCloseDUnitTest.java      |  8 +-
 ...erInterestBeforeRegionCreationDUnitTest.java | 11 +--
 .../sockets/RegisterInterestKeysDUnitTest.java  |  7 +-
 .../sockets/ReliableMessagingDUnitTest.java     | 10 +--
 .../sockets/UnregisterInterestDUnitTest.java    |  6 +-
 .../sockets/UpdatePropagationDUnitTest.java     |  7 +-
 .../VerifyEventIDGenerationInP2PDUnitTest.java  |  7 +-
 ...UpdatesFromNonInterestEndPointDUnitTest.java |  9 +-
 .../cache/wan/AsyncEventQueueTestBase.java      | 14 ++--
 .../asyncqueue/AsyncEventListenerDUnitTest.java |  4 -
 .../AsyncEventQueueStatsDUnitTest.java          |  4 -
 .../ConcurrentAsyncEventQueueDUnitTest.java     |  4 -
 .../CommonParallelAsyncEventQueueDUnitTest.java |  4 -
 .../CompressionCacheConfigDUnitTest.java        |  5 --
 .../CompressionCacheListenerDUnitTest.java      |  5 +-
 .../CompressionRegionConfigDUnitTest.java       |  5 --
 .../CompressionRegionFactoryDUnitTest.java      |  5 --
 .../CompressionRegionOperationsDUnitTest.java   |  6 +-
 .../internal/jta/dunit/ExceptionsDUnitTest.java |  6 +-
 .../jta/dunit/IdleTimeOutDUnitTest.java         |  6 +-
 .../jta/dunit/MaxPoolSizeDUnitTest.java         |  6 +-
 .../jta/dunit/TransactionTimeOutDUnitTest.java  |  6 +-
 .../dunit/TxnManagerMultiThreadDUnitTest.java   |  7 +-
 .../internal/jta/dunit/TxnTimeOutDUnitTest.java |  6 +-
 .../offheap/OutOfOffHeapMemoryDUnitTest.java    |  9 +-
 .../process/LocalProcessLauncherDUnitTest.java  |  3 +-
 .../statistics/StatisticsDUnitTest.java         |  7 +-
 .../management/CacheManagementDUnitTest.java    |  5 --
 .../management/ClientHealthStatsDUnitTest.java  |  9 +-
 .../management/CompositeTypeTestDUnitTest.java  |  5 --
 .../management/DLockManagementDUnitTest.java    |  5 --
 .../management/DiskManagementDUnitTest.java     |  5 +-
 .../management/DistributedSystemDUnitTest.java  |  6 --
 .../management/LocatorManagementDUnitTest.java  |  4 +-
 .../gemfire/management/ManagementTestBase.java  | 12 +--
 .../MemberMBeanAttributesDUnitTest.java         |  5 --
 .../management/OffHeapManagementDUnitTest.java  |  5 +-
 .../gemfire/management/QueryDataDUnitTest.java  |  6 +-
 .../management/RegionManagementDUnitTest.java   |  5 --
 ...ersalMembershipListenerAdapterDUnitTest.java |  2 +-
 .../stats/DistributedSystemStatsDUnitTest.java  |  4 -
 .../internal/cli/CliUtilDUnitTest.java          |  2 +-
 .../cli/commands/CliCommandTestBase.java        |  6 +-
 .../cli/commands/DeployCommandsDUnitTest.java   |  4 +-
 ...WithCacheLoaderDuringCacheMissDUnitTest.java |  4 +-
 ...stAndDescribeDiskStoreCommandsDUnitTest.java |  3 +-
 .../cli/commands/ListIndexCommandDUnitTest.java |  3 +-
 .../cli/commands/MemberCommandsDUnitTest.java   |  5 +-
 .../cli/commands/QueueCommandsDUnitTest.java    |  4 +-
 .../SharedConfigurationCommandsDUnitTest.java   |  2 +-
 .../cli/commands/ShellCommandsDUnitTest.java    |  4 +-
 .../cli/commands/ShowDeadlockDUnitTest.java     |  5 +-
 .../cli/commands/UserCommandsDUnitTest.java     |  5 +-
 .../SharedConfigurationDUnitTest.java           |  2 +-
 .../internal/pulse/TestClientIdsDUnitTest.java  |  6 +-
 .../internal/pulse/TestFunctionsDUnitTest.java  |  5 --
 .../internal/pulse/TestHeapDUnitTest.java       |  7 +-
 .../internal/pulse/TestLocatorsDUnitTest.java   |  5 --
 .../pulse/TestSubscriptionsDUnitTest.java       |  6 +-
 .../ClientsWithVersioningRetryDUnitTest.java    |  5 +-
 .../pdx/JSONPdxClientServerDUnitTest.java       |  2 +-
 .../gemfire/pdx/PdxSerializableDUnitTest.java   |  6 --
 .../gemfire/pdx/PdxTypeExportDUnitTest.java     |  6 +-
 .../gemfire/redis/RedisDistDUnitTest.java       |  5 +-
 .../security/ClientAuthenticationDUnitTest.java |  6 +-
 .../security/ClientAuthorizationDUnitTest.java  |  6 +-
 .../security/ClientMultiUserAuthzDUnitTest.java |  7 +-
 .../DeltaClientAuthorizationDUnitTest.java      |  6 +-
 .../DeltaClientPostAuthorizationDUnitTest.java  |  7 +-
 .../security/P2PAuthenticationDUnitTest.java    |  5 +-
 .../gemfire/test/dunit/DistributedTestCase.java | 68 +++++++--------
 .../cache/internal/JUnit3CacheTestCase.java     | 46 ++--------
 .../cache/internal/JUnit4CacheTestCase.java     | 10 ++-
 .../dunit/internal/DistributedTestFixture.java  |  4 -
 .../internal/JUnit3DistributedTestCase.java     | 60 +++++++------
 .../internal/JUnit4DistributedTestCase.java     | 69 +++++++--------
 .../cache/query/cq/dunit/CqDataDUnitTest.java   | 12 +--
 .../dunit/CqDataOptimizedExecuteDUnitTest.java  |  8 +-
 .../cq/dunit/CqDataUsingPoolDUnitTest.java      | 11 ++-
 ...qDataUsingPoolOptimizedExecuteDUnitTest.java | 12 ++-
 .../cache/query/cq/dunit/CqPerfDUnitTest.java   |  9 +-
 .../cq/dunit/CqPerfUsingPoolDUnitTest.java      |  9 +-
 .../cache/query/cq/dunit/CqQueryDUnitTest.java  | 12 +--
 .../dunit/CqQueryOptimizedExecuteDUnitTest.java |  8 +-
 .../cq/dunit/CqQueryUsingPoolDUnitTest.java     | 12 +--
 ...QueryUsingPoolOptimizedExecuteDUnitTest.java |  6 +-
 .../cq/dunit/CqResultSetUsingPoolDUnitTest.java | 16 ++--
 ...ltSetUsingPoolOptimizedExecuteDUnitTest.java |  8 +-
 .../cache/query/cq/dunit/CqStatsDUnitTest.java  | 12 +--
 .../dunit/CqStatsOptimizedExecuteDUnitTest.java |  8 +-
 .../cq/dunit/CqStatsUsingPoolDUnitTest.java     | 12 +--
 ...StatsUsingPoolOptimizedExecuteDUnitTest.java |  8 +-
 ...dRegionCqQueryOptimizedExecuteDUnitTest.java |  6 +-
 .../PrCqUsingPoolOptimizedExecuteDUnitTest.java |  8 +-
 .../cache/query/dunit/PdxQueryCQTestBase.java   |  2 +-
 .../query/dunit/QueryMonitorDUnitTest.java      |  2 +-
 .../cache/snapshot/ClientSnapshotDUnitTest.java |  6 +-
 .../cache/PRDeltaPropagationDUnitTest.java      |  6 +-
 .../cache/RemoteCQTransactionDUnitTest.java     |  2 +-
 .../internal/cache/ha/CQListGIIDUnitTest.java   |  7 +-
 .../cache/ha/HADispatcherDUnitTest.java         |  8 +-
 .../sockets/ClientToServerDeltaDUnitTest.java   |  5 +-
 .../DeltaPropagationWithCQDUnitTest.java        |  6 +-
 ...ToRegionRelationCQRegistrationDUnitTest.java |  6 +-
 .../sockets/DurableClientCrashDUnitTest.java    |  4 +-
 .../tier/sockets/DurableClientTestCase.java     |  9 +-
 .../CacheServerManagementDUnitTest.java         |  4 +-
 .../cli/commands/ClientCommandsDUnitTest.java   |  2 +-
 .../DurableClientCommandsDUnitTest.java         |  2 +-
 .../internal/pulse/TestCQDUnitTest.java         |  5 --
 .../internal/pulse/TestClientsDUnitTest.java    |  5 --
 .../internal/pulse/TestServerDUnitTest.java     |  5 --
 .../ClientAuthorizationTwoDUnitTest.java        |  6 +-
 .../security/ClientAuthzObjectModDUnitTest.java |  5 +-
 .../ClientCQPostAuthorizationDUnitTest.java     |  7 +-
 .../ClientPostAuthorizationDUnitTest.java       |  7 +-
 .../gemfire/security/MultiuserAPIDUnitTest.java |  6 +-
 .../MultiuserDurableCQAuthzDUnitTest.java       |  4 +-
 .../LuceneFunctionReadPathDUnitTest.java        |  3 +-
 .../internal/cache/UpdateVersionDUnitTest.java  |  2 +-
 .../gemfire/internal/cache/wan/WANTestBase.java | 20 +++--
 ...oncurrentParallelGatewaySenderDUnitTest.java |  4 -
 ...allelGatewaySenderOperation_1_DUnitTest.java |  6 +-
 ...allelGatewaySenderOperation_2_DUnitTest.java |  6 +-
 .../cache/wan/disttx/DistTXWANDUnitTest.java    |  6 +-
 ...wWANConcurrencyCheckForDestroyDUnitTest.java |  4 -
 .../cache/wan/misc/PDXNewWanDUnitTest.java      |  4 -
 .../SenderWithTransportFilterDUnitTest.java     |  4 -
 ...downAllPersistentGatewaySenderDUnitTest.java |  3 +-
 .../wan/misc/WANLocatorServerDUnitTest.java     |  5 +-
 .../cache/wan/misc/WANSSLDUnitTest.java         |  4 -
 .../wan/misc/WanAutoDiscoveryDUnitTest.java     |  5 +-
 .../cache/wan/misc/WanValidationsDUnitTest.java |  4 -
 ...arallelGatewaySenderOperationsDUnitTest.java |  6 +-
 ...llelGatewaySenderQueueOverflowDUnitTest.java |  4 -
 .../ParallelWANConflationDUnitTest.java         |  4 +-
 ...ersistenceEnabledGatewaySenderDUnitTest.java |  6 +-
 ...llelWANPropagationClientServerDUnitTest.java |  4 -
 ...lelWANPropagationConcurrentOpsDUnitTest.java |  4 -
 .../ParallelWANPropagationDUnitTest.java        |  4 -
 ...ParallelWANPropagationLoopBackDUnitTest.java |  4 -
 .../wan/parallel/ParallelWANStatsDUnitTest.java |  4 +-
 ...tewaySenderDistributedDeadlockDUnitTest.java |  4 -
 ...rialGatewaySenderEventListenerDUnitTest.java |  4 -
 .../SerialGatewaySenderOperationsDUnitTest.java |  4 +-
 .../SerialGatewaySenderQueueDUnitTest.java      |  5 --
 ...ersistenceEnabledGatewaySenderDUnitTest.java |  4 -
 .../SerialWANPropagationLoopBackDUnitTest.java  |  4 -
 .../serial/SerialWANPropogationDUnitTest.java   |  4 +-
 ...NPropogation_PartitionedRegionDUnitTest.java |  5 --
 .../SerialWANPropogationsFeatureDUnitTest.java  |  4 -
 .../wan/serial/SerialWANStatsDUnitTest.java     |  4 +-
 .../wan/wancommand/WANCommandTestBase.java      |  6 +-
 ...anCommandCreateGatewayReceiverDUnitTest.java |  4 -
 .../WanCommandCreateGatewaySenderDUnitTest.java |  4 -
 ...WanCommandGatewayReceiverStartDUnitTest.java |  4 -
 .../WanCommandGatewayReceiverStopDUnitTest.java |  4 -
 .../WanCommandGatewaySenderStartDUnitTest.java  |  4 -
 .../WanCommandGatewaySenderStopDUnitTest.java   |  4 -
 .../wan/wancommand/WanCommandListDUnitTest.java |  4 -
 .../WanCommandPauseResumeDUnitTest.java         |  4 -
 .../wancommand/WanCommandStatusDUnitTest.java   |  4 -
 390 files changed, 1060 insertions(+), 1536 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
index 7c6929c..89925a2 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
@@ -144,12 +144,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
   }
 
   @Override
-  public void setUp() throws Exception {
-    super.setUp();
-  }
-
-  @Override
-  protected final void postTearDown() throws Exception {
+  public final void postTearDown() throws Exception {
     LauncherLifecycleCommands launcherLifecycleCommands = new LauncherLifecycleCommands();
     Integer pid;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
index 4a958ce..46bf4a5 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
@@ -90,8 +90,8 @@ public class RestAPIOnRegionFunctionExecutionDUnitTest extends RestAPITestBase {
     super(name);
   }
 
-  public void setUp() throws Exception {
-    super.setUp();
+  @Override
+  protected final void postSetUpRestAPITestBase() throws Exception {
     final Host host = Host.getHost(0);
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
index 3709475..814063b 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
@@ -47,8 +47,7 @@ public class RestAPITestBase extends DistributedTestCase {
   
   
   @Override
-  public void setUp() throws Exception {
-    super.setUp();
+  public final void postSetUp() throws Exception {
     disconnectAllFromDS();
     AgentUtil agentUtil = new AgentUtil(GemFireVersion.getGemFireVersion());
     if (agentUtil.findWarLocation("geode-web-api") == null) {
@@ -63,13 +62,17 @@ public class RestAPITestBase extends DistributedTestCase {
     // gradle sets a property telling us where the build is located
     final String buildDir = System.getProperty("geode.build.dir", System.getProperty("user.dir"));
     Invoke.invokeInEveryVM(()-> System.setProperty("geode.build.dir", buildDir));
-  }  
+    postSetUpRestAPITestBase();
+  }
+
+  protected void postSetUpRestAPITestBase() throws Exception {
+  }
   
   /**
    * close the clients and teh servers
    */
   @Override
-  protected final void preTearDown() throws Exception {
+  public final void preTearDown() throws Exception {
     vm0.invoke(() -> closeCache());
     vm1.invoke(() -> closeCache());
     vm2.invoke(() -> closeCache());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
index 0245fa0..d1ec00f 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
@@ -170,9 +170,9 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
 
   }
 
-  public void setUp() throws Exception {
+  @Override
+  public final void postSetUp() throws Exception {
     disconnectAllFromDS();
-    super.setUp();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
index 1ae3810..58a22b0 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
@@ -46,9 +46,9 @@ public class RestAPIsOnGroupsFunctionExecutionDUnitTest extends RestAPITestBase
   public RestAPIsOnGroupsFunctionExecutionDUnitTest(String name) {
     super(name);
   }
-  
-  public void setUp() throws Exception {
-    super.setUp();
+
+  @Override
+  protected final void postSetUpRestAPITestBase() throws Exception {
     final Host host = Host.getHost(0);
   }
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
index adb2b55..68916fc 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
@@ -68,8 +68,7 @@ public class RestAPIsOnMembersFunctionExecutionDUnitTest extends CacheTestCase {
   }
   
   @Override
-  public void setUp() throws Exception {
-    super.setUp();
+  public final void postSetUp() throws Exception {
     Host host = Host.getHost(0);
     member1 = host.getVM(0);
     member2 = host.getVM(1);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
index 29aab32..24224c6 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
@@ -89,9 +89,9 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
 
   }
 
-  public void setUp() throws Exception {
+  @Override
+  public final void postSetUp() throws Exception {
     disconnectAllFromDS();
-    super.setUp();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
index 88a32a3..18e7505 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
@@ -61,8 +61,7 @@ public class CacheRegionClearStatsDUnitTest extends DistributedTestCase {
     super(name);
   }
 
-  public void setUp() throws Exception {
-    super.setUp();
+  public final void postSetUp() throws Exception {
     final Host host = Host.getHost(0);
     server1 = host.getVM(0);
     client1 = host.getVM(1);
@@ -187,7 +186,7 @@ public class CacheRegionClearStatsDUnitTest extends DistributedTestCase {
   }
   
   @Override
-  protected final void preTearDown() throws Exception {
+  public final void preTearDown() throws Exception {
     client1.invoke(() -> CacheRegionClearStatsDUnitTest.closeCache());
     // then close the servers
     server1.invoke(() -> CacheRegionClearStatsDUnitTest.closeCache());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
index ee382ab..9ce5bed 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
@@ -48,12 +48,8 @@ public class ConnectionPoolAndLoaderDUnitTest  extends CacheTestCase {
     super(name);
   }
   
-  public void setUp() throws Exception {
-    super.setUp();
-  }
-  
   @Override
-  protected final void preTearDownCacheTestCase() {
+  public 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/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
index 58844b0..1b7eb78 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
@@ -65,15 +65,14 @@ public class ClientServerRegisterInterestsDUnitTest extends DistributedTestCase
   }
 
   @Override
-  public void setUp() throws Exception {
-    super.setUp();
+  public final void postSetUp() throws Exception {
     disconnectAllFromDS();
     setupGemFireCacheServer();
     IgnoredException.addIgnoredException("java.net.ConnectException");
   }
 
   @Override
-  protected final void preTearDown() throws Exception {
+  public 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/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
index 03368de..a38bc05 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
@@ -55,9 +55,9 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
   
   protected static final Object BRIDGE_LISTENER = "BRIDGE_LISTENER";
   private static final long MAX_WAIT = 60000;
-  
-  public void setUp() throws Exception {
-    super.setUp();
+
+  @Override
+  public final void postSetUp() throws Exception {
     IgnoredException.addIgnoredException("NoAvailableLocatorsException");
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
index 5fa4fc4..69831e7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
@@ -61,10 +61,9 @@ public class CacheServerSSLConnectionDUnitTest extends DistributedTestCase {
   
   private static CacheServerSSLConnectionDUnitTest instance = new CacheServerSSLConnectionDUnitTest("CacheServerSSLConnectionDUnit");
   
-  
-  public void setUp() throws Exception {
+  @Override
+  public final void postSetUp() throws Exception {
     disconnectAllFromDS();
-    super.setUp();
   }
 
   public CacheServerSSLConnectionDUnitTest(String name) {
@@ -413,7 +412,7 @@ public class CacheServerSSLConnectionDUnitTest extends DistributedTestCase {
   }
   
   @Override
-  protected final void preTearDown() throws Exception {
+  public final void preTearDown() throws Exception {
     final Host host = Host.getHost(0);
     VM serverVM = host.getVM(1);
     VM clientVM = host.getVM(2);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
index a89d648..74822d5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
@@ -72,7 +72,7 @@ public abstract class LocatorTestBase  extends DistributedTestCase {
   }
   
   @Override
-  protected final void preTearDown() throws Exception {
+  public final void preTearDown() throws Exception {
     
     SerializableRunnable tearDown = new SerializableRunnable("tearDown") {
       public void run() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
index e23fb76..321cde0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
@@ -54,10 +54,9 @@ public class SSLNoClientAuthDUnitTest extends DistributedTestCase {
   
   private static SSLNoClientAuthDUnitTest instance = new SSLNoClientAuthDUnitTest("SSLNoClientAuthDUnitTest");
   
-  
-  public void setUp() throws Exception {
+  @Override
+  public final void postSetUp() throws Exception {
     disconnectAllFromDS();
-    super.setUp();
   }
 
   public SSLNoClientAuthDUnitTest(String name) {
@@ -267,7 +266,7 @@ public class SSLNoClientAuthDUnitTest extends DistributedTestCase {
   }
   
   @Override
-  protected final void preTearDown() throws Exception {
+  public final void preTearDown() throws Exception {
     final Host host = Host.getHost(0);
     VM serverVM = host.getVM(1);
     VM clientVM = host.getVM(2);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
index c93848b..17529b8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
@@ -135,8 +135,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
   }
   
   @Override
-  public void setUp() throws Exception {
-    super.setUp();
+  protected final void postSetUpClientServerTestCase() throws Exception {
     Invoke.invokeInEveryVM(this.setHeapMemoryMonitorTestMode);
     IgnoredException.addIgnoredException(expectedEx);
     IgnoredException.addIgnoredException(expectedBelow);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
index 3cf7b09..7c61788 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
@@ -105,16 +105,12 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
     super(name);
   }
   
-  
-
   @Override
-  public void setUp() throws Exception {
+  public final void postSetUpClientServerTestCase() throws Exception {
     IgnoredException.addIgnoredException(expectedEx);
     IgnoredException.addIgnoredException(expectedBelow);
   }
 
-
-
   @Override
   protected void preTearDownClientServerTestCase() throws Exception {
     Invoke.invokeInEveryVM(this.resetResourceManager);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java
index 81b545f..5a8eee1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java
@@ -44,8 +44,8 @@ public class CompactRangeIndexDUnitTest extends DistributedTestCase{
     super(name);
   }
 
-  public void setUp() throws Exception {
-    super.setUp();
+  @Override
+  public final void postSetUp() throws Exception {
     getSystem();
     Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
       public void run() {
@@ -59,8 +59,7 @@ public class CompactRangeIndexDUnitTest extends DistributedTestCase{
     utils.createReplicateRegion("exampleRegion", vm0);
     utils.createIndex(vm0,"type", "\"type\"", "/exampleRegion");
   }
-  
-  
+
   /*
    * Tests that the message component of the exception is not null
    */
@@ -169,7 +168,7 @@ public class CompactRangeIndexDUnitTest extends DistributedTestCase{
   }
   
   @Override
-  protected final void preTearDown() throws Exception {
+  public final void preTearDown() throws Exception {
     Thread.sleep(5000);
     removeHook();
     utils.closeServer(vm0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java
index 38721be..718670d 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java
@@ -37,8 +37,8 @@ public class HashIndexDUnitTest extends DistributedTestCase{
     super(name);
   }
 
-  public void setUp() throws Exception {
-    super.setUp();
+  @Override
+  public final void postSetUp() throws Exception {
     getSystem();
     Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
       public void run() {
@@ -125,7 +125,7 @@ public class HashIndexDUnitTest extends DistributedTestCase{
   }
   
   @Override
-  protected final void preTearDown() throws Exception {
+  public final void preTearDown() throws Exception {
     Thread.sleep(5000);
     utils.closeServer(vm0);
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
index 0227836..a11c5de 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
@@ -95,18 +95,17 @@ public class QueryDataInconsistencyDUnitTest extends CacheTestCase {
   }
 
   @Override
-  protected final void preTearDownCacheTestCase() throws Exception {
+  public final void preTearDownCacheTestCase() throws Exception {
     Invoke.invokeInEveryVM(CacheTestCase.class, "disconnectFromDS");
   }
   
   @Override
-  protected final void postTearDownCacheTestCase() throws Exception {
+  public final void postTearDownCacheTestCase() throws Exception {
     Invoke.invokeInEveryVM(QueryObserverHolder.class, "reset");
   }
 
   @Override
-  public void setUp() throws Exception {
-    super.setUp();
+  public final void postSetUp() throws Exception {
     Host host = Host.getHost(0);
     server = host.getVM(0);
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
index 775ea29..0731ae2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
@@ -58,6 +58,7 @@ import com.gemstone.gemfire.cache30.CertifiableTestCacheListener;
 import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.internal.FileUtil;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.cache.LocalRegion;
 import com.gemstone.gemfire.internal.cache.PartitionedRegion;
@@ -132,27 +133,47 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
     super(name);
   }
 
-  public void setUp() throws Exception {
-    super.setUp();
+  @Override
+  public final void preSetUp() throws Exception {
+    System.out.println("KIRK:preSetUp");
+  }
+
+  @Override
+  public final void postSetUp() throws Exception {
     //Workaround for #52008
     IgnoredException.addIgnoredException("Failed to create index");
   }
 
   @Override
-  protected final void postTearDownCacheTestCase() throws Exception {
-    // Get the disk store name.
-    GemFireCacheImpl cache = (GemFireCacheImpl)getCache();
-    String diskStoreName = cache.getDefaultDiskStoreName();
-    
-    //reset TestHook
+  public final void preTearDownCacheTestCase() throws Exception {
+    System.out.println("KIRK:preTearDownCacheTestCase");
+  }
+
+  @Override
+  public final void postTearDownCacheTestCase() throws Exception {
+    resetTestHook();
     Invoke.invokeInEveryVM(resetTestHook());
-    // close the cache.
-    closeCache();
-    disconnectFromDS();
-    
-    // remove the disk store.
-    File diskDir = new File(diskStoreName).getAbsoluteFile();
-    com.gemstone.gemfire.internal.FileUtil.delete(diskDir);
+
+    disconnectAllFromDS();
+
+    FileUtil.delete(new File(GemFireCacheImpl.DEFAULT_DS_NAME).getAbsoluteFile());
+    Invoke.invokeInEveryVM(()->FileUtil.delete(new File(GemFireCacheImpl.DEFAULT_DS_NAME).getAbsoluteFile()));
+
+//    // Get the disk store name.
+//    GemFireCacheImpl cache = (GemFireCacheImpl)getCache(); // TODO: don't create a new Cache just to get the diskStoreName
+//    String diskStoreName = cache.getDefaultDiskStoreName();
+//
+//    assertEquals(GemFireCacheImpl.DEFAULT_DS_NAME, diskStoreName);
+//
+//    //reset TestHook
+//    Invoke.invokeInEveryVM(resetTestHook());
+//    // close the cache.
+//    closeCache();
+//    disconnectFromDS();
+//
+//    // remove the disk store.
+//    File diskDir = new File(diskStoreName).getAbsoluteFile();
+//    com.gemstone.gemfire.internal.FileUtil.delete(diskDir);
   }
   
   /**
@@ -339,7 +360,7 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
     com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info(
         "Creating index using an xml file name : " + fileName);
     
-    vm0.invoke(createIndexThrougXML("vm0testPersistentPRRegion", persistentRegName, fileName));
+    vm0.invoke(createIndexThrougXML("vm0testPersistentPRRegion", persistentRegName, fileName)); // TODO: hangs
     // LoadRegion
     vm0.invoke(loadRegion(this.persistentRegName));
     vm0.invoke(loadRegion(noIndexRepReg));

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
index 1e3e973..0b76efd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
@@ -135,20 +135,19 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
   }
 
   @Override
-  protected final void preTearDownCacheTestCase() throws Exception {
+  public final void preTearDownCacheTestCase() throws Exception {
     Invoke.invokeInEveryVM(CacheTestCase.class, "disconnectFromDS");
   }
   
   @Override
-  protected final void postTearDownCacheTestCase() throws Exception {
+  public final void postTearDownCacheTestCase() throws Exception {
     Invoke.invokeInEveryVM(QueryObserverHolder.class, "reset");
     cache = null;
     Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } });
   }
 
   @Override
-  public void setUp() throws Exception {
-    super.setUp();
+  public final void postSetUp() throws Exception {
     Host host = Host.getHost(0);
     server1 = host.getVM(0);
     server2 = host.getVM(1);
@@ -159,7 +158,6 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
     registerFunctionOnServers();
   }
 
-
   /**
    * Test on Replicated Region.
    */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
index 1bffce5..cddfa83 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
@@ -97,15 +97,14 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
   ////////  Test Methods
 
   @Override
-  public void setUp() throws Exception {
-    super.setUp();
+  public final void postSetUp() throws Exception {
     disconnectAllFromDS();
     IgnoredException.addIgnoredException("Connection reset");
     IgnoredException.addIgnoredException("Socket input is shutdown");
   }
 
   @Override
-  protected final void postTearDownCacheTestCase() throws Exception {
+  public final void postTearDownCacheTestCase() throws Exception {
     disconnectAllFromDS();
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
index c0de700..d144c00 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
@@ -73,13 +73,12 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
   ////////  Test Methods
 
   @Override
-  public void setUp() throws Exception {
-    super.setUp();
+  public final void postSetUp() throws Exception {
     disconnectAllFromDS();
   }
 
   @Override
-  protected final void postTearDownCacheTestCase() throws Exception {
+  public final void postTearDownCacheTestCase() throws Exception {
     disconnectAllFromDS();
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
index 85ae9aa..8b392cb 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
@@ -86,8 +86,7 @@ public class ResourceManagerWithQueryMonitorDUnitTest extends ClientServerTestCa
   }
   
   @Override
-  public void setUp() throws Exception {
-    super.setUp();
+  public final void postSetUpClientServerTestCase() throws Exception {
     Invoke.invokeInEveryVM(this.setHeapMemoryMonitorTestMode);
     IgnoredException.addIgnoredException("above heap critical threshold");
     IgnoredException.addIgnoredException("below heap critical threshold");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
index 6cbbef2..88326bd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
@@ -91,7 +91,7 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends
   }
 
   @Override
-  public void setUp() throws Exception {
+  public final void postSetUp() throws Exception {
     Invoke.invokeInEveryVM(new CacheSerializableRunnable("Set INPLACE_OBJECT_MODIFICATION false") {
       
       @Override
@@ -100,7 +100,6 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends
         IndexManager.INPLACE_OBJECT_MODIFICATION_FOR_TEST = true;
       }
     });
-    super.setUp();
   }
 
   /**
@@ -108,7 +107,7 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends
    * (mainly because we want to destroy any existing PartitionedRegions)
    */
   @Override
-  protected final void preTearDown() throws Exception {
+  public final void preTearDown() throws Exception {
     Invoke.invokeInEveryVM(new CacheSerializableRunnable("Set INPLACE_OBJECT_MODIFICATION false") {
       
       @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
index 2ac564a..1036106 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
@@ -93,7 +93,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest extends
    * (mainly because we want to destroy any existing PartitionedRegions)
    */
   @Override
-  protected final void preTearDown() throws Exception {
+  public final void preTearDown() throws Exception {
     Invoke.invokeInEveryVM(ConcurrentIndexUpdateWithoutWLDUnitTest.class, "destroyRegions");
     Invoke.invokeInEveryVM(CacheTestCase.class, "closeCache");
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
index d44c7f6..18c73dc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
@@ -59,13 +59,12 @@ public class CopyOnReadIndexDUnitTest extends CacheTestCase {
   VM vm1;
   VM vm2;
 
-  
   public CopyOnReadIndexDUnitTest(String name) {
     super(name);
   }
 
-  public void setUp() throws Exception {
-    super.setUp();
+  @Override
+  public final void postSetUp() throws Exception {
     getSystem();
     Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
       public void run() {
@@ -79,11 +78,10 @@ public class CopyOnReadIndexDUnitTest extends CacheTestCase {
   }
   
   @Override
-  protected final void preTearDownCacheTestCase() throws Exception {
+  public final void preTearDownCacheTestCase() throws Exception {
     disconnectAllFromDS();
   }
-  
-  
+
   //test different queries against partitioned region
   public void testPRQueryOnLocalNode() throws Exception {
     QueryTestUtils utils = new QueryTestUtils();

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

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
index 960bd4e..053f87a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
@@ -63,13 +63,13 @@ public class PutAllWithIndexPerfDUnitTest extends CacheTestCase {
     super(name);
   }
 
-  public void setUp() throws Exception {
-    super.setUp();
+  @Override
+  public final void postSetUp() throws Exception {
     disconnectAllFromDS();
   }
 
   @Override
-  protected final void postTearDownCacheTestCase() throws Exception {
+  public final void postTearDownCacheTestCase() throws Exception {
     disconnectAllFromDS();
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/ParallelSnapshotDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/ParallelSnapshotDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/ParallelSnapshotDUnitTest.java
index ea95558..5b123f2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/ParallelSnapshotDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/ParallelSnapshotDUnitTest.java
@@ -155,14 +155,14 @@ public class ParallelSnapshotDUnitTest extends CacheTestCase {
     }
     return null;
   }
-  
-  public void setUp() throws Exception {
-    super.setUp();
+
+  @Override
+  public final void postSetUp() throws Exception {
     loadCache();
   }
   
   @Override
-  protected final void postTearDownCacheTestCase() throws Exception {
+  public 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/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotByteArrayDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotByteArrayDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotByteArrayDUnitTest.java
index 43fc2e3..eae745a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotByteArrayDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotByteArrayDUnitTest.java
@@ -105,13 +105,13 @@ public class SnapshotByteArrayDUnitTest extends CacheTestCase {
     }
   }
 
-  public void setUp() throws Exception {
-    super.setUp();
+  @Override
+  public final void postSetUp() throws Exception {
     loadCache();
   }
   
   @Override
-  protected final void preTearDownCacheTestCase() throws Exception {
+  public final void preTearDownCacheTestCase() throws Exception {
     if (snap.exists()) {
       snap.delete();
     }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotDUnitTest.java
index 764f276..06bfecc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotDUnitTest.java
@@ -158,9 +158,9 @@ public class SnapshotDUnitTest extends CacheTestCase {
     
     assertTrue(caughtException);
   }
-  
-  public void setUp() throws Exception {
-    super.setUp();
+
+  @Override
+  public final void postSetUp() throws Exception {
     loadCache();
     
     RegionGenerator rgen = new RegionGenerator();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotPerformanceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotPerformanceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotPerformanceDUnitTest.java
index 83fc231..c5b0e55 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotPerformanceDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotPerformanceDUnitTest.java
@@ -100,9 +100,9 @@ public class SnapshotPerformanceDUnitTest extends CacheTestCase {
     LogWriterUtils.getLogWriter().info("SNP: Import entry rate: " + eps + " entries / sec");
     LogWriterUtils.getLogWriter().info("SNP: Import data rate: " + mbps + " MB / sec");
   }
-  
-  public void setUp() throws Exception {
-    super.setUp();
+
+  @Override
+  public final void postSetUp() throws Exception {
     createCache();
   }
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheCloseDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheCloseDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheCloseDUnitTest.java
index ea17a4d..1938483 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheCloseDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheCloseDUnitTest.java
@@ -26,7 +26,6 @@ import com.gemstone.gemfire.cache.CacheLoaderException;
 import com.gemstone.gemfire.cache.LoaderHelper;
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.RegionAttributes;
-import com.gemstone.gemfire.test.dunit.cache.internal.JUnit3CacheTestCase;
 
 /**
  * Test to make sure cache close is working.
@@ -34,7 +33,7 @@ import com.gemstone.gemfire.test.dunit.cache.internal.JUnit3CacheTestCase;
  * @author darrel
  * @since 3.0
  */
-public class CacheCloseDUnitTest extends JUnit3CacheTestCase {
+public class CacheCloseDUnitTest extends CacheTestCase {
 
   public CacheCloseDUnitTest(String name) {
     super(name);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java
index f7e1739..0be86e2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java
@@ -57,17 +57,20 @@ public class CacheMapTxnDUnitTest extends DistributedTestCase{
     }
     
     @Override
-    public void setUp() throws Exception {
-      super.setUp();
+    public final void postSetUp() throws Exception {
       Host host = Host.getHost(0);
       VM vm0 = host.getVM(0);
       VM vm1 = host.getVM(1);
       vm0.invoke(() -> CacheMapTxnDUnitTest.createCache());
       vm1.invoke(() -> CacheMapTxnDUnitTest.createCache());
+      postSetUpCacheMapTxnDUnitTest();
+    }
+
+    protected void postSetUpCacheMapTxnDUnitTest() throws Exception {
     }
     
     @Override
-    protected final void preTearDown() throws Exception {
+    public 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/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java
index 561209a..95a861b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java
@@ -25,6 +25,7 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
 
+import com.gemstone.gemfire.test.dunit.cache.internal.CacheTestFixture;
 import org.apache.logging.log4j.Logger;
 
 import com.gemstone.gemfire.InternalGemFireError;
@@ -63,6 +64,7 @@ import com.gemstone.gemfire.test.dunit.LogWriterUtils;
 import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.test.dunit.Wait;
 import com.gemstone.gemfire.test.dunit.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.internal.JUnit3DistributedTestCase;
 
 /**
  * The abstract superclass of tests that require the creation of a
@@ -71,23 +73,22 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  * @author David Whitlock
  * @since 3.0
  */
-public abstract class CacheTestCase extends DistributedTestCase {
+public abstract class CacheTestCase extends DistributedTestCase implements CacheTestFixture {
   private static final Logger logger = LogService.getLogger();
 
-  /** The Cache from which regions are obtained 
-   * 
-   * All references synchronized via <code>CacheTestCase.class</code>
-   * */
-  // static so it doesn't get serialized with SerializableRunnable inner classes
+  /**
+   * The Cache from which regions are obtained.
+   *
+   * <p>All references synchronized via {@code JUnit4CacheTestCase.class}.
+   *
+   * <p>Field is static so it doesn't get serialized with SerializableRunnable inner classes.
+   */
   private static Cache cache;
   
-  ////////  Constructors
-
   public CacheTestCase(String name) {
     super(name);
   }
 
-  ////////  Helper methods
   /**
    * Creates the <code>Cache</code> for this test
    */
@@ -162,12 +163,10 @@ public abstract class CacheTestCase extends DistributedTestCase {
    * Any existing cache is closed. Whoever calls this must also call finishCacheXml
    */
   public static final synchronized void beginCacheXml() {
-//    getLogWriter().info("before closeCache");
     closeCache();
-//    getLogWriter().info("before TestCacheCreation");
     cache = new TestCacheCreation();
-//    getLogWriter().info("after TestCacheCreation");
   }
+
   /**
    * Finish what beginCacheXml started. It does this be generating a cache.xml
    * file and then creating a real cache using that cache.xml.
@@ -272,11 +271,11 @@ public abstract class CacheTestCase extends DistributedTestCase {
       if (gfCache != null && !gfCache.isClosed()
           && gfCache.getCancelCriterion().cancelInProgress() != null) {
         Wait.waitForCriterion(new WaitCriterion() {
-
+          @Override
           public boolean done() {
             return gfCache.isClosed();
           }
-
+          @Override
           public String description() {
             return "waiting for cache to close";
           }
@@ -300,15 +299,16 @@ public abstract class CacheTestCase extends DistributedTestCase {
   public final GemFireCacheImpl getGemfireCache() {
     return (GemFireCacheImpl)getCache();
   }
+
   public static synchronized final boolean hasCache() {
-      return cache != null;
+    return cache != null;
   }
 
   /**
    * Return current cache without creating one.
    */
   public static synchronized final Cache basicGetCache() {
-      return cache;
+    return cache;
   }
 
   /** Close the cache */
@@ -356,7 +356,7 @@ public abstract class CacheTestCase extends DistributedTestCase {
   }
 
   @Override
-  protected final void preTearDown() throws Exception {
+  public final void preTearDown() throws Exception {
     preTearDownCacheTestCase();
     
     // locally destroy all root regions and close the cache
@@ -373,10 +373,10 @@ public abstract class CacheTestCase extends DistributedTestCase {
     postTearDownCacheTestCase();
   }
   
-  protected void preTearDownCacheTestCase() throws Exception {
+  public void preTearDownCacheTestCase() throws Exception {
   }
 
-  protected void postTearDownCacheTestCase() throws Exception {
+  public void postTearDownCacheTestCase() throws Exception {
   }
 
   /**
@@ -480,6 +480,7 @@ public abstract class CacheTestCase extends DistributedTestCase {
   throws RegionExistsException, TimeoutException {
     return getCache().createRegion(rootName, attrs);
   }
+
   public final Region createExpiryRootRegion(String rootName, RegionAttributes attrs)
   throws RegionExistsException, TimeoutException {
     System.setProperty(LocalRegion.EXPIRY_MS_PROPERTY, "true");
@@ -490,55 +491,6 @@ public abstract class CacheTestCase extends DistributedTestCase {
     }
   }
 
-
-//  /**
-//   * send an unordered message requiring an ack to all connected members
-//   * in order to flush the unordered communication channel
-//   */
-//  public final void sendUnorderedMessageToAll() {
-//    //if (getCache() instanceof distcache.gemfire.GemFireCacheImpl) {
-//      try {
-//        com.gemstone.gemfire.distributed.internal.HighPriorityAckedMessage msg = new com.gemstone.gemfire.distributed.internal.HighPriorityAckedMessage();
-//        msg.send(InternalDistributedSystem.getConnectedInstance().getDM().getNormalDistributionManagerIds(), false);
-//      }
-//      catch (Exception e) {
-//        throw new RuntimeException("Unable to send unordered message due to exception", e);
-//      }
-//    //}
-//  }
-
-  /**
-   * send an unordered message requiring an ack to all connected admin members 
-   * in order to flush the unordered communication channel
-   */
-//  public void sendUnorderedMessageToAdminMembers() {
-//    //if (getCache() instanceof distcache.gemfire.GemFireCacheImpl) {
-//      try {
-//        com.gemstone.gemfire.distributed.internal.HighPriorityAckedMessage msg = new com.gemstone.gemfire.distributed.internal.HighPriorityAckedMessage();
-//        msg.send(DistributedSystemHelper.getAdminMembers(), false);
-//      }
-//      catch (Exception e) {
-//        throw new RuntimeException("Unable to send unordered message due to exception", e);
-//      }
-//    //}
-//  }
-
-//  /**
-//   * send an ordered message requiring an ack to all connected members
-//   * in order to flush the ordered communication channel
-//   */
-//  public final void sendSerialMessageToAll() {
-//    if (getCache() instanceof GemFireCacheImpl) {
-//      try {
-//        com.gemstone.gemfire.distributed.internal.SerialAckedMessage msg = new com.gemstone.gemfire.distributed.internal.SerialAckedMessage();
-//        msg.send(InternalDistributedSystem.getConnectedInstance().getDM().getNormalDistributionManagerIds(), false);
-//      }
-//      catch (Exception e) {
-//        throw new RuntimeException("Unable to send serial message due to exception", e);
-//      }
-//    }
-//  }
-
   /**
    * @deprecated Use DistributedTestCase.addExpectedException
    */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
index dd127cb..8c9776e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
@@ -44,18 +44,18 @@ public class CacheXmlTestCase extends CacheTestCase {
     super(name);
   }
 
-  public void setUp() throws Exception {
-    super.setUp();
+  @Override
+  public final void postSetUp() throws Exception {
     disconnectAllFromDS();
   }
 
   @Override
-  protected final void preTearDownCacheTestCase() throws Exception {
+  public final void preTearDownCacheTestCase() throws Exception {
     this.xmlFile = null;    
   }
   
   @Override
-  protected final void postTearDownCacheTestCase() throws Exception {
+  public final void postTearDownCacheTestCase() throws Exception {
     disconnectAllFromDS();
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/CachedAllEventsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CachedAllEventsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CachedAllEventsDUnitTest.java
index 68f1305..6ffc53d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CachedAllEventsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CachedAllEventsDUnitTest.java
@@ -30,7 +30,9 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 /**
  * Make sure that create are distributed and done in
@@ -39,6 +41,7 @@ import org.junit.Test;
  * @author darrel
  * @since 5.0
  */
+@Category(DistributedTest.class)
 public class CachedAllEventsDUnitTest extends JUnit4CacheTestCase {
 
   private VM getOtherVm() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java
index e748a42..031fd76 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java
@@ -60,10 +60,8 @@ public class ClearMultiVmCallBkDUnitTest extends DistributedTestCase{
     static CacheTransactionManager cacheTxnMgr;
     static boolean afterClear=false;
     
-    
     @Override
-    public void setUp() throws Exception {
-      super.setUp();
+    public final void postSetUp() throws Exception {
       Host host = Host.getHost(0);
       VM vm0 = host.getVM(0);
       VM vm1 = host.getVM(1);
@@ -73,7 +71,7 @@ public class ClearMultiVmCallBkDUnitTest extends DistributedTestCase{
     }
     
     @Override
-    protected final void preTearDown() throws Exception {
+    public final void preTearDown() throws Exception {
       Host host = Host.getHost(0);
       VM vm0 = host.getVM(0);
       VM vm1 = host.getVM(1);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java
index 5f9450b..9aa4e95 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java
@@ -66,8 +66,7 @@ public class ClearMultiVmDUnitTest extends DistributedTestCase{
     static CacheTransactionManager cacheTxnMgr;
     
     @Override
-    public void setUp() throws Exception {
-      super.setUp();
+    public final void postSetUp() throws Exception {
       Host host = Host.getHost(0);
       VM vm0 = host.getVM(0);
       VM vm1 = host.getVM(1);
@@ -76,7 +75,7 @@ public class ClearMultiVmDUnitTest extends DistributedTestCase{
     }
     
     @Override
-    protected final void preTearDown() throws Exception {
+    public final void preTearDown() throws Exception {
       Host host = Host.getHost(0);
       VM vm0 = host.getVM(0);
       VM vm1 = host.getVM(1);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
index 23386a7..e6be910 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
@@ -82,12 +82,8 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
     super(name);
   }
 
-  public void setUp() throws Exception {
-    super.setUp();
-  }
-  
   @Override
-  protected final void postTearDownCacheTestCase() throws Exception {
+  public final void postTearDownCacheTestCase() throws Exception {
     InternalClientMembership.unregisterAllListeners();
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
index f7e2277..ce8783b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
@@ -46,7 +46,7 @@ public class ClientRegisterInterestDUnitTest extends ClientServerTestCase {
   }
   
   @Override
-  protected final void postTearDownCacheTestCase() throws Exception {
+  public 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/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
index fb319b6..1355571 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
@@ -69,7 +69,7 @@ public class ClientServerCCEDUnitTest extends CacheTestCase {
   }
   
   @Override
-  protected final void preTearDownCacheTestCase() {
+  public final void preTearDownCacheTestCase() {
     disconnectAllFromDS();
     HARegionQueue.setMessageSyncInterval(HARegionQueue.DEFAULT_MESSAGE_SYNC_INTERVAL);
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
index 5c2f8a2..b37c60a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
@@ -55,14 +55,17 @@ public class ClientServerTestCase extends CacheTestCase {
   public static boolean AUTO_LOAD_BALANCE = false;
 
   @Override
-  public void setUp() throws Exception {
-    super.setUp();
+  public final void postSetUp() throws Exception {
     // this makes sure we don't have any connection left over from previous tests
     disconnectAllFromDS();
+    postSetUpClientServerTestCase();
+  }
+
+  protected void postSetUpClientServerTestCase() throws Exception {
   }
   
   @Override
-  protected final void preTearDownCacheTestCase() throws Exception {
+  public final void preTearDownCacheTestCase() throws Exception {
     preTearDownClientServerTestCase();
     // this makes sure we don't leave anything for the next tests
     disconnectAllFromDS();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3543e224/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java
index cf6226d..9284e26 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java
@@ -71,8 +71,7 @@ public class DistAckMapMethodsDUnitTest extends DistributedTestCase{
     }
     
     @Override
-    public void setUp() throws Exception {
-      super.setUp();
+    public final void postSetUp() throws Exception {
       Host host = Host.getHost(0);
       VM vm0 = host.getVM(0);
       VM vm1 = host.getVM(1);
@@ -81,7 +80,7 @@ public class DistAckMapMethodsDUnitTest extends DistributedTestCase{
     }
     
     @Override
-    protected final void preTearDown() throws Exception {
+    public final void preTearDown() throws Exception {
       Host host = Host.getHost(0);
       VM vm0 = host.getVM(0);
       VM vm1 = host.getVM(1);



Mime
View raw message