geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jensde...@apache.org
Subject [51/62] [abbrv] [partial] incubator-geode git commit: GEODE-773: Extract static methods from DistributedTestCase
Date Thu, 11 Feb 2016 15:27:15 GMT
GEODE-773: Extract static methods from DistributedTestCase

Refactor DistributedTestCase by extracting inner classes & interfaces into:
* IgnoredException
* StoppableWaitCriterion
* WaitCriterion

Refactor DistributedTestCase by extracting static methods into:
* Assert
* DebuggerUtils
* DistributedTestUtils
* Invoke
* Jitter
* LogWriterUtils
* NetworkUtils
* ThreadUtils
* Wait

Also:
* Rename variables for clarity
* Replace several uses of LogWriter with Logger
* Write and polish lots of javadocs
* Overhaul entire hierarchy of tearDown() methods across dunit tests


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

Branch: refs/heads/feature/GEODE-17
Commit: 820cfd632abbb18f9a2265048c8e2ad3d56c2b9d
Parents: 21d9229
Author: Kirk Lund <klund@pivotal.io>
Authored: Tue Feb 9 10:40:21 2016 -0800
Committer: Kirk Lund <klund@pivotal.io>
Committed: Tue Feb 9 10:43:30 2016 -0800

----------------------------------------------------------------------
 .../LauncherLifecycleCommandsDUnitTest.java     |   40 +-
 .../SharedConfigurationEndToEndDUnitTest.java   |   16 +-
 .../gemfire/internal/util/DebuggerSupport.java  |   17 +-
 .../com/gemstone/gemfire/TXExpiryJUnitTest.java |   10 +-
 .../cache/CacheRegionClearStatsDUnitTest.java   |   12 +-
 .../cache/ClientServerTimeSyncDUnitTest.java    |   31 +-
 .../cache/ConnectionPoolAndLoaderDUnitTest.java |   12 +-
 .../ClientServerRegisterInterestsDUnitTest.java |    6 +-
 .../internal/AutoConnectionSourceDUnitTest.java |   47 +-
 .../CacheServerSSLConnectionDUnitTest.java      |   13 +-
 .../internal/LocatorLoadBalancingDUnitTest.java |   51 +-
 .../cache/client/internal/LocatorTestBase.java  |   25 +-
 .../internal/SSLNoClientAuthDUnitTest.java      |    6 +-
 .../pooling/ConnectionManagerJUnitTest.java     |   11 +-
 .../management/MemoryThresholdsDUnitTest.java   |   77 +-
 .../MemoryThresholdsOffHeapDUnitTest.java       |   69 +-
 .../management/ResourceManagerDUnitTest.java    |    5 +-
 .../mapInterface/PutAllGlobalLockJUnitTest.java |    4 +-
 .../PartitionRegionHelperDUnitTest.java         |   23 +-
 .../query/cq/dunit/CqQueryTestListener.java     |   26 +-
 .../query/dunit/CompactRangeIndexDUnitTest.java |   15 +-
 .../cache/query/dunit/CqTimeTestListener.java   |   14 +-
 .../cache/query/dunit/HashIndexDUnitTest.java   |   10 +-
 .../cache/query/dunit/HelperTestCase.java       |    3 +-
 .../query/dunit/PdxStringQueryDUnitTest.java    |  297 ++--
 .../dunit/QueryDataInconsistencyDUnitTest.java  |   57 +-
 .../dunit/QueryIndexUsingXMLDUnitTest.java      |   83 +-
 .../QueryParamsAuthorizationDUnitTest.java      |    3 +-
 .../QueryUsingFunctionContextDUnitTest.java     |   42 +-
 .../query/dunit/QueryUsingPoolDUnitTest.java    |  283 ++--
 .../cache/query/dunit/RemoteQueryDUnitTest.java |  148 +-
 ...esourceManagerWithQueryMonitorDUnitTest.java |   27 +-
 .../query/dunit/SelectStarQueryDUnitTest.java   |  121 +-
 .../IndexCreationDeadLockJUnitTest.java         |    6 +-
 .../IndexMaintenanceAsynchJUnitTest.java        |    6 +-
 .../functional/LikePredicateJUnitTest.java      |    4 +-
 .../internal/ExecutionContextJUnitTest.java     |    4 +-
 .../index/AsynchIndexMaintenanceJUnitTest.java  |   17 +-
 ...rrentIndexInitOnOverflowRegionDUnitTest.java |   45 +-
 ...ndexOperationsOnOverflowRegionDUnitTest.java |   64 +-
 ...pdateWithInplaceObjectModFalseDUnitTest.java |   67 +-
 ...ConcurrentIndexUpdateWithoutWLDUnitTest.java |   61 +-
 .../index/CopyOnReadIndexDUnitTest.java         |   60 +-
 .../index/IndexCreationInternalsJUnitTest.java  |    6 +-
 .../index/IndexMaintainceJUnitTest.java         |    4 +-
 .../IndexTrackingQueryObserverDUnitTest.java    |   16 +-
 ...itializeIndexEntryDestroyQueryDUnitTest.java |   37 +-
 .../index/MultiIndexCreationDUnitTest.java      |   30 +-
 .../index/PutAllWithIndexPerfDUnitTest.java     |   23 +-
 .../PRBasicIndexCreationDUnitTest.java          |  108 +-
 .../PRBasicIndexCreationDeadlockDUnitTest.java  |   17 +-
 .../PRBasicMultiIndexCreationDUnitTest.java     |   85 +-
 .../partitioned/PRBasicQueryDUnitTest.java      |   33 +-
 .../PRBasicRemoveIndexDUnitTest.java            |    7 +-
 .../PRColocatedEquiJoinDUnitTest.java           |  305 ++--
 .../partitioned/PRInvalidQueryDUnitTest.java    |   17 +-
 .../partitioned/PRQueryCacheCloseDUnitTest.java |   75 +-
 .../PRQueryCacheClosedJUnitTest.java            |    6 +-
 .../query/partitioned/PRQueryDUnitHelper.java   |  157 ++-
 .../query/partitioned/PRQueryDUnitTest.java     |  158 ++-
 .../query/partitioned/PRQueryPerfDUnitTest.java |   10 +-
 .../PRQueryRegionCloseDUnitTest.java            |   39 +-
 .../PRQueryRegionDestroyedDUnitTest.java        |   41 +-
 .../PRQueryRegionDestroyedJUnitTest.java        |    6 +-
 .../PRQueryRemoteNodeExceptionDUnitTest.java    |  153 +-
 .../snapshot/ParallelSnapshotDUnitTest.java     |    5 +-
 .../snapshot/SnapshotByteArrayDUnitTest.java    |   11 +-
 .../snapshot/SnapshotPerformanceDUnitTest.java  |   21 +-
 .../gemfire/cache30/Bug35214DUnitTest.java      |   14 +-
 .../gemfire/cache30/Bug38741DUnitTest.java      |   15 +-
 .../gemfire/cache30/CacheListenerTestCase.java  |   16 +-
 .../gemfire/cache30/CacheLoaderTestCase.java    |    8 +-
 .../gemfire/cache30/CacheMapTxnDUnitTest.java   |   24 +-
 ...cheRegionsReliablityStatsCheckDUnitTest.java |    3 +-
 .../cache30/CacheStatisticsDUnitTest.java       |   15 +-
 .../gemstone/gemfire/cache30/CacheTestCase.java |   49 +-
 .../gemfire/cache30/CacheXml30DUnitTest.java    |   25 +-
 .../gemfire/cache30/CacheXml41DUnitTest.java    |   13 +-
 .../gemfire/cache30/CacheXml45DUnitTest.java    |    2 +-
 .../gemfire/cache30/CacheXml57DUnitTest.java    |   18 +-
 .../gemfire/cache30/CacheXml60DUnitTest.java    |    8 +-
 .../gemfire/cache30/CacheXml65DUnitTest.java    |   24 +-
 .../gemfire/cache30/CacheXml66DUnitTest.java    |    6 +-
 .../gemfire/cache30/CacheXml80DUnitTest.java    |    3 +-
 .../gemfire/cache30/CacheXml81DUnitTest.java    |    4 +-
 .../gemfire/cache30/CacheXml90DUnitTest.java    |    7 +-
 .../gemfire/cache30/CacheXmlTestCase.java       |   13 +-
 .../cache30/CertifiableTestCacheListener.java   |   12 +-
 .../cache30/ClearMultiVmCallBkDUnitTest.java    |   27 +-
 .../gemfire/cache30/ClearMultiVmDUnitTest.java  |   33 +-
 .../cache30/ClientMembershipDUnitTest.java      |  157 ++-
 .../ClientRegisterInterestDUnitTest.java        |   57 +-
 .../cache30/ClientServerCCEDUnitTest.java       |   56 +-
 .../gemfire/cache30/ClientServerTestCase.java   |   13 +-
 .../ConcurrentLeaveDuringGIIDUnitTest.java      |   13 +-
 .../gemfire/cache30/DiskRegionDUnitTest.java    |   24 +-
 .../cache30/DistAckMapMethodsDUnitTest.java     |   23 +-
 ...tedAckOverflowRegionCCEOffHeapDUnitTest.java |    6 +-
 ...tributedAckPersistentRegionCCEDUnitTest.java |    1 -
 ...dAckPersistentRegionCCEOffHeapDUnitTest.java |   11 +-
 .../DistributedAckRegionCCEDUnitTest.java       |   20 +-
 ...DistributedAckRegionCCEOffHeapDUnitTest.java |   11 +-
 .../cache30/DistributedAckRegionDUnitTest.java  |   10 +-
 .../DistributedAckRegionOffHeapDUnitTest.java   |   11 +-
 .../DistributedMulticastRegionDUnitTest.java    |    8 +-
 .../DistributedNoAckRegionCCEDUnitTest.java     |   19 +-
 ...stributedNoAckRegionCCEOffHeapDUnitTest.java |   11 +-
 .../DistributedNoAckRegionDUnitTest.java        |   48 +-
 .../DistributedNoAckRegionOffHeapDUnitTest.java |   11 +-
 .../gemfire/cache30/DynamicRegionDUnitTest.java |   20 +-
 .../gemfire/cache30/GlobalLockingDUnitTest.java |    7 +-
 .../cache30/GlobalRegionCCEDUnitTest.java       |    5 +-
 .../GlobalRegionCCEOffHeapDUnitTest.java        |   11 +-
 .../gemfire/cache30/GlobalRegionDUnitTest.java  |   28 +-
 .../cache30/GlobalRegionOffHeapDUnitTest.java   |   13 +-
 .../cache30/LRUEvictionControllerDUnitTest.java |    3 +-
 .../gemfire/cache30/LocalRegionDUnitTest.java   |    3 +-
 .../gemfire/cache30/MultiVMRegionTestCase.java  |  372 ++---
 .../OffHeapLRUEvictionControllerDUnitTest.java  |   11 +-
 .../PRBucketSynchronizationDUnitTest.java       |   27 +-
 .../cache30/PartitionedRegionDUnitTest.java     |   15 +-
 .../PartitionedRegionOffHeapDUnitTest.java      |   11 +-
 .../cache30/PreloadedRegionTestCase.java        |    5 +-
 .../cache30/PutAllCallBkRemoteVMDUnitTest.java  |   40 +-
 .../cache30/PutAllCallBkSingleVMDUnitTest.java  |   36 +-
 .../gemfire/cache30/PutAllMultiVmDUnitTest.java |   18 +-
 .../gemfire/cache30/QueueMsgDUnitTest.java      |    5 +-
 .../cache30/RRSynchronizationDUnitTest.java     |   25 +-
 .../gemfire/cache30/ReconnectDUnitTest.java     |  159 ++-
 .../ReconnectedCacheServerDUnitTest.java        |    2 +-
 .../cache30/RegionExpirationDUnitTest.java      |   14 +-
 .../RegionMembershipListenerDUnitTest.java      |   23 +-
 .../cache30/RegionReliabilityTestCase.java      |   15 +-
 .../gemfire/cache30/RegionTestCase.java         |  114 +-
 .../cache30/RemoveAllMultiVmDUnitTest.java      |   18 +-
 .../gemfire/cache30/RequiredRolesDUnitTest.java |   19 +-
 .../cache30/RolePerformanceDUnitTest.java       |    5 +-
 .../gemfire/cache30/SearchAndLoadDUnitTest.java |   74 +-
 .../gemfire/cache30/SlowRecDUnitTest.java       |  137 +-
 .../gemfire/cache30/TXDistributedDUnitTest.java |   72 +-
 .../gemfire/cache30/TXOrderDUnitTest.java       |   11 +-
 .../cache30/TXRestrictionsDUnitTest.java        |    6 +-
 .../gemfire/cache30/TestCacheCallback.java      |    6 +-
 .../distributed/DistributedMemberDUnitTest.java |    3 +-
 .../distributed/DistributedSystemDUnitTest.java |   12 +-
 .../distributed/HostedLocatorsDUnitTest.java    |    3 +-
 .../gemfire/distributed/LocatorDUnitTest.java   |  191 +--
 .../gemfire/distributed/LocatorJUnitTest.java   |    1 -
 .../distributed/SystemAdminDUnitTest.java       |   13 +-
 .../distributed/internal/Bug40751DUnitTest.java |    7 +-
 .../ConsoleDistributionManagerDUnitTest.java    |   45 +-
 .../internal/DistributionAdvisorDUnitTest.java  |    7 +-
 .../internal/DistributionManagerDUnitTest.java  |   30 +-
 .../internal/ProductUseLogDUnitTest.java        |    6 +-
 .../GemFireDeadlockDetectorDUnitTest.java       |   15 +-
 .../internal/locks/CollaborationJUnitTest.java  |   53 +-
 .../membership/gms/MembershipManagerHelper.java |    6 +-
 .../TcpServerBackwardCompatDUnitTest.java       |   18 +-
 .../gemfire/disttx/DistTXDebugDUnitTest.java    |  115 +-
 .../disttx/DistTXPersistentDebugDUnitTest.java  |   17 +-
 .../disttx/DistributedTransactionDUnitTest.java |   30 +-
 ...wardCompatibilitySerializationDUnitTest.java |    2 +-
 .../ClassNotFoundExceptionDUnitTest.java        |    6 +-
 .../gemfire/internal/JSSESocketJUnitTest.java   |    4 +-
 .../gemfire/internal/JarDeployerDUnitTest.java  |   10 +-
 .../internal/PdxDeleteFieldDUnitTest.java       |    6 +-
 .../gemfire/internal/PdxRenameDUnitTest.java    |    6 +-
 .../gemfire/internal/SocketCloserJUnitTest.java |   12 +-
 .../gemfire/internal/cache/BackupDUnitTest.java |   60 +-
 .../internal/cache/Bug33359DUnitTest.java       |   21 +-
 .../internal/cache/Bug33726DUnitTest.java       |    3 +-
 .../internal/cache/Bug37241DUnitTest.java       |   14 +-
 .../internal/cache/Bug37377DUnitTest.java       |   12 +-
 .../internal/cache/Bug39079DUnitTest.java       |   13 +-
 .../internal/cache/Bug40299DUnitTest.java       |    7 +-
 .../internal/cache/Bug41091DUnitTest.java       |   18 +-
 .../internal/cache/Bug41733DUnitTest.java       |    3 +-
 .../internal/cache/Bug41957DUnitTest.java       |   13 +-
 .../internal/cache/Bug45164DUnitTest.java       |    3 +-
 .../internal/cache/Bug47667DUnitTest.java       |    6 +-
 .../internal/cache/CacheAdvisorDUnitTest.java   |    7 +-
 .../internal/cache/ClearDAckDUnitTest.java      |   47 +-
 .../internal/cache/ClearGlobalDUnitTest.java    |   14 +-
 .../cache/ClientServerGetAllDUnitTest.java      |   33 +-
 ...ServerInvalidAndDestroyedEntryDUnitTest.java |   26 +-
 .../ClientServerTransactionCCEDUnitTest.java    |   12 +-
 .../cache/ClientServerTransactionDUnitTest.java |   83 +-
 .../ConcurrentDestroySubRegionDUnitTest.java    |    5 +-
 .../cache/ConcurrentMapOpsDUnitTest.java        |   29 +-
 .../ConcurrentRegionOperationsJUnitTest.java    |   18 +-
 ...rentRollingAndRegionOperationsJUnitTest.java |    4 +-
 .../cache/ConnectDisconnectDUnitTest.java       |   17 +-
 .../cache/DeltaPropagationDUnitTest.java        |   32 +-
 .../cache/DeltaPropagationStatsDUnitTest.java   |   17 +-
 .../internal/cache/DeltaSizingDUnitTest.java    |    5 +-
 .../cache/DiskRegByteArrayDUnitTest.java        |    7 +-
 .../cache/DiskRegionClearJUnitTest.java         |    4 +-
 .../internal/cache/DiskRegionJUnitTest.java     |   43 +-
 ...DistrbutedRegionProfileOffHeapDUnitTest.java |   24 +-
 .../cache/DistributedCacheTestCase.java         |   16 +-
 .../internal/cache/EventTrackerDUnitTest.java   |   27 +-
 .../internal/cache/EvictionDUnitTest.java       |    9 +-
 .../cache/EvictionObjectSizerDUnitTest.java     |   25 +-
 .../internal/cache/EvictionStatsDUnitTest.java  |   20 +-
 .../internal/cache/EvictionTestBase.java        |   39 +-
 .../cache/FixedPRSinglehopDUnitTest.java        |   31 +-
 .../internal/cache/GIIDeltaDUnitTest.java       |   76 +-
 .../internal/cache/GIIFlowControlDUnitTest.java |   38 +-
 .../internal/cache/GridAdvisorDUnitTest.java    |   33 +-
 .../internal/cache/HABug36773DUnitTest.java     |   21 +-
 .../HAOverflowMemObjectSizerDUnitTest.java      |    9 +-
 .../cache/IncrementalBackupDUnitTest.java       |   16 +-
 .../cache/InterruptClientServerDUnitTest.java   |    9 +-
 .../internal/cache/InterruptsDUnitTest.java     |    6 +-
 .../internal/cache/MapClearGIIDUnitTest.java    |   26 +-
 .../internal/cache/MapInterface2JUnitTest.java  |    6 +-
 .../cache/NetSearchMessagingDUnitTest.java      |   13 +-
 .../cache/OffHeapEvictionDUnitTest.java         |   28 +-
 .../cache/OffHeapEvictionStatsDUnitTest.java    |   23 +-
 .../gemfire/internal/cache/OffHeapTestUtil.java |    2 +-
 .../gemfire/internal/cache/OplogJUnitTest.java  |   25 +-
 .../cache/P2PDeltaPropagationDUnitTest.java     |    6 +-
 .../internal/cache/PRBadToDataDUnitTest.java    |    3 +-
 .../cache/PartitionedRegionAPIDUnitTest.java    |   23 +-
 ...gionBucketCreationDistributionDUnitTest.java |  107 +-
 .../PartitionedRegionCacheCloseDUnitTest.java   |   17 +-
 .../PartitionedRegionCreationDUnitTest.java     |   67 +-
 .../cache/PartitionedRegionDUnitTestCase.java   |   22 +-
 ...rtitionedRegionDelayedRecoveryDUnitTest.java |   11 +-
 .../PartitionedRegionDestroyDUnitTest.java      |   23 +-
 .../PartitionedRegionEntryCountDUnitTest.java   |    3 +-
 .../PartitionedRegionEvictionDUnitTest.java     |   16 +-
 .../cache/PartitionedRegionHADUnitTest.java     |   24 +-
 ...onedRegionHAFailureAndRecoveryDUnitTest.java |   49 +-
 ...artitionedRegionLocalMaxMemoryDUnitTest.java |    5 +-
 ...nedRegionLocalMaxMemoryOffHeapDUnitTest.java |   11 +-
 .../PartitionedRegionMultipleDUnitTest.java     |   72 +-
 ...rtitionedRegionOffHeapEvictionDUnitTest.java |   11 +-
 .../cache/PartitionedRegionPRIDDUnitTest.java   |   22 +-
 .../cache/PartitionedRegionQueryDUnitTest.java  |   33 +-
 ...artitionedRegionRedundancyZoneDUnitTest.java |    3 +-
 ...tionedRegionSerializableObjectJUnitTest.java |    4 +-
 .../PartitionedRegionSingleHopDUnitTest.java    |  173 ++-
 ...RegionSingleHopWithServerGroupDUnitTest.java |  148 +-
 .../cache/PartitionedRegionSizeDUnitTest.java   |   20 +-
 .../cache/PartitionedRegionStatsDUnitTest.java  |   11 +-
 .../PartitionedRegionTestUtilsDUnitTest.java    |   22 +-
 .../PartitionedRegionWithSameNameDUnitTest.java |   46 +-
 .../internal/cache/PutAllDAckDUnitTest.java     |   23 +-
 .../internal/cache/PutAllGlobalDUnitTest.java   |   53 +-
 .../cache/RemoteTransactionDUnitTest.java       |   38 +-
 .../internal/cache/RemoveAllDAckDUnitTest.java  |   21 +-
 .../internal/cache/RemoveDAckDUnitTest.java     |   17 +-
 .../internal/cache/RemoveGlobalDUnitTest.java   |   20 +-
 .../cache/SimpleDiskRegionJUnitTest.java        |   12 +-
 .../internal/cache/SingleHopStatsDUnitTest.java |   55 +-
 .../internal/cache/SizingFlagDUnitTest.java     |    3 +-
 .../internal/cache/SystemFailureDUnitTest.java  |   22 +-
 .../cache/TXReservationMgrJUnitTest.java        |    4 +-
 .../cache/TransactionsWithDeltaDUnitTest.java   |   11 +-
 .../control/RebalanceOperationDUnitTest.java    |   46 +-
 ...egionOverflowAsyncRollingOpLogJUnitTest.java |    6 +-
 ...RegionOverflowSyncRollingOpLogJUnitTest.java |    6 +-
 ...ltiThreadedOplogPerJUnitPerformanceTest.java |    4 +-
 .../cache/execute/Bug51193DUnitTest.java        |    6 +-
 .../ClientServerFunctionExecutionDUnitTest.java |   87 +-
 .../execute/ColocationFailoverDUnitTest.java    |   27 +-
 ...ributedRegionFunctionExecutionDUnitTest.java |   78 +-
 .../execute/FunctionServiceStatsDUnitTest.java  |   57 +-
 .../cache/execute/LocalDataSetDUnitTest.java    |   14 +-
 .../execute/LocalDataSetIndexingDUnitTest.java  |    2 +-
 .../LocalFunctionExecutionDUnitTest.java        |   19 +-
 .../MemberFunctionExecutionDUnitTest.java       |   41 +-
 .../MultiRegionFunctionExecutionDUnitTest.java  |    9 +-
 .../OnGroupsFunctionExecutionDUnitTest.java     |   71 +-
 ...ntServerFunctionExecutionNoAckDUnitTest.java |   40 +-
 ...tServerRegionFunctionExecutionDUnitTest.java |   83 +-
 ...egionFunctionExecutionFailoverDUnitTest.java |   70 +-
 ...onFunctionExecutionNoSingleHopDUnitTest.java |   84 +-
 ...onExecutionSelectorNoSingleHopDUnitTest.java |  100 +-
 ...gionFunctionExecutionSingleHopDUnitTest.java |   94 +-
 .../cache/execute/PRClientServerTestBase.java   |   59 +-
 .../cache/execute/PRColocationDUnitTest.java    |  126 +-
 .../execute/PRCustomPartitioningDUnitTest.java  |   14 +-
 .../execute/PRFunctionExecutionDUnitTest.java   |   51 +-
 .../PRFunctionExecutionTimeOutDUnitTest.java    |    5 +-
 ...ctionExecutionWithResultSenderDUnitTest.java |    3 +-
 .../execute/PRPerformanceTestDUnitTest.java     |   12 +-
 .../cache/execute/PRTransactionDUnitTest.java   |   44 +-
 .../execute/SingleHopGetAllPutAllDUnitTest.java |   25 +-
 .../functions/DistributedRegionFunction.java    |    6 +-
 .../internal/cache/functions/TestFunction.java  |    8 +-
 .../ha/BlockingHARQAddOperationJUnitTest.java   |    9 +-
 .../cache/ha/BlockingHARegionJUnitTest.java     |   55 +-
 .../cache/ha/Bug36853EventsExpiryDUnitTest.java |   24 +-
 .../internal/cache/ha/Bug48571DUnitTest.java    |   13 +-
 .../internal/cache/ha/Bug48879DUnitTest.java    |    3 +-
 .../cache/ha/EventIdOptimizationDUnitTest.java  |   21 +-
 .../internal/cache/ha/FailoverDUnitTest.java    |   25 +-
 .../internal/cache/ha/HABugInPutDUnitTest.java  |   11 +-
 .../internal/cache/ha/HAClearDUnitTest.java     |   22 +-
 .../cache/ha/HAConflationDUnitTest.java         |   14 +-
 .../internal/cache/ha/HADuplicateDUnitTest.java |   14 +-
 .../cache/ha/HAEventIdPropagationDUnitTest.java |   26 +-
 .../internal/cache/ha/HAExpiryDUnitTest.java    |   17 +-
 .../internal/cache/ha/HAGIIBugDUnitTest.java    |   29 +-
 .../internal/cache/ha/HAGIIDUnitTest.java       |   43 +-
 .../cache/ha/HARQAddOperationJUnitTest.java     |   24 +-
 .../cache/ha/HARQueueNewImplDUnitTest.java      |  108 +-
 .../internal/cache/ha/HARegionDUnitTest.java    |   15 +-
 .../cache/ha/HARegionQueueDUnitTest.java        |   36 +-
 .../cache/ha/HARegionQueueJUnitTest.java        |   26 +-
 .../cache/ha/HASlowReceiverDUnitTest.java       |   22 +-
 .../ha/OperationsPropagationDUnitTest.java      |   40 +-
 .../internal/cache/ha/PutAllDUnitTest.java      |   15 +-
 .../internal/cache/ha/StatsBugDUnitTest.java    |   26 +-
 .../cache/locks/TXLockServiceDUnitTest.java     |   49 +-
 .../cache/partitioned/Bug39356DUnitTest.java    |    5 +-
 .../cache/partitioned/Bug43684DUnitTest.java    |    9 +-
 .../cache/partitioned/Bug47388DUnitTest.java    |    9 +-
 .../cache/partitioned/Bug51400DUnitTest.java    |    9 +-
 .../partitioned/ElidedPutAllDUnitTest.java      |    5 +-
 .../partitioned/PartitionResolverDUnitTest.java |    5 +-
 .../PartitionedRegionLoaderWriterDUnitTest.java |   10 +-
 ...rtitionedRegionMetaDataCleanupDUnitTest.java |   17 +-
 .../partitioned/PersistPRKRFDUnitTest.java      |   22 +-
 ...tentColocatedPartitionedRegionDUnitTest.java |   43 +-
 .../PersistentPartitionedRegionDUnitTest.java   |   64 +-
 .../PersistentPartitionedRegionTestBase.java    |   27 +-
 ...rtitionedRegionWithTransactionDUnitTest.java |   19 +-
 .../cache/partitioned/ShutdownAllDUnitTest.java |   17 +-
 ...StreamingPartitionOperationOneDUnitTest.java |    3 +-
 .../fixed/FixedPartitioningDUnitTest.java       |   66 +-
 .../fixed/FixedPartitioningTestBase.java        |   98 +-
 ...ngWithColocationAndPersistenceDUnitTest.java |   50 +-
 .../PersistentRVVRecoveryDUnitTest.java         |   28 +-
 .../PersistentRecoveryOrderDUnitTest.java       |  119 +-
 .../PersistentReplicatedTestBase.java           |   14 +-
 .../internal/cache/tier/Bug40396DUnitTest.java  |    7 +-
 ...mpatibilityHigherVersionClientDUnitTest.java |    9 +-
 .../cache/tier/sockets/Bug36269DUnitTest.java   |   24 +-
 .../cache/tier/sockets/Bug36457DUnitTest.java   |   16 +-
 .../cache/tier/sockets/Bug36805DUnitTest.java   |   14 +-
 .../cache/tier/sockets/Bug36829DUnitTest.java   |   13 +-
 .../cache/tier/sockets/Bug36995DUnitTest.java   |   19 +-
 .../cache/tier/sockets/Bug37210DUnitTest.java   |   22 +-
 .../cache/tier/sockets/Bug37805DUnitTest.java   |    6 +-
 .../CacheServerMaxConnectionsJUnitTest.java     |    8 +-
 .../cache/tier/sockets/CacheServerTestUtil.java |   30 +-
 .../CacheServerTransactionsDUnitTest.java       |  115 +-
 .../tier/sockets/ClearPropagationDUnitTest.java |   26 +-
 .../tier/sockets/ClientConflationDUnitTest.java |   31 +-
 .../sockets/ClientHealthMonitorJUnitTest.java   |    8 +-
 .../sockets/ClientInterestNotifyDUnitTest.java  |   29 +-
 .../tier/sockets/ClientServerMiscDUnitTest.java |  111 +-
 .../cache/tier/sockets/ConflationDUnitTest.java |   65 +-
 .../tier/sockets/ConnectionProxyJUnitTest.java  |   14 +-
 .../DataSerializerPropogationDUnitTest.java     |  118 +-
 .../DestroyEntryPropagationDUnitTest.java       |   41 +-
 .../sockets/DurableClientBug39997DUnitTest.java |   10 +-
 .../DurableClientQueueSizeDUnitTest.java        |   11 +-
 .../DurableClientReconnectAutoDUnitTest.java    |    4 +-
 .../DurableClientReconnectDUnitTest.java        |   93 +-
 .../sockets/DurableClientStatsDUnitTest.java    |   43 +-
 .../sockets/DurableRegistrationDUnitTest.java   |   60 +-
 .../sockets/DurableResponseMatrixDUnitTest.java |   30 +-
 .../sockets/EventIDVerificationDUnitTest.java   |   21 +-
 .../EventIDVerificationInP2PDUnitTest.java      |   16 +-
 .../ForceInvalidateEvictionDUnitTest.java       |   12 +-
 ...ForceInvalidateOffHeapEvictionDUnitTest.java |   11 +-
 .../cache/tier/sockets/HABug36738DUnitTest.java |   16 +-
 .../tier/sockets/HAInterestPart1DUnitTest.java  |   22 +-
 .../tier/sockets/HAInterestPart2DUnitTest.java  |   31 +-
 .../cache/tier/sockets/HAInterestTestCase.java  |   50 +-
 .../sockets/HAStartupAndFailoverDUnitTest.java  |   50 +-
 .../InstantiatorPropagationDUnitTest.java       |  120 +-
 .../tier/sockets/InterestListDUnitTest.java     |  116 +-
 .../sockets/InterestListEndpointDUnitTest.java  |   27 +-
 .../sockets/InterestListFailoverDUnitTest.java  |   23 +-
 .../sockets/InterestListRecoveryDUnitTest.java  |   45 +-
 .../sockets/InterestRegrListenerDUnitTest.java  |   51 +-
 .../sockets/InterestResultPolicyDUnitTest.java  |   26 +-
 .../sockets/NewRegionAttributesDUnitTest.java   |    7 +-
 .../sockets/RedundancyLevelPart1DUnitTest.java  |   58 +-
 .../sockets/RedundancyLevelPart2DUnitTest.java  |   56 +-
 .../sockets/RedundancyLevelPart3DUnitTest.java  |   14 +-
 .../tier/sockets/RedundancyLevelTestBase.java   |   55 +-
 .../tier/sockets/RegionCloseDUnitTest.java      |   22 +-
 ...erInterestBeforeRegionCreationDUnitTest.java |   14 +-
 .../sockets/RegisterInterestKeysDUnitTest.java  |   22 +-
 .../sockets/ReliableMessagingDUnitTest.java     |   37 +-
 .../sockets/UnregisterInterestDUnitTest.java    |   15 +-
 .../sockets/UpdatePropagationDUnitTest.java     |   49 +-
 .../VerifyEventIDGenerationInP2PDUnitTest.java  |   10 +-
 ...UpdatesFromNonInterestEndPointDUnitTest.java |   21 +-
 .../versions/RegionVersionVectorJUnitTest.java  |    4 +-
 .../cache/wan/AsyncEventQueueTestBase.java      |  102 +-
 .../asyncqueue/AsyncEventListenerDUnitTest.java |  396 +++---
 .../AsyncEventQueueStatsDUnitTest.java          |   79 +-
 .../ConcurrentAsyncEventQueueDUnitTest.java     |   47 +-
 .../CommonParallelAsyncEventQueueDUnitTest.java |   10 +-
 .../CompressionCacheConfigDUnitTest.java        |   18 +-
 .../CompressionCacheListenerDUnitTest.java      |    9 +-
 ...ompressionCacheListenerOffHeapDUnitTest.java |   11 +-
 .../CompressionRegionConfigDUnitTest.java       |   22 +-
 .../CompressionRegionFactoryDUnitTest.java      |    5 -
 .../CompressionRegionOperationsDUnitTest.java   |   25 +-
 ...ressionRegionOperationsOffHeapDUnitTest.java |   12 +-
 .../internal/jta/dunit/ExceptionsDUnitTest.java |   14 +-
 .../jta/dunit/IdleTimeOutDUnitTest.java         |   57 +-
 .../jta/dunit/LoginTimeOutDUnitTest.java        |   14 +-
 .../jta/dunit/MaxPoolSizeDUnitTest.java         |   42 +-
 .../jta/dunit/TransactionTimeOutDUnitTest.java  |   20 +-
 .../dunit/TxnManagerMultiThreadDUnitTest.java   |   76 +-
 .../internal/jta/dunit/TxnTimeOutDUnitTest.java |   42 +-
 .../DistributedSystemLogFileJUnitTest.java      |   18 +-
 .../logging/LocatorLogFileJUnitTest.java        |    6 +-
 .../logging/MergeLogFilesJUnitTest.java         |    4 +-
 .../internal/offheap/OffHeapRegionBase.java     |    4 +-
 .../offheap/OutOfOffHeapMemoryDUnitTest.java    |   17 +-
 .../process/LocalProcessLauncherDUnitTest.java  |    4 -
 .../statistics/StatisticsDUnitTest.java         |   20 +-
 .../statistics/ValueMonitorJUnitTest.java       |    6 +-
 .../management/CacheManagementDUnitTest.java    |   28 +-
 .../management/ClientHealthStatsDUnitTest.java  |   29 +-
 .../management/CompositeTypeTestDUnitTest.java  |    9 +-
 .../management/DLockManagementDUnitTest.java    |   24 +-
 .../management/DiskManagementDUnitTest.java     |   36 +-
 .../management/DistributedSystemDUnitTest.java  |   43 +-
 .../management/LocatorManagementDUnitTest.java  |   29 +-
 .../gemstone/gemfire/management/MBeanUtil.java  |   26 +-
 .../gemfire/management/ManagementTestBase.java  |   45 +-
 .../MemberMBeanAttributesDUnitTest.java         |    7 +-
 .../management/OffHeapManagementDUnitTest.java  |    6 +-
 .../gemfire/management/QueryDataDUnitTest.java  |   28 +-
 .../management/RegionManagementDUnitTest.java   |   71 +-
 ...ersalMembershipListenerAdapterDUnitTest.java |  152 +-
 .../stats/DistributedSystemStatsDUnitTest.java  |    9 +-
 .../internal/cli/CliUtilDUnitTest.java          |   39 +-
 .../cli/commands/CliCommandTestBase.java        |   16 +-
 .../cli/commands/ConfigCommandsDUnitTest.java   |   46 +-
 ...eateAlterDestroyRegionCommandsDUnitTest.java |   62 +-
 .../cli/commands/DeployCommandsDUnitTest.java   |   16 +-
 .../commands/DiskStoreCommandsDUnitTest.java    |   40 +-
 .../cli/commands/FunctionCommandsDUnitTest.java |   56 +-
 .../commands/GemfireDataCommandsDUnitTest.java  |  194 +--
 ...WithCacheLoaderDuringCacheMissDUnitTest.java |    8 +-
 .../cli/commands/IndexCommandsDUnitTest.java    |   22 +-
 ...stAndDescribeDiskStoreCommandsDUnitTest.java |   12 +-
 .../ListAndDescribeRegionDUnitTest.java         |   29 +-
 .../cli/commands/ListIndexCommandDUnitTest.java |   20 +-
 .../cli/commands/MemberCommandsDUnitTest.java   |   15 +-
 .../MiscellaneousCommandsDUnitTest.java         |   39 +-
 ...laneousCommandsExportLogsPart1DUnitTest.java |    9 +-
 ...laneousCommandsExportLogsPart2DUnitTest.java |   14 +-
 ...laneousCommandsExportLogsPart3DUnitTest.java |    9 +-
 ...laneousCommandsExportLogsPart4DUnitTest.java |   14 +-
 .../cli/commands/QueueCommandsDUnitTest.java    |   16 +-
 .../SharedConfigurationCommandsDUnitTest.java   |   30 +-
 .../cli/commands/ShellCommandsDUnitTest.java    |   18 +-
 .../cli/commands/ShowDeadlockDUnitTest.java     |   13 +-
 .../cli/commands/ShowMetricsDUnitTest.java      |   37 +-
 .../cli/commands/ShowStackTraceDUnitTest.java   |   21 +-
 .../cli/commands/UserCommandsDUnitTest.java     |    3 +-
 .../SharedConfigurationDUnitTest.java           |   19 +-
 .../internal/pulse/TestClientIdsDUnitTest.java  |   25 +-
 .../internal/pulse/TestFunctionsDUnitTest.java  |   11 +-
 .../internal/pulse/TestHeapDUnitTest.java       |   11 +-
 .../internal/pulse/TestLocatorsDUnitTest.java   |   11 +-
 .../pulse/TestSubscriptionsDUnitTest.java       |   22 +-
 .../ClientsWithVersioningRetryDUnitTest.java    |   37 +-
 .../pdx/DistributedSystemIdDUnitTest.java       |    3 +-
 .../pdx/JSONPdxClientServerDUnitTest.java       |    7 +-
 .../gemfire/pdx/PdxClientServerDUnitTest.java   |   16 +-
 .../pdx/PdxDeserializationDUnitTest.java        |    9 +-
 .../gemfire/pdx/PdxTypeExportDUnitTest.java     |    3 +-
 .../gemfire/pdx/VersionClassLoader.java         |   10 +-
 .../gemfire/redis/RedisDistDUnitTest.java       |   14 +-
 .../web/controllers/RestAPITestBase.java        |   10 +-
 .../security/ClientAuthenticationDUnitTest.java |  100 +-
 .../security/ClientAuthorizationDUnitTest.java  |   63 +-
 .../security/ClientAuthorizationTestBase.java   |   28 +-
 .../security/ClientMultiUserAuthzDUnitTest.java |   41 +-
 .../DeltaClientAuthorizationDUnitTest.java      |   56 +-
 .../DeltaClientPostAuthorizationDUnitTest.java  |   30 +-
 .../security/P2PAuthenticationDUnitTest.java    |   44 +-
 .../gemfire/security/SecurityTestUtil.java      |  311 ++--
 .../com/gemstone/gemfire/test/dunit/Assert.java |   66 +
 .../gemfire/test/dunit/AsyncInvocation.java     |   23 +-
 .../gemstone/gemfire/test/dunit/DUnitEnv.java   |    1 -
 .../gemfire/test/dunit/DebuggerUtils.java       |   52 +
 .../gemfire/test/dunit/DistributedTestCase.java | 1328 +++---------------
 .../test/dunit/DistributedTestUtils.java        |  167 +++
 .../com/gemstone/gemfire/test/dunit/Host.java   |    5 +-
 .../gemfire/test/dunit/IgnoredException.java    |  200 +++
 .../com/gemstone/gemfire/test/dunit/Invoke.java |  160 +++
 .../com/gemstone/gemfire/test/dunit/Jitter.java |   87 ++
 .../gemfire/test/dunit/LogWriterUtils.java      |  111 ++
 .../gemfire/test/dunit/NetworkUtils.java        |   69 +
 .../gemfire/test/dunit/RMIException.java        |    2 +-
 .../gemfire/test/dunit/RepeatableRunnable.java  |    4 +-
 .../test/dunit/SerializableCallableIF.java      |    4 +-
 .../test/dunit/SerializableRunnable.java        |    3 +-
 .../test/dunit/SerializableRunnableIF.java      |    4 +-
 .../test/dunit/StoppableWaitCriterion.java      |   35 +
 .../gemfire/test/dunit/ThreadUtils.java         |  155 ++
 .../com/gemstone/gemfire/test/dunit/VM.java     |   60 +-
 .../com/gemstone/gemfire/test/dunit/Wait.java   |  204 +++
 .../gemfire/test/dunit/WaitCriterion.java       |   33 +
 .../dunit/rules/DistributedDisconnectRule.java  |  121 ++
 .../rules/DistributedExternalResource.java      |   58 +
 .../DistributedRestoreSystemProperties.java     |   74 +
 .../gemfire/test/dunit/rules/RemoteInvoker.java |   39 +
 .../test/dunit/tests/BasicDUnitTest.java        |    5 +-
 .../tests/GetDefaultDiskStoreNameDUnitTest.java |   67 +
 .../dunit/tests/GetTestMethodNameDUnitTest.java |   54 +
 .../src/test/java/hydra/MethExecutor.java       |    1 +
 .../cache/query/cq/dunit/CqDataDUnitTest.java   |   90 +-
 .../dunit/CqDataOptimizedExecuteDUnitTest.java  |   11 +-
 .../cq/dunit/CqDataUsingPoolDUnitTest.java      |   99 +-
 ...qDataUsingPoolOptimizedExecuteDUnitTest.java |   13 +-
 .../cache/query/cq/dunit/CqPerfDUnitTest.java   |   79 +-
 .../cq/dunit/CqPerfUsingPoolDUnitTest.java      |   77 +-
 .../cache/query/cq/dunit/CqQueryDUnitTest.java  |  327 ++---
 .../dunit/CqQueryOptimizedExecuteDUnitTest.java |   25 +-
 .../cq/dunit/CqQueryUsingPoolDUnitTest.java     |  328 ++---
 ...QueryUsingPoolOptimizedExecuteDUnitTest.java |    8 +-
 .../cq/dunit/CqResultSetUsingPoolDUnitTest.java |   77 +-
 ...ltSetUsingPoolOptimizedExecuteDUnitTest.java |   30 +-
 .../cache/query/cq/dunit/CqStateDUnitTest.java  |   16 +-
 .../cache/query/cq/dunit/CqStatsDUnitTest.java  |   34 +-
 .../dunit/CqStatsOptimizedExecuteDUnitTest.java |    8 +-
 .../cq/dunit/CqStatsUsingPoolDUnitTest.java     |   34 +-
 ...StatsUsingPoolOptimizedExecuteDUnitTest.java |    8 +-
 .../query/cq/dunit/CqTimeTestListener.java      |   14 +-
 .../PartitionedRegionCqQueryDUnitTest.java      |   72 +-
 ...dRegionCqQueryOptimizedExecuteDUnitTest.java |   18 +-
 .../query/cq/dunit/PrCqUsingPoolDUnitTest.java  |   62 +-
 .../PrCqUsingPoolOptimizedExecuteDUnitTest.java |    8 +-
 .../cache/query/dunit/PdxQueryCQDUnitTest.java  |   46 +-
 .../cache/query/dunit/PdxQueryCQTestBase.java   |   32 +-
 .../dunit/QueryIndexUpdateRIDUnitTest.java      |   72 +-
 .../query/dunit/QueryMonitorDUnitTest.java      |   48 +-
 .../cache/snapshot/ClientSnapshotDUnitTest.java |    6 +-
 .../cache/PRDeltaPropagationDUnitTest.java      |   17 +-
 .../internal/cache/PutAllCSDUnitTest.java       |  401 +++---
 .../cache/RemoteCQTransactionDUnitTest.java     |   13 +-
 .../internal/cache/ha/CQListGIIDUnitTest.java   |   53 +-
 .../cache/ha/HADispatcherDUnitTest.java         |   23 +-
 .../sockets/ClientToServerDeltaDUnitTest.java   |   27 +-
 .../DeltaPropagationWithCQDUnitTest.java        |   19 +-
 ...ToRegionRelationCQRegistrationDUnitTest.java |   32 +-
 .../sockets/DurableClientCrashDUnitTest.java    |    4 +-
 .../sockets/DurableClientNetDownDUnitTest.java  |    3 +-
 .../sockets/DurableClientSimpleDUnitTest.java   |   69 +-
 .../tier/sockets/DurableClientTestCase.java     |   97 +-
 .../CacheServerManagementDUnitTest.java         |   44 +-
 .../cli/commands/ClientCommandsDUnitTest.java   |   31 +-
 .../DurableClientCommandsDUnitTest.java         |   13 +-
 .../internal/pulse/TestCQDUnitTest.java         |   16 +-
 .../internal/pulse/TestClientsDUnitTest.java    |   14 +-
 .../internal/pulse/TestServerDUnitTest.java     |   11 +-
 .../ClientAuthorizationTwoDUnitTest.java        |   16 +-
 .../security/ClientAuthzObjectModDUnitTest.java |   13 +-
 .../ClientCQPostAuthorizationDUnitTest.java     |   39 +-
 .../ClientPostAuthorizationDUnitTest.java       |   21 +-
 .../gemfire/security/MultiuserAPIDUnitTest.java |   21 +-
 .../MultiuserDurableCQAuthzDUnitTest.java       |   22 +-
 .../internal/cache/UpdateVersionDUnitTest.java  |   59 +-
 .../gemfire/internal/cache/wan/WANTestBase.java |  353 ++---
 ...oncurrentParallelGatewaySenderDUnitTest.java |  191 +--
 ...allelGatewaySenderOperation_1_DUnitTest.java |  253 ++--
 ...allelGatewaySenderOperation_2_DUnitTest.java |   90 +-
 .../ConcurrentWANPropogation_1_DUnitTest.java   |  216 +--
 .../ConcurrentWANPropogation_2_DUnitTest.java   |  168 +--
 .../cache/wan/disttx/DistTXWANDUnitTest.java    |   54 +-
 .../CommonParallelGatewaySenderDUnitTest.java   |  150 +-
 ...wWANConcurrencyCheckForDestroyDUnitTest.java |   44 +-
 .../cache/wan/misc/PDXNewWanDUnitTest.java      |  202 +--
 ...dRegion_ParallelWANPersistenceDUnitTest.java |  229 +--
 ...dRegion_ParallelWANPropogationDUnitTest.java |  256 ++--
 .../SenderWithTransportFilterDUnitTest.java     |   18 +-
 ...downAllPersistentGatewaySenderDUnitTest.java |   34 +-
 .../wan/misc/WANLocatorServerDUnitTest.java     |   14 +-
 .../cache/wan/misc/WANSSLDUnitTest.java         |   40 +-
 .../wan/misc/WanAutoDiscoveryDUnitTest.java     |   14 +-
 .../cache/wan/misc/WanValidationsDUnitTest.java |  352 ++---
 ...arallelGatewaySenderOperationsDUnitTest.java |  157 ++-
 ...llelGatewaySenderQueueOverflowDUnitTest.java |  107 +-
 .../ParallelWANConflationDUnitTest.java         |   55 +-
 ...ersistenceEnabledGatewaySenderDUnitTest.java |  539 +++----
 ...llelWANPropagationClientServerDUnitTest.java |   28 +-
 ...lelWANPropagationConcurrentOpsDUnitTest.java |   81 +-
 .../ParallelWANPropagationDUnitTest.java        |  381 ++---
 ...ParallelWANPropagationLoopBackDUnitTest.java |   77 +-
 .../wan/parallel/ParallelWANStatsDUnitTest.java |    8 +-
 ...tewaySenderDistributedDeadlockDUnitTest.java |  109 +-
 ...rialGatewaySenderEventListenerDUnitTest.java |   75 +-
 .../SerialGatewaySenderOperationsDUnitTest.java |  130 +-
 .../SerialGatewaySenderQueueDUnitTest.java      |   68 +-
 ...ersistenceEnabledGatewaySenderDUnitTest.java |  210 +--
 .../SerialWANPropagationLoopBackDUnitTest.java  |   97 +-
 .../serial/SerialWANPropogationDUnitTest.java   |  509 +++----
 ...NPropogation_PartitionedRegionDUnitTest.java |  179 +--
 .../SerialWANPropogationsFeatureDUnitTest.java  |  124 +-
 .../wan/serial/SerialWANStatsDUnitTest.java     |   12 +-
 .../wan/wancommand/WANCommandTestBase.java      |   38 +-
 .../WanCommandCreateGatewaySenderDUnitTest.java |    5 +-
 ...WanCommandGatewayReceiverStartDUnitTest.java |    9 +-
 .../WanCommandGatewayReceiverStopDUnitTest.java |    9 +-
 .../WanCommandGatewaySenderStartDUnitTest.java  |   14 +-
 .../WanCommandGatewaySenderStopDUnitTest.java   |   12 +-
 .../wan/wancommand/WanCommandListDUnitTest.java |   11 +-
 .../WanCommandPauseResumeDUnitTest.java         |   17 +-
 .../wancommand/WanCommandStatusDUnitTest.java   |   25 +-
 .../management/WANManagementDUnitTest.java      |   30 +-
 .../ClusterConfigurationDUnitTest.java          |   20 +-
 .../pulse/TestRemoteClusterDUnitTest.java       |   22 +-
 618 files changed, 15004 insertions(+), 13100 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java b/gemfire-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
index afb2770..7c6929c 100644
--- a/gemfire-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
+++ b/gemfire-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
@@ -16,6 +16,8 @@
  */
 package com.gemstone.gemfire.management.internal.cli.commands;
 
+import static com.gemstone.gemfire.test.dunit.Wait.*;
+
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.client.ClientCache;
 import com.gemstone.gemfire.cache.client.ClientCacheFactory;
@@ -43,6 +45,8 @@ import com.gemstone.gemfire.management.cli.Result;
 import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
 import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
 import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
+
 import org.junit.FixMethodOrder;
 import org.junit.runners.MethodSorters;
 
@@ -145,9 +149,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
   }
 
   @Override
-  protected void tearDownAfter() throws Exception {
-    super.tearDownAfter();
-
+  protected final void postTearDown() throws Exception {
     LauncherLifecycleCommands launcherLifecycleCommands = new LauncherLifecycleCommands();
     Integer pid;
 
@@ -302,7 +304,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
   public void test000StartLocatorCapturesOutputOnError() throws IOException {
     final int locatorPort = AvailablePortHelper.getRandomAvailableTCPPort();
 
-    String pathname = (getClass().getSimpleName() + "_" + testName);
+    String pathname = (getClass().getSimpleName() + "_" + getTestMethodName());
     File workingDirectory = new File(pathname);
 
     assertTrue(workingDirectory.isDirectory() || workingDirectory.mkdir());
@@ -364,7 +366,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
 
     CommandStringBuilder command = new CommandStringBuilder(CliStrings.START_LOCATOR);
 
-    command.addOption(CliStrings.START_LOCATOR__MEMBER_NAME, getClass().getSimpleName().concat("_").concat(testName));
+    command.addOption(CliStrings.START_LOCATOR__MEMBER_NAME, getClass().getSimpleName().concat("_").concat(getTestMethodName()));
     command.addOption(CliStrings.START_LOCATOR__PORT, "0");
     command.addOption(CliStrings.START_LOCATOR__PROPERTIES, gemfirePropertiesPathname);
     command.addOption(CliStrings.START_LOCATOR__J, "-Dgemfire.http-service-port=0");
@@ -389,7 +391,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
 
     CommandStringBuilder command = new CommandStringBuilder(CliStrings.START_LOCATOR);
 
-    command.addOption(CliStrings.START_LOCATOR__MEMBER_NAME, getClass().getSimpleName().concat("_").concat(testName));
+    command.addOption(CliStrings.START_LOCATOR__MEMBER_NAME, getClass().getSimpleName().concat("_").concat(getTestMethodName()));
     command.addOption(CliStrings.START_LOCATOR__PORT, "0");
     command.addOption(CliStrings.START_LOCATOR__SECURITY_PROPERTIES, gemfireSecurityPropertiesPathname);
     command.addOption(CliStrings.START_LOCATOR__J, "-Dgemfire.http-service-port=0");
@@ -414,7 +416,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
 
     CommandStringBuilder command = new CommandStringBuilder(CliStrings.START_SERVER);
 
-    command.addOption(CliStrings.START_SERVER__NAME, getClass().getSimpleName().concat("_").concat(testName));
+    command.addOption(CliStrings.START_SERVER__NAME, getClass().getSimpleName().concat("_").concat(getTestMethodName()));
     command.addOption(CliStrings.START_SERVER__CACHE_XML_FILE, cacheXmlPathname);
 
     CommandResult result = executeCommand(command.toString());
@@ -433,7 +435,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
 
     CommandStringBuilder command = new CommandStringBuilder(CliStrings.START_SERVER);
 
-    command.addOption(CliStrings.START_SERVER__NAME, getClass().getSimpleName().concat("_").concat(testName));
+    command.addOption(CliStrings.START_SERVER__NAME, getClass().getSimpleName().concat("_").concat(getTestMethodName()));
     command.addOption(CliStrings.START_SERVER__PROPERTIES, gemfirePropertiesFile);
 
     CommandResult result = executeCommand(command.toString());
@@ -453,7 +455,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
 
     CommandStringBuilder command = new CommandStringBuilder(CliStrings.START_SERVER);
 
-    command.addOption(CliStrings.START_SERVER__NAME, getClass().getSimpleName().concat("_").concat(testName));
+    command.addOption(CliStrings.START_SERVER__NAME, getClass().getSimpleName().concat("_").concat(getTestMethodName()));
     command.addOption(CliStrings.START_SERVER__SECURITY_PROPERTIES, gemfireSecuritiesPropertiesFile);
 
     CommandResult result = executeCommand(command.toString());
@@ -471,7 +473,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
   public void test006StartLocatorInRelativeDirectory() {
     final int locatorPort = AvailablePortHelper.getRandomAvailableTCPPort();
 
-    String pathname = (getClass().getSimpleName() + "_" + testName);
+    String pathname = (getClass().getSimpleName() + "_" + getTestMethodName());
     File workingDirectory = new File(pathname);
 
     assertTrue(workingDirectory.isDirectory() || workingDirectory.mkdir());
@@ -504,7 +506,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
   }
 
   public void test007StatusLocatorUsingMemberNameIDWhenGfshIsNotConnected() {
-    CommandResult result = executeCommand(CliStrings.STATUS_LOCATOR + " --name=" + testName);
+    CommandResult result = executeCommand(CliStrings.STATUS_LOCATOR + " --name=" + getTestMethodName());
 
     assertNotNull(result);
     assertEquals(Result.Status.ERROR, result.getStatus());
@@ -518,7 +520,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
     final int jmxManagerPort = ports[0];
     final int locatorPort = ports[1];
 
-    String pathname = (getClass().getSimpleName() + "_" + testName);
+    String pathname = (getClass().getSimpleName() + "_" + getTestMethodName());
     File workingDirectory = new File(pathname);
 
     assertTrue(workingDirectory.isDirectory() || workingDirectory.mkdir());
@@ -580,7 +582,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
     final int jmxManagerPort = ports[0];
     final int locatorPort = ports[1];
 
-    String pathname = (getClass().getSimpleName() + "_" + testName);
+    String pathname = (getClass().getSimpleName() + "_" + getTestMethodName());
     File workingDirectory = new File(pathname);
 
     assertTrue(workingDirectory.isDirectory() || workingDirectory.mkdir());
@@ -631,7 +633,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
   }
 
   public void test010StopLocatorUsingMemberNameIDWhenGfshIsNotConnected() {
-    CommandResult result = executeCommand(CliStrings.STOP_LOCATOR + " --name=" + testName);
+    CommandResult result = executeCommand(CliStrings.STOP_LOCATOR + " --name=" + getTestMethodName());
 
     assertNotNull(result);
     assertEquals(Result.Status.ERROR, result.getStatus());
@@ -645,7 +647,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
     final int jmxManagerPort = ports[0];
     final int locatorPort = ports[1];
 
-    String pathname = (getClass().getSimpleName() + "_" + testName);
+    String pathname = (getClass().getSimpleName() + "_" + getTestMethodName());
     File workingDirectory = new File(pathname);
 
     assertTrue(workingDirectory.isDirectory() || workingDirectory.mkdir());
@@ -732,7 +734,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
     final int jmxManagerPort = ports[0];
     final int locatorPort = ports[1];
 
-    String pathname = (getClass().getSimpleName() + "_" + testName);
+    String pathname = (getClass().getSimpleName() + "_" + getTestMethodName());
     File workingDirectory = new File(pathname);
 
     assertTrue(workingDirectory.isDirectory() || workingDirectory.mkdir());
@@ -803,14 +805,14 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
   }
 
   public void test013StartServerWithSpring() {
-    String pathname = (getClass().getSimpleName() + "_" + testName);
+    String pathname = (getClass().getSimpleName() + "_" + getTestMethodName());
     File workingDirectory = new File(pathname);
 
     assertTrue(workingDirectory.isDirectory() || workingDirectory.mkdir());
 
     CommandStringBuilder command = new CommandStringBuilder(CliStrings.START_SERVER);
 
-    command.addOption(CliStrings.START_SERVER__NAME, getClass().getSimpleName().concat("_").concat(testName));
+    command.addOption(CliStrings.START_SERVER__NAME, getClass().getSimpleName().concat("_").concat(getTestMethodName()));
     command.addOption(CliStrings.START_SERVER__USE_CLUSTER_CONFIGURATION, Boolean.FALSE.toString());
     command.addOption(CliStrings.START_SERVER__LOG_LEVEL, "config");
     command.addOption(CliStrings.START_SERVER__INCLUDE_SYSTEM_CLASSPATH);
@@ -863,7 +865,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
     final int serverPort = ports[0];
     final int locatorPort = ports[1];
 
-    String pathname = getClass().getSimpleName().concat("_").concat(testName);
+    String pathname = getClass().getSimpleName().concat("_").concat(getTestMethodName());
     File workingDirectory = new File(pathname);
 
     assertTrue(workingDirectory.isDirectory() || workingDirectory.mkdir());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java b/gemfire-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
index de75927..edd056b 100644
--- a/gemfire-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
+++ b/gemfire-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
@@ -16,6 +16,8 @@
  */
 package com.gemstone.gemfire.management.internal.configuration;
 
+import static com.gemstone.gemfire.test.dunit.Wait.*;
+
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.RegionShortcut;
@@ -40,8 +42,12 @@ import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
 import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
 import com.gemstone.gemfire.test.dunit.DistributedTestCase;
 import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
 import com.gemstone.gemfire.test.dunit.SerializableCallable;
 import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
+
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
@@ -88,7 +94,7 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
   }
 
   public void testStartServerAndExecuteCommands() throws InterruptedException, ClassNotFoundException, IOException, ExecutionException {
-    addExpectedException("EntryDestroyedException");
+    IgnoredException.addIgnoredException("EntryDestroyedException");
     Object[] result = setup();
     final int locatorPort = (Integer) result[0];
     final String jmxHost = (String) result[1];
@@ -111,7 +117,7 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
 
 
     //shutdown everything
-    getLogWriter().info("Shutting down all the members");
+    LogWriterUtils.getLogWriter().info("Shutting down all the members");
     shutdownAll();
     deleteSavedJarFiles();
   }
@@ -141,7 +147,7 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
 
   protected void executeAndVerifyCommand(String commandString) {
     CommandResult cmdResult = executeCommand(commandString);
-    getLogWriter().info("Command Result : \n" + commandResultToString(cmdResult));
+    LogWriterUtils.getLogWriter().info("Command Result : \n" + commandResultToString(cmdResult));
     assertEquals(Status.OK, cmdResult.getStatus());
     assertFalse(cmdResult.failedToPersist());
   }
@@ -332,7 +338,7 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
         try {
           final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locator1Port, locatorLogFile, null,
               locatorProps);
-          DistributedTestCase.WaitCriterion wc = new DistributedTestCase.WaitCriterion() {
+          WaitCriterion wc = new WaitCriterion() {
             @Override
             public boolean done() {
               return locator.isSharedConfigurationRunning();
@@ -343,7 +349,7 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
               return "Waiting for shared configuration to be started";
             }
           };
-          DistributedTestCase.waitForCriterion(wc, TIMEOUT, INTERVAL, true);
+          waitForCriterion(wc, TIMEOUT, INTERVAL, true);
         } catch (IOException ioex) {
           fail("Unable to create a locator with a shared configuration");
         }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/DebuggerSupport.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/DebuggerSupport.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/DebuggerSupport.java
index 49ce32e..3df61ec 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/DebuggerSupport.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/DebuggerSupport.java
@@ -14,11 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.gemstone.gemfire.internal.util;
 
-import com.gemstone.gemfire.i18n.LogWriterI18n;
+import org.apache.logging.log4j.Logger;
+
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.internal.logging.LogService;
+import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
 
 /**
  *
@@ -26,23 +28,24 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  *
  */
 public abstract class DebuggerSupport  {
+  private static final Logger logger = LogService.getLogger();
   
   /** Creates a new instance of DebuggerSupport */
   private DebuggerSupport() {
   }
   
   /** Debugger support */
-  public static void waitForJavaDebugger(LogWriterI18n logger) {
-    waitForJavaDebugger(logger, null);
+  public static void waitForJavaDebugger() {
+    waitForJavaDebugger(null);
   }
   
   @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="IL_INFINITE_LOOP", justification="Endless loop is for debugging purposes.") 
-  public static void waitForJavaDebugger(LogWriterI18n logger, String extraLogMsg) {
+  public static void waitForJavaDebugger(String extraLogMsg) {
     boolean cont = false;
     String msg = ":";
     if (extraLogMsg != null)
       msg += extraLogMsg;
-    logger.severe(LocalizedStrings.DebuggerSupport_WAITING_FOR_DEBUGGER_TO_ATTACH_0, msg);
+    logger.fatal(LocalizedMessage.create(LocalizedStrings.DebuggerSupport_WAITING_FOR_DEBUGGER_TO_ATTACH_0, msg));
     boolean interrupted = false;
     while (!cont) { // set cont to true in debugger when ready to continue
       try {
@@ -57,6 +60,6 @@ public abstract class DebuggerSupport  {
     if (interrupted) {
       Thread.currentThread().interrupt();
     }
-    logger.info(LocalizedStrings.DebuggerSupport_DEBUGGER_CONTINUING);
+    logger.info(LocalizedMessage.create(LocalizedStrings.DebuggerSupport_DEBUGGER_CONTINUING));
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java
index 674f0c9..d396877 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java
@@ -51,8 +51,8 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.cache.LocalRegion;
 import com.gemstone.gemfire.internal.cache.TXManagerImpl;
 import com.gemstone.gemfire.internal.cache.TXStateProxy;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 
 /**
@@ -247,7 +247,7 @@ public class TXExpiryJUnitTest {
         return "never saw entry destroy of " + key;
       }
     };
-    DistributedTestCase.waitForCriterion(waitForExpire, 3000, 10, true);
+    Wait.waitForCriterion(waitForExpire, 3000, 10, true);
   }
   
   public static void waitForEntryExpiration(LocalRegion lr, String key) {
@@ -257,7 +257,7 @@ public class TXExpiryJUnitTest {
         detector = new ExpirationDetector(lr.getEntryExpiryTask(key));
         ExpiryTask.expiryTaskListener = detector;
         ExpiryTask.permitExpiration();
-        DistributedTestCase.waitForCriterion(detector, 3000, 2, true);
+        Wait.waitForCriterion(detector, 3000, 2, true);
       } while (!detector.hasExpired() && detector.wasRescheduled());
     } finally {
       ExpiryTask.expiryTaskListener = null;
@@ -270,7 +270,7 @@ public class TXExpiryJUnitTest {
         detector = new ExpirationDetector(ttl ? lr.getRegionTTLExpiryTask() : lr.getRegionIdleExpiryTask());
         ExpiryTask.expiryTaskListener = detector;
         ExpiryTask.permitExpiration();
-        DistributedTestCase.waitForCriterion(detector, 3000, 2, true);
+        Wait.waitForCriterion(detector, 3000, 2, true);
       } while (!detector.hasExpired() && detector.wasRescheduled());
     } finally {
       ExpiryTask.expiryTaskListener = null;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/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 3502021..7ea3565 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
@@ -25,8 +25,10 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.test.dunit.Assert;
 import com.gemstone.gemfire.test.dunit.DistributedTestCase;
 import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
 import com.gemstone.gemfire.test.dunit.VM;
 /**
  * verifies the count of clear operation
@@ -151,7 +153,7 @@ public class CacheRegionClearStatsDUnitTest extends DistributedTestCase {
 
     client1.invoke(CacheRegionClearStatsDUnitTest.class,
         "createClientCache", new Object[] {
-            getServerHostName(server1.getHost()), port1 });
+            NetworkUtils.getServerHostName(server1.getHost()), port1 });
     client1.invoke(CacheRegionClearStatsDUnitTest.class, "put");
     
     try{
@@ -176,7 +178,7 @@ public class CacheRegionClearStatsDUnitTest extends DistributedTestCase {
 
     client1.invoke(CacheRegionClearStatsDUnitTest.class,
         "createClientCacheDisk", new Object[] {
-            getServerHostName(server1.getHost()), port1 });
+            NetworkUtils.getServerHostName(server1.getHost()), port1 });
     client1.invoke(CacheRegionClearStatsDUnitTest.class, "put");
     
     try{
@@ -192,8 +194,8 @@ public class CacheRegionClearStatsDUnitTest extends DistributedTestCase {
     "validationClearStat");
   }
   
-  public void tearDown2() throws Exception {
-    super.tearDown2();
+  @Override
+  protected final void preTearDown() throws Exception {
     client1.invoke(CacheRegionClearStatsDUnitTest.class, "closeCache");
     // then close the servers
     server1.invoke(CacheRegionClearStatsDUnitTest.class, "closeCache");
@@ -234,7 +236,7 @@ public class CacheRegionClearStatsDUnitTest extends DistributedTestCase {
       r1.clear();
     }
     catch (Exception ex) {
-      fail("failed while put", ex);
+      Assert.fail("failed while put", ex);
     }
   }
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java
index 2606a8f..8166318 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java
@@ -29,9 +29,14 @@ import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.distributed.internal.DSClock;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.test.dunit.Assert;
 import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
 import com.gemstone.gemfire.test.dunit.SerializableCallable;
 import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
 
 public class ClientServerTimeSyncDUnitTest extends CacheTestCase {
 
@@ -58,25 +63,25 @@ public class ClientServerTimeSyncDUnitTest extends CacheTestCase {
         public Object call() {
           Cache cache = getCache();
           cache.createRegionFactory(RegionShortcut.REPLICATE).create(regionName);
-          getLogWriter().info("Done creating region, now creating CacheServer");
+          LogWriterUtils.getLogWriter().info("Done creating region, now creating CacheServer");
           CacheServer server = null;
           try {
             server = cache.addCacheServer();
             server.setPort(AvailablePortHelper.getRandomAvailableTCPPort());
             server.start();
           } catch (IOException e) {
-            fail("Starting cache server failed.", e);
+            Assert.fail("Starting cache server failed.", e);
           }
   
           // now set an artificial time offset for the test
           system.getClock().setCacheTimeOffset(null, TEST_OFFSET, true);
           
-          getLogWriter().info("Done creating and starting CacheServer on port " + server.getPort());
+          LogWriterUtils.getLogWriter().info("Done creating and starting CacheServer on port " + server.getPort());
           return server.getPort();
         }
       });
       
-      final String hostName = getServerHostName(vm0.getHost());
+      final String hostName = NetworkUtils.getServerHostName(vm0.getHost());
   
       // Start client with proxy region and register interest
         
@@ -98,14 +103,14 @@ public class ClientServerTimeSyncDUnitTest extends CacheTestCase {
       WaitCriterion wc = new WaitCriterion() {
         public boolean done() {
           long clientTimeOffset = clock.getCacheTimeOffset();
-          getLogWriter().info("Client node's new time offset is: " + clientTimeOffset);
+          LogWriterUtils.getLogWriter().info("Client node's new time offset is: " + clientTimeOffset);
           return clientTimeOffset >= TEST_OFFSET;
         }
         public String description() {
           return "Waiting for cacheTimeOffset to be non-zero.  PingOp should have set it to something";
         }
       };
-      waitForCriterion(wc, 60000, 1000, true);
+      Wait.waitForCriterion(wc, 60000, 1000, true);
     } finally {
       cache.close();
       vm1.invoke(CacheTestCase.class, "disconnectFromDS");
@@ -135,27 +140,27 @@ public class ClientServerTimeSyncDUnitTest extends CacheTestCase {
         public Object call() {
           Cache cache = getCache();
           cache.createRegionFactory(RegionShortcut.REPLICATE).create(regionName);
-          getLogWriter().info("Done creating region, now creating CacheServer");
+          LogWriterUtils.getLogWriter().info("Done creating region, now creating CacheServer");
           CacheServer server = null;
           try {
             server = cache.addCacheServer();
             server.setPort(AvailablePortHelper.getRandomAvailableTCPPort());
             server.start();
           } catch (IOException e) {
-            fail("Starting cache server failed.", e);
+            Assert.fail("Starting cache server failed.", e);
           }
   
           // now set an artificial time offset for the test
           system.getClock().setCacheTimeOffset(null, -TEST_OFFSET, true);
           
-          getLogWriter().info("Done creating and starting CacheServer on port " + server.getPort());
+          LogWriterUtils.getLogWriter().info("Done creating and starting CacheServer on port " + server.getPort());
           return server.getPort();
         }
       });
       
-      pause((int)TEST_OFFSET);  // let cacheTimeMillis consume the time offset
+      Wait.pause((int)TEST_OFFSET);  // let cacheTimeMillis consume the time offset
       
-      final String hostName = getServerHostName(vm0.getHost());
+      final String hostName = NetworkUtils.getServerHostName(vm0.getHost());
   
       // Start client with proxy region and register interest
         
@@ -177,7 +182,7 @@ public class ClientServerTimeSyncDUnitTest extends CacheTestCase {
       WaitCriterion wc = new WaitCriterion() {
         public boolean done() {
           long clientTimeOffset = clock.getCacheTimeOffset();
-          getLogWriter().info("Client node's new time offset is: " + clientTimeOffset);
+          LogWriterUtils.getLogWriter().info("Client node's new time offset is: " + clientTimeOffset);
           if (clientTimeOffset >= 0) {
             return false;
           }
@@ -188,7 +193,7 @@ public class ClientServerTimeSyncDUnitTest extends CacheTestCase {
           return "Waiting for cacheTimeOffset to be negative and cacheTimeMillis to stabilize";
         }
       };
-      waitForCriterion(wc, 60000, 1000, true);
+      Wait.waitForCriterion(wc, 60000, 1000, true);
     } finally {
       cache.close();
       vm1.invoke(CacheTestCase.class, "disconnectFromDS");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/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 677ab14..ee382ab 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
@@ -28,6 +28,7 @@ import com.gemstone.gemfire.cache.util.CacheWriterAdapter;
 import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
 import com.gemstone.gemfire.test.dunit.SerializableCallable;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.dunit.VM;
@@ -51,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
@@ -92,7 +94,7 @@ public class ConnectionPoolAndLoaderDUnitTest  extends CacheTestCase {
       public Object call() {
         Cache cache = getCache();
         PoolFactory factory = PoolManager.createFactory();
-        factory.addServer(getServerHostName(host), serverPort);
+        factory.addServer(NetworkUtils.getServerHostName(host), serverPort);
         factory.create("pool1");
         
         AttributesFactory af = new AttributesFactory();
@@ -171,7 +173,7 @@ public class ConnectionPoolAndLoaderDUnitTest  extends CacheTestCase {
       public Object call() {
         Cache cache = getCache();
         PoolFactory factory = PoolManager.createFactory();
-        factory.addServer(getServerHostName(host), serverPort);
+        factory.addServer(NetworkUtils.getServerHostName(host), serverPort);
         factory.create("pool1");
         
         AttributesFactory af = new AttributesFactory();
@@ -281,7 +283,7 @@ public class ConnectionPoolAndLoaderDUnitTest  extends CacheTestCase {
         Cache cache = getCache();
         useLocator = false;
         PoolFactory factory = PoolManager.createFactory();
-        factory.addServer(getServerHostName(host), serverPort);
+        factory.addServer(NetworkUtils.getServerHostName(host), serverPort);
         factory.create("pool1");
         AttributesFactory af = new AttributesFactory();
         af.setDataPolicy(DataPolicy.NORMAL);
@@ -303,7 +305,7 @@ public class ConnectionPoolAndLoaderDUnitTest  extends CacheTestCase {
         Cache cache = getCache();
         useLocator = false;
         PoolFactory factory = PoolManager.createFactory();
-        factory.addServer(getServerHostName(host), serverPort);
+        factory.addServer(NetworkUtils.getServerHostName(host), serverPort);
         factory.create("pool1");
         AttributesFactory af = new AttributesFactory();
         af.setDataPolicy(DataPolicy.NORMAL);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/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 89c4e58..58844b0 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
@@ -35,6 +35,7 @@ import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.test.dunit.DistributedTestCase;
 import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
 import com.gemstone.gemfire.test.dunit.SerializableCallable;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.dunit.VM;
@@ -68,12 +69,11 @@ public class ClientServerRegisterInterestsDUnitTest extends DistributedTestCase
     super.setUp();
     disconnectAllFromDS();
     setupGemFireCacheServer();
-    addExpectedException("java.net.ConnectException");
+    IgnoredException.addIgnoredException("java.net.ConnectException");
   }
 
   @Override
-  public void tearDown2() throws Exception {
-    super.tearDown2();
+  protected final void preTearDown() throws Exception {
     serverPort.set(0);
     entryEvents.clear();
     gemfireServerVm.invoke(new SerializableRunnable() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
index 2d5f8fe..b0f3b59 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
@@ -37,9 +37,12 @@ import com.gemstone.gemfire.management.membership.ClientMembership;
 import com.gemstone.gemfire.management.membership.ClientMembershipEvent;
 import com.gemstone.gemfire.management.membership.ClientMembershipListenerAdapter;
 import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
 import com.gemstone.gemfire.test.dunit.SerializableCallable;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
 
 /**
  * Tests cases that are particular for the auto connection source
@@ -55,7 +58,7 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
   
   public void setUp() throws Exception {
     super.setUp();
-    addExpectedException("NoAvailableLocatorsException");
+    IgnoredException.addIgnoredException("NoAvailableLocatorsException");
   }
 
   public AutoConnectionSourceDUnitTest(String name) {
@@ -71,11 +74,11 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
     int locatorPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
     startLocatorInVM(vm0, locatorPort, "");
     
-    String locators = getServerHostName(vm0.getHost())+ "[" + locatorPort + "]";
+    String locators = NetworkUtils.getServerHostName(vm0.getHost())+ "[" + locatorPort + "]";
     
     startBridgeServerInVM(vm1, null, locators);
 
-    startBridgeClientInVM(vm2, null, getServerHostName(vm0.getHost()), locatorPort);
+    startBridgeClientInVM(vm2, null, NetworkUtils.getServerHostName(vm0.getHost()), locatorPort);
 
     putAndWaitForSuccess(vm2, REGION_NAME, "key", "value");
     
@@ -88,7 +91,7 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
     VM vm0 = host.getVM(0);
     
     try {
-      startBridgeClientInVM(vm0, null, getServerHostName(vm0.getHost()), AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET));
+      startBridgeClientInVM(vm0, null, NetworkUtils.getServerHostName(vm0.getHost()), AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET));
       putInVM(vm0, "key", "value");
       fail("Client cache should not have been able to start");
     } catch(Exception e) {
@@ -104,7 +107,7 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
     int locatorPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
     startLocatorInVM(vm0, locatorPort, "");
     try { 
-      startBridgeClientInVM(vm1, null, getServerHostName(vm0.getHost()), locatorPort);
+      startBridgeClientInVM(vm1, null, NetworkUtils.getServerHostName(vm0.getHost()), locatorPort);
       putInVM(vm0, "key", "value");
       fail("Client cache should not have been able to start");
     } catch(Exception e) {
@@ -122,11 +125,11 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
     int locatorPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
     startLocatorInVM(vm0, locatorPort, "");
     
-    String locators = getServerHostName(vm0.getHost()) + "[" + locatorPort + "]";
+    String locators = NetworkUtils.getServerHostName(vm0.getHost()) + "[" + locatorPort + "]";
     
     startBridgeServerInVM(vm1, null, locators);
     
-    startBridgeClientInVM(vm2, null, getServerHostName(vm0.getHost()), locatorPort);
+    startBridgeClientInVM(vm2, null, NetworkUtils.getServerHostName(vm0.getHost()), locatorPort);
     
     putAndWaitForSuccess(vm2, REGION_NAME, "key", "value");
     
@@ -141,7 +144,7 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
   
   public void testDynamicallyFindLocators() throws Exception {
     final Host host = Host.getHost(0);
-    final String hostName = getServerHostName(host);
+    final String hostName = NetworkUtils.getServerHostName(host);
     VM vm0 = host.getVM(0);
     VM vm1 = host.getVM(1);
     VM vm2 = host.getVM(2);
@@ -156,7 +159,7 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
     startLocatorInVM(vm0, locatorPort0, locators);
     
     startLocatorInVM(vm1, locatorPort1, locators);
-    startBridgeClientInVM(vm2, null, getServerHostName(vm0.getHost()), locatorPort0);
+    startBridgeClientInVM(vm2, null, NetworkUtils.getServerHostName(vm0.getHost()), locatorPort0);
     
     InetSocketAddress locatorToWaitFor= new InetSocketAddress(hostName, locatorPort1);
     waitForLocatorDiscovery(vm2, locatorToWaitFor);
@@ -187,11 +190,11 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
     
     int locatorPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
     
-    String locators = getServerHostName(vm0.getHost()) + "[" + locatorPort + "]";
+    String locators = NetworkUtils.getServerHostName(vm0.getHost()) + "[" + locatorPort + "]";
     
     startBridgeServerWithEmbeddedLocator(vm0, null, locators, new String[] {REGION_NAME}, CacheServer.DEFAULT_LOAD_PROBE);
     
-    startBridgeClientInVM(vm2, null, getServerHostName(vm0.getHost()), locatorPort);
+    startBridgeClientInVM(vm2, null, NetworkUtils.getServerHostName(vm0.getHost()), locatorPort);
     
     putAndWaitForSuccess(vm2, REGION_NAME, "key", "value");
     
@@ -223,13 +226,13 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
     int locatorPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
     startLocatorInVM(vm0, locatorPort, "");
     
-    String locators = getServerHostName(vm0.getHost()) + "[" + locatorPort + "]";
+    String locators = NetworkUtils.getServerHostName(vm0.getHost()) + "[" + locatorPort + "]";
     
     startBridgeServerInVM(vm1, new String[] {"group1", "group2"} , locators, new String[] {"A", "B"});
     startBridgeServerInVM(vm2, new String[] {"group2", "group3"}, locators, new String[] {"B", "C"});
 
     
-    startBridgeClientInVM(vm3, "group1", getServerHostName(vm0.getHost()), locatorPort, new String [] {"A", "B", "C"});
+    startBridgeClientInVM(vm3, "group1", NetworkUtils.getServerHostName(vm0.getHost()), locatorPort, new String [] {"A", "B", "C"});
     putAndWaitForSuccess(vm3, "A", "key", "value");
     Assert.assertEquals("value", getInVM(vm1, "A", "key"));
     try {
@@ -239,7 +242,7 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
     
     stopBridgeMemberVM(vm3);
     
-    startBridgeClientInVM(vm3, "group3", getServerHostName(vm0.getHost()), locatorPort, new String [] {"A", "B", "C"});
+    startBridgeClientInVM(vm3, "group3", NetworkUtils.getServerHostName(vm0.getHost()), locatorPort, new String [] {"A", "B", "C"});
     try {
       putInVM(vm3, "A", "key3", "value");
       fail("Should not have been able to find Region A on the server");
@@ -249,7 +252,7 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
     
     stopBridgeMemberVM(vm3);
     
-    startBridgeClientInVM(vm3, "group2", getServerHostName(vm0.getHost()), locatorPort, new String [] {"A", "B", "C"});
+    startBridgeClientInVM(vm3, "group2", NetworkUtils.getServerHostName(vm0.getHost()), locatorPort, new String [] {"A", "B", "C"});
     putInVM(vm3, "B", "key5", "value");
     Assert.assertEquals("value", getInVM(vm1, "B", "key5"));
     Assert.assertEquals("value", getInVM(vm2, "B", "key5"));
@@ -275,18 +278,18 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
     
     startLocatorInVM(vm0, locatorPort, "");
     
-    final String locators = getServerHostName(vm0.getHost()) + "[" + locatorPort + "]";
+    final String locators = NetworkUtils.getServerHostName(vm0.getHost()) + "[" + locatorPort + "]";
     
     final int serverPort1 =startBridgeServerInVM(vm1, new String[] {"group1"}, locators);
     final int serverPort2 =addCacheServerInVM(vm1, new String[] {"group2"});
     
-    startBridgeClientInVM(vm2, "group2", getServerHostName(vm0.getHost()), locatorPort);
+    startBridgeClientInVM(vm2, "group2", NetworkUtils.getServerHostName(vm0.getHost()), locatorPort);
     
     checkEndpoints(vm2, new int[] {serverPort2});
     
     stopBridgeMemberVM(vm2);
 
-    startBridgeClientInVM(vm2, "group1", getServerHostName(vm0.getHost()), locatorPort);
+    startBridgeClientInVM(vm2, "group1", NetworkUtils.getServerHostName(vm0.getHost()), locatorPort);
     
     checkEndpoints(vm2, new int[] {serverPort1});
   }
@@ -299,7 +302,7 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
     VM clientVM = host.getVM(3);
     int locatorPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
     startLocatorInVM(locatorVM, locatorPort, "");
-    String locators = getServerHostName(locatorVM.getHost()) + "[" + locatorPort + "]";
+    String locators = NetworkUtils.getServerHostName(locatorVM.getHost()) + "[" + locatorPort + "]";
 
     //start a bridge server with a listener
     addBridgeListener(bridge1VM);
@@ -307,7 +310,7 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
 
     //start a bridge client with a listener
     addBridgeListener(clientVM);
-    startBridgeClientInVM(clientVM, null, getServerHostName(locatorVM.getHost()), locatorPort);
+    startBridgeClientInVM(clientVM, null, NetworkUtils.getServerHostName(locatorVM.getHost()), locatorPort);
     // wait for client to connect
     checkEndpoints(clientVM, new int[] {serverPort1});
     
@@ -401,7 +404,7 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
         if(remaining <= 0) {
           throw e;
         }
-        pause(100);
+        Wait.pause(100);
         remaining = endTime - System.currentTimeMillis();
       }
     }
@@ -450,7 +453,7 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
           if (expectedEndpointPorts.size() == actualEndpointPorts.size()) {
             break;
           } else {
-            pause(100);
+            Wait.pause(100);
           }
         } while(retryCount-- > 0);
         Assert.assertEquals(expectedEndpointPorts, actualEndpointPorts);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/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 3150edd..9bdf56c 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
@@ -34,6 +34,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.security.AuthenticationRequiredException;
 import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.util.test.TestUtil;
@@ -294,8 +295,8 @@ public class CacheServerSSLConnectionDUnitTest extends DistributedTestCase {
     params[3] = cacheClientSslRequireAuth;
     params[4] = TRUSTED_STORE;
     params[5] = TRUSTED_STORE;
-    ExpectedException expect = addExpectedException("javax.net.ssl.SSLException", serverVM);
-    ExpectedException expect2 = addExpectedException("IOException", serverVM);
+    IgnoredException expect = IgnoredException.addIgnoredException("javax.net.ssl.SSLException", serverVM);
+    IgnoredException expect2 = IgnoredException.addIgnoredException("IOException", serverVM);
     try{
       //getLogWriter().info("Starting client with server endpoint " + hostName + ":" + port);    
       clientVM.invoke(CacheServerSSLConnectionDUnitTest.class, "setUpClientVMTaskNoSubscription", params);
@@ -384,7 +385,7 @@ public class CacheServerSSLConnectionDUnitTest extends DistributedTestCase {
     params[3] = cacheClientSslRequireAuth;
     params[4] = TRUSTED_STORE;
     params[5] = TRUSTED_STORE;
-    ExpectedException expect = addExpectedException("javax.net.ssl.SSLHandshakeException", serverVM);
+    IgnoredException expect = IgnoredException.addIgnoredException("javax.net.ssl.SSLHandshakeException", serverVM);
     try{
       //getLogWriter().info("Starting client with server endpoint " + hostName + ":" + port);    
       clientVM.invoke(CacheServerSSLConnectionDUnitTest.class, "setUpClientVMTask", params);
@@ -411,15 +412,13 @@ public class CacheServerSSLConnectionDUnitTest extends DistributedTestCase {
     }
   }
   
-  public void tearDown2() throws Exception
-  {
+  @Override
+  protected final void preTearDown() throws Exception {
     final Host host = Host.getHost(0);
     VM serverVM = host.getVM(1);
     VM clientVM = host.getVM(2);
     clientVM.invoke(CacheServerSSLConnectionDUnitTest.class, "closeClientCacheTask");
     serverVM.invoke(CacheServerSSLConnectionDUnitTest.class, "closeCacheTask");
-    super.tearDown2();
   }
-
 }
 


Mime
View raw message