geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sai_boorlaga...@apache.org
Subject [51/90] [abbrv] [partial] incubator-geode git commit: GEODE-837: update tests from JUnit3 to JUnit4
Date Tue, 14 Jun 2016 19:11:01 GMT
GEODE-837: update tests from JUnit3 to JUnit4

* convert JUnit3 tests to use JUnit4 syntax and classes
* remove unused junit3 classes
* rename misnamed tests
* fixup and organize imports
* remove empty or worthless javadocs
* remove deadcode
* update from junit.framework.Assert to org.junit.Assert
* fix exception eating
* add usage of junit Assume
* remove some empty constructors
* increase getRepeatTimeoutMs to 2 minutes
* use getDiskDirs() and getUniqueName() for disk dirs in some tests
* move some setup code from ctor to setup
* change scope of some methods and vars to private
* add TODOs for further cleanup work
* remove some unecessary type casts
* annotate disabled tests with @Ignore and @Test
* change assertEquals with floats to call three arg version
* add some missing categories


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

Branch: refs/heads/feature/GEODE-93
Commit: b914df23044db3b5e1b8cbfb5e425df8c88bb4c0
Parents: 7fb8a39
Author: Kirk Lund <klund@apache.org>
Authored: Thu Jun 9 09:47:37 2016 -0700
Committer: Kirk Lund <klund@apache.org>
Committed: Thu Jun 9 10:05:14 2016 -0700

----------------------------------------------------------------------
 convert_one_dunit_to_junit4.pl                  |   41 +
 etc/intellijIdeaCodeStyle.xml                   |  431 ++++-
 .../gemstone/gemfire/modules/SecondVMTest.java  |   46 +-
 .../session/internal/filter/CommonTests.java    |   16 +-
 .../modules/session/TestSessionsBase.java       |   57 +-
 ...stAPIOnRegionFunctionExecutionDUnitTest.java |   18 +-
 .../web/controllers/RestAPITestBase.java        |   65 +-
 .../RestAPIsAndInterOpsDUnitTest.java           |   17 +-
 ...tAPIsOnGroupsFunctionExecutionDUnitTest.java |   23 +-
 ...APIsOnMembersFunctionExecutionDUnitTest.java |   27 +-
 .../RestAPIsQueryAndFEJUnitTest.java            |  306 ++-
 .../controllers/RestAPIsWithSSLDUnitTest.java   |   24 +-
 .../com/gemstone/gemfire/JUnitTestSetup.java    |  143 --
 .../gemstone/gemfire/TestDataSerializer.java    |    2 -
 .../com/gemstone/gemfire/TimingTestCase.java    |   77 -
 .../cache/CacheRegionClearStatsDUnitTest.java   |   43 +-
 .../cache/ClientServerTimeSyncDUnitTest.java    |   17 +-
 .../cache/ConnectionPoolAndLoaderDUnitTest.java |  184 +-
 .../cache/ConnectionPoolAutoDUnitTest.java      |    7 +-
 .../gemfire/cache/ConnectionPoolDUnitTest.java  |  145 +-
 .../ClientServerRegisterInterestsDUnitTest.java |   39 +-
 .../internal/AutoConnectionSourceDUnitTest.java |   23 +-
 .../CacheServerSSLConnectionDUnitTest.java      |   45 +-
 .../internal/LocatorLoadBalancingDUnitTest.java |   20 +-
 .../cache/client/internal/LocatorTestBase.java  |   15 +-
 .../internal/SSLNoClientAuthDUnitTest.java      |   38 +-
 .../management/MemoryThresholdsDUnitTest.java   |  142 +-
 .../MemoryThresholdsOffHeapDUnitTest.java       |  130 +-
 .../management/ResourceManagerDUnitTest.java    |   41 +-
 .../mapInterface/PutAllGlobalLockJUnitTest.java |   39 +-
 .../PartitionRegionHelperDUnitTest.java         |   21 +-
 .../gemfire/cache/query/QueryJUnitTest.java     |    9 +-
 .../gemfire/cache/query/QueryTestUtils.java     |   23 +-
 .../query/dunit/CloseCacheAuthorization.java    |   11 +-
 .../query/dunit/CompactRangeIndexDUnitTest.java |   20 +-
 .../cache/query/dunit/GroupByDUnitImpl.java     |   32 +-
 .../dunit/GroupByPartitionedQueryDUnitTest.java |   13 +-
 .../query/dunit/GroupByQueryDUnitTest.java      |   16 +-
 .../cache/query/dunit/HashIndexDUnitTest.java   |   15 +-
 .../cache/query/dunit/HelperTestCase.java       |   47 +-
 .../dunit/NonDistinctOrderByDUnitImpl.java      |   25 +-
 .../NonDistinctOrderByPartitionedDUnitTest.java |   13 +-
 ...itionedRegionCompactRangeIndexDUnitTest.java |   35 +-
 .../query/dunit/PdxStringQueryDUnitTest.java    |   31 +-
 .../cache/query/dunit/QueryAuthorization.java   |   18 +-
 .../dunit/QueryDataInconsistencyDUnitTest.java  |   26 +-
 .../dunit/QueryIndexUsingXMLDUnitTest.java      |   82 +-
 .../QueryParamsAuthorizationDUnitTest.java      |   17 +-
 .../QueryUsingFunctionContextDUnitTest.java     |   61 +-
 .../query/dunit/QueryUsingPoolDUnitTest.java    |  154 +-
 .../cache/query/dunit/RemoteQueryDUnitTest.java |   79 +-
 ...esourceManagerWithQueryMonitorDUnitTest.java |  133 +-
 .../query/functional/ConstantsJUnitTest.java    |   21 +-
 .../query/functional/CountStarJUnitTest.java    |  535 +++---
 .../query/functional/FunctionJUnitTest.java     |   10 +-
 .../IUMRShuffleIteratorsJUnitTest.java          |  369 ++--
 .../IndexCreationDeadLockJUnitTest.java         |   79 +-
 .../functional/IndexCreationJUnitTest.java      | 1427 +++++++-------
 .../IndexUsageWithAliasAsProjAtrbt.java         |  176 --
 ...IndexUsageWithAliasAsProjAtrbtJUnitTest.java |   92 +-
 .../functional/LikePredicateJUnitTest.java      |   42 +-
 .../cache/query/functional/MiscJUnitTest.java   |  305 +--
 .../query/functional/NestedQueryJUnitTest.java  |   88 +-
 .../query/functional/NumericQueryJUnitTest.java |   42 +-
 .../query/functional/StructSetOrResultsSet.java |   86 +-
 .../query/functional/TestNewFunctionSSorRS.java |  128 --
 .../TestNewFunctionSSorRSIntegrationTest.java   |  128 ++
 .../index/AsynchIndexMaintenanceJUnitTest.java  |   52 +-
 .../index/CompactRangeIndexJUnitTest.java       |   91 +-
 ...rrentIndexInitOnOverflowRegionDUnitTest.java |   19 +-
 ...ndexOperationsOnOverflowRegionDUnitTest.java |   29 +-
 ...pdateWithInplaceObjectModFalseDUnitTest.java |   48 +-
 ...ConcurrentIndexUpdateWithoutWLDUnitTest.java |   61 +-
 .../index/CopyOnReadIndexDUnitTest.java         |   53 +-
 .../DeclarativeIndexCreationJUnitTest.java      |   50 +-
 .../internal/index/EquiJoinIntegrationTest.java |  437 +++++
 .../query/internal/index/EquijoinDUnitTest.java |  437 -----
 .../IndexTrackingQueryObserverDUnitTest.java    |   17 +-
 ...itializeIndexEntryDestroyQueryDUnitTest.java |   19 +-
 .../index/MultiIndexCreationDUnitTest.java      |   17 +-
 ...artitionedRegionEquiJoinIntegrationTest.java |  130 ++
 .../PartitionedRegionEquijoinDUnitTest.java     |  130 --
 .../index/PdxCopyOnReadQueryJUnitTest.java      |   17 +-
 .../index/PutAllWithIndexPerfDUnitTest.java     |   49 +-
 .../PRBasicIndexCreationDUnitTest.java          |   36 +-
 .../PRBasicIndexCreationDeadlockDUnitTest.java  |   15 +-
 .../PRBasicMultiIndexCreationDUnitTest.java     |   34 +-
 .../partitioned/PRBasicQueryDUnitTest.java      |   17 +-
 .../PRBasicRemoveIndexDUnitTest.java            |   59 +-
 .../PRColocatedEquiJoinDUnitTest.java           |   30 +-
 .../partitioned/PRInvalidQueryDUnitTest.java    |   15 +-
 .../partitioned/PRQueryCacheCloseDUnitTest.java |   16 +-
 .../query/partitioned/PRQueryDUnitHelper.java   |   14 +-
 .../query/partitioned/PRQueryDUnitTest.java     |   31 +-
 .../PRQueryRegionCloseDUnitTest.java            |   15 +-
 .../PRQueryRegionDestroyedDUnitTest.java        |   15 +-
 .../PRQueryRemoteNodeExceptionDUnitTest.java    |   31 +-
 .../snapshot/ParallelSnapshotDUnitTest.java     |   18 +-
 .../snapshot/SnapshotByteArrayDUnitTest.java    |   17 +-
 .../cache/snapshot/SnapshotDUnitTest.java       |   19 +-
 .../snapshot/SnapshotPerformanceDUnitTest.java  |   17 +-
 .../gemfire/cache30/Bug34387DUnitTest.java      |   18 +-
 .../gemfire/cache30/Bug34948DUnitTest.java      |   17 +-
 .../gemfire/cache30/Bug35214DUnitTest.java      |   17 +-
 .../gemfire/cache30/Bug38013DUnitTest.java      |   17 +-
 .../gemfire/cache30/Bug38741DUnitTest.java      |   58 +-
 .../gemfire/cache30/CacheCloseDUnitTest.java    |   17 +-
 .../gemfire/cache30/CacheListenerTestCase.java  |   20 +-
 .../gemfire/cache30/CacheLoaderTestCase.java    |   17 +-
 .../gemfire/cache30/CacheLogRollDUnitTest.java  |  144 +-
 .../gemfire/cache30/CacheMapTxnDUnitTest.java   |   73 +-
 ...cheRegionsReliablityStatsCheckDUnitTest.java |   30 +-
 .../cache30/CacheSerializableRunnable.java      |   28 +-
 .../cache30/CacheStatisticsDUnitTest.java       |   20 +-
 .../gemfire/cache30/CacheWriterTestCase.java    |   19 +-
 .../gemfire/cache30/CacheXml30DUnitTest.java    |   93 +-
 .../gemfire/cache30/CacheXml40DUnitTest.java    |   23 +-
 .../gemfire/cache30/CacheXml41DUnitTest.java    |   26 +-
 .../gemfire/cache30/CacheXml45DUnitTest.java    |   62 +-
 .../gemfire/cache30/CacheXml51DUnitTest.java    |   39 +-
 .../gemfire/cache30/CacheXml55DUnitTest.java    |   10 +-
 .../gemfire/cache30/CacheXml57DUnitTest.java    |   63 +-
 .../gemfire/cache30/CacheXml58DUnitTest.java    |   28 +-
 .../gemfire/cache30/CacheXml60DUnitTest.java    |   35 +-
 .../gemfire/cache30/CacheXml61DUnitTest.java    |   40 +-
 .../gemfire/cache30/CacheXml65DUnitTest.java    |   95 +-
 .../gemfire/cache30/CacheXml66DUnitTest.java    |   17 +-
 .../gemfire/cache30/CacheXml70DUnitTest.java    |   21 +-
 .../gemfire/cache30/CacheXml80DUnitTest.java    |   20 +-
 .../gemfire/cache30/CacheXml81DUnitTest.java    |   12 +-
 .../cache30/CacheXmlGeode10DUnitTest.java       |   45 +-
 .../gemfire/cache30/CacheXmlTestCase.java       |   22 +-
 .../gemfire/cache30/CallbackArgDUnitTest.java   |   18 +-
 .../cache30/ClearMultiVmCallBkDUnitTest.java    |  100 +-
 .../gemfire/cache30/ClearMultiVmDUnitTest.java  |   33 +-
 .../cache30/ClientMembershipDUnitTest.java      |   57 +-
 .../ClientMembershipSelectorDUnitTest.java      |    9 +-
 .../ClientRegisterInterestDUnitTest.java        |   49 +-
 ...ClientRegisterInterestSelectorDUnitTest.java |    9 +-
 .../cache30/ClientServerCCEDUnitTest.java       |   53 +-
 .../gemfire/cache30/ClientServerTestCase.java   |   10 +-
 .../ConcurrentLeaveDuringGIIDUnitTest.java      |   17 +-
 ...ibutedNoAckAsyncOverflowRegionDUnitTest.java |   21 +-
 ...iskDistributedNoAckAsyncRegionDUnitTest.java |   18 +-
 .../DiskDistributedNoAckRegionTestCase.java     |   15 +-
 ...ributedNoAckSyncOverflowRegionDUnitTest.java |   23 +-
 .../gemfire/cache30/DiskRegionDUnitTest.java    |   37 +-
 .../gemfire/cache30/DiskRegionTestImpl.java     |   14 +-
 .../cache30/DistAckMapMethodsDUnitTest.java     |   73 +-
 ...istributedAckOverflowRegionCCEDUnitTest.java |   18 +-
 ...tedAckOverflowRegionCCEOffHeapDUnitTest.java |   16 +-
 ...tributedAckPersistentRegionCCEDUnitTest.java |   71 +-
 ...dAckPersistentRegionCCEOffHeapDUnitTest.java |   15 +-
 .../DistributedAckRegionCCEDUnitTest.java       |  117 +-
 ...DistributedAckRegionCCEOffHeapDUnitTest.java |   19 +-
 ...istributedAckRegionCompressionDUnitTest.java |   12 +-
 .../cache30/DistributedAckRegionDUnitTest.java  |   31 +-
 .../DistributedAckRegionOffHeapDUnitTest.java   |   20 +-
 .../DistributedMulticastRegionDUnitTest.java    |   92 +-
 .../DistributedNoAckRegionCCEDUnitTest.java     |   54 +-
 ...stributedNoAckRegionCCEOffHeapDUnitTest.java |   16 +-
 .../DistributedNoAckRegionDUnitTest.java        |   45 +-
 .../DistributedNoAckRegionOffHeapDUnitTest.java |   15 +-
 .../gemfire/cache30/DynamicRegionDUnitTest.java |   17 +-
 .../gemfire/cache30/GlobalLockingDUnitTest.java |   27 +-
 .../cache30/GlobalRegionCCEDUnitTest.java       |   80 +-
 .../GlobalRegionCCEOffHeapDUnitTest.java        |   16 +-
 .../gemfire/cache30/GlobalRegionDUnitTest.java  |   15 +-
 .../cache30/GlobalRegionOffHeapDUnitTest.java   |   30 +-
 .../cache30/LRUEvictionControllerDUnitTest.java |   25 +-
 .../gemfire/cache30/LocalRegionDUnitTest.java   |   17 +-
 .../MemLRUEvictionControllerDUnitTest.java      |   22 +-
 .../gemfire/cache30/MultiVMRegionTestCase.java  | 1752 ++++++++++--------
 .../OffHeapLRUEvictionControllerDUnitTest.java  |   16 +-
 .../PRBucketSynchronizationDUnitTest.java       |   19 +-
 .../PartitionedRegionCompressionDUnitTest.java  |   14 +-
 .../cache30/PartitionedRegionDUnitTest.java     |  171 +-
 ...tionedRegionMembershipListenerDUnitTest.java |   14 +-
 .../PartitionedRegionOffHeapDUnitTest.java      |   20 +-
 .../cache30/PreloadedRegionTestCase.java        |   15 +-
 .../gemfire/cache30/ProxyDUnitTest.java         |   19 +-
 .../cache30/PutAllCallBkRemoteVMDUnitTest.java  |   29 +-
 .../cache30/PutAllCallBkSingleVMDUnitTest.java  |   21 +-
 .../gemfire/cache30/PutAllMultiVmDUnitTest.java |   30 +-
 .../gemfire/cache30/QueueMsgDUnitTest.java      |   65 +-
 .../cache30/RRSynchronizationDUnitTest.java     |   19 +-
 .../gemfire/cache30/ReconnectDUnitTest.java     |   22 +-
 .../ReconnectedCacheServerDUnitTest.java        |   18 +-
 .../cache30/RegionAttributesTestCase.java       |   16 +-
 .../cache30/RegionExpirationDUnitTest.java      |   23 +-
 .../RegionMembershipListenerDUnitTest.java      |   20 +-
 .../RegionReliabilityDistAckDUnitTest.java      |   14 +-
 .../RegionReliabilityDistNoAckDUnitTest.java    |   14 +-
 .../RegionReliabilityGlobalDUnitTest.java       |   14 +-
 .../RegionReliabilityListenerDUnitTest.java     |   31 +-
 .../cache30/RegionReliabilityTestCase.java      |   83 +-
 .../gemfire/cache30/RegionTestCase.java         |   66 +-
 .../gemfire/cache30/ReliabilityTestCase.java    |   23 +-
 .../cache30/RemoveAllMultiVmDUnitTest.java      |   30 +-
 .../gemfire/cache30/RequiredRolesDUnitTest.java |   38 +-
 .../cache30/RolePerformanceDUnitTest.java       |   31 +-
 .../gemfire/cache30/SearchAndLoadDUnitTest.java |   31 +-
 .../gemfire/cache30/SlowRecDUnitTest.java       |  178 +-
 .../gemfire/cache30/TXDistributedDUnitTest.java |   90 +-
 .../gemfire/cache30/TXOrderDUnitTest.java       |   58 +-
 .../cache30/TXRestrictionsDUnitTest.java        |   14 +-
 .../codeAnalysis/ClassAndMethodDetails.java     |   42 +-
 .../DistributedLockServiceDUnitTest.java        |  131 +-
 .../gemfire/distributed/LocatorDUnitTest.java   |   32 +-
 .../gemfire/distributed/RoleDUnitTest.java      |   35 +-
 .../distributed/SystemAdminDUnitTest.java       |   18 +-
 .../distributed/internal/Bug40751DUnitTest.java |   33 +-
 .../ConsoleDistributionManagerDUnitTest.java    |   54 +-
 .../internal/DistributionAdvisorDUnitTest.java  |   21 +-
 .../internal/DistributionManagerDUnitTest.java  |   88 +-
 .../gemfire/distributed/internal/LDM.java       |   12 +-
 .../internal/ProductUseLogDUnitTest.java        |   38 +-
 .../GemFireDeadlockDetectorDUnitTest.java       |   19 +-
 .../messenger/JGroupsMessengerJUnitTest.java    |   69 +-
 .../StreamingOperationManyDUnitTest.java        |   20 +-
 .../StreamingOperationOneDUnitTest.java         |   16 +-
 .../TcpServerBackwardCompatDUnitTest.java       |   31 +-
 .../internal/tcpserver/TcpServerJUnitTest.java  |   47 +-
 .../gemfire/disttx/CacheMapDistTXDUnitTest.java |   15 +-
 .../disttx/DistTXManagerImplJUnitTest.java      |   18 +-
 .../gemfire/disttx/DistTXOrderDUnitTest.java    |   24 +-
 .../disttx/DistTXRestrictionsDUnitTest.java     |   12 +-
 .../disttx/DistTXWithDeltaDUnitTest.java        |   14 +-
 .../disttx/DistributedTransactionDUnitTest.java |  101 +-
 .../gemfire/disttx/PRDistTXDUnitTest.java       |   35 +-
 .../disttx/PRDistTXWithVersionsDUnitTest.java   |   32 +-
 ...entPartitionedRegionWithDistTXDUnitTest.java |   14 +-
 ...wardCompatibilitySerializationDUnitTest.java |   16 +-
 .../ClassNotFoundExceptionDUnitTest.java        |   18 +-
 .../internal/JarClassLoaderJUnitTest.java       |   62 +-
 .../gemfire/internal/JarDeployerDUnitTest.java  |   55 +-
 .../internal/PdxDeleteFieldDUnitTest.java       |   41 +-
 .../gemfire/internal/PdxRenameDUnitTest.java    |   39 +-
 .../gemfire/internal/SSLConfigJUnitTest.java    |   79 +-
 .../gemfire/internal/cache/BackupDUnitTest.java |   27 +-
 .../internal/cache/Bug33359DUnitTest.java       |   24 +-
 .../internal/cache/Bug33726DUnitTest.java       |   21 +-
 .../Bug34179TooManyFilesOpenJUnitTest.java      |   77 +-
 .../internal/cache/Bug37241DUnitTest.java       |   28 +-
 .../internal/cache/Bug37377DUnitTest.java       |   30 +-
 .../internal/cache/Bug39079DUnitTest.java       |  479 +++--
 .../internal/cache/Bug40299DUnitTest.java       |   35 +-
 .../internal/cache/Bug40632DUnitTest.java       |   78 +-
 .../internal/cache/Bug41091DUnitTest.java       |   50 +-
 .../internal/cache/Bug41733DUnitTest.java       |   33 +-
 .../internal/cache/Bug41957DUnitTest.java       |   39 +-
 .../internal/cache/Bug42055DUnitTest.java       |   17 +-
 .../internal/cache/Bug45164DUnitTest.java       |   17 +-
 .../internal/cache/Bug45934DUnitTest.java       |   32 +-
 .../internal/cache/Bug47667DUnitTest.java       |   15 +-
 .../internal/cache/CacheAdvisorDUnitTest.java   |   25 +-
 .../cache/CacheLifecycleListenerJUnitTest.java  |   33 +-
 .../internal/cache/ClearDAckDUnitTest.java      |   48 +-
 .../internal/cache/ClearGlobalDUnitTest.java    |   28 +-
 .../cache/ClientServerGetAllDUnitTest.java      |   55 +-
 ...ServerInvalidAndDestroyedEntryDUnitTest.java |   56 +-
 .../ClientServerTransactionCCEDUnitTest.java    |   14 +-
 .../cache/ClientServerTransactionDUnitTest.java |  127 +-
 .../cache/ComplexDiskRegionJUnitTest.java       |   34 +-
 .../ConcurrentDestroySubRegionDUnitTest.java    |   18 +-
 ...entFlushingAndRegionOperationsJUnitTest.java |   38 +-
 .../cache/ConcurrentMapLocalJUnitTest.java      |   17 +-
 .../cache/ConcurrentMapOpsDUnitTest.java        |  130 +-
 .../ConcurrentRegionOperationsJUnitTest.java    |   40 +-
 ...rentRollingAndRegionOperationsJUnitTest.java |  173 +-
 .../internal/cache/ConflationJUnitTest.java     |  159 +-
 .../cache/ConnectDisconnectDUnitTest.java       |   34 +-
 .../internal/cache/DeltaFaultInDUnitTest.java   |   17 +-
 .../cache/DeltaPropagationDUnitTest.java        |   74 +-
 .../cache/DeltaPropagationStatsDUnitTest.java   |   63 +-
 .../internal/cache/DeltaSizingDUnitTest.java    |   24 +-
 .../cache/DiskOfflineCompactionJUnitTest.java   |   79 +-
 .../internal/cache/DiskOldAPIsJUnitTest.java    |   41 +-
 ...iskRandomOperationsAndRecoveryJUnitTest.java |   38 +-
 .../cache/DiskRegByteArrayDUnitTest.java        |   60 +-
 .../cache/DiskRegCacheXmlJUnitTest.java         |   84 +-
 .../DiskRegCachexmlGeneratorJUnitTest.java      |  124 +-
 .../internal/cache/DiskRegCbkChkJUnitTest.java  |   38 +-
 .../DiskRegOplogSwtchingAndRollerJUnitTest.java |  130 +-
 .../cache/DiskRegRecoveryJUnitTest.java         |  215 +--
 .../cache/DiskRegionAsyncRecoveryJUnitTest.java |   14 +-
 ...RegionChangingRegionAttributesJUnitTest.java |   51 +-
 .../cache/DiskRegionClearJUnitTest.java         |  167 +-
 .../DiskRegionIllegalArguementsJUnitTest.java   |   39 +-
 ...iskRegionIllegalCacheXMLvaluesJUnitTest.java |   58 +-
 .../internal/cache/DiskRegionJUnitTest.java     |  979 ++++------
 .../internal/cache/DiskRegionTestingBase.java   |  154 +-
 .../cache/DiskStoreFactoryJUnitTest.java        |   46 +-
 ...DistrbutedRegionProfileOffHeapDUnitTest.java |   34 +-
 .../cache/DistributedCacheTestCase.java         |   35 +-
 .../internal/cache/EventTrackerDUnitTest.java   |   58 +-
 .../internal/cache/EvictionDUnitTest.java       |   58 +-
 .../cache/EvictionObjectSizerDUnitTest.java     |   21 +-
 .../internal/cache/EvictionStatsDUnitTest.java  |   26 +-
 .../internal/cache/EvictionTestBase.java        |   48 +-
 .../internal/cache/FaultingInJUnitTest.java     |   77 +-
 .../cache/FixedPRSinglehopDUnitTest.java        |   80 +-
 .../internal/cache/GIIDeltaDUnitTest.java       |   40 +-
 .../internal/cache/GIIFlowControlDUnitTest.java |   19 +-
 .../internal/cache/GridAdvisorDUnitTest.java    |   40 +-
 .../HAOverflowMemObjectSizerDUnitTest.java      |   44 +-
 .../cache/IncrementalBackupDUnitTest.java       |   62 +-
 .../cache/InterruptClientServerDUnitTest.java   |   29 +-
 ...InterruptsConserveSocketsFalseDUnitTest.java |   15 +-
 .../internal/cache/InterruptsDUnitTest.java     |   28 +-
 .../internal/cache/IteratorDUnitTest.java       |   18 +-
 .../internal/cache/MapClearGIIDUnitTest.java    |  102 +-
 .../internal/cache/MapInterfaceJUnitTest.java   |   73 +-
 .../MultipleOplogsRollingFeatureJUnitTest.java  |  112 +-
 .../cache/NetSearchMessagingDUnitTest.java      |   40 +-
 .../cache/OffHeapEvictionDUnitTest.java         |   34 +-
 .../cache/OffHeapEvictionStatsDUnitTest.java    |   20 +-
 .../gemfire/internal/cache/OffHeapTestUtil.java |    8 +-
 .../cache/OfflineSnapshotJUnitTest.java         |   28 +-
 .../gemfire/internal/cache/OplogJUnitTest.java  |   32 +-
 .../cache/P2PDeltaPropagationDUnitTest.java     |   52 +-
 .../internal/cache/PRBadToDataDUnitTest.java    |   17 +-
 .../cache/PRDataStoreMemoryJUnitTest.java       |   27 +-
 .../cache/PartitionListenerDUnitTest.java       |   17 +-
 ...dRegionAPIConserveSocketsFalseDUnitTest.java |   20 +-
 .../cache/PartitionedRegionAPIDUnitTest.java    |   23 +-
 .../PartitionedRegionAsSubRegionDUnitTest.java  |   17 +-
 ...gionBucketCreationDistributionDUnitTest.java |   65 +-
 .../PartitionedRegionCacheCloseDUnitTest.java   |   15 +-
 ...rtitionedRegionCacheLoaderForRootRegion.java |   18 +-
 ...artitionedRegionCacheLoaderForSubRegion.java |   17 +-
 ...rtitionedRegionCacheXMLExampleDUnitTest.java |   27 +-
 .../PartitionedRegionCreationDUnitTest.java     |   23 +-
 .../cache/PartitionedRegionDUnitTestCase.java   |   25 +-
 ...rtitionedRegionDelayedRecoveryDUnitTest.java |   19 +-
 .../PartitionedRegionDestroyDUnitTest.java      |   15 +-
 .../PartitionedRegionEntryCountDUnitTest.java   |   17 +-
 .../PartitionedRegionEvictionDUnitTest.java     |   70 +-
 .../cache/PartitionedRegionHADUnitTest.java     |   17 +-
 ...onedRegionHAFailureAndRecoveryDUnitTest.java |   17 +-
 .../PartitionedRegionInvalidateDUnitTest.java   |   19 +-
 ...artitionedRegionLocalMaxMemoryDUnitTest.java |   19 +-
 ...nedRegionLocalMaxMemoryOffHeapDUnitTest.java |   16 +-
 .../PartitionedRegionMultipleDUnitTest.java     |   17 +-
 ...rtitionedRegionOffHeapEvictionDUnitTest.java |   19 +-
 .../cache/PartitionedRegionPRIDDUnitTest.java   |   15 +-
 .../cache/PartitionedRegionQueryDUnitTest.java  |   28 +-
 ...artitionedRegionRedundancyZoneDUnitTest.java |   72 +-
 ...tionedRegionSerializableObjectJUnitTest.java |   51 +-
 .../PartitionedRegionSingleHopDUnitTest.java    |  235 ++-
 ...RegionSingleHopWithServerGroupDUnitTest.java |  215 +--
 .../cache/PartitionedRegionSizeDUnitTest.java   |   18 +-
 .../cache/PartitionedRegionStatsDUnitTest.java  |   19 +-
 .../PartitionedRegionTestUtilsDUnitTest.java    |   34 +-
 .../PartitionedRegionWithSameNameDUnitTest.java |   24 +-
 .../internal/cache/PutAllDAckDUnitTest.java     |   25 +-
 .../internal/cache/PutAllGlobalDUnitTest.java   |   27 +-
 .../cache/RegionEntryFlagsJUnitTest.java        |    9 +-
 .../cache/RemoteTransactionCCEDUnitTest.java    |   17 +-
 .../cache/RemoteTransactionDUnitTest.java       |  177 +-
 .../internal/cache/RemoveAllDAckDUnitTest.java  |   22 +-
 .../internal/cache/RemoveDAckDUnitTest.java     |   28 +-
 .../internal/cache/RemoveGlobalDUnitTest.java   |   28 +-
 .../cache/SimpleDiskRegionJUnitTest.java        |   16 +-
 .../internal/cache/SingleHopStatsDUnitTest.java |   60 +-
 .../internal/cache/SizingFlagDUnitTest.java     |   35 +-
 .../internal/cache/SystemFailureDUnitTest.java  |  152 +-
 .../gemfire/internal/cache/TestDelta.java       |  112 +-
 .../cache/TransactionsWithDeltaDUnitTest.java   |   19 +-
 .../cache/control/MemoryMonitorJUnitTest.java   |   52 +-
 .../control/RebalanceOperationDUnitTest.java    |  124 +-
 ...skRegOverflowAsyncGetInMemPerfJUnitTest.java |   40 +-
 ...iskRegOverflowAsyncJUnitPerformanceTest.java |   55 +-
 ...lowSyncGetInMemPerfJUnitPerformanceTest.java |   53 +-
 ...DiskRegOverflowSyncJUnitPerformanceTest.java |   65 +-
 ...egionOverflowAsyncRollingOpLogJUnitTest.java |   67 +-
 ...RegionOverflowSyncRollingOpLogJUnitTest.java |   14 +-
 .../DiskRegionPerfJUnitPerformanceTest.java     |   78 +-
 .../DiskRegionPersistOnlySyncJUnitTest.java     |   45 +-
 ...DiskRegionRollOpLogJUnitPerformanceTest.java |   90 +-
 .../cache/execute/Bug51193DUnitTest.java        |   56 +-
 .../ClientServerFunctionExecutionDUnitTest.java |   29 +-
 .../execute/ColocationFailoverDUnitTest.java    |   19 +-
 ...ributedRegionFunctionExecutionDUnitTest.java |   96 +-
 .../FunctionExecution_ExceptionDUnitTest.java   |   23 +-
 .../execute/FunctionServiceStatsDUnitTest.java  |   90 +-
 .../cache/execute/LocalDataSetDUnitTest.java    |   25 +-
 .../execute/LocalDataSetIndexingDUnitTest.java  |   17 +-
 .../LocalFunctionExecutionDUnitTest.java        |   23 +-
 .../MemberFunctionExecutionDUnitTest.java       |   69 +-
 .../MultiRegionFunctionExecutionDUnitTest.java  |   27 +-
 .../OnGroupsFunctionExecutionDUnitTest.java     |   66 +-
 ...ntServerFunctionExecutionNoAckDUnitTest.java |   16 +-
 ...tServerRegionFunctionExecutionDUnitTest.java |   41 +-
 ...egionFunctionExecutionFailoverDUnitTest.java |   85 +-
 ...onFunctionExecutionNoSingleHopDUnitTest.java |   35 +-
 ...onExecutionSelectorNoSingleHopDUnitTest.java |   33 +-
 ...gionFunctionExecutionSingleHopDUnitTest.java |   76 +-
 .../cache/execute/PRClientServerTestBase.java   |   55 +-
 .../cache/execute/PRColocationDUnitTest.java    |   38 +-
 .../execute/PRCustomPartitioningDUnitTest.java  |   17 +-
 .../execute/PRFunctionExecutionDUnitTest.java   |  215 ++-
 .../PRFunctionExecutionTimeOutDUnitTest.java    |   21 +-
 ...ctionExecutionWithResultSenderDUnitTest.java |   22 +-
 .../execute/PRPerformanceTestDUnitTest.java     |   17 +-
 .../cache/execute/PRTransactionDUnitTest.java   |   36 +-
 .../PRTransactionWithVersionsDUnitTest.java     |   14 +-
 .../cache/execute/PerformanceTestFunction.java  |    6 +-
 .../execute/SingleHopGetAllPutAllDUnitTest.java |   16 +-
 .../cache/ha/BlockingHARegionJUnitTest.java     |  525 +++---
 .../cache/ha/Bug36853EventsExpiryDUnitTest.java |   81 +-
 .../internal/cache/ha/Bug48571DUnitTest.java    |   49 +-
 .../internal/cache/ha/Bug48879DUnitTest.java    |   26 +-
 .../cache/ha/EventIdOptimizationDUnitTest.java  |   54 +-
 .../internal/cache/ha/FailoverDUnitTest.java    |   76 +-
 .../internal/cache/ha/HABugInPutDUnitTest.java  |   57 +-
 .../internal/cache/ha/HAClearDUnitTest.java     |   62 +-
 .../cache/ha/HAConflationDUnitTest.java         |   66 +-
 .../internal/cache/ha/HADuplicateDUnitTest.java |   68 +-
 .../cache/ha/HAEventIdPropagationDUnitTest.java |  117 +-
 .../internal/cache/ha/HAExpiryDUnitTest.java    |   22 +-
 .../internal/cache/ha/HAGIIBugDUnitTest.java    |   36 +-
 .../internal/cache/ha/HAGIIDUnitTest.java       |  154 +-
 .../cache/ha/HARQAddOperationJUnitTest.java     |  188 +-
 .../cache/ha/HARQueueNewImplDUnitTest.java      |  297 ++-
 .../internal/cache/ha/HARegionDUnitTest.java    |   34 +-
 .../internal/cache/ha/HARegionJUnitTest.java    |  178 +-
 .../cache/ha/HARegionQueueDUnitTest.java        |  473 ++---
 .../cache/ha/HARegionQueueJUnitTest.java        |  684 +++----
 .../cache/ha/HASlowReceiverDUnitTest.java       |   35 +-
 .../ha/OperationsPropagationDUnitTest.java      |  149 +-
 .../internal/cache/ha/PutAllDUnitTest.java      |   56 +-
 .../internal/cache/ha/StatsBugDUnitTest.java    |   73 +-
 .../cache/ha/ThreadIdentifierJUnitTest.java     |    2 -
 .../cache/locks/TXLockServiceDUnitTest.java     |   61 +-
 .../internal/cache/lru/LRUClockJUnitTest.java   |  293 ++-
 .../cache/partitioned/Bug39356DUnitTest.java    |   25 +-
 .../cache/partitioned/Bug43684DUnitTest.java    |   60 +-
 .../cache/partitioned/Bug47388DUnitTest.java    |   68 +-
 .../cache/partitioned/Bug51400DUnitTest.java    |   39 +-
 .../partitioned/ElidedPutAllDUnitTest.java      |   17 +-
 .../partitioned/PartitionResolverDUnitTest.java |   31 +-
 .../PartitionedRegionLoaderWriterDUnitTest.java |   27 +-
 ...rtitionedRegionMetaDataCleanupDUnitTest.java |   19 +-
 .../partitioned/PersistPRKRFDUnitTest.java      |   15 +-
 ...tentColocatedPartitionedRegionDUnitTest.java |   28 +-
 .../PersistentPartitionedRegionDUnitTest.java   |  118 +-
 ...tentPartitionedRegionOldConfigDUnitTest.java |   14 +-
 .../PersistentPartitionedRegionTestBase.java    |   20 +-
 ...rtitionedRegionWithTransactionDUnitTest.java |   15 +-
 .../cache/partitioned/ShutdownAllDUnitTest.java |   51 +-
 ...treamingPartitionOperationManyDUnitTest.java |   17 +-
 ...StreamingPartitionOperationOneDUnitTest.java |   17 +-
 .../fixed/FixedPartitioningDUnitTest.java       |   41 +-
 .../fixed/FixedPartitioningTestBase.java        |   66 +-
 ...ngWithColocationAndPersistenceDUnitTest.java |   26 +-
 .../persistence/BackupInspectorJUnitTest.java   |    9 +-
 .../PersistentRVVRecoveryDUnitTest.java         |   27 +-
 .../PersistentRecoveryOrderDUnitTest.java       |  152 +-
 ...rsistentRecoveryOrderOldConfigDUnitTest.java |   14 +-
 .../PersistentReplicatedTestBase.java           |   23 +-
 .../GFSnapshotJUnitPerformanceTest.java         |   32 +-
 .../internal/cache/tier/Bug40396DUnitTest.java  |   20 +-
 ...mpatibilityHigherVersionClientDUnitTest.java |   46 +-
 .../cache/tier/sockets/Bug36269DUnitTest.java   |   85 +-
 .../cache/tier/sockets/Bug36457DUnitTest.java   |   47 +-
 .../cache/tier/sockets/Bug36805DUnitTest.java   |   44 +-
 .../cache/tier/sockets/Bug36829DUnitTest.java   |   78 +-
 .../cache/tier/sockets/Bug36995DUnitTest.java   |   76 +-
 .../cache/tier/sockets/Bug37210DUnitTest.java   |   55 +-
 .../cache/tier/sockets/Bug37805DUnitTest.java   |   31 +-
 .../CacheServerMaxConnectionsJUnitTest.java     |  129 +-
 .../cache/tier/sockets/CacheServerTestUtil.java |  234 +--
 .../CacheServerTransactionsDUnitTest.java       |   73 +-
 ...acheServerTransactionsSelectorDUnitTest.java |   14 +-
 .../tier/sockets/ClearPropagationDUnitTest.java |   52 +-
 .../tier/sockets/ClientConflationDUnitTest.java |   52 +-
 .../sockets/ClientInterestNotifyDUnitTest.java  |   55 +-
 .../ClientServerForceInvalidateDUnitTest.java   |  109 +-
 .../tier/sockets/ClientServerMiscDUnitTest.java |  109 +-
 .../ClientServerMiscSelectorDUnitTest.java      |   14 +-
 .../cache/tier/sockets/ConflationDUnitTest.java |   72 +-
 .../DataSerializerPropogationDUnitTest.java     |   69 +-
 .../DestroyEntryPropagationDUnitTest.java       |  159 +-
 .../sockets/DurableClientBug39997DUnitTest.java |   41 +-
 .../DurableClientQueueSizeDUnitTest.java        |   75 +-
 .../DurableClientReconnectAutoDUnitTest.java    |   28 +-
 .../DurableClientReconnectDUnitTest.java        |  306 +--
 .../sockets/DurableClientStatsDUnitTest.java    |   52 +-
 .../sockets/DurableRegistrationDUnitTest.java   |   48 +-
 .../sockets/DurableResponseMatrixDUnitTest.java |   87 +-
 .../sockets/EventIDVerificationDUnitTest.java   |   58 +-
 .../EventIDVerificationInP2PDUnitTest.java      |   32 +-
 .../ForceInvalidateEvictionDUnitTest.java       |   20 +-
 ...ForceInvalidateOffHeapEvictionDUnitTest.java |   16 +-
 .../cache/tier/sockets/HABug36738DUnitTest.java |   15 +-
 .../tier/sockets/HAInterestPart1DUnitTest.java  |   22 +-
 .../tier/sockets/HAInterestPart2DUnitTest.java  |   22 +-
 .../cache/tier/sockets/HAInterestTestCase.java  |   53 +-
 .../sockets/HAStartupAndFailoverDUnitTest.java  |   93 +-
 .../InstantiatorPropagationDUnitTest.java       |  160 +-
 .../tier/sockets/InterestListDUnitTest.java     |  576 +++---
 .../sockets/InterestListEndpointDUnitTest.java  |   70 +-
 .../InterestListEndpointPRDUnitTest.java        |   16 +-
 .../InterestListEndpointSelectorDUnitTest.java  |   14 +-
 .../sockets/InterestListFailoverDUnitTest.java  |   33 +-
 .../sockets/InterestListRecoveryDUnitTest.java  |  205 +-
 .../sockets/InterestRegrListenerDUnitTest.java  |   66 +-
 .../sockets/InterestResultPolicyDUnitTest.java  |   66 +-
 .../sockets/NewRegionAttributesDUnitTest.java   |   27 +-
 .../tier/sockets/ObjectPartListJUnitTest.java   |   16 +-
 .../sockets/RedundancyLevelPart1DUnitTest.java  |  258 ++-
 .../sockets/RedundancyLevelPart2DUnitTest.java  |  105 +-
 .../sockets/RedundancyLevelPart3DUnitTest.java  |   41 +-
 .../tier/sockets/RedundancyLevelTestBase.java   |   95 +-
 .../tier/sockets/RegionCloseDUnitTest.java      |   47 +-
 ...erInterestBeforeRegionCreationDUnitTest.java |   62 +-
 .../sockets/RegisterInterestKeysDUnitTest.java  |   53 +-
 .../RegisterInterestKeysPRDUnitTest.java        |   16 +-
 .../sockets/ReliableMessagingDUnitTest.java     |   55 +-
 .../sockets/UnregisterInterestDUnitTest.java    |   59 +-
 .../sockets/UpdatePropagationDUnitTest.java     |  118 +-
 .../sockets/UpdatePropagationPRDUnitTest.java   |    8 +-
 .../VerifyEventIDGenerationInP2PDUnitTest.java  |   32 +-
 ...UpdatesFromNonInterestEndPointDUnitTest.java |   56 +-
 .../cache/wan/AsyncEventQueueTestBase.java      |   93 +-
 .../asyncqueue/AsyncEventListenerDUnitTest.java |  134 +-
 .../AsyncEventListenerOffHeapDUnitTest.java     |   14 +-
 .../AsyncEventQueueStatsDUnitTest.java          |   19 +-
 .../AsyncEventQueueValidationsJUnitTest.java    |   34 +-
 .../ConcurrentAsyncEventQueueDUnitTest.java     |   21 +-
 ...ncurrentAsyncEventQueueOffHeapDUnitTest.java |   14 +-
 .../CommonParallelAsyncEventQueueDUnitTest.java |   15 +-
 ...ParallelAsyncEventQueueOffHeapDUnitTest.java |   14 +-
 .../CompressionCacheConfigDUnitTest.java        |   43 +-
 .../CompressionCacheListenerDUnitTest.java      |   17 +-
 ...ompressionCacheListenerOffHeapDUnitTest.java |   27 +-
 .../CompressionRegionConfigDUnitTest.java       |   22 +-
 .../CompressionRegionFactoryDUnitTest.java      |   17 +-
 .../CompressionRegionOperationsDUnitTest.java   |   24 +-
 ...ressionRegionOperationsOffHeapDUnitTest.java |   18 +-
 .../compression/CompressionStatsDUnitTest.java  |   17 +-
 .../datasource/AbstractPoolCacheJUnitTest.java  |  256 ++-
 .../datasource/DataSourceFactoryJUnitTest.java  |   86 +-
 .../internal/jta/ExceptionJUnitTest.java        |   27 +-
 .../jta/GlobalTransactionJUnitTest.java         |  138 +-
 .../jta/TransactionTimeOutJUnitTest.java        |  419 ++---
 .../internal/jta/dunit/ExceptionsDUnitTest.java |   39 +-
 .../jta/dunit/IdleTimeOutDUnitTest.java         |   51 +-
 .../jta/dunit/LoginTimeOutDUnitTest.java        |   70 +-
 .../jta/dunit/MaxPoolSizeDUnitTest.java         |   84 +-
 .../jta/dunit/TransactionTimeOutDUnitTest.java  |  134 +-
 .../dunit/TxnManagerMultiThreadDUnitTest.java   |  155 +-
 .../internal/jta/dunit/TxnTimeOutDUnitTest.java |  119 +-
 .../logging/LocatorLogFileJUnitTest.java        |   32 +-
 .../LogWriterDisabledPerformanceTest.java       |   30 +-
 .../logging/LogWriterPerformanceTest.java       |   46 +-
 .../logging/LoggingPerformanceTestCase.java     |   40 +-
 .../internal/logging/TestLogWriterFactory.java  |   12 +-
 .../log4j/Log4J2DisabledPerformanceTest.java    |   29 +-
 .../logging/log4j/Log4J2PerformanceTest.java    |   54 +-
 .../LogWriterLoggerDisabledPerformanceTest.java |   25 +-
 .../log4j/LogWriterLoggerPerformanceTest.java   |   58 +-
 .../offheap/OutOfOffHeapMemoryDUnitTest.java    |   42 +-
 .../process/LocalProcessLauncherDUnitTest.java  |   18 +-
 .../statistics/StatisticsDUnitTest.java         |   82 +-
 .../statistics/ValueMonitorJUnitTest.java       |   23 +-
 .../ConcurrentHashMapIteratorJUnitTest.java     |   43 +-
 .../concurrent/CopyOnWriteHashMapJUnitTest.java |   48 +-
 .../cm/ConcurrentHashMapJUnitTest.java          |   73 +-
 .../concurrent/cm/CountedMapLoopsJUnitTest.java |   10 +-
 .../concurrent/cm/IntMapCheckJUnitTest.java     |   26 +-
 .../util/concurrent/cm/MapCheckJUnitTest.java   |   26 +-
 .../util/concurrent/cm/MapLoopsJUnitTest.java   |   12 +-
 .../util/concurrent/cm/RLJBarJUnitTest.java     |   13 +-
 .../concurrent/cm/StringMapLoopsJUnitTest.java  |   10 +-
 .../management/CacheManagementDUnitTest.java    |  150 +-
 .../management/ClientHealthStatsDUnitTest.java  |  110 +-
 .../management/CompositeTypeTestDUnitTest.java  |   15 +-
 .../management/DLockManagementDUnitTest.java    |   16 +-
 .../management/DiskManagementDUnitTest.java     |   19 +-
 .../management/DistributedSystemDUnitTest.java  |   20 +-
 .../management/LocatorManagementDUnitTest.java  |   57 +-
 .../gemstone/gemfire/management/MBeanUtil.java  |   16 +-
 .../gemfire/management/ManagementTestBase.java  |   59 +-
 .../MemberMBeanAttributesDUnitTest.java         |   18 +-
 .../management/OffHeapManagementDUnitTest.java  |   52 +-
 .../gemfire/management/QueryDataDUnitTest.java  |   23 +-
 .../management/RegionManagementDUnitTest.java   |   24 +-
 ...ersalMembershipListenerAdapterDUnitTest.java |  306 +--
 .../stats/DistributedSystemStatsDUnitTest.java  |   15 +-
 .../internal/cli/CliUtilDUnitTest.java          |   51 +-
 .../internal/pulse/TestClientIdsDUnitTest.java  |   47 +-
 .../internal/pulse/TestFunctionsDUnitTest.java  |   15 +-
 .../internal/pulse/TestHeapDUnitTest.java       |   15 +-
 .../internal/pulse/TestLocatorsDUnitTest.java   |   15 +-
 .../pulse/TestSubscriptionsDUnitTest.java       |   50 +-
 .../DomainObjectsAsValuesJUnitTest.java         |   25 +-
 .../gemfire/memcached/IntegrationJUnitTest.java |   22 +-
 .../gemfire/pdx/AutoSerializableJUnitTest.java  |    9 -
 .../ClientsWithVersioningRetryDUnitTest.java    |   60 +-
 .../pdx/DistributedSystemIdDUnitTest.java       |   43 +-
 .../gemfire/pdx/JSONFormatterJUnitTest.java     |   58 +-
 .../pdx/JSONPdxClientServerDUnitTest.java       |   81 +-
 .../pdx/PDXAsyncEventQueueDUnitTest.java        |   18 +-
 .../gemfire/pdx/PdxClientServerDUnitTest.java   |   63 +-
 .../pdx/PdxDeserializationDUnitTest.java        |   20 +-
 .../gemfire/pdx/PdxSerializableDUnitTest.java   |   20 +-
 .../gemfire/pdx/PdxSerializableJUnitTest.java   |   59 +-
 .../gemfire/pdx/PdxStringJUnitTest.java         |   27 +-
 .../gemfire/pdx/PdxTypeExportDUnitTest.java     |   18 +-
 .../gemfire/pdx/VersionClassLoader.java         |   98 -
 .../gemfire/redis/RedisDistDUnitTest.java       |   57 +-
 .../security/ClientAuthorizationTestCase.java   |   49 +-
 .../DeltaClientPostAuthorizationDUnitTest.java  |    3 +-
 .../gemfire/security/SecurityTestUtils.java     |   79 +-
 .../gemfire/test/dunit/DistributedTestCase.java |   11 +-
 .../com/gemstone/gemfire/test/dunit/VM.java     |    4 +-
 .../cache/internal/JUnit3CacheTestCase.java     |    2 +-
 .../cache/internal/JUnit4CacheTestCase.java     |   43 +-
 .../internal/JUnit4DistributedTestCase.java     |    1 +
 .../test/dunit/tests/BasicDUnitTest.java        |   40 +-
 .../tests/GetDefaultDiskStoreNameDUnitTest.java |   13 +-
 .../dunit/tests/GetTestMethodNameDUnitTest.java |   13 +-
 ...ingGetPropertiesDisconnectsAllDUnitTest.java |   19 +-
 .../gemfire/test/dunit/tests/VMDUnitTest.java   |   21 +-
 ...WithLineMissingFromEndOfOutputJUnitTest.java |    3 +-
 ...hLineMissingFromMiddleOfOutputJUnitTest.java |    3 +-
 .../gemstone/gemfire/util/JSR166TestCase.java   |   23 +-
 .../gemfire/cache/query/cq/CQJUnitTest.java     |   51 +-
 .../cache/query/cq/dunit/CqDataDUnitTest.java   |   31 +-
 .../dunit/CqDataOptimizedExecuteDUnitTest.java  |   14 +-
 .../cq/dunit/CqDataUsingPoolDUnitTest.java      |  580 +++---
 ...qDataUsingPoolOptimizedExecuteDUnitTest.java |   14 +-
 .../cache/query/cq/dunit/CqPerfDUnitTest.java   |   23 +-
 .../cq/dunit/CqPerfUsingPoolDUnitTest.java      |   22 +-
 .../cache/query/cq/dunit/CqQueryDUnitTest.java  |  102 +-
 .../dunit/CqQueryOptimizedExecuteDUnitTest.java |   17 +-
 .../cq/dunit/CqQueryUsingPoolDUnitTest.java     |  543 +++---
 ...QueryUsingPoolOptimizedExecuteDUnitTest.java |   14 +-
 .../cq/dunit/CqResultSetUsingPoolDUnitTest.java |   29 +-
 ...ltSetUsingPoolOptimizedExecuteDUnitTest.java |   15 +-
 .../cache/query/cq/dunit/CqStateDUnitTest.java  |   39 +-
 .../cache/query/cq/dunit/CqStatsDUnitTest.java  |   20 +-
 .../dunit/CqStatsOptimizedExecuteDUnitTest.java |   14 +-
 .../cq/dunit/CqStatsUsingPoolDUnitTest.java     |   20 +-
 ...StatsUsingPoolOptimizedExecuteDUnitTest.java |   14 +-
 .../PartitionedRegionCqQueryDUnitTest.java      |  380 +---
 ...dRegionCqQueryOptimizedExecuteDUnitTest.java |   16 +-
 .../query/cq/dunit/PrCqUsingPoolDUnitTest.java  |   34 +-
 .../PrCqUsingPoolOptimizedExecuteDUnitTest.java |   14 +-
 .../cache/query/dunit/PdxQueryCQDUnitTest.java  |   17 +-
 .../cache/query/dunit/PdxQueryCQTestBase.java   |   43 +-
 .../dunit/QueryIndexUpdateRIDUnitTest.java      |   40 +-
 .../query/dunit/QueryMonitorDUnitTest.java      |   95 +-
 .../cache/snapshot/ClientSnapshotDUnitTest.java |   43 +-
 .../cache/PRDeltaPropagationDUnitTest.java      |  238 ++-
 .../internal/cache/PutAllCSDUnitTest.java       |  500 +++--
 .../cache/RemoteCQTransactionDUnitTest.java     |  223 ++-
 .../internal/cache/ha/CQListGIIDUnitTest.java   |  223 +--
 .../sockets/ClientToServerDeltaDUnitTest.java   |   88 +-
 .../DeltaPropagationWithCQDUnitTest.java        |   79 +-
 ...ToRegionRelationCQRegistrationDUnitTest.java |  106 +-
 .../sockets/DurableClientCrashDUnitTest.java    |   35 +-
 .../sockets/DurableClientNetDownDUnitTest.java  |   63 +-
 .../sockets/DurableClientSimpleDUnitTest.java   |  268 ++-
 .../tier/sockets/DurableClientTestCase.java     |  102 +-
 .../CacheServerManagementDUnitTest.java         |   21 +-
 .../internal/pulse/TestCQDUnitTest.java         |   18 +-
 .../internal/pulse/TestClientsDUnitTest.java    |   18 +-
 .../internal/pulse/TestServerDUnitTest.java     |   18 +-
 .../ClientPostAuthorizationDUnitTest.java       |    6 +-
 .../internal/LuceneEventListenerJUnitTest.java  |    7 +-
 .../tools/pulse/testbed/driver/PulseUITest.java |   62 +-
 .../tools/pulse/tests/PulseAbstractTest.java    |  177 +-
 .../tools/pulse/tests/PulseAutomatedTest.java   |   79 +-
 .../tools/pulse/tests/PulseBaseTest.java        |   77 +-
 .../cache/CacheXml70GatewayDUnitTest.java       |   18 +-
 .../cache/CacheXml80GatewayDUnitTest.java       |   17 +-
 .../internal/cache/UpdateVersionDUnitTest.java  |   90 +-
 .../cache/wan/CacheClientNotifierDUnitTest.java |   54 +-
 .../cache/wan/Simple2CacheServerDUnitTest.java  |   15 +-
 .../gemfire/internal/cache/wan/WANTestBase.java |  166 +-
 ...oncurrentParallelGatewaySenderDUnitTest.java |   25 +-
 ...ntParallelGatewaySenderOffHeapDUnitTest.java |   14 +-
 ...allelGatewaySenderOperation_1_DUnitTest.java |   23 +-
 ...allelGatewaySenderOperation_2_DUnitTest.java |   25 +-
 ...tSerialGatewaySenderOperationsDUnitTest.java |   14 +-
 ...GatewaySenderOperationsOffHeapDUnitTest.java |   14 +-
 .../ConcurrentWANPropogation_1_DUnitTest.java   |   21 +-
 .../ConcurrentWANPropogation_2_DUnitTest.java   |   22 +-
 .../cache/wan/disttx/DistTXWANDUnitTest.java    |   34 +-
 .../CommonParallelGatewaySenderDUnitTest.java   |   28 +-
 ...onParallelGatewaySenderOffHeapDUnitTest.java |   14 +-
 ...wWANConcurrencyCheckForDestroyDUnitTest.java |   20 +-
 .../wan/misc/NewWanAuthenticationDUnitTest.java |   33 +-
 .../cache/wan/misc/PDXNewWanDUnitTest.java      |   30 +-
 ...dRegion_ParallelWANPersistenceDUnitTest.java |   15 +-
 ...dRegion_ParallelWANPropogationDUnitTest.java |   15 +-
 .../SenderWithTransportFilterDUnitTest.java     |   57 +-
 ...downAllPersistentGatewaySenderDUnitTest.java |   14 +-
 .../wan/misc/WANLocatorServerDUnitTest.java     |   32 +-
 .../cache/wan/misc/WANSSLDUnitTest.java         |   17 +-
 .../wan/misc/WanAutoDiscoveryDUnitTest.java     |   24 +-
 .../cache/wan/misc/WanValidationsDUnitTest.java |   52 +-
 ...tewaySenderOperation_2_OffHeapDUnitTest.java |   14 +-
 ...tewaySenderOperation_2_OffHeapDUnitTest.java |   14 +-
 ...GatewaySenderOperationsOffHeapDUnitTest.java |   14 +-
 ...ewaySenderQueueOverflowOffHeapDUnitTest.java |   14 +-
 .../ParallelWANConflationOffHeapDUnitTest.java  |   14 +-
 ...nceEnabledGatewaySenderOffHeapDUnitTest.java |   14 +-
 ...ropogationConcurrentOpsOffHeapDUnitTest.java |   14 +-
 .../ParallelWANPropogationOffHeapDUnitTest.java |   14 +-
 ...erialGatewaySenderQueueOffHeapDUnitTest.java |   14 +-
 ...nceEnabledGatewaySenderOffHeapDUnitTest.java |   14 +-
 .../SerialWANPropogationOffHeapDUnitTest.java   |   14 +-
 ...ation_PartitionedRegionOffHeapDUnitTest.java |   14 +-
 ...allelGatewaySenderOperation_2_DUnitTest.java |   14 +-
 ...arallelGatewaySenderOperationsDUnitTest.java |   45 +-
 ...llelGatewaySenderQueueOverflowDUnitTest.java |   66 +-
 .../ParallelWANConflationDUnitTest.java         |   21 +-
 ...ersistenceEnabledGatewaySenderDUnitTest.java |   26 +-
 ...llelWANPropagationClientServerDUnitTest.java |   15 +-
 ...lelWANPropagationConcurrentOpsDUnitTest.java |   17 +-
 .../ParallelWANPropagationDUnitTest.java        |   32 +-
 ...ParallelWANPropagationLoopBackDUnitTest.java |   17 +-
 .../wan/parallel/ParallelWANStatsDUnitTest.java |   21 +-
 ...tewaySenderDistributedDeadlockDUnitTest.java |   26 +-
 ...rialGatewaySenderEventListenerDUnitTest.java |   17 +-
 .../SerialGatewaySenderOperationsDUnitTest.java |   25 +-
 .../SerialGatewaySenderQueueDUnitTest.java      |   44 +-
 ...ersistenceEnabledGatewaySenderDUnitTest.java |   21 +-
 .../SerialWANPropagationLoopBackDUnitTest.java  |   18 +-
 .../serial/SerialWANPropogationDUnitTest.java   |  185 +-
 ...NPropogation_PartitionedRegionDUnitTest.java |   21 +-
 .../SerialWANPropogationsFeatureDUnitTest.java  |   21 +-
 .../wan/serial/SerialWANStatsDUnitTest.java     |   22 +-
 .../management/WANManagementDUnitTest.java      |   17 +-
 .../pulse/TestRemoteClusterDUnitTest.java       |   15 +-
 .../cli/commands/CommandOverHttpDUnitTest.java  |    9 +
 .../ConnectCommandWithHttpAndSSLDUnitTest.java  |   35 +-
 741 files changed, 25670 insertions(+), 20701 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b914df23/convert_one_dunit_to_junit4.pl
----------------------------------------------------------------------
diff --git a/convert_one_dunit_to_junit4.pl b/convert_one_dunit_to_junit4.pl
new file mode 100755
index 0000000..c6b6dd9
--- /dev/null
+++ b/convert_one_dunit_to_junit4.pl
@@ -0,0 +1,41 @@
+#!/usr/bin/perl -w -i -p
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+use strict;
+
+my $filename = $ARGV;
+$filename =~ s/.*\/(.*).java/$1/;
+
+#Change constructor to a no arg constructor
+s/(public.*$filename)\(String name\)/$1()/;
+s/super\(name\)/super()/;
+
+#Add @Test annotation
+s/^[^\/]*public void test/  \@Test\n  public void test/;
+
+#Extend the correct junit 4 class
+s/extends CacheTestCase/extends JUnit4CacheTestCase/;
+s/extends DistributedTestCase/extends JUnit4DistributedTestCase/;
+
+#Add the DistributedTest category
+s/(^public class $filename)/\@Category(DistributedTest.class)\n$1/;
+
+#Change calls to new MyTest("string") to use the no arg constructor
+s/new $filename\(\".*?\"\)/new $filename\(\)/;
+
+#Add imports
+s/^(package com.gemstone.*)/$1\n\nimport org.junit.experimental.categories.Category;\nimport org.junit.Test;\n\nimport static org.junit.Assert.*;\n\nimport com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;\nimport com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;\nimport com.gemstone.gemfire.test.junit.categories.DistributedTest;/
+

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b914df23/etc/intellijIdeaCodeStyle.xml
----------------------------------------------------------------------
diff --git a/etc/intellijIdeaCodeStyle.xml b/etc/intellijIdeaCodeStyle.xml
index eb88ace..a6d1f25 100755
--- a/etc/intellijIdeaCodeStyle.xml
+++ b/etc/intellijIdeaCodeStyle.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<code_scheme name="gemstoneCodeStyleScheme">
+<code_scheme name="geodeCodeStyleScheme">
   <option name="OTHER_INDENT_OPTIONS">
     <value>
       <option name="INDENT_SIZE" value="2" />
@@ -12,7 +11,7 @@
       <option name="USE_RELATIVE_INDENTS" value="false" />
     </value>
   </option>
-  <option name="LINE_SEPARATOR" value="&#10;" />
+  <option name="LINE_SEPARATOR" value="&#xA;" />
   <option name="GENERATE_FINAL_LOCALS" value="true" />
   <option name="GENERATE_FINAL_PARAMETERS" value="true" />
   <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
@@ -28,29 +27,33 @@
       <package name="java" withSubpackages="true" static="false" />
       <package name="javax" withSubpackages="true" static="false" />
       <emptyLine />
-      <package name="junit" withSubpackages="true" static="false" />
-      <package name="jmock" withSubpackages="true" static="false" />
-      <emptyLine />
-      <package name="com" withSubpackages="true" static="false" />
-      <emptyLine />
-      <package name="edu" withSubpackages="true" static="false" />
-      <emptyLine />
-      <package name="net" withSubpackages="true" static="false" />
+      <package name="" withSubpackages="true" static="false" />
       <emptyLine />
-      <package name="org" withSubpackages="true" static="false" />
+      <package name="batterytest" withSubpackages="true" static="false" />
+      <package name="cacheRunner" withSubpackages="true" static="false" />
+      <package name="hydra" withSubpackages="true" static="false" />
+      <package name="parReg" withSubpackages="true" static="false" />
+      <package name="perffmwk" withSubpackages="true" static="false" />
       <emptyLine />
-      <package name="" withSubpackages="true" static="false" />
+      <package name="com.gemstone" withSubpackages="true" static="false" />
+      <package name="com.vmware.gemfire" withSubpackages="true" static="false" />
+      <package name="io.pivotal.geode" withSubpackages="true" static="false" />
     </value>
   </option>
   <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
   <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
-  <option name="JD_ADD_BLANK_AFTER_DESCRIPTION" value="false" />
+  <option name="JD_ADD_BLANK_AFTER_PARM_COMMENTS" value="true" />
+  <option name="JD_ADD_BLANK_AFTER_RETURN" value="true" />
   <option name="JD_KEEP_INVALID_TAGS" value="false" />
   <option name="JD_PRESERVE_LINE_FEEDS" value="true" />
   <option name="HTML_ATTRIBUTE_WRAP" value="0" />
   <option name="HTML_ALIGN_TEXT" value="true" />
   <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
   <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
+  <option name="WRAP_COMMENTS" value="true" />
+  <JavaCodeStyleSettings>
+    <option name="ALIGN_MULTILINE_ANNOTATION_PARAMETERS" value="true" />
+  </JavaCodeStyleSettings>
   <XML>
     <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
   </XML>
@@ -62,25 +65,20 @@
     </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="JAVA">
+    <option name="KEEP_LINE_BREAKS" value="false" />
     <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
     <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
-    <option name="BLANK_LINES_BEFORE_PACKAGE" value="1" />
     <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
-    <option name="CLASS_BRACE_STYLE" value="5" />
-    <option name="METHOD_BRACE_STYLE" value="5" />
-    <option name="ELSE_ON_NEW_LINE" value="true" />
-    <option name="WHILE_ON_NEW_LINE" value="true" />
-    <option name="CATCH_ON_NEW_LINE" value="true" />
-    <option name="FINALLY_ON_NEW_LINE" value="true" />
+    <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
+    <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+    <option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
     <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
     <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
-    <option name="CALL_PARAMETERS_WRAP" value="1" />
     <option name="PREFER_PARAMETERS_WRAP" value="true" />
     <option name="METHOD_PARAMETERS_WRAP" value="5" />
     <option name="EXTENDS_KEYWORD_WRAP" value="1" />
     <option name="THROWS_KEYWORD_WRAP" value="1" />
-    <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
-    <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+    <option name="METHOD_CALL_CHAIN_WRAP" value="5" />
     <option name="ARRAY_INITIALIZER_WRAP" value="5" />
     <option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
     <option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
@@ -88,15 +86,389 @@
     <option name="DOWHILE_BRACE_FORCE" value="3" />
     <option name="WHILE_BRACE_FORCE" value="3" />
     <option name="FOR_BRACE_FORCE" value="3" />
-    <option name="METHOD_ANNOTATION_WRAP" value="5" />
-    <option name="CLASS_ANNOTATION_WRAP" value="5" />
-    <option name="FIELD_ANNOTATION_WRAP" value="5" />
-    <option name="VARIABLE_ANNOTATION_WRAP" value="5" />
+    <option name="VARIABLE_ANNOTATION_WRAP" value="2" />
     <indentOptions>
       <option name="INDENT_SIZE" value="2" />
       <option name="CONTINUATION_INDENT_SIZE" value="2" />
       <option name="TAB_SIZE" value="2" />
     </indentOptions>
+    <arrangement>
+      <tokens>
+        <token id="visibility" name="visibility">
+          <rules>
+            <rule>
+              <match>
+                <PUBLIC>true</PUBLIC>
+              </match>
+            </rule>
+            <rule>
+              <match>
+                <PROTECTED>true</PROTECTED>
+              </match>
+            </rule>
+            <rule>
+              <match>
+                <PACKAGE_PRIVATE>true</PACKAGE_PRIVATE>
+              </match>
+            </rule>
+            <rule>
+              <match>
+                <PRIVATE>true</PRIVATE>
+              </match>
+            </rule>
+          </rules>
+        </token>
+      </tokens>
+      <rules>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD>true</FIELD>
+                <FINAL>true</FINAL>
+                <PUBLIC>true</PUBLIC>
+                <STATIC>true</STATIC>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD>true</FIELD>
+                <FINAL>true</FINAL>
+                <PROTECTED>true</PROTECTED>
+                <STATIC>true</STATIC>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD>true</FIELD>
+                <FINAL>true</FINAL>
+                <PACKAGE_PRIVATE>true</PACKAGE_PRIVATE>
+                <STATIC>true</STATIC>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD>true</FIELD>
+                <FINAL>true</FINAL>
+                <PRIVATE>true</PRIVATE>
+                <STATIC>true</STATIC>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD>true</FIELD>
+                <PUBLIC>true</PUBLIC>
+                <STATIC>true</STATIC>
+                <VOLATILE>true</VOLATILE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD>true</FIELD>
+                <PROTECTED>true</PROTECTED>
+                <STATIC>true</STATIC>
+                <VOLATILE>true</VOLATILE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD>true</FIELD>
+                <PACKAGE_PRIVATE>true</PACKAGE_PRIVATE>
+                <STATIC>true</STATIC>
+                <VOLATILE>true</VOLATILE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD>true</FIELD>
+                <PRIVATE>true</PRIVATE>
+                <STATIC>true</STATIC>
+                <VOLATILE>true</VOLATILE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD>true</FIELD>
+                <PUBLIC>true</PUBLIC>
+                <STATIC>true</STATIC>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD>true</FIELD>
+                <PROTECTED>true</PROTECTED>
+                <STATIC>true</STATIC>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD>true</FIELD>
+                <PACKAGE_PRIVATE>true</PACKAGE_PRIVATE>
+                <STATIC>true</STATIC>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD>true</FIELD>
+                <PRIVATE>true</PRIVATE>
+                <STATIC>true</STATIC>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <INITIALIZER_BLOCK>true</INITIALIZER_BLOCK>
+                <STATIC>true</STATIC>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD>true</FIELD>
+                <FINAL>true</FINAL>
+                <PUBLIC>true</PUBLIC>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD>true</FIELD>
+                <FINAL>true</FINAL>
+                <PROTECTED>true</PROTECTED>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD>true</FIELD>
+                <FINAL>true</FINAL>
+                <PACKAGE_PRIVATE>true</PACKAGE_PRIVATE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD>true</FIELD>
+                <FINAL>true</FINAL>
+                <PRIVATE>true</PRIVATE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD>true</FIELD>
+                <PUBLIC>true</PUBLIC>
+                <VOLATILE>true</VOLATILE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD>true</FIELD>
+                <PROTECTED>true</PROTECTED>
+                <VOLATILE>true</VOLATILE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD>true</FIELD>
+                <PACKAGE_PRIVATE>true</PACKAGE_PRIVATE>
+                <VOLATILE>true</VOLATILE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD>true</FIELD>
+                <PRIVATE>true</PRIVATE>
+                <VOLATILE>true</VOLATILE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD>true</FIELD>
+                <PUBLIC>true</PUBLIC>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD>true</FIELD>
+                <PROTECTED>true</PROTECTED>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD>true</FIELD>
+                <PACKAGE_PRIVATE>true</PACKAGE_PRIVATE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <FIELD>true</FIELD>
+                <PRIVATE>true</PRIVATE>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <FIELD>true</FIELD>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <INITIALIZER_BLOCK>true</INITIALIZER_BLOCK>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <CONSTRUCTOR>true</CONSTRUCTOR>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <METHOD>true</METHOD>
+                <STATIC>true</STATIC>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <METHOD>true</METHOD>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <ENUM>true</ENUM>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <INTERFACE>true</INTERFACE>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <AND>
+                <CLASS>true</CLASS>
+                <STATIC>true</STATIC>
+              </AND>
+            </match>
+          </rule>
+        </section>
+        <section>
+          <rule>
+            <match>
+              <CLASS>true</CLASS>
+            </match>
+          </rule>
+        </section>
+      </rules>
+    </arrangement>
   </codeStyleSettings>
   <codeStyleSettings language="XML">
     <indentOptions>
@@ -105,5 +477,4 @@
       <option name="TAB_SIZE" value="2" />
     </indentOptions>
   </codeStyleSettings>
-</code_scheme>
-
+</code_scheme>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b914df23/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java b/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java
index f2fb584..d4df02c 100644
--- a/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java
+++ b/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java
@@ -16,6 +16,20 @@
 */
 package com.gemstone.gemfire.modules;
 
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.hibernate.Session;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.GemFireCache;
@@ -23,30 +37,16 @@ import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.Region.Entry;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
-import junit.framework.TestCase;
-import org.hibernate.Session;
-import org.junit.Ignore;
-import org.junit.experimental.categories.Category;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.logging.Level;
-
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 
-@Ignore("Can this test be deleted?")
 @Category(IntegrationTest.class)
-public class SecondVMTest extends TestCase {
+@Ignore("Can this test be deleted?")
+public class SecondVMTest {
 
   private Logger log = LoggerFactory.getLogger(getClass());
-  
-  public void testNoop() {
-    
-  }
-  public void _testStartEmptyVM() throws IOException {
+
+  @Ignore
+  @Test
+  public void testStartEmptyVM() throws IOException {
     Properties gemfireProperties = new Properties();
     gemfireProperties.setProperty(MCAST_PORT, "5555");
     gemfireProperties.setProperty(LOG_LEVEL, "fine");
@@ -63,8 +63,10 @@ public class SecondVMTest extends TestCase {
       }
     }
   }
-  
-  public void _testStartVM() throws Exception {
+
+  @Ignore
+  @Test
+  public void testStartVM() throws Exception {
     java.util.logging.Logger.getLogger("org.hibernate").setLevel(Level.ALL);
     Session session = HibernateJUnitTest.getSessionFactory(null).openSession();
     log.info("SWAP:new session open");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b914df23/extensions/geode-modules-session/src/test/java/com/gemstone/gemfire/modules/session/internal/filter/CommonTests.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/test/java/com/gemstone/gemfire/modules/session/internal/filter/CommonTests.java b/extensions/geode-modules-session/src/test/java/com/gemstone/gemfire/modules/session/internal/filter/CommonTests.java
index 4a37d36..c341c6f 100644
--- a/extensions/geode-modules-session/src/test/java/com/gemstone/gemfire/modules/session/internal/filter/CommonTests.java
+++ b/extensions/geode-modules-session/src/test/java/com/gemstone/gemfire/modules/session/internal/filter/CommonTests.java
@@ -14,15 +14,9 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 package com.gemstone.gemfire.modules.session.internal.filter;
 
-import com.mockrunner.mock.web.MockHttpServletRequest;
-import com.mockrunner.mock.web.MockHttpServletResponse;
-import com.mockrunner.mock.web.MockHttpSession;
-import com.mockrunner.servlet.BasicServletTestCaseAdapter;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.Assert.*;
 
 import java.util.concurrent.TimeUnit;
 import javax.servlet.http.Cookie;
@@ -31,8 +25,12 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSessionAttributeListener;
 
-import static junit.framework.Assert.assertEquals;
-import static org.junit.Assert.*;
+import com.mockrunner.mock.web.MockHttpServletRequest;
+import com.mockrunner.mock.web.MockHttpServletResponse;
+import com.mockrunner.mock.web.MockHttpSession;
+import com.mockrunner.servlet.BasicServletTestCaseAdapter;
+import org.junit.Ignore;
+import org.junit.Test;
 
 /**
  * This servlet tests the effects of the downstream SessionCachingFilter filter.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b914df23/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java b/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java
index 292f5ca..f2ef993 100644
--- a/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java
+++ b/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java
@@ -16,10 +16,16 @@
 */
 package com.gemstone.gemfire.modules.session;
 
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.internal.AvailablePortHelper;
-import com.gemstone.gemfire.modules.session.catalina.DeltaSessionManager;
-import com.gemstone.gemfire.modules.session.catalina.PeerToPeerCacheLifecycleListener;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static org.junit.Assert.*;
+
+import java.beans.PropertyChangeEvent;
+import java.io.IOException;
+import java.io.PrintWriter;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
 import com.meterware.httpunit.GetMethodWebRequest;
 import com.meterware.httpunit.WebConversation;
 import com.meterware.httpunit.WebRequest;
@@ -29,15 +35,10 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.Test;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.beans.PropertyChangeEvent;
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
-import static junit.framework.Assert.*;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+import com.gemstone.gemfire.modules.session.catalina.DeltaSessionManager;
+import com.gemstone.gemfire.modules.session.catalina.PeerToPeerCacheLifecycleListener;
 
 public abstract class TestSessionsBase {
 
@@ -185,36 +186,6 @@ public abstract class TestSessionsBase {
   }
 
   /**
-   * Check that our session persists beyond the container restarting.
-   */
-//    public void testSessionPersists2() throws Exception {
-//        String key = "value_testSessionPersists2";
-//        String value = "Foo";
-//
-//        WebConversation wc = new WebConversation();
-//        WebRequest req = new GetMethodWebRequest("http://localhost:7890/test");
-//        req.setParameter("cmd", QueryCommand.SET.name());
-//        req.setParameter("param", key);
-//        req.setParameter("value", value);
-//        WebResponse response = wc.getResponse(req);
-//        String sessionId = response.getNewCookieValue("JSESSIONID");
-//
-//        assertNotNull("No apparent session cookie", sessionId);
-//
-//        // Restart the container
-//        AllTests.teardownClass();
-//        AllTests.setupClass();
-//
-//        // The request retains the cookie from the prior response...
-//        req.setParameter("cmd", QueryCommand.GET.name());
-//        req.setParameter("param", key);
-//        req.removeParameter("value");
-//        response = wc.getResponse(req);
-//
-//        assertIndexDetailsEquals(value, response.getText());
-//    }
-
-  /**
    * Test that invalidating a session makes it's attributes inaccessible.
    */
   @Test

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b914df23/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
index 5c10342..d384fef 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.rest.internal.web.controllers;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import com.gemstone.gemfire.LogWriter;
 import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.cache.execute.FunctionContext;
@@ -40,14 +49,15 @@ import java.util.*;
  * @since GemFire 8.0
  */
 
+@Category(DistributedTest.class)
 public class RestAPIOnRegionFunctionExecutionDUnitTest extends RestAPITestBase {
 
   private final String REPLICATE_REGION_NAME = "sampleRRegion";
 
   private final String PR_REGION_NAME = "samplePRRegion";
 
-  public RestAPIOnRegionFunctionExecutionDUnitTest(String name) {
-    super(name);
+  public RestAPIOnRegionFunctionExecutionDUnitTest() {
+    super();
   }
 
   private class SampleFunction extends RestFunctionTemplate {
@@ -243,6 +253,7 @@ public class RestAPIOnRegionFunctionExecutionDUnitTest extends RestAPITestBase {
     vm3.invoke("registerFunction(new SampleFunction())", () -> FunctionService.registerFunction(new SampleFunction()));
   }
 
+  @Test
   public void testOnRegionExecutionWithReplicateRegion() {
     createCacheAndRegisterFunction();
 
@@ -263,6 +274,7 @@ public class RestAPIOnRegionFunctionExecutionDUnitTest extends RestAPITestBase {
     restURLs.clear();
   }
 
+  @Test
   public void testOnRegionExecutionWithPartitionRegion() throws Exception {
     createCacheAndRegisterFunction();
 
@@ -279,6 +291,7 @@ public class RestAPIOnRegionFunctionExecutionDUnitTest extends RestAPITestBase {
     restURLs.clear();
   }
 
+  @Test
   public void testOnRegionWithFilterExecutionWithPartitionRegion() throws Exception {
     createCacheAndRegisterFunction();
 
@@ -301,6 +314,7 @@ public class RestAPIOnRegionFunctionExecutionDUnitTest extends RestAPITestBase {
     }
   }
 
+  @Test
   public void testOnRegionWithFilterExecutionWithPartitionRegionJsonArgs() throws Exception {
     createCacheAndRegisterFunction();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b914df23/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
index eca5656..d5bc12f 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
@@ -17,16 +17,18 @@
  */
 package com.gemstone.gemfire.rest.internal.web.controllers;
 
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.execute.FunctionService;
-import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.internal.AvailablePortHelper;
-import com.gemstone.gemfire.internal.GemFireVersion;
-import com.gemstone.gemfire.internal.lang.StringUtils;
-import com.gemstone.gemfire.management.internal.AgentUtil;
-import com.gemstone.gemfire.rest.internal.web.RestFunctionTemplate;
-import com.gemstone.gemfire.test.dunit.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.Random;
+
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -36,19 +38,26 @@ import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.json.JSONArray;
+import org.junit.experimental.categories.Category;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.Random;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.execute.FunctionService;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+import com.gemstone.gemfire.internal.GemFireVersion;
+import com.gemstone.gemfire.internal.lang.StringUtils;
+import com.gemstone.gemfire.management.internal.AgentUtil;
+import com.gemstone.gemfire.rest.internal.web.RestFunctionTemplate;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.Invoke;
+import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+@Category(DistributedTest.class)
+public class RestAPITestBase extends JUnit4DistributedTestCase {
 
-public class RestAPITestBase extends DistributedTestCase {
   protected Cache cache = null;
   protected List<String> restURLs = new ArrayList();
   protected VM vm0 = null;
@@ -56,10 +65,6 @@ public class RestAPITestBase extends DistributedTestCase {
   protected VM vm2 = null;
   protected VM vm3 = null;
 
-  public RestAPITestBase(String name) {
-    super(name);
-  }
-
   @Override
   public final void postSetUp() throws Exception {
     disconnectAllFromDS();
@@ -103,7 +108,7 @@ public class RestAPITestBase extends DistributedTestCase {
   }
 
   public String createCacheWithGroups(final String hostName, final String groups) {
-    RestAPITestBase test = new RestAPITestBase(getTestMethodName());
+    RestAPITestBase test = new RestAPITestBase();
 
     final int servicePort = AvailablePortHelper.getRandomAvailableTCPPort();
 
@@ -132,6 +137,7 @@ public class RestAPITestBase extends DistributedTestCase {
   protected CloseableHttpResponse executeFunctionThroughRestCall(String function, String regionName, String filter, String jsonBody, String groups,
                                                                  String members) {
     System.out.println("Entering executeFunctionThroughRestCall");
+    CloseableHttpResponse value = null;
     try {
       CloseableHttpClient httpclient = HttpClients.createDefault();
       Random randomGenerator = new Random();
@@ -140,10 +146,11 @@ public class RestAPITestBase extends DistributedTestCase {
       HttpPost post = createHTTPPost(function, regionName, filter, restURLIndex, groups, members, jsonBody);
 
       System.out.println("Request: POST " + post.toString());
-      return httpclient.execute(post);
+      value = httpclient.execute(post);
     } catch (Exception e) {
-      throw new RuntimeException("unexpected exception", e);
+      fail("unexpected exception", e);
     }
+    return value;
   }
 
   private HttpPost createHTTPPost(String function, String regionName, String filter, int restUrlIndex, String groups, String members, String jsonBody) {
@@ -189,7 +196,7 @@ public class RestAPITestBase extends DistributedTestCase {
       JSONArray resultArray = new JSONArray(httpResponseString);
       assertEquals(resultArray.length(), expectedServerResponses);
     } catch (Exception e) {
-      e.printStackTrace();
+      //fail("exception", e);
     }
   }
 
@@ -206,7 +213,7 @@ public class RestAPITestBase extends DistributedTestCase {
       }
       return sb.toString();
     } catch (IOException e) {
-      LogWriterUtils.getLogWriter().error("Error in processing Http Response", e);
+      fail("exception", e);
     }
     return "";
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b914df23/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
index c0b5c79..b601b3a 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
@@ -16,6 +16,15 @@
  */
 package com.gemstone.gemfire.rest.internal.web.controllers;
 
+import org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+
 import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.cache.client.ClientCache;
 import com.gemstone.gemfire.cache.client.ClientCacheFactory;
@@ -57,6 +66,7 @@ import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties
  * @since GemFire 8.0
  */
 
+@Category(DistributedTest.class)
 public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
 
   private static final long serialVersionUID = -254776154266339226L;
@@ -147,9 +157,9 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
       + " \"middleName\": \"kiran12\"," + " \"lastName\": \"Patel\","
       + " \"birthDate\": \"23/08/2012\"," + "\"gender\": \"MALE\"" + "}" + "]";
 
-  public RestAPIsAndInterOpsDUnitTest(String name) {
-    super(name);
-    this.helper = new ManagementTestBase(name);
+  public RestAPIsAndInterOpsDUnitTest() {
+    super();
+    this.helper = new ManagementTestBase() {{}};
 
   }
 
@@ -759,6 +769,7 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
    * @throws Exception
    */
 
+  @Test
   public void testInterOpsWithReplicatedRegion() throws Exception {
 
     final Host host = Host.getHost(0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b914df23/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
index a567700..33faf9a 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
@@ -16,23 +16,25 @@
  */
 package com.gemstone.gemfire.rest.internal.web.controllers;
 
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.Collections;
+
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.gemstone.gemfire.cache.execute.FunctionContext;
 import com.gemstone.gemfire.cache.execute.FunctionService;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.rest.internal.web.RestFunctionTemplate;
 import com.gemstone.gemfire.test.dunit.LogWriterUtils;
-import com.gemstone.gemfire.test.dunit.VM;
-import org.apache.http.client.methods.CloseableHttpResponse;
-
-import java.util.ArrayList;
-import java.util.Collections;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
+@Category(DistributedTest.class)
 public class RestAPIsOnGroupsFunctionExecutionDUnitTest extends RestAPITestBase {
 
-  public RestAPIsOnGroupsFunctionExecutionDUnitTest(String name) {
-    super(name);
-  }
-
   @Override
   protected String getFunctionID() {
     return OnGroupsFunction.Id;
@@ -48,6 +50,7 @@ public class RestAPIsOnGroupsFunctionExecutionDUnitTest extends RestAPITestBase
     vm2.invoke("registerFunction(new OnGroupsFunction())", () -> FunctionService.registerFunction(new OnGroupsFunction()));
   }
 
+  @Test
   public void testonGroupsExecutionOnAllMembers() {
     setupCacheWithGroupsAndFunction();
 
@@ -61,6 +64,7 @@ public class RestAPIsOnGroupsFunctionExecutionDUnitTest extends RestAPITestBase
     restURLs.clear();
   }
 
+  @Test
   public void testonGroupsExecutionOnAllMembersWithFilter() {
     setupCacheWithGroupsAndFunction();
 
@@ -74,6 +78,7 @@ public class RestAPIsOnGroupsFunctionExecutionDUnitTest extends RestAPITestBase
     restURLs.clear();
   }
 
+  @Test
   public void testBasicP2PFunctionSelectedGroup() {
     setupCacheWithGroupsAndFunction();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b914df23/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
index 901f15f..80d30e6 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
@@ -16,6 +16,14 @@
  */
 package com.gemstone.gemfire.rest.internal.web.controllers;
 
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+
+import java.util.Properties;
+
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheClosedException;
 import com.gemstone.gemfire.cache.CacheFactory;
@@ -23,19 +31,11 @@ import com.gemstone.gemfire.cache.execute.FunctionContext;
 import com.gemstone.gemfire.cache.execute.FunctionService;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.rest.internal.web.RestFunctionTemplate;
-import org.apache.http.client.methods.CloseableHttpResponse;
-
-import java.util.Properties;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
+@Category(DistributedTest.class)
 public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase {
 
-  private static final long serialVersionUID = 1L;
-
-  public RestAPIsOnMembersFunctionExecutionDUnitTest(String name) {
-    super(name);
-  }
-
   private class OnMembersFunction extends RestFunctionTemplate {
     public static final String Id = "OnMembersFunction";
 
@@ -80,12 +80,12 @@ public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase
 
     Cache c = null;
     try {
-      c = CacheFactory.getInstance(new RestAPIsOnMembersFunctionExecutionDUnitTest("temp").getSystem(props));
+      c = CacheFactory.getInstance(new RestAPIsOnMembersFunctionExecutionDUnitTest().getSystem(props));
       c.close();
     } catch (CacheClosedException cce) {
     }
 
-    c = CacheFactory.create(new RestAPIsOnMembersFunctionExecutionDUnitTest("temp").getSystem(props));
+    c = CacheFactory.create(new RestAPIsOnMembersFunctionExecutionDUnitTest().getSystem(props));
     FunctionService.registerFunction(new OnMembersFunction());
 
     String restEndPoint = "http://" + hostName + ":" + servicePort + "/gemfire-api/v1";
@@ -98,6 +98,7 @@ public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase
     return OnMembersFunction.Id;
   }
 
+  @Test
   public void testFunctionExecutionOnAllMembers() {
     createCacheForVMs();
 
@@ -118,6 +119,7 @@ public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase
     restURLs.add(vm3.invoke("createCacheAndRegisterFunction",() -> createCacheAndRegisterFunction(vm3.getHost().getHostName(), "m4")));
   }
 
+  @Test
   public void testFunctionExecutionEOnSelectedMembers() {
     createCacheForVMs();
 
@@ -131,6 +133,7 @@ public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase
     restURLs.clear();
   }
 
+  @Test
   public void testFunctionExecutionOnMembersWithFilter() {
     createCacheForVMs();
 



Mime
View raw message