geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [26/27] incubator-geode git commit: GEODE 773 rough draft
Date Tue, 26 Jan 2016 00:49:36 GMT
GEODE 773 rough draft


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

Branch: refs/heads/feature/GEODE-773
Commit: e2f18f9735aa0e6cecf8db72ce9f9521f6062b3b
Parents: ed31351
Author: Kirk Lund <klund@pivotal.io>
Authored: Mon Jan 25 16:47:43 2016 -0800
Committer: Kirk Lund <klund@pivotal.io>
Committed: Mon Jan 25 16:47:43 2016 -0800

----------------------------------------------------------------------
 .../gemfire/internal/util/DebuggerSupport.java  |   17 +-
 .../com/gemstone/gemfire/TXExpiryJUnitTest.java |   10 +-
 .../cache/CacheRegionClearStatsDUnitTest.java   |   12 +-
 .../cache/ClientServerTimeSyncDUnitTest.java    |   18 +-
 .../cache/ConnectionPoolAndLoaderDUnitTest.java |   11 +-
 .../ClientServerRegisterInterestsDUnitTest.java |    7 +-
 .../internal/AutoConnectionSourceDUnitTest.java |   47 +-
 .../CacheServerSSLConnectionDUnitTest.java      |   11 +-
 .../internal/LocatorLoadBalancingDUnitTest.java |   40 +-
 .../cache/client/internal/LocatorTestBase.java  |   20 +-
 .../internal/SSLNoClientAuthDUnitTest.java      |    4 +-
 .../pooling/ConnectionManagerJUnitTest.java     |   11 +-
 .../management/MemoryThresholdsDUnitTest.java   |   63 +-
 .../MemoryThresholdsOffHeapDUnitTest.java       |   65 +-
 .../management/ResourceManagerDUnitTest.java    |    5 +-
 .../mapInterface/PutAllGlobalLockJUnitTest.java |    4 +-
 .../PartitionRegionHelperDUnitTest.java         |   12 +-
 .../query/cq/dunit/CqQueryTestListener.java     |   26 +-
 .../query/dunit/CompactRangeIndexDUnitTest.java |   14 +-
 .../cache/query/dunit/CqTimeTestListener.java   |   14 +-
 .../cache/query/dunit/HashIndexDUnitTest.java   |    8 +-
 .../cache/query/dunit/HelperTestCase.java       |    3 +-
 .../query/dunit/PdxStringQueryDUnitTest.java    |  114 +-
 .../dunit/QueryDataInconsistencyDUnitTest.java  |   47 +-
 .../dunit/QueryIndexUsingXMLDUnitTest.java      |   61 +-
 .../QueryParamsAuthorizationDUnitTest.java      |    3 +-
 .../QueryUsingFunctionContextDUnitTest.java     |   36 +-
 .../query/dunit/QueryUsingPoolDUnitTest.java    |  219 +--
 .../cache/query/dunit/RemoteQueryDUnitTest.java |  140 +-
 ...esourceManagerWithQueryMonitorDUnitTest.java |   28 +-
 .../query/dunit/SelectStarQueryDUnitTest.java   |   98 +-
 .../IndexCreationDeadLockJUnitTest.java         |    6 +-
 .../IndexMaintenanceAsynchJUnitTest.java        |    6 +-
 .../functional/LikePredicateJUnitTest.java      |    4 +-
 .../internal/ExecutionContextJUnitTest.java     |    4 +-
 .../index/AsynchIndexMaintenanceJUnitTest.java  |   17 +-
 ...rrentIndexInitOnOverflowRegionDUnitTest.java |   38 +-
 ...ndexOperationsOnOverflowRegionDUnitTest.java |   47 +-
 ...pdateWithInplaceObjectModFalseDUnitTest.java |   31 +-
 ...ConcurrentIndexUpdateWithoutWLDUnitTest.java |   35 +-
 .../index/CopyOnReadIndexDUnitTest.java         |   59 +-
 .../index/IndexCreationInternalsJUnitTest.java  |    6 +-
 .../index/IndexMaintainceJUnitTest.java         |    4 +-
 .../IndexTrackingQueryObserverDUnitTest.java    |   13 +-
 ...itializeIndexEntryDestroyQueryDUnitTest.java |   30 +-
 .../index/MultiIndexCreationDUnitTest.java      |   20 +-
 .../index/PutAllWithIndexPerfDUnitTest.java     |   17 +-
 .../PRBasicIndexCreationDUnitTest.java          |   11 +-
 .../PRBasicIndexCreationDeadlockDUnitTest.java  |   17 +-
 .../PRColocatedEquiJoinDUnitTest.java           |    6 +-
 .../partitioned/PRQueryCacheCloseDUnitTest.java |   14 +-
 .../PRQueryCacheClosedJUnitTest.java            |    6 +-
 .../query/partitioned/PRQueryDUnitHelper.java   |   13 +-
 .../query/partitioned/PRQueryDUnitTest.java     |    5 +-
 .../PRQueryRegionCloseDUnitTest.java            |   10 +-
 .../PRQueryRegionDestroyedDUnitTest.java        |   10 +-
 .../PRQueryRegionDestroyedJUnitTest.java        |    6 +-
 .../PRQueryRemoteNodeExceptionDUnitTest.java    |   19 +-
 .../snapshot/ParallelSnapshotDUnitTest.java     |    4 +-
 .../snapshot/SnapshotByteArrayDUnitTest.java    |    4 +-
 .../snapshot/SnapshotPerformanceDUnitTest.java  |    4 +-
 .../gemfire/cache30/Bug35214DUnitTest.java      |   11 +-
 .../gemfire/cache30/Bug38741DUnitTest.java      |   15 +-
 .../gemfire/cache30/CacheListenerTestCase.java  |    5 +-
 .../gemfire/cache30/CacheLoaderTestCase.java    |    8 +-
 .../gemfire/cache30/CacheMapTxnDUnitTest.java   |   12 +-
 ...cheRegionsReliablityStatsCheckDUnitTest.java |    3 +-
 .../cache30/CacheStatisticsDUnitTest.java       |   15 +-
 .../gemstone/gemfire/cache30/CacheTestCase.java |   35 +-
 .../gemfire/cache30/CacheXml30DUnitTest.java    |   22 +-
 .../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       |    9 +-
 .../cache30/CertifiableTestCacheListener.java   |   12 +-
 .../cache30/ClearMultiVmCallBkDUnitTest.java    |    2 +-
 .../gemfire/cache30/ClearMultiVmDUnitTest.java  |   19 +-
 .../cache30/ClientMembershipDUnitTest.java      |   41 +-
 .../ClientRegisterInterestDUnitTest.java        |   22 +-
 .../cache30/ClientServerCCEDUnitTest.java       |   25 +-
 .../gemfire/cache30/ClientServerTestCase.java   |    9 +-
 .../ConcurrentLeaveDuringGIIDUnitTest.java      |   10 +-
 .../gemfire/cache30/DiskRegionDUnitTest.java    |    9 +-
 .../cache30/DistAckMapMethodsDUnitTest.java     |    5 +-
 ...tedAckOverflowRegionCCEOffHeapDUnitTest.java |    7 +-
 ...tributedAckPersistentRegionCCEDUnitTest.java |    1 -
 ...dAckPersistentRegionCCEOffHeapDUnitTest.java |    7 +-
 .../DistributedAckRegionCCEDUnitTest.java       |   20 +-
 ...DistributedAckRegionCCEOffHeapDUnitTest.java |    7 +-
 .../cache30/DistributedAckRegionDUnitTest.java  |   10 +-
 .../DistributedAckRegionOffHeapDUnitTest.java   |    7 +-
 .../DistributedMulticastRegionDUnitTest.java    |    9 +-
 .../DistributedNoAckRegionCCEDUnitTest.java     |   10 +-
 ...stributedNoAckRegionCCEOffHeapDUnitTest.java |    7 +-
 .../DistributedNoAckRegionDUnitTest.java        |   21 +-
 .../DistributedNoAckRegionOffHeapDUnitTest.java |    7 +-
 .../gemfire/cache30/DynamicRegionDUnitTest.java |    4 +-
 .../cache30/GlobalRegionCCEDUnitTest.java       |    5 +-
 .../GlobalRegionCCEOffHeapDUnitTest.java        |    7 +-
 .../gemfire/cache30/GlobalRegionDUnitTest.java  |   21 +-
 .../cache30/GlobalRegionOffHeapDUnitTest.java   |    7 +-
 .../gemfire/cache30/LocalRegionDUnitTest.java   |    3 +-
 .../gemfire/cache30/MultiVMRegionTestCase.java  |  269 ++--
 .../OffHeapLRUEvictionControllerDUnitTest.java  |    7 +-
 .../PRBucketSynchronizationDUnitTest.java       |    9 +-
 .../cache30/PartitionedRegionDUnitTest.java     |   13 +-
 .../PartitionedRegionOffHeapDUnitTest.java      |    7 +-
 .../cache30/PreloadedRegionTestCase.java        |    5 +-
 .../cache30/PutAllCallBkRemoteVMDUnitTest.java  |    6 +-
 .../cache30/PutAllCallBkSingleVMDUnitTest.java  |    5 +-
 .../gemfire/cache30/PutAllMultiVmDUnitTest.java |    5 +-
 .../gemfire/cache30/QueueMsgDUnitTest.java      |    5 +-
 .../cache30/RRSynchronizationDUnitTest.java     |    7 +-
 .../gemfire/cache30/ReconnectDUnitTest.java     |   79 +-
 .../ReconnectedCacheServerDUnitTest.java        |    2 +-
 .../cache30/RegionExpirationDUnitTest.java      |    5 +-
 .../RegionMembershipListenerDUnitTest.java      |    9 +-
 .../cache30/RegionReliabilityTestCase.java      |   16 +-
 .../gemfire/cache30/RegionTestCase.java         |   89 +-
 .../cache30/RemoveAllMultiVmDUnitTest.java      |    5 +-
 .../gemfire/cache30/RequiredRolesDUnitTest.java |   16 +-
 .../gemfire/cache30/SearchAndLoadDUnitTest.java |   61 +-
 .../gemfire/cache30/SlowRecDUnitTest.java       |   36 +-
 .../gemfire/cache30/TXDistributedDUnitTest.java |   72 +-
 .../gemfire/cache30/TXOrderDUnitTest.java       |    6 +-
 .../cache30/TXRestrictionsDUnitTest.java        |    6 +-
 .../gemfire/cache30/TestCacheCallback.java      |    6 +-
 .../distributed/DistributedMemberDUnitTest.java |    3 +-
 .../distributed/DistributedSystemDUnitTest.java |    9 +-
 .../distributed/HostedLocatorsDUnitTest.java    |    2 +-
 .../gemfire/distributed/LocatorDUnitTest.java   |  122 +-
 .../gemfire/distributed/LocatorJUnitTest.java   |    1 -
 .../distributed/SystemAdminDUnitTest.java       |    7 +-
 .../distributed/internal/Bug40751DUnitTest.java |    7 +-
 .../ConsoleDistributionManagerDUnitTest.java    |   18 +-
 .../internal/DistributionAdvisorDUnitTest.java  |    7 +-
 .../internal/DistributionManagerDUnitTest.java  |   20 +-
 .../internal/ProductUseLogDUnitTest.java        |    5 +-
 .../GemFireDeadlockDetectorDUnitTest.java       |   10 +-
 .../internal/locks/CollaborationJUnitTest.java  |   53 +-
 .../membership/gms/MembershipManagerHelper.java |    6 +-
 .../TcpServerBackwardCompatDUnitTest.java       |   19 +-
 .../gemfire/disttx/DistTXDebugDUnitTest.java    |    7 +-
 .../disttx/DistTXPersistentDebugDUnitTest.java  |    9 +-
 .../disttx/DistributedTransactionDUnitTest.java |   18 +-
 ...wardCompatibilitySerializationDUnitTest.java |    2 +-
 .../ClassNotFoundExceptionDUnitTest.java        |    6 +-
 .../gemfire/internal/JSSESocketJUnitTest.java   |    4 +-
 .../gemfire/internal/JarDeployerDUnitTest.java  |   11 +-
 .../internal/PdxDeleteFieldDUnitTest.java       |    4 +-
 .../gemfire/internal/PdxRenameDUnitTest.java    |    4 +-
 .../gemfire/internal/SocketCloserJUnitTest.java |   12 +-
 .../gemfire/internal/cache/BackupDUnitTest.java |   16 +-
 .../internal/cache/Bug33359DUnitTest.java       |    2 +-
 .../internal/cache/Bug33726DUnitTest.java       |    2 +-
 .../internal/cache/Bug37241DUnitTest.java       |    2 +-
 .../internal/cache/Bug37377DUnitTest.java       |   11 +-
 .../internal/cache/Bug39079DUnitTest.java       |   10 +-
 .../internal/cache/Bug40299DUnitTest.java       |    7 +-
 .../internal/cache/Bug41091DUnitTest.java       |   19 +-
 .../internal/cache/Bug41733DUnitTest.java       |    4 +-
 .../internal/cache/Bug41957DUnitTest.java       |   13 +-
 .../internal/cache/Bug47667DUnitTest.java       |    7 +-
 .../internal/cache/CacheAdvisorDUnitTest.java   |    7 +-
 .../internal/cache/ClearDAckDUnitTest.java      |    5 +-
 .../internal/cache/ClearGlobalDUnitTest.java    |    5 +-
 .../cache/ClientServerGetAllDUnitTest.java      |   34 +-
 ...ServerInvalidAndDestroyedEntryDUnitTest.java |   10 +-
 .../ClientServerTransactionCCEDUnitTest.java    |    9 +-
 .../cache/ClientServerTransactionDUnitTest.java |   53 +-
 .../ConcurrentDestroySubRegionDUnitTest.java    |    5 +-
 .../cache/ConcurrentMapOpsDUnitTest.java        |   29 +-
 .../ConcurrentRegionOperationsJUnitTest.java    |   18 +-
 ...rentRollingAndRegionOperationsJUnitTest.java |    4 +-
 .../cache/ConnectDisconnectDUnitTest.java       |    8 +-
 .../cache/DeltaPropagationDUnitTest.java        |   30 +-
 .../cache/DeltaPropagationStatsDUnitTest.java   |   17 +-
 .../internal/cache/DeltaSizingDUnitTest.java    |    5 +-
 .../cache/DiskRegByteArrayDUnitTest.java        |    7 +-
 .../cache/DiskRegionClearJUnitTest.java         |    4 +-
 .../internal/cache/DiskRegionJUnitTest.java     |   43 +-
 ...DistrbutedRegionProfileOffHeapDUnitTest.java |   10 +-
 .../cache/DistributedCacheTestCase.java         |    4 +-
 .../internal/cache/EventTrackerDUnitTest.java   |   21 +-
 .../cache/EvictionObjectSizerDUnitTest.java     |    7 +-
 .../internal/cache/EvictionStatsDUnitTest.java  |    3 +-
 .../internal/cache/EvictionTestBase.java        |   12 +-
 .../cache/FixedPRSinglehopDUnitTest.java        |   22 +-
 .../internal/cache/GIIDeltaDUnitTest.java       |   50 +-
 .../internal/cache/GIIFlowControlDUnitTest.java |   39 +-
 .../internal/cache/GridAdvisorDUnitTest.java    |   25 +-
 .../internal/cache/HABug36773DUnitTest.java     |   12 +-
 .../HAOverflowMemObjectSizerDUnitTest.java      |    9 +-
 .../cache/IncrementalBackupDUnitTest.java       |   14 +-
 .../cache/InterruptClientServerDUnitTest.java   |   10 +-
 .../internal/cache/InterruptsDUnitTest.java     |    7 +-
 .../internal/cache/MapClearGIIDUnitTest.java    |   17 +-
 .../internal/cache/MapInterface2JUnitTest.java  |    6 +-
 .../cache/NetSearchMessagingDUnitTest.java      |    4 +-
 .../cache/OffHeapEvictionDUnitTest.java         |   15 +-
 .../cache/OffHeapEvictionStatsDUnitTest.java    |   10 +-
 .../gemfire/internal/cache/OplogJUnitTest.java  |   25 +-
 .../cache/P2PDeltaPropagationDUnitTest.java     |    4 +-
 .../internal/cache/PRBadToDataDUnitTest.java    |    3 +-
 ...gionBucketCreationDistributionDUnitTest.java |   44 +-
 .../PartitionedRegionCacheCloseDUnitTest.java   |   13 +-
 .../PartitionedRegionCreationDUnitTest.java     |   30 +-
 .../cache/PartitionedRegionDUnitTestCase.java   |    7 +-
 ...rtitionedRegionDelayedRecoveryDUnitTest.java |   10 +-
 .../PartitionedRegionDestroyDUnitTest.java      |   10 +-
 .../PartitionedRegionEntryCountDUnitTest.java   |    3 +-
 .../PartitionedRegionEvictionDUnitTest.java     |   16 +-
 .../cache/PartitionedRegionHADUnitTest.java     |   13 +-
 ...onedRegionHAFailureAndRecoveryDUnitTest.java |   12 +-
 ...nedRegionLocalMaxMemoryOffHeapDUnitTest.java |    7 +-
 .../PartitionedRegionMultipleDUnitTest.java     |   31 +-
 ...rtitionedRegionOffHeapEvictionDUnitTest.java |    7 +-
 .../cache/PartitionedRegionPRIDDUnitTest.java   |   11 +-
 .../cache/PartitionedRegionQueryDUnitTest.java  |   28 +-
 ...artitionedRegionRedundancyZoneDUnitTest.java |    4 +-
 ...tionedRegionSerializableObjectJUnitTest.java |    4 +-
 .../PartitionedRegionSingleHopDUnitTest.java    |   92 +-
 ...RegionSingleHopWithServerGroupDUnitTest.java |   53 +-
 .../cache/PartitionedRegionSizeDUnitTest.java   |    7 +-
 .../cache/PartitionedRegionStatsDUnitTest.java  |   11 +-
 .../PartitionedRegionTestUtilsDUnitTest.java    |   13 +-
 .../PartitionedRegionWithSameNameDUnitTest.java |    3 +-
 .../internal/cache/PutAllDAckDUnitTest.java     |    7 +-
 .../internal/cache/PutAllGlobalDUnitTest.java   |   21 +-
 .../cache/RemoteTransactionDUnitTest.java       |   31 +-
 .../internal/cache/RemoveAllDAckDUnitTest.java  |    5 +-
 .../internal/cache/RemoveDAckDUnitTest.java     |    2 +-
 .../internal/cache/RemoveGlobalDUnitTest.java   |    7 +-
 .../cache/SimpleDiskRegionJUnitTest.java        |   12 +-
 .../internal/cache/SingleHopStatsDUnitTest.java |   14 +-
 .../internal/cache/SizingFlagDUnitTest.java     |    3 +-
 .../internal/cache/SystemFailureDUnitTest.java  |    2 +-
 .../cache/TXReservationMgrJUnitTest.java        |    4 +-
 .../cache/TransactionsWithDeltaDUnitTest.java   |    3 +-
 .../control/RebalanceOperationDUnitTest.java    |   34 +-
 ...egionOverflowAsyncRollingOpLogJUnitTest.java |    6 +-
 ...RegionOverflowSyncRollingOpLogJUnitTest.java |    6 +-
 ...ltiThreadedOplogPerJUnitPerformanceTest.java |    4 +-
 .../cache/execute/Bug51193DUnitTest.java        |    5 +-
 .../ClientServerFunctionExecutionDUnitTest.java |   30 +-
 .../execute/ColocationFailoverDUnitTest.java    |   18 +-
 ...ributedRegionFunctionExecutionDUnitTest.java |   61 +-
 .../execute/FunctionServiceStatsDUnitTest.java  |   29 +-
 .../cache/execute/LocalDataSetDUnitTest.java    |    5 +-
 .../execute/LocalDataSetIndexingDUnitTest.java  |    2 +-
 .../LocalFunctionExecutionDUnitTest.java        |   14 +-
 .../MemberFunctionExecutionDUnitTest.java       |   17 +-
 .../MultiRegionFunctionExecutionDUnitTest.java  |    9 +-
 .../OnGroupsFunctionExecutionDUnitTest.java     |   45 +-
 ...ntServerFunctionExecutionNoAckDUnitTest.java |    4 +-
 ...tServerRegionFunctionExecutionDUnitTest.java |   37 +-
 ...egionFunctionExecutionFailoverDUnitTest.java |   58 +-
 ...onFunctionExecutionNoSingleHopDUnitTest.java |   50 +-
 ...onExecutionSelectorNoSingleHopDUnitTest.java |   66 +-
 ...gionFunctionExecutionSingleHopDUnitTest.java |   58 +-
 .../cache/execute/PRClientServerTestBase.java   |   46 +-
 .../cache/execute/PRColocationDUnitTest.java    |   46 +-
 .../execute/PRCustomPartitioningDUnitTest.java  |    9 +-
 .../execute/PRFunctionExecutionDUnitTest.java   |   34 +-
 .../PRFunctionExecutionTimeOutDUnitTest.java    |    5 +-
 .../execute/PRPerformanceTestDUnitTest.java     |    3 +-
 .../cache/execute/PRTransactionDUnitTest.java   |   12 +-
 .../execute/SingleHopGetAllPutAllDUnitTest.java |   24 +-
 .../functions/DistributedRegionFunction.java    |    6 +-
 .../internal/cache/functions/TestFunction.java  |    8 +-
 .../ha/BlockingHARQAddOperationJUnitTest.java   |    8 +-
 .../cache/ha/BlockingHARegionJUnitTest.java     |   55 +-
 .../cache/ha/Bug36853EventsExpiryDUnitTest.java |   10 +-
 .../internal/cache/ha/Bug48571DUnitTest.java    |   12 +-
 .../internal/cache/ha/Bug48879DUnitTest.java    |    2 +-
 .../cache/ha/EventIdOptimizationDUnitTest.java  |    7 +-
 .../internal/cache/ha/FailoverDUnitTest.java    |   24 +-
 .../internal/cache/ha/HABugInPutDUnitTest.java  |    9 +-
 .../internal/cache/ha/HAClearDUnitTest.java     |   11 +-
 .../cache/ha/HAConflationDUnitTest.java         |   12 +-
 .../internal/cache/ha/HADuplicateDUnitTest.java |   12 +-
 .../cache/ha/HAEventIdPropagationDUnitTest.java |   14 +-
 .../internal/cache/ha/HAExpiryDUnitTest.java    |   15 +-
 .../internal/cache/ha/HAGIIBugDUnitTest.java    |   15 +-
 .../internal/cache/ha/HAGIIDUnitTest.java       |   41 +-
 .../cache/ha/HARQAddOperationJUnitTest.java     |   24 +-
 .../cache/ha/HARQueueNewImplDUnitTest.java      |  108 +-
 .../internal/cache/ha/HARegionDUnitTest.java    |   14 +-
 .../cache/ha/HARegionQueueDUnitTest.java        |   35 +-
 .../cache/ha/HARegionQueueJUnitTest.java        |   26 +-
 .../cache/ha/HASlowReceiverDUnitTest.java       |   23 +-
 .../ha/OperationsPropagationDUnitTest.java      |   38 +-
 .../internal/cache/ha/PutAllDUnitTest.java      |   11 +-
 .../internal/cache/ha/StatsBugDUnitTest.java    |   10 +-
 .../cache/locks/TXLockServiceDUnitTest.java     |   13 +-
 .../cache/partitioned/Bug39356DUnitTest.java    |    3 +-
 .../cache/partitioned/Bug43684DUnitTest.java    |    8 +-
 .../cache/partitioned/Bug47388DUnitTest.java    |    8 +-
 .../cache/partitioned/Bug51400DUnitTest.java    |    8 +-
 .../partitioned/ElidedPutAllDUnitTest.java      |    5 +-
 .../partitioned/PartitionResolverDUnitTest.java |    4 +-
 .../PartitionedRegionLoaderWriterDUnitTest.java |    9 +-
 ...rtitionedRegionMetaDataCleanupDUnitTest.java |   17 +-
 .../partitioned/PersistPRKRFDUnitTest.java      |   22 +-
 ...tentColocatedPartitionedRegionDUnitTest.java |   44 +-
 .../PersistentPartitionedRegionDUnitTest.java   |   57 +-
 .../PersistentPartitionedRegionTestBase.java    |   20 +-
 ...rtitionedRegionWithTransactionDUnitTest.java |    9 +-
 .../cache/partitioned/ShutdownAllDUnitTest.java |   17 +-
 ...StreamingPartitionOperationOneDUnitTest.java |    3 +-
 .../fixed/FixedPartitioningDUnitTest.java       |   66 +-
 .../fixed/FixedPartitioningTestBase.java        |   49 +-
 ...ngWithColocationAndPersistenceDUnitTest.java |   50 +-
 .../PersistentRVVRecoveryDUnitTest.java         |   22 +-
 .../PersistentRecoveryOrderDUnitTest.java       |   28 +-
 .../PersistentReplicatedTestBase.java           |   11 +-
 .../internal/cache/tier/Bug40396DUnitTest.java  |    7 +-
 ...mpatibilityHigherVersionClientDUnitTest.java |   10 +-
 .../cache/tier/sockets/Bug36269DUnitTest.java   |   20 +-
 .../cache/tier/sockets/Bug36457DUnitTest.java   |   12 +-
 .../cache/tier/sockets/Bug36805DUnitTest.java   |   13 +-
 .../cache/tier/sockets/Bug36829DUnitTest.java   |   12 +-
 .../cache/tier/sockets/Bug36995DUnitTest.java   |   18 +-
 .../cache/tier/sockets/Bug37210DUnitTest.java   |   14 +-
 .../cache/tier/sockets/Bug37805DUnitTest.java   |    5 +-
 .../CacheServerMaxConnectionsJUnitTest.java     |    8 +-
 .../cache/tier/sockets/CacheServerTestUtil.java |   31 +-
 .../CacheServerTransactionsDUnitTest.java       |  108 +-
 .../tier/sockets/ClearPropagationDUnitTest.java |   20 +-
 .../tier/sockets/ClientConflationDUnitTest.java |   26 +-
 .../sockets/ClientHealthMonitorJUnitTest.java   |    8 +-
 .../sockets/ClientInterestNotifyDUnitTest.java  |   20 +-
 .../tier/sockets/ClientServerMiscDUnitTest.java |  100 +-
 .../cache/tier/sockets/ConflationDUnitTest.java |   46 +-
 .../tier/sockets/ConnectionProxyJUnitTest.java  |   14 +-
 .../DataSerializerPropogationDUnitTest.java     |  114 +-
 .../DestroyEntryPropagationDUnitTest.java       |   28 +-
 .../sockets/DurableClientBug39997DUnitTest.java |   10 +-
 .../DurableClientQueueSizeDUnitTest.java        |   10 +-
 .../DurableClientReconnectAutoDUnitTest.java    |    4 +-
 .../DurableClientReconnectDUnitTest.java        |   73 +-
 .../sockets/DurableClientStatsDUnitTest.java    |   43 +-
 .../sockets/DurableRegistrationDUnitTest.java   |   54 +-
 .../sockets/DurableResponseMatrixDUnitTest.java |   29 +-
 .../sockets/EventIDVerificationDUnitTest.java   |   20 +-
 .../EventIDVerificationInP2PDUnitTest.java      |   15 +-
 .../ForceInvalidateEvictionDUnitTest.java       |   12 +-
 ...ForceInvalidateOffHeapEvictionDUnitTest.java |    7 +-
 .../cache/tier/sockets/HABug36738DUnitTest.java |    7 +-
 .../tier/sockets/HAInterestPart1DUnitTest.java  |   22 +-
 .../tier/sockets/HAInterestPart2DUnitTest.java  |   31 +-
 .../cache/tier/sockets/HAInterestTestCase.java  |   50 +-
 .../sockets/HAStartupAndFailoverDUnitTest.java  |   49 +-
 .../InstantiatorPropagationDUnitTest.java       |  119 +-
 .../tier/sockets/InterestListDUnitTest.java     |   99 +-
 .../sockets/InterestListEndpointDUnitTest.java  |   24 +-
 .../sockets/InterestListFailoverDUnitTest.java  |   22 +-
 .../sockets/InterestListRecoveryDUnitTest.java  |   38 +-
 .../sockets/InterestRegrListenerDUnitTest.java  |    4 +-
 .../sockets/InterestResultPolicyDUnitTest.java  |   22 +-
 .../sockets/NewRegionAttributesDUnitTest.java   |    5 +-
 .../sockets/RedundancyLevelPart1DUnitTest.java  |   58 +-
 .../sockets/RedundancyLevelPart2DUnitTest.java  |   56 +-
 .../sockets/RedundancyLevelPart3DUnitTest.java  |   14 +-
 .../tier/sockets/RedundancyLevelTestBase.java   |   53 +-
 .../tier/sockets/RegionCloseDUnitTest.java      |   20 +-
 ...erInterestBeforeRegionCreationDUnitTest.java |   13 +-
 .../sockets/RegisterInterestKeysDUnitTest.java  |   15 +-
 .../sockets/ReliableMessagingDUnitTest.java     |   19 +-
 .../sockets/UnregisterInterestDUnitTest.java    |   14 +-
 .../sockets/UpdatePropagationDUnitTest.java     |   45 +-
 .../VerifyEventIDGenerationInP2PDUnitTest.java  |    9 +-
 ...UpdatesFromNonInterestEndPointDUnitTest.java |   17 +-
 .../versions/RegionVersionVectorJUnitTest.java  |    4 +-
 .../cache/wan/AsyncEventQueueTestBase.java      |   83 +-
 .../asyncqueue/AsyncEventListenerDUnitTest.java |  355 ++---
 .../AsyncEventQueueStatsDUnitTest.java          |   79 +-
 .../ConcurrentAsyncEventQueueDUnitTest.java     |   47 +-
 .../CommonParallelAsyncEventQueueDUnitTest.java |   10 +-
 .../CompressionCacheConfigDUnitTest.java        |   10 +-
 .../CompressionCacheListenerDUnitTest.java      |    4 +-
 ...ompressionCacheListenerOffHeapDUnitTest.java |    7 +-
 .../CompressionRegionConfigDUnitTest.java       |   12 +-
 .../CompressionRegionFactoryDUnitTest.java      |    4 +-
 .../CompressionRegionOperationsDUnitTest.java   |    4 +-
 ...ressionRegionOperationsOffHeapDUnitTest.java |    7 +-
 .../internal/jta/dunit/ExceptionsDUnitTest.java |    2 +-
 .../jta/dunit/IdleTimeOutDUnitTest.java         |    8 +-
 .../jta/dunit/LoginTimeOutDUnitTest.java        |   14 +-
 .../jta/dunit/MaxPoolSizeDUnitTest.java         |   10 +-
 .../jta/dunit/TransactionTimeOutDUnitTest.java  |   12 +-
 .../dunit/TxnManagerMultiThreadDUnitTest.java   |   12 +-
 .../internal/jta/dunit/TxnTimeOutDUnitTest.java |   35 +-
 .../DistributedSystemLogFileJUnitTest.java      |   18 +-
 .../logging/LocatorLogFileJUnitTest.java        |    6 +-
 .../logging/MergeLogFilesJUnitTest.java         |    4 +-
 .../internal/offheap/OffHeapRegionBase.java     |    4 +-
 .../offheap/OutOfOffHeapMemoryDUnitTest.java    |   20 +-
 .../process/LocalProcessLauncherDUnitTest.java  |    2 +-
 .../statistics/StatisticsDUnitTest.java         |   20 +-
 .../statistics/ValueMonitorJUnitTest.java       |    6 +-
 .../management/CacheManagementDUnitTest.java    |   13 +-
 .../management/ClientHealthStatsDUnitTest.java  |   16 +-
 .../management/CompositeTypeTestDUnitTest.java  |    8 +-
 .../management/DLockManagementDUnitTest.java    |   12 +-
 .../management/DiskManagementDUnitTest.java     |    8 +-
 .../management/DistributedSystemDUnitTest.java  |   26 +-
 .../management/LocatorManagementDUnitTest.java  |   20 +-
 .../gemstone/gemfire/management/MBeanUtil.java  |   23 +-
 .../gemfire/management/ManagementTestBase.java  |   24 +-
 .../MemberMBeanAttributesDUnitTest.java         |    4 +-
 .../management/OffHeapManagementDUnitTest.java  |    6 +-
 .../gemfire/management/QueryDataDUnitTest.java  |   10 +-
 .../management/RegionManagementDUnitTest.java   |   27 +-
 ...ersalMembershipListenerAdapterDUnitTest.java |   21 +-
 .../stats/DistributedSystemStatsDUnitTest.java  |    9 +-
 .../internal/cli/CliUtilDUnitTest.java          |   14 +-
 .../cli/commands/CliCommandTestBase.java        |    4 +-
 .../cli/commands/ConfigCommandsDUnitTest.java   |   21 +-
 ...eateAlterDestroyRegionCommandsDUnitTest.java |   30 +-
 .../cli/commands/DeployCommandsDUnitTest.java   |   16 +-
 .../commands/DiskStoreCommandsDUnitTest.java    |   18 +-
 .../cli/commands/FunctionCommandsDUnitTest.java |    5 +-
 .../commands/GemfireDataCommandsDUnitTest.java  |   27 +-
 ...WithCacheLoaderDuringCacheMissDUnitTest.java |    5 +-
 .../cli/commands/IndexCommandsDUnitTest.java    |   18 +-
 ...stAndDescribeDiskStoreCommandsDUnitTest.java |    7 +-
 .../cli/commands/ListIndexCommandDUnitTest.java |    7 +-
 .../cli/commands/MemberCommandsDUnitTest.java   |    7 +-
 .../MiscellaneousCommandsDUnitTest.java         |   18 +-
 ...laneousCommandsExportLogsPart2DUnitTest.java |    4 +-
 ...laneousCommandsExportLogsPart4DUnitTest.java |    4 +-
 .../cli/commands/QueueCommandsDUnitTest.java    |   14 +-
 .../SharedConfigurationCommandsDUnitTest.java   |   18 +-
 .../cli/commands/ShowDeadlockDUnitTest.java     |    8 +-
 .../cli/commands/ShowMetricsDUnitTest.java      |   14 +-
 .../cli/commands/UserCommandsDUnitTest.java     |    4 +-
 .../SharedConfigurationDUnitTest.java           |   19 +-
 .../internal/pulse/TestClientIdsDUnitTest.java  |   17 +-
 .../internal/pulse/TestFunctionsDUnitTest.java  |    8 +-
 .../internal/pulse/TestHeapDUnitTest.java       |    8 +-
 .../internal/pulse/TestLocatorsDUnitTest.java   |    8 +-
 .../pulse/TestSubscriptionsDUnitTest.java       |   18 +-
 .../ClientsWithVersioningRetryDUnitTest.java    |   24 +-
 .../pdx/DistributedSystemIdDUnitTest.java       |    3 +-
 .../pdx/JSONPdxClientServerDUnitTest.java       |    7 +-
 .../gemfire/pdx/PdxClientServerDUnitTest.java   |   16 +-
 .../pdx/PdxDeserializationDUnitTest.java        |    9 +-
 .../gemfire/pdx/PdxTypeExportDUnitTest.java     |    3 +-
 .../gemfire/redis/RedisDistDUnitTest.java       |   14 +-
 .../web/controllers/RestAPITestBase.java        |    9 +-
 .../security/ClientAuthenticationDUnitTest.java |   10 +-
 .../security/ClientAuthorizationDUnitTest.java  |    7 +-
 .../security/ClientAuthorizationTestBase.java   |    7 +-
 .../security/ClientMultiUserAuthzDUnitTest.java |    4 +-
 .../DeltaClientAuthorizationDUnitTest.java      |   21 +-
 .../DeltaClientPostAuthorizationDUnitTest.java  |   12 +-
 .../security/P2PAuthenticationDUnitTest.java    |   44 +-
 .../gemfire/security/SecurityTestUtil.java      |  139 +-
 .../gemfire/test/dunit/AsyncInvocation.java     |    8 +-
 .../gemstone/gemfire/test/dunit/DUnitEnv.java   |   96 +-
 .../gemfire/test/dunit/DistributedTestCase.java | 1257 ++++--------------
 .../test/dunit/SerializableRunnable.java        |   11 +-
 .../com/gemstone/gemfire/test/dunit/VM.java     |   10 +
 .../test/dunit/tests/BasicDUnitTest.java        |    5 +-
 471 files changed, 5663 insertions(+), 5451 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e2f18f97/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/e2f18f97/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/e2f18f97/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..310737d 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.NetworkSupport;
 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 });
+            NetworkSupport.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 });
+            NetworkSupport.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();
+  public void tearDownBeforeDisconnect() throws Exception {
+    super.tearDownBeforeDisconnect();
     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/e2f18f97/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..d74c3b0 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,13 @@ 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.NetworkSupport;
 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 {
 
@@ -65,7 +69,7 @@ public class ClientServerTimeSyncDUnitTest extends CacheTestCase {
             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
@@ -76,7 +80,7 @@ public class ClientServerTimeSyncDUnitTest extends CacheTestCase {
         }
       });
       
-      final String hostName = getServerHostName(vm0.getHost());
+      final String hostName = NetworkSupport.getServerHostName(vm0.getHost());
   
       // Start client with proxy region and register interest
         
@@ -105,7 +109,7 @@ public class ClientServerTimeSyncDUnitTest extends CacheTestCase {
           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");
@@ -142,7 +146,7 @@ public class ClientServerTimeSyncDUnitTest extends CacheTestCase {
             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
@@ -153,9 +157,9 @@ public class ClientServerTimeSyncDUnitTest extends CacheTestCase {
         }
       });
       
-      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 = NetworkSupport.getServerHostName(vm0.getHost());
   
       // Start client with proxy region and register interest
         
@@ -188,7 +192,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/e2f18f97/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..0644a99 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.NetworkSupport;
 import com.gemstone.gemfire.test.dunit.SerializableCallable;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.dunit.VM;
@@ -51,7 +52,7 @@ public class ConnectionPoolAndLoaderDUnitTest  extends CacheTestCase {
     super.setUp();
   }
   
-  public void tearDown2() {
+  public void tearDownBeforeDisconnect() {
     //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 +93,7 @@ public class ConnectionPoolAndLoaderDUnitTest  extends CacheTestCase {
       public Object call() {
         Cache cache = getCache();
         PoolFactory factory = PoolManager.createFactory();
-        factory.addServer(getServerHostName(host), serverPort);
+        factory.addServer(NetworkSupport.getServerHostName(host), serverPort);
         factory.create("pool1");
         
         AttributesFactory af = new AttributesFactory();
@@ -171,7 +172,7 @@ public class ConnectionPoolAndLoaderDUnitTest  extends CacheTestCase {
       public Object call() {
         Cache cache = getCache();
         PoolFactory factory = PoolManager.createFactory();
-        factory.addServer(getServerHostName(host), serverPort);
+        factory.addServer(NetworkSupport.getServerHostName(host), serverPort);
         factory.create("pool1");
         
         AttributesFactory af = new AttributesFactory();
@@ -281,7 +282,7 @@ public class ConnectionPoolAndLoaderDUnitTest  extends CacheTestCase {
         Cache cache = getCache();
         useLocator = false;
         PoolFactory factory = PoolManager.createFactory();
-        factory.addServer(getServerHostName(host), serverPort);
+        factory.addServer(NetworkSupport.getServerHostName(host), serverPort);
         factory.create("pool1");
         AttributesFactory af = new AttributesFactory();
         af.setDataPolicy(DataPolicy.NORMAL);
@@ -303,7 +304,7 @@ public class ConnectionPoolAndLoaderDUnitTest  extends CacheTestCase {
         Cache cache = getCache();
         useLocator = false;
         PoolFactory factory = PoolManager.createFactory();
-        factory.addServer(getServerHostName(host), serverPort);
+        factory.addServer(NetworkSupport.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/e2f18f97/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..5a3c2a3 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,12 @@ 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();
+  public void tearDownBeforeDisconnect() throws Exception {
+    super.tearDownBeforeDisconnect();
     serverPort.set(0);
     entryEvents.clear();
     gemfireServerVm.invoke(new SerializableRunnable() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e2f18f97/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 e8d4915..85541e7 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.NetworkSupport;
 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 = NetworkSupport.getServerHostName(vm0.getHost())+ "[" + locatorPort + "]";
     
     startBridgeServerInVM(vm1, null, locators);
 
-    startBridgeClientInVM(vm2, null, getServerHostName(vm0.getHost()), locatorPort);
+    startBridgeClientInVM(vm2, null, NetworkSupport.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, NetworkSupport.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, NetworkSupport.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 = NetworkSupport.getServerHostName(vm0.getHost()) + "[" + locatorPort + "]";
     
     startBridgeServerInVM(vm1, null, locators);
     
-    startBridgeClientInVM(vm2, null, getServerHostName(vm0.getHost()), locatorPort);
+    startBridgeClientInVM(vm2, null, NetworkSupport.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 = NetworkSupport.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, NetworkSupport.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 = NetworkSupport.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, NetworkSupport.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 = NetworkSupport.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", NetworkSupport.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", NetworkSupport.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", NetworkSupport.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 = NetworkSupport.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", NetworkSupport.getServerHostName(vm0.getHost()), locatorPort);
     
     checkEndpoints(vm2, new int[] {serverPort2});
     
     stopBridgeMemberVM(vm2);
 
-    startBridgeClientInVM(vm2, "group1", getServerHostName(vm0.getHost()), locatorPort);
+    startBridgeClientInVM(vm2, "group1", NetworkSupport.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 = NetworkSupport.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, NetworkSupport.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/e2f18f97/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..209109c 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,14 +412,14 @@ public class CacheServerSSLConnectionDUnitTest extends DistributedTestCase {
     }
   }
   
-  public void tearDown2() throws Exception
+  public void tearDownBeforeDisconnect() throws Exception
   {
     final Host host = Host.getHost(0);
     VM serverVM = host.getVM(1);
     VM clientVM = host.getVM(2);
     clientVM.invoke(CacheServerSSLConnectionDUnitTest.class, "closeClientCacheTask");
     serverVM.invoke(CacheServerSSLConnectionDUnitTest.class, "closeCacheTask");
-    super.tearDown2();
+    super.tearDownBeforeDisconnect();
   }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e2f18f97/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java
index 1c8e9eb..3c6953d 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java
@@ -47,11 +47,13 @@ import com.gemstone.gemfire.internal.cache.CacheServerImpl;
 import com.gemstone.gemfire.internal.cache.PoolFactoryImpl;
 import com.gemstone.gemfire.internal.logging.InternalLogWriter;
 import com.gemstone.gemfire.internal.logging.LocalLogWriter;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
 import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.NetworkSupport;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.dunit.SerializableRunnableIF;
 import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
 
 /**
  * @author dsmith
@@ -98,7 +100,7 @@ public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
     int serverPort = startBridgeServerInVM(vm1, new String[] {"a", "b"},  locators);
     
     ServerLoad expectedLoad = new ServerLoad(0f, 1 / 800.0f, 0f, 1f);
-    ServerLocation expectedLocation = new ServerLocation(getServerHostName(vm0
+    ServerLocation expectedLocation = new ServerLocation(NetworkSupport.getServerHostName(vm0
         .getHost()), serverPort);
     Map expected = new HashMap();
     expected.put(expectedLocation, expectedLoad);
@@ -107,7 +109,7 @@ public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
     
     int serverPort2 = startBridgeServerInVM(vm2, new String[] {"a", "b"},  locators);
     
-    ServerLocation expectedLocation2 = new ServerLocation(getServerHostName(vm0
+    ServerLocation expectedLocation2 = new ServerLocation(NetworkSupport.getServerHostName(vm0
         .getHost()), serverPort2);
     
     expected.put(expectedLocation2, expectedLoad);
@@ -130,18 +132,18 @@ public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
     int serverPort = startBridgeServerInVM(vm1, new String[] {"a", "b"},  locators);
     
     ServerLoad expectedLoad = new ServerLoad(2/800f, 1 / 800.0f, 0f, 1f);
-    ServerLocation expectedLocation = new ServerLocation(getServerHostName(host), serverPort);
+    ServerLocation expectedLocation = new ServerLocation(NetworkSupport.getServerHostName(host), serverPort);
     Map expected = new HashMap();
     expected.put(expectedLocation, expectedLoad);
     
     ClientConnectionResponse response;
     response = (ClientConnectionResponse) TcpClient.requestToServer(InetAddress
-        .getByName(getServerHostName(host)), locatorPort,
+        .getByName(NetworkSupport.getServerHostName(host)), locatorPort,
         new ClientConnectionRequest(Collections.EMPTY_SET, null), 10000);
     Assert.assertEquals(expectedLocation, response.getServer());
     
     response = (ClientConnectionResponse) TcpClient.requestToServer(InetAddress
-        .getByName(getServerHostName(host)), locatorPort,
+        .getByName(NetworkSupport.getServerHostName(host)), locatorPort,
         new ClientConnectionRequest(Collections.EMPTY_SET, null), 10000, true);
     Assert.assertEquals(expectedLocation, response.getServer());
     
@@ -150,13 +152,13 @@ public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
     
     QueueConnectionResponse response2;
     response2 = (QueueConnectionResponse) TcpClient.requestToServer(InetAddress
-        .getByName(getServerHostName(host)), locatorPort,
+        .getByName(NetworkSupport.getServerHostName(host)), locatorPort,
         new QueueConnectionRequest(null, 2,
             Collections.EMPTY_SET, null, false), 10000, true);
     Assert.assertEquals(Collections.singletonList(expectedLocation), response2.getServers());
     
     response2 = (QueueConnectionResponse) TcpClient
-        .requestToServer(InetAddress.getByName(getServerHostName(host)),
+        .requestToServer(InetAddress.getByName(NetworkSupport.getServerHostName(host)),
             locatorPort, new QueueConnectionRequest(null, 5, Collections.EMPTY_SET, null,
                 false), 10000, true);
     
@@ -186,13 +188,13 @@ public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
     
     //We expect 0 load
     Map expected = new HashMap();
-    ServerLocation expectedLocation = new ServerLocation(getServerHostName(host), serverPort);
+    ServerLocation expectedLocation = new ServerLocation(NetworkSupport.getServerHostName(host), serverPort);
     ServerLoad expectedLoad = new ServerLoad(0f, 1 / 800.0f, 0f, 1f);
     expected.put(expectedLocation, expectedLoad);
     checkLocatorLoad(vm0, expected);
     
     PoolFactoryImpl pf = new PoolFactoryImpl(null);
-    pf.addServer(getServerHostName(host), serverPort);
+    pf.addServer(NetworkSupport.getServerHostName(host), serverPort);
     pf.setMinConnections(8);
     pf.setMaxConnections(8);
     pf.setSubscriptionEnabled(true);
@@ -233,7 +235,7 @@ public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
     startBridgeServerInVM(vm2, new String[] {"a", "b"},  locators);
     
     PoolFactoryImpl pf = new PoolFactoryImpl(null);
-    pf.addLocator(getServerHostName(host), locatorPort);
+    pf.addLocator(NetworkSupport.getServerHostName(host), locatorPort);
     pf.setMinConnections(80);
     pf.setMaxConnections(80);
     pf.setSubscriptionEnabled(false);
@@ -267,7 +269,7 @@ public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
             return excuse;
           }
         };
-        DistributedTestCase.waitForCriterion(wc, 5 * 60 * 1000, 1000, true);
+        Wait.waitForCriterion(wc, 5 * 60 * 1000, 1000, true);
       }
     };
     
@@ -290,7 +292,7 @@ public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
             return "connection count never reached " + count;
           }
         };
-        DistributedTestCase.waitForCriterion(ev, MAX_WAIT, 200, true);
+        Wait.waitForCriterion(ev, MAX_WAIT, 200, true);
       }
     };
     if(vm == null) {
@@ -321,7 +323,7 @@ public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
     startBridgeServerInVM(vm3, new String[] {"b"},  locators);
     
     PoolFactoryImpl pf = new PoolFactoryImpl(null);
-    pf.addLocator(getServerHostName(host), locatorPort);
+    pf.addLocator(NetworkSupport.getServerHostName(host), locatorPort);
     pf.setMinConnections(12);
     pf.setSubscriptionEnabled(false);
     pf.setServerGroup("a");
@@ -349,7 +351,7 @@ public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
     
     getLogWriter().info("pool2 prefilled");
     
-    ServerLocation location1 = new ServerLocation(getServerHostName(host), serverPort1);
+    ServerLocation location1 = new ServerLocation(NetworkSupport.getServerHostName(host), serverPort1);
     PoolImpl pool1 = (PoolImpl) PoolManager.getAll().get(POOL_NAME);
     Assert.assertEquals("a", pool1.getServerGroup());
     
@@ -404,8 +406,8 @@ public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
     int serverPort2 = startBridgeServerInVM(vm2, null, locators, new String[] {REGION_NAME}, new MyLoadProbe(load2 ));
     
     HashMap expected = new HashMap();
-    ServerLocation l1 = new ServerLocation(getServerHostName(host), serverPort1);
-    ServerLocation l2 = new ServerLocation(getServerHostName(host), serverPort2);
+    ServerLocation l1 = new ServerLocation(NetworkSupport.getServerHostName(host), serverPort1);
+    ServerLocation l2 = new ServerLocation(NetworkSupport.getServerHostName(host), serverPort2);
     expected.put(l1, load1);
     expected.put(l2, load2);
     checkLocatorLoad(vm0, expected);
@@ -425,7 +427,7 @@ public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
     checkLocatorLoad(vm0, expected);
     
     PoolFactoryImpl pf = new PoolFactoryImpl(null);
-    pf.addLocator(getServerHostName(host), locatorPort);
+    pf.addLocator(NetworkSupport.getServerHostName(host), locatorPort);
     pf.setMinConnections(20);
     pf.setSubscriptionEnabled(true);
     pf.setIdleTimeout(-1);
@@ -455,7 +457,7 @@ public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
             return "load map never became equal to " + expected;
           }
         };
-        DistributedTestCase.waitForCriterion(ev, MAX_WAIT, 200, true);
+        Wait.waitForCriterion(ev, MAX_WAIT, 200, true);
       }
     });
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e2f18f97/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
index 72f1a5c..5938b49 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
@@ -42,8 +42,12 @@ import com.gemstone.gemfire.distributed.Locator;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.cache.PoolFactoryImpl;
+import com.gemstone.gemfire.test.dunit.Assert;
+import com.gemstone.gemfire.test.dunit.DUnitEnv;
 import com.gemstone.gemfire.test.dunit.DistributedTestCase;
 import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.Invoke;
+import com.gemstone.gemfire.test.dunit.NetworkSupport;
 import com.gemstone.gemfire.test.dunit.SerializableCallable;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.dunit.VM;
@@ -67,7 +71,7 @@ public abstract class LocatorTestBase  extends DistributedTestCase {
     super(name);
   }
   
-  public void tearDown2() throws Exception {
+  public void tearDownBeforeDisconnect() throws Exception {
     
     SerializableRunnable tearDown = new SerializableRunnable("tearDown") {
       public void run() {
@@ -94,9 +98,9 @@ public abstract class LocatorTestBase  extends DistributedTestCase {
     };
     //We seem to like leaving the DS open if we can for
     //speed, but lets at least destroy our cache and locator.
-    invokeInEveryVM(tearDown);
+    Invoke.invokeInEveryVM(tearDown);
     tearDown.run();
-    super.tearDown2();
+    super.tearDownBeforeDisconnect();
   }
   
   protected void startLocatorInVM(final VM vm, final int locatorPort, final String otherLocators) {
@@ -108,21 +112,21 @@ public abstract class LocatorTestBase  extends DistributedTestCase {
         Properties props = new Properties();
         props.setProperty(DistributionConfig.MCAST_PORT_NAME, String.valueOf(0));
         props.setProperty(DistributionConfig.LOCATORS_NAME, otherLocators);
-        props.setProperty(DistributionConfig.LOG_LEVEL_NAME, getDUnitLogLevel());
+        props.setProperty(DistributionConfig.LOG_LEVEL_NAME, DUnitEnv.getDUnitLogLevel());
         props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
         try {
           File logFile = new File(testName + "-locator" + locatorPort
               + ".log");
           InetAddress bindAddr = null;
           try {
-            bindAddr = InetAddress.getByName(getServerHostName(vm.getHost()));
+            bindAddr = InetAddress.getByName(NetworkSupport.getServerHostName(vm.getHost()));
           } catch (UnknownHostException uhe) {
-            fail("While resolving bind address ", uhe);
+            Assert.fail("While resolving bind address ", uhe);
           }
           Locator locator = Locator.startLocatorAndDS(locatorPort, logFile, bindAddr, props);
           remoteObjects.put(LOCATOR_KEY, locator);
         } catch (IOException ex) {
-          fail("While starting locator on port " + locatorPort, ex);
+          Assert.fail("While starting locator on port " + locatorPort, ex);
         }
       }
     });
@@ -302,7 +306,7 @@ public abstract class LocatorTestBase  extends DistributedTestCase {
   public String getLocatorString(Host host, int[] locatorPorts) {
     StringBuffer str = new StringBuffer();
     for(int i = 0; i < locatorPorts.length; i++) {
-      str.append(getServerHostName(host))
+      str.append(NetworkSupport.getServerHostName(host))
           .append("[")
           .append(locatorPorts[i])
           .append("]");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e2f18f97/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
index 1c79129..818020b 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
@@ -266,14 +266,14 @@ public class SSLNoClientAuthDUnitTest extends DistributedTestCase {
     }
   }
   
-  public void tearDown2() throws Exception
+  public void tearDownBeforeDisconnect() throws Exception
   {
     final Host host = Host.getHost(0);
     VM serverVM = host.getVM(1);
     VM clientVM = host.getVM(2);
     clientVM.invoke(SSLNoClientAuthDUnitTest.class, "closeClientCacheTask");
     serverVM.invoke(SSLNoClientAuthDUnitTest.class, "closeCacheTask");
-    super.tearDown2();
+    super.tearDownBeforeDisconnect();
   }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e2f18f97/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
index a398975..94dd10e 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
@@ -59,8 +59,9 @@ import com.gemstone.gemfire.internal.cache.PoolStats;
 import com.gemstone.gemfire.internal.cache.tier.sockets.ServerQueueStatus;
 import com.gemstone.gemfire.internal.logging.InternalLogWriter;
 import com.gemstone.gemfire.internal.logging.LocalLogWriter;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.Threads;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 
 /**
@@ -159,7 +160,7 @@ public class ConnectionManagerJUnitTest {
         return "waiting for manager " + descrip; 
       }
     };
-    DistributedTestCase.waitForCriterion(ev, 200, 200, true);
+    Wait.waitForCriterion(ev, 200, 200, true);
   }
   
   @Test
@@ -426,7 +427,7 @@ public class ConnectionManagerJUnitTest {
     }
     
     for(int i = 0; i < updaterCount; i++) {
-      DistributedTestCase.join(updaters[i], 30 * 1000, null);
+      Threads.join(updaters[i], 30 * 1000);
     }
 
     if(exception.get() !=null) {
@@ -490,7 +491,7 @@ public class ConnectionManagerJUnitTest {
     }
     
     for(int i = 0; i < updaterCount; i++) {
-      DistributedTestCase.join(updaters[i], 30 * 1000, null);
+      Threads.join(updaters[i], 30 * 1000);
     }
 
     if(exception.get() !=null) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e2f18f97/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
index 9f84325..e331926 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
@@ -79,12 +79,19 @@ import com.gemstone.gemfire.internal.cache.control.ResourceAdvisor;
 import com.gemstone.gemfire.internal.cache.control.ResourceListener;
 import com.gemstone.gemfire.internal.cache.control.TestMemoryThresholdListener;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.test.dunit.Assert;
 import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.DUnitEnv;
 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.Invoke;
+import com.gemstone.gemfire.test.dunit.NetworkSupport;
 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;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
 
 /**
  * Tests the Heap Memory thresholds of {@link ResourceManager}
@@ -129,15 +136,15 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
   @Override
   public void setUp() throws Exception {
     super.setUp();
-    invokeInEveryVM(this.setHeapMemoryMonitorTestMode);
-    addExpectedException(expectedEx);
-    addExpectedException(expectedBelow);
+    Invoke.invokeInEveryVM(this.setHeapMemoryMonitorTestMode);
+    IgnoredException.addIgnoredException(expectedEx);
+    IgnoredException.addIgnoredException(expectedBelow);
   }
 
   @Override
-  public void tearDown2() throws Exception {
-    invokeInEveryVM(resetResourceManager);
-    super.tearDown2();
+  public void tearDownBeforeDisconnect() throws Exception {
+    Invoke.invokeInEveryVM(resetResourceManager);
+    super.tearDownBeforeDisconnect();
   }
 
   public void testPRClientPutRejection() throws Exception {
@@ -263,7 +270,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
             return dr.getMemoryThresholdReachedMembers().size() == 0;
           }
         };
-        waitForCriterion(wc, 30000, 10, true);
+        Wait.waitForCriterion(wc, 30000, 10, true);
         return null;
       }
     });
@@ -646,7 +653,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
             return keyFoundOnSickMember && caughtException;
           }
         };
-        waitForCriterion(wc, 30000, 10, true);
+        Wait.waitForCriterion(wc, 30000, 10, true);
         return null;
       }
     });
@@ -699,7 +706,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
             return done;
           }
         };
-        waitForCriterion(wc, 30000, 10, true);
+        Wait.waitForCriterion(wc, 30000, 10, true);
         return null;
       }
     });
@@ -814,7 +821,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
   }
 
   public void testDRFunctionExecutionRejection() throws Exception {
-    addExpectedException("LowMemoryException");
+    IgnoredException.addIgnoredException("LowMemoryException");
     final Host host = Host.getHost(0);
     final VM server1 = host.getVM(0);
     final VM server2 = host.getVM(1);
@@ -832,7 +839,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
     
     final RejectFunction function = new RejectFunction();
     final RejectFunction function2 = new RejectFunction("noRejFunc", false);
-    invokeInEveryVM(new SerializableCallable("register function") {
+    Invoke.invokeInEveryVM(new SerializableCallable("register function") {
       public Object call() throws Exception {
         FunctionService.registerFunction(function);
         FunctionService.registerFunction(function2);
@@ -915,7 +922,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
           fail("expected low memory exception was not thrown");
         } catch (FunctionException e) {
           if (!(e.getCause().getCause() instanceof LowMemoryException)) {
-            fail("unexpected exception ", e);
+            Assert.fail("unexpected exception ", e);
           }
           //expected
         }
@@ -928,7 +935,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
 
   // this test is DISABLED due to intermittent failures.  See bug #52222
   public void disabledtestPRFunctionExecutionRejection() throws Exception {
-    addExpectedException("LowMemoryException");
+    IgnoredException.addIgnoredException("LowMemoryException");
     final Host host = Host.getHost(0);
     final VM accessor = host.getVM(0);
     final VM server1 = host.getVM(1);
@@ -961,7 +968,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
     
     final RejectFunction function = new RejectFunction();
     final RejectFunction function2 = new RejectFunction("noRejFunc", false);
-    invokeInEveryVM(new SerializableCallable("register function") {
+    Invoke.invokeInEveryVM(new SerializableCallable("register function") {
       public Object call() throws Exception {
         FunctionService.registerFunction(function);
         FunctionService.registerFunction(function2);
@@ -1046,7 +1053,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
           fail("expected low memory exception was not thrown");
         } catch (FunctionException e) {
           if (!(e.getCause().getCause() instanceof LowMemoryException)) {
-            fail("unexpected exception", e);
+            Assert.fail("unexpected exception", e);
           }
           //expected
         }
@@ -1141,7 +1148,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
     
     final RejectFunction function = new RejectFunction();
     final RejectFunction function2 = new RejectFunction("noRejFunc", false);
-    invokeInEveryVM(new SerializableCallable("register function") {
+    Invoke.invokeInEveryVM(new SerializableCallable("register function") {
       public Object call() throws Exception {
         FunctionService.registerFunction(function);
         FunctionService.registerFunction(function2);
@@ -1187,7 +1194,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
           fail("expected LowMemoryExcception was not thrown");
         } catch (ServerOperationException e) {
           if (!(e.getCause().getMessage().matches(".*low.*memory.*"))) {
-            fail("unexpected exception", e);
+            Assert.fail("unexpected exception", e);
           }
           //expected
         }
@@ -1280,7 +1287,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
         getCache();
 
         PoolFactory pf = PoolManager.createFactory();
-        pf.addServer(getServerHostName(server.getHost()), serverPort);
+        pf.addServer(NetworkSupport.getServerHostName(server.getHost()), serverPort);
         pf.create("pool1");
         
         AttributesFactory af = new AttributesFactory();
@@ -1305,14 +1312,14 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
           }
         } catch (ServerOperationException ex) {
           if (!catchServerException) {
-            fail("Unexpected exception: ", ex);
+            Assert.fail("Unexpected exception: ", ex);
           }
           if (!(ex.getCause() instanceof LowMemoryException)) {
-            fail("Unexpected exception: ", ex);
+            Assert.fail("Unexpected exception: ", ex);
           }
         } catch (LowMemoryException low) {
           if (!catchLowMemoryException) {
-            fail("Unexpected exception: ", low);
+            Assert.fail("Unexpected exception: ", low);
           }
         }
         return null;
@@ -1342,10 +1349,10 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
           }
         } catch (ServerOperationException ex) {
           if (!catchServerException) {
-            fail("Unexpected exception: ", ex);
+            Assert.fail("Unexpected exception: ", ex);
           }
           if (!(ex.getCause() instanceof LowMemoryException)) {
-            fail("Unexpected exception: ", ex);
+            Assert.fail("Unexpected exception: ", ex);
           }
           for(Integer me: temp.keySet()) {
             assertFalse("Key " + me + " should not exist", r.containsKey(me));
@@ -1353,7 +1360,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
         } catch (LowMemoryException low) {
           getLogWriter().info("Caught LowMemoryException", low);
           if (!catchLowMemoryException) {
-            fail("Unexpected exception: ", low);
+            Assert.fail("Unexpected exception: ", low);
           }
           for(Integer me: temp.keySet()) {
             assertFalse("Key " + me + " should not exist", r.containsKey(me));
@@ -1536,7 +1543,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
             throw new IllegalStateException("Unknown memory state");
         }
         if (useWaitCriterion) {
-          waitForCriterion(wc, 30000, 10, true);
+          Wait.waitForCriterion(wc, 30000, 10, true);
         }
         return null;
       }
@@ -1556,7 +1563,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
             return numberOfProfiles == ra.adviseGeneric().size();
           }
         };
-        waitForCriterion(wc, 30000, 10, true);
+        Wait.waitForCriterion(wc, 30000, 10, true);
         return null;
       }
     });
@@ -1571,7 +1578,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
 
   protected Properties getServerProperties() {
     Properties p = new Properties();
-    p.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+getDUnitLocatorPort()+"]");
+    p.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+DUnitEnv.getDUnitLocatorPort()+"]");
     return p;
   }
 
@@ -1685,7 +1692,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
         return "Waiting for " + tenuredPoolName + " statistics to be added to create listener for";
       }
     };
-    DistributedTestCase.waitForCriterion(wc, 5000, 10, true);
+    Wait.waitForCriterion(wc, 5000, 10, true);
     
     assertTrue("expected at least one stat listener, found " +
         sampler.getLocalListeners().size(),


Mime
View raw message