You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/05/24 00:31:50 UTC
[25/29] incubator-geode git commit: Converting dunits to junit 4
using dunits_to_junit4.sh
Converting dunits to junit 4 using dunits_to_junit4.sh
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f83cc548
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f83cc548
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f83cc548
Branch: refs/heads/feature/GEODE-837
Commit: f83cc54837559727b1fecd919db853c96acad1fd
Parents: dd0fdfa
Author: Kirk Lund <kl...@apache.org>
Authored: Mon May 23 16:09:59 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Mon May 23 16:09:59 2016 -0700
----------------------------------------------------------------------
...stAPIOnRegionFunctionExecutionDUnitTest.java | 18 ++-
.../web/controllers/RestAPITestBase.java | 16 ++-
.../RestAPIsAndInterOpsDUnitTest.java | 15 ++-
...tAPIsOnGroupsFunctionExecutionDUnitTest.java | 17 ++-
...APIsOnMembersFunctionExecutionDUnitTest.java | 21 +++-
.../controllers/RestAPIsWithSSLDUnitTest.java | 24 +++-
.../cache/CacheRegionClearStatsDUnitTest.java | 28 +++--
.../cache/ClientServerTimeSyncDUnitTest.java | 17 ++-
.../cache/ConnectionPoolAndLoaderDUnitTest.java | 19 +++-
.../ClientServerRegisterInterestsDUnitTest.java | 13 ++-
.../internal/AutoConnectionSourceDUnitTest.java | 23 +++-
.../CacheServerSSLConnectionDUnitTest.java | 22 +++-
.../internal/LocatorLoadBalancingDUnitTest.java | 20 +++-
.../cache/client/internal/LocatorTestBase.java | 15 ++-
.../internal/SSLNoClientAuthDUnitTest.java | 19 +++-
.../management/ResourceManagerDUnitTest.java | 33 +++++-
.../PartitionRegionHelperDUnitTest.java | 21 +++-
.../query/dunit/CompactRangeIndexDUnitTest.java | 20 +++-
.../dunit/GroupByPartitionedQueryDUnitTest.java | 14 ++-
.../query/dunit/GroupByQueryDUnitTest.java | 17 ++-
.../cache/query/dunit/HashIndexDUnitTest.java | 18 ++-
.../dunit/NonDistinctOrderByDUnitImpl.java | 25 ++++-
.../NonDistinctOrderByPartitionedDUnitTest.java | 14 ++-
...itionedRegionCompactRangeIndexDUnitTest.java | 17 ++-
.../query/dunit/PdxStringQueryDUnitTest.java | 24 +++-
.../dunit/QueryDataInconsistencyDUnitTest.java | 26 ++++-
.../dunit/QueryIndexUsingXMLDUnitTest.java | 25 ++++-
.../QueryParamsAuthorizationDUnitTest.java | 17 ++-
.../QueryUsingFunctionContextDUnitTest.java | 61 ++++++----
.../query/dunit/QueryUsingPoolDUnitTest.java | 30 ++++-
.../cache/query/dunit/RemoteQueryDUnitTest.java | 28 ++++-
...rrentIndexInitOnOverflowRegionDUnitTest.java | 19 +++-
...ndexOperationsOnOverflowRegionDUnitTest.java | 24 +++-
...pdateWithInplaceObjectModFalseDUnitTest.java | 20 +++-
...ConcurrentIndexUpdateWithoutWLDUnitTest.java | 20 +++-
.../index/CopyOnReadIndexDUnitTest.java | 18 ++-
.../query/internal/index/EquijoinDUnitTest.java | 17 +++
.../IndexTrackingQueryObserverDUnitTest.java | 17 ++-
...itializeIndexEntryDestroyQueryDUnitTest.java | 19 +++-
.../index/MultiIndexCreationDUnitTest.java | 17 ++-
.../PartitionedRegionEquijoinDUnitTest.java | 11 ++
.../index/PutAllWithIndexPerfDUnitTest.java | 17 ++-
.../PRBasicIndexCreationDUnitTest.java | 36 +++++-
.../PRBasicIndexCreationDeadlockDUnitTest.java | 15 ++-
.../PRBasicMultiIndexCreationDUnitTest.java | 34 +++++-
.../partitioned/PRBasicQueryDUnitTest.java | 17 ++-
.../PRBasicRemoveIndexDUnitTest.java | 14 ++-
.../PRColocatedEquiJoinDUnitTest.java | 30 ++++-
.../partitioned/PRInvalidQueryDUnitTest.java | 15 ++-
.../partitioned/PRQueryCacheCloseDUnitTest.java | 16 ++-
.../query/partitioned/PRQueryDUnitTest.java | 31 ++++-
.../PRQueryRegionCloseDUnitTest.java | 15 ++-
.../PRQueryRegionDestroyedDUnitTest.java | 15 ++-
.../PRQueryRemoteNodeExceptionDUnitTest.java | 19 +++-
.../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/CacheCloseDUnitTest.java | 17 ++-
.../gemfire/cache30/CacheListenerTestCase.java | 20 +++-
.../gemfire/cache30/CacheLoaderTestCase.java | 17 ++-
.../gemfire/cache30/CacheLogRollDUnitTest.java | 21 +++-
.../gemfire/cache30/CacheMapTxnDUnitTest.java | 30 +++--
...cheRegionsReliablityStatsCheckDUnitTest.java | 19 +++-
.../cache30/CacheStatisticsDUnitTest.java | 20 +++-
.../gemfire/cache30/CacheWriterTestCase.java | 19 +++-
.../gemfire/cache30/CacheXml40DUnitTest.java | 20 +++-
.../gemfire/cache30/CacheXml41DUnitTest.java | 30 ++++-
.../gemfire/cache30/CacheXml45DUnitTest.java | 21 +++-
.../gemfire/cache30/CacheXml51DUnitTest.java | 26 ++++-
.../gemfire/cache30/CacheXml55DUnitTest.java | 15 ++-
.../gemfire/cache30/CacheXml57DUnitTest.java | 32 +++++-
.../gemfire/cache30/CacheXml58DUnitTest.java | 24 +++-
.../gemfire/cache30/CacheXml60DUnitTest.java | 18 ++-
.../gemfire/cache30/CacheXml61DUnitTest.java | 15 ++-
.../gemfire/cache30/CacheXml65DUnitTest.java | 60 +++++++++-
.../gemfire/cache30/CacheXml66DUnitTest.java | 20 +++-
.../gemfire/cache30/CacheXml70DUnitTest.java | 20 +++-
.../gemfire/cache30/CacheXml80DUnitTest.java | 19 +++-
.../gemfire/cache30/CacheXml81DUnitTest.java | 17 ++-
.../cache30/CacheXmlGeode10DUnitTest.java | 19 +++-
.../gemfire/cache30/CallbackArgDUnitTest.java | 18 ++-
.../cache30/ClearMultiVmCallBkDUnitTest.java | 24 +++-
.../gemfire/cache30/ClearMultiVmDUnitTest.java | 30 +++--
.../cache30/ClientServerCCEDUnitTest.java | 25 ++++-
.../ConcurrentLeaveDuringGIIDUnitTest.java | 17 ++-
...ibutedNoAckAsyncOverflowRegionDUnitTest.java | 14 ++-
...iskDistributedNoAckAsyncRegionDUnitTest.java | 14 ++-
.../DiskDistributedNoAckRegionTestCase.java | 15 ++-
...ributedNoAckSyncOverflowRegionDUnitTest.java | 14 ++-
.../gemfire/cache30/DiskRegionDUnitTest.java | 37 +++++-
.../cache30/DistAckMapMethodsDUnitTest.java | 45 +++++---
...istributedAckOverflowRegionCCEDUnitTest.java | 16 ++-
...tedAckOverflowRegionCCEOffHeapDUnitTest.java | 14 ++-
...tributedAckPersistentRegionCCEDUnitTest.java | 17 ++-
...dAckPersistentRegionCCEOffHeapDUnitTest.java | 14 ++-
.../DistributedAckRegionCCEDUnitTest.java | 29 ++++-
...DistributedAckRegionCCEOffHeapDUnitTest.java | 14 ++-
...istributedAckRegionCompressionDUnitTest.java | 14 ++-
.../cache30/DistributedAckRegionDUnitTest.java | 15 ++-
.../DistributedAckRegionOffHeapDUnitTest.java | 14 ++-
.../DistributedMulticastRegionDUnitTest.java | 18 ++-
.../DistributedNoAckRegionCCEDUnitTest.java | 27 ++++-
...stributedNoAckRegionCCEOffHeapDUnitTest.java | 14 ++-
.../DistributedNoAckRegionDUnitTest.java | 16 ++-
.../DistributedNoAckRegionOffHeapDUnitTest.java | 14 ++-
.../gemfire/cache30/DynamicRegionDUnitTest.java | 17 ++-
.../gemfire/cache30/GlobalLockingDUnitTest.java | 27 ++++-
.../cache30/GlobalRegionCCEDUnitTest.java | 22 +++-
.../GlobalRegionCCEOffHeapDUnitTest.java | 14 ++-
.../gemfire/cache30/GlobalRegionDUnitTest.java | 18 ++-
.../cache30/GlobalRegionOffHeapDUnitTest.java | 14 ++-
.../cache30/LRUEvictionControllerDUnitTest.java | 25 ++++-
.../gemfire/cache30/LocalRegionDUnitTest.java | 18 ++-
.../MemLRUEvictionControllerDUnitTest.java | 22 +++-
.../gemfire/cache30/MultiVMRegionTestCase.java | 65 ++++++++++-
.../OffHeapLRUEvictionControllerDUnitTest.java | 14 ++-
.../PRBucketSynchronizationDUnitTest.java | 19 +++-
.../PartitionedRegionCompressionDUnitTest.java | 14 ++-
.../cache30/PartitionedRegionDUnitTest.java | 29 ++++-
...tionedRegionMembershipListenerDUnitTest.java | 14 ++-
.../PartitionedRegionOffHeapDUnitTest.java | 14 ++-
.../gemfire/cache30/ProxyDUnitTest.java | 19 +++-
.../cache30/PutAllCallBkRemoteVMDUnitTest.java | 26 +++--
.../cache30/PutAllCallBkSingleVMDUnitTest.java | 21 +++-
.../gemfire/cache30/PutAllMultiVmDUnitTest.java | 27 +++--
.../gemfire/cache30/QueueMsgDUnitTest.java | 15 ++-
.../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 | 15 ++-
.../cache30/RegionReliabilityTestCase.java | 25 ++++-
.../gemfire/cache30/RegionTestCase.java | 66 ++++++++++-
.../gemfire/cache30/ReliabilityTestCase.java | 15 ++-
.../cache30/RemoveAllMultiVmDUnitTest.java | 30 +++--
.../gemfire/cache30/RequiredRolesDUnitTest.java | 17 ++-
.../cache30/RolePerformanceDUnitTest.java | 17 ++-
.../gemfire/cache30/SearchAndLoadDUnitTest.java | 25 ++++-
.../gemfire/cache30/SlowRecDUnitTest.java | 21 +++-
.../gemfire/cache30/TXDistributedDUnitTest.java | 21 +++-
.../gemfire/cache30/TXOrderDUnitTest.java | 22 +++-
.../cache30/TXRestrictionsDUnitTest.java | 17 ++-
.../DistributedLockServiceDUnitTest.java | 61 +++++++++-
.../gemfire/distributed/LocatorDUnitTest.java | 32 +++++-
.../gemfire/distributed/RoleDUnitTest.java | 19 +++-
.../distributed/SystemAdminDUnitTest.java | 17 ++-
.../distributed/internal/Bug40751DUnitTest.java | 17 ++-
.../ConsoleDistributionManagerDUnitTest.java | 19 +++-
.../internal/DistributionAdvisorDUnitTest.java | 17 ++-
.../internal/DistributionManagerDUnitTest.java | 24 +++-
.../internal/ProductUseLogDUnitTest.java | 17 ++-
.../GemFireDeadlockDetectorDUnitTest.java | 19 +++-
.../StreamingOperationManyDUnitTest.java | 17 ++-
.../StreamingOperationOneDUnitTest.java | 17 ++-
.../TcpServerBackwardCompatDUnitTest.java | 17 ++-
.../gemfire/disttx/CacheMapDistTXDUnitTest.java | 15 ++-
.../gemfire/disttx/DistTXOrderDUnitTest.java | 16 ++-
.../disttx/DistTXRestrictionsDUnitTest.java | 14 ++-
.../disttx/DistTXWithDeltaDUnitTest.java | 14 ++-
.../disttx/DistributedTransactionDUnitTest.java | 44 +++++++-
...entPartitionedRegionWithDistTXDUnitTest.java | 14 ++-
...wardCompatibilitySerializationDUnitTest.java | 21 +++-
.../ClassNotFoundExceptionDUnitTest.java | 18 ++-
.../gemfire/internal/JarDeployerDUnitTest.java | 28 ++++-
.../internal/PdxDeleteFieldDUnitTest.java | 17 ++-
.../gemfire/internal/PdxRenameDUnitTest.java | 17 ++-
.../gemfire/internal/cache/BackupDUnitTest.java | 22 +++-
.../internal/cache/Bug33359DUnitTest.java | 23 +++-
.../internal/cache/Bug33726DUnitTest.java | 21 +++-
.../internal/cache/Bug37241DUnitTest.java | 22 +++-
.../internal/cache/Bug37377DUnitTest.java | 21 +++-
.../internal/cache/Bug39079DUnitTest.java | 28 +++--
.../internal/cache/Bug40299DUnitTest.java | 19 +++-
.../internal/cache/Bug40632DUnitTest.java | 20 +++-
.../internal/cache/Bug41091DUnitTest.java | 17 ++-
.../internal/cache/Bug41733DUnitTest.java | 18 ++-
.../internal/cache/Bug42055DUnitTest.java | 17 ++-
.../internal/cache/Bug45164DUnitTest.java | 17 ++-
.../internal/cache/Bug45934DUnitTest.java | 17 ++-
.../internal/cache/Bug47667DUnitTest.java | 15 ++-
.../internal/cache/CacheAdvisorDUnitTest.java | 25 ++++-
.../internal/cache/ClearDAckDUnitTest.java | 25 +++--
.../internal/cache/ClearGlobalDUnitTest.java | 21 +++-
...ServerInvalidAndDestroyedEntryDUnitTest.java | 26 ++++-
.../ClientServerTransactionCCEDUnitTest.java | 14 ++-
.../cache/ClientServerTransactionDUnitTest.java | 112 ++++++++++++++++++-
.../ConcurrentDestroySubRegionDUnitTest.java | 18 ++-
.../cache/ConcurrentMapOpsDUnitTest.java | 44 +++++++-
.../cache/ConnectDisconnectDUnitTest.java | 17 ++-
.../internal/cache/DeltaFaultInDUnitTest.java | 17 ++-
.../cache/DeltaPropagationDUnitTest.java | 37 +++++-
.../cache/DeltaPropagationStatsDUnitTest.java | 24 +++-
.../internal/cache/DeltaSizingDUnitTest.java | 24 +++-
.../cache/DiskRegByteArrayDUnitTest.java | 23 +++-
...DistrbutedRegionProfileOffHeapDUnitTest.java | 20 +++-
.../cache/DistributedCacheTestCase.java | 17 ++-
.../internal/cache/EventTrackerDUnitTest.java | 20 +++-
.../internal/cache/EvictionDUnitTest.java | 24 +++-
.../cache/EvictionObjectSizerDUnitTest.java | 21 +++-
.../internal/cache/EvictionStatsDUnitTest.java | 26 ++++-
.../internal/cache/EvictionTestBase.java | 18 ++-
.../cache/FixedPRSinglehopDUnitTest.java | 20 +++-
.../internal/cache/GIIDeltaDUnitTest.java | 40 ++++++-
.../internal/cache/GIIFlowControlDUnitTest.java | 19 +++-
.../internal/cache/GridAdvisorDUnitTest.java | 18 ++-
.../HAOverflowMemObjectSizerDUnitTest.java | 22 +++-
.../cache/IncrementalBackupDUnitTest.java | 21 +++-
.../cache/InterruptClientServerDUnitTest.java | 17 ++-
...InterruptsConserveSocketsFalseDUnitTest.java | 14 ++-
.../internal/cache/InterruptsDUnitTest.java | 17 ++-
.../internal/cache/IteratorDUnitTest.java | 18 ++-
.../internal/cache/MapClearGIIDUnitTest.java | 25 +++--
.../cache/NetSearchMessagingDUnitTest.java | 21 +++-
.../cache/OffHeapEvictionDUnitTest.java | 14 ++-
.../cache/OffHeapEvictionStatsDUnitTest.java | 14 ++-
.../cache/P2PDeltaPropagationDUnitTest.java | 29 ++++-
.../internal/cache/PRBadToDataDUnitTest.java | 15 ++-
.../cache/PartitionListenerDUnitTest.java | 17 ++-
...dRegionAPIConserveSocketsFalseDUnitTest.java | 14 ++-
.../cache/PartitionedRegionAPIDUnitTest.java | 23 +++-
.../PartitionedRegionAsSubRegionDUnitTest.java | 17 ++-
...gionBucketCreationDistributionDUnitTest.java | 21 +++-
.../PartitionedRegionCacheCloseDUnitTest.java | 15 ++-
...rtitionedRegionCacheXMLExampleDUnitTest.java | 20 +++-
.../PartitionedRegionCreationDUnitTest.java | 23 +++-
.../cache/PartitionedRegionDUnitTestCase.java | 16 ++-
...rtitionedRegionDelayedRecoveryDUnitTest.java | 19 +++-
.../PartitionedRegionDestroyDUnitTest.java | 15 ++-
.../PartitionedRegionEntryCountDUnitTest.java | 15 ++-
.../PartitionedRegionEvictionDUnitTest.java | 30 ++++-
.../cache/PartitionedRegionHADUnitTest.java | 17 ++-
...onedRegionHAFailureAndRecoveryDUnitTest.java | 17 ++-
.../PartitionedRegionInvalidateDUnitTest.java | 16 ++-
...artitionedRegionLocalMaxMemoryDUnitTest.java | 16 ++-
...nedRegionLocalMaxMemoryOffHeapDUnitTest.java | 14 ++-
.../PartitionedRegionMultipleDUnitTest.java | 17 ++-
...rtitionedRegionOffHeapEvictionDUnitTest.java | 14 ++-
.../cache/PartitionedRegionPRIDDUnitTest.java | 15 ++-
.../cache/PartitionedRegionQueryDUnitTest.java | 28 ++++-
...artitionedRegionRedundancyZoneDUnitTest.java | 17 ++-
.../PartitionedRegionSingleHopDUnitTest.java | 34 +++++-
...RegionSingleHopWithServerGroupDUnitTest.java | 28 ++++-
.../cache/PartitionedRegionSizeDUnitTest.java | 18 ++-
.../cache/PartitionedRegionStatsDUnitTest.java | 19 +++-
.../PartitionedRegionTestUtilsDUnitTest.java | 19 +++-
.../PartitionedRegionWithSameNameDUnitTest.java | 24 +++-
.../internal/cache/PutAllDAckDUnitTest.java | 23 +++-
.../internal/cache/PutAllGlobalDUnitTest.java | 23 +++-
.../cache/RemoteTransactionCCEDUnitTest.java | 14 ++-
.../internal/cache/RemoveAllDAckDUnitTest.java | 23 +++-
.../internal/cache/RemoveDAckDUnitTest.java | 23 +++-
.../internal/cache/RemoveGlobalDUnitTest.java | 24 +++-
.../internal/cache/SingleHopStatsDUnitTest.java | 18 ++-
.../internal/cache/SizingFlagDUnitTest.java | 35 +++++-
.../cache/TransactionsWithDeltaDUnitTest.java | 19 +++-
.../control/RebalanceOperationDUnitTest.java | 53 ++++++++-
.../cache/execute/Bug51193DUnitTest.java | 26 ++++-
.../ClientServerFunctionExecutionDUnitTest.java | 29 ++++-
.../execute/ColocationFailoverDUnitTest.java | 20 +++-
...ributedRegionFunctionExecutionDUnitTest.java | 54 +++++++--
.../FunctionExecution_ExceptionDUnitTest.java | 23 +++-
.../execute/FunctionServiceStatsDUnitTest.java | 22 +++-
.../cache/execute/LocalDataSetDUnitTest.java | 20 +++-
.../execute/LocalDataSetIndexingDUnitTest.java | 17 ++-
.../LocalFunctionExecutionDUnitTest.java | 21 +++-
.../MemberFunctionExecutionDUnitTest.java | 37 +++++-
.../MultiRegionFunctionExecutionDUnitTest.java | 27 +++--
.../OnGroupsFunctionExecutionDUnitTest.java | 35 +++++-
...ntServerFunctionExecutionNoAckDUnitTest.java | 16 ++-
...tServerRegionFunctionExecutionDUnitTest.java | 39 ++++++-
...egionFunctionExecutionFailoverDUnitTest.java | 24 +++-
...onFunctionExecutionNoSingleHopDUnitTest.java | 35 +++++-
...onExecutionSelectorNoSingleHopDUnitTest.java | 33 +++++-
...gionFunctionExecutionSingleHopDUnitTest.java | 76 +++++++++----
.../cache/execute/PRClientServerTestBase.java | 20 +++-
.../cache/execute/PRColocationDUnitTest.java | 38 ++++++-
.../execute/PRCustomPartitioningDUnitTest.java | 17 ++-
.../execute/PRFunctionExecutionDUnitTest.java | 51 ++++++++-
.../PRFunctionExecutionTimeOutDUnitTest.java | 21 +++-
...ctionExecutionWithResultSenderDUnitTest.java | 22 +++-
.../execute/PRPerformanceTestDUnitTest.java | 17 ++-
.../cache/execute/PRTransactionDUnitTest.java | 36 +++++-
.../PRTransactionWithVersionsDUnitTest.java | 14 ++-
.../execute/SingleHopGetAllPutAllDUnitTest.java | 16 ++-
.../cache/ha/Bug36853EventsExpiryDUnitTest.java | 21 +++-
.../internal/cache/ha/Bug48571DUnitTest.java | 21 +++-
.../internal/cache/ha/Bug48879DUnitTest.java | 21 +++-
.../cache/ha/EventIdOptimizationDUnitTest.java | 26 ++++-
.../internal/cache/ha/FailoverDUnitTest.java | 21 +++-
.../internal/cache/ha/HABugInPutDUnitTest.java | 21 +++-
.../internal/cache/ha/HAClearDUnitTest.java | 24 +++-
.../cache/ha/HAConflationDUnitTest.java | 24 +++-
.../internal/cache/ha/HADuplicateDUnitTest.java | 21 +++-
.../cache/ha/HAEventIdPropagationDUnitTest.java | 22 +++-
.../internal/cache/ha/HAExpiryDUnitTest.java | 20 +++-
.../internal/cache/ha/HAGIIBugDUnitTest.java | 15 ++-
.../internal/cache/ha/HAGIIDUnitTest.java | 23 +++-
.../internal/cache/ha/HARegionDUnitTest.java | 21 +++-
.../cache/ha/HASlowReceiverDUnitTest.java | 21 +++-
.../ha/OperationsPropagationDUnitTest.java | 21 +++-
.../internal/cache/ha/PutAllDUnitTest.java | 23 +++-
.../internal/cache/ha/StatsBugDUnitTest.java | 23 +++-
.../cache/locks/TXLockServiceDUnitTest.java | 22 +++-
.../cache/partitioned/Bug39356DUnitTest.java | 18 ++-
.../cache/partitioned/Bug43684DUnitTest.java | 30 ++++-
.../cache/partitioned/Bug47388DUnitTest.java | 21 +++-
.../cache/partitioned/Bug51400DUnitTest.java | 21 +++-
.../partitioned/ElidedPutAllDUnitTest.java | 17 ++-
.../partitioned/PartitionResolverDUnitTest.java | 26 ++++-
.../PartitionedRegionLoaderWriterDUnitTest.java | 27 ++++-
...rtitionedRegionMetaDataCleanupDUnitTest.java | 19 +++-
.../partitioned/PersistPRKRFDUnitTest.java | 15 ++-
...tentColocatedPartitionedRegionDUnitTest.java | 28 ++++-
.../PersistentPartitionedRegionDUnitTest.java | 56 ++++++++--
...tentPartitionedRegionOldConfigDUnitTest.java | 14 ++-
...rtitionedRegionWithTransactionDUnitTest.java | 15 ++-
.../cache/partitioned/ShutdownAllDUnitTest.java | 28 ++++-
...treamingPartitionOperationManyDUnitTest.java | 17 ++-
...StreamingPartitionOperationOneDUnitTest.java | 17 ++-
.../fixed/FixedPartitioningDUnitTest.java | 41 ++++++-
.../fixed/FixedPartitioningTestBase.java | 20 +++-
...ngWithColocationAndPersistenceDUnitTest.java | 26 ++++-
.../PersistentRecoveryOrderDUnitTest.java | 35 +++++-
...rsistentRecoveryOrderOldConfigDUnitTest.java | 14 ++-
.../internal/cache/tier/Bug40396DUnitTest.java | 20 +++-
...mpatibilityHigherVersionClientDUnitTest.java | 21 +++-
.../cache/tier/sockets/Bug36269DUnitTest.java | 21 +++-
.../cache/tier/sockets/Bug36457DUnitTest.java | 21 +++-
.../cache/tier/sockets/Bug36805DUnitTest.java | 21 +++-
.../cache/tier/sockets/Bug36829DUnitTest.java | 17 ++-
.../cache/tier/sockets/Bug36995DUnitTest.java | 25 ++++-
.../cache/tier/sockets/Bug37210DUnitTest.java | 21 +++-
.../cache/tier/sockets/Bug37805DUnitTest.java | 17 ++-
.../CacheServerTransactionsDUnitTest.java | 31 ++++-
...acheServerTransactionsSelectorDUnitTest.java | 14 ++-
.../tier/sockets/ClearPropagationDUnitTest.java | 22 +++-
.../tier/sockets/ClientConflationDUnitTest.java | 25 ++++-
.../sockets/ClientInterestNotifyDUnitTest.java | 23 +++-
.../ClientServerForceInvalidateDUnitTest.java | 31 ++++-
.../tier/sockets/ClientServerMiscDUnitTest.java | 70 ++++++++----
.../ClientServerMiscSelectorDUnitTest.java | 14 ++-
.../cache/tier/sockets/ConflationDUnitTest.java | 33 ++++--
.../DataSerializerPropogationDUnitTest.java | 33 ++++--
.../sockets/DurableClientBug39997DUnitTest.java | 17 ++-
.../DurableClientQueueSizeDUnitTest.java | 19 +++-
.../DurableClientReconnectAutoDUnitTest.java | 16 ++-
.../DurableClientReconnectDUnitTest.java | 33 ++++--
.../sockets/DurableClientStatsDUnitTest.java | 18 ++-
.../sockets/DurableRegistrationDUnitTest.java | 20 +++-
.../sockets/DurableResponseMatrixDUnitTest.java | 40 ++++++-
.../sockets/EventIDVerificationDUnitTest.java | 23 +++-
.../EventIDVerificationInP2PDUnitTest.java | 20 +++-
.../ForceInvalidateEvictionDUnitTest.java | 20 +++-
...ForceInvalidateOffHeapEvictionDUnitTest.java | 14 ++-
.../cache/tier/sockets/HABug36738DUnitTest.java | 17 ++-
.../tier/sockets/HAInterestPart1DUnitTest.java | 22 +++-
.../tier/sockets/HAInterestPart2DUnitTest.java | 22 +++-
.../cache/tier/sockets/HAInterestTestCase.java | 26 +++--
.../sockets/HAStartupAndFailoverDUnitTest.java | 53 ++++++---
.../InstantiatorPropagationDUnitTest.java | 32 ++++--
.../tier/sockets/InterestListDUnitTest.java | 35 ++++--
.../sockets/InterestListEndpointDUnitTest.java | 28 +++--
.../InterestListEndpointPRDUnitTest.java | 16 ++-
.../InterestListEndpointSelectorDUnitTest.java | 14 ++-
.../sockets/InterestListFailoverDUnitTest.java | 18 ++-
.../sockets/InterestListRecoveryDUnitTest.java | 17 ++-
.../sockets/InterestRegrListenerDUnitTest.java | 21 +++-
.../sockets/InterestResultPolicyDUnitTest.java | 20 +++-
.../sockets/NewRegionAttributesDUnitTest.java | 20 +++-
.../sockets/RedundancyLevelPart1DUnitTest.java | 23 +++-
.../sockets/RedundancyLevelPart2DUnitTest.java | 26 ++++-
.../sockets/RedundancyLevelPart3DUnitTest.java | 17 ++-
.../tier/sockets/RedundancyLevelTestBase.java | 20 +++-
.../tier/sockets/RegionCloseDUnitTest.java | 21 +++-
...erInterestBeforeRegionCreationDUnitTest.java | 21 +++-
.../sockets/RegisterInterestKeysDUnitTest.java | 23 +++-
.../RegisterInterestKeysPRDUnitTest.java | 16 ++-
.../sockets/ReliableMessagingDUnitTest.java | 22 +++-
.../sockets/UnregisterInterestDUnitTest.java | 25 ++++-
.../VerifyEventIDGenerationInP2PDUnitTest.java | 19 +++-
...UpdatesFromNonInterestEndPointDUnitTest.java | 21 +++-
.../cache/wan/AsyncEventQueueTestBase.java | 16 ++-
.../asyncqueue/AsyncEventListenerDUnitTest.java | 44 +++++++-
.../AsyncEventListenerOffHeapDUnitTest.java | 14 ++-
.../AsyncEventQueueStatsDUnitTest.java | 19 +++-
.../ConcurrentAsyncEventQueueDUnitTest.java | 21 +++-
...ncurrentAsyncEventQueueOffHeapDUnitTest.java | 14 ++-
.../CommonParallelAsyncEventQueueDUnitTest.java | 15 ++-
...ParallelAsyncEventQueueOffHeapDUnitTest.java | 14 ++-
.../CompressionCacheConfigDUnitTest.java | 18 ++-
.../CompressionCacheListenerDUnitTest.java | 17 ++-
...ompressionCacheListenerOffHeapDUnitTest.java | 14 ++-
.../CompressionRegionConfigDUnitTest.java | 22 +++-
.../CompressionRegionFactoryDUnitTest.java | 17 ++-
.../CompressionRegionOperationsDUnitTest.java | 20 +++-
...ressionRegionOperationsOffHeapDUnitTest.java | 14 ++-
.../compression/CompressionStatsDUnitTest.java | 17 ++-
.../internal/jta/dunit/ExceptionsDUnitTest.java | 18 ++-
.../jta/dunit/IdleTimeOutDUnitTest.java | 19 +++-
.../jta/dunit/LoginTimeOutDUnitTest.java | 17 ++-
.../jta/dunit/MaxPoolSizeDUnitTest.java | 18 ++-
.../jta/dunit/TransactionTimeOutDUnitTest.java | 18 ++-
.../dunit/TxnManagerMultiThreadDUnitTest.java | 21 +++-
.../internal/jta/dunit/TxnTimeOutDUnitTest.java | 19 +++-
.../offheap/OutOfOffHeapMemoryDUnitTest.java | 18 ++-
.../process/LocalProcessLauncherDUnitTest.java | 19 +++-
.../statistics/StatisticsDUnitTest.java | 17 ++-
.../management/CacheManagementDUnitTest.java | 25 ++++-
.../management/ClientHealthStatsDUnitTest.java | 20 +++-
.../management/CompositeTypeTestDUnitTest.java | 15 ++-
.../management/DLockManagementDUnitTest.java | 16 ++-
.../management/DiskManagementDUnitTest.java | 19 +++-
.../management/LocatorManagementDUnitTest.java | 22 +++-
.../gemfire/management/ManagementTestBase.java | 20 +++-
.../MemberMBeanAttributesDUnitTest.java | 18 ++-
.../management/OffHeapManagementDUnitTest.java | 22 +++-
.../gemfire/management/QueryDataDUnitTest.java | 23 +++-
.../management/RegionManagementDUnitTest.java | 22 +++-
.../stats/DistributedSystemStatsDUnitTest.java | 15 ++-
.../internal/cli/CliUtilDUnitTest.java | 18 ++-
.../internal/pulse/TestClientIdsDUnitTest.java | 17 ++-
.../internal/pulse/TestFunctionsDUnitTest.java | 15 ++-
.../internal/pulse/TestHeapDUnitTest.java | 15 ++-
.../internal/pulse/TestLocatorsDUnitTest.java | 15 ++-
.../pulse/TestSubscriptionsDUnitTest.java | 17 ++-
.../ClientsWithVersioningRetryDUnitTest.java | 19 +++-
.../pdx/DistributedSystemIdDUnitTest.java | 20 +++-
.../pdx/JSONPdxClientServerDUnitTest.java | 19 +++-
.../pdx/PDXAsyncEventQueueDUnitTest.java | 18 ++-
.../gemfire/pdx/PdxClientServerDUnitTest.java | 26 ++++-
.../pdx/PdxDeserializationDUnitTest.java | 20 +++-
.../gemfire/pdx/PdxSerializableDUnitTest.java | 20 +++-
.../gemfire/pdx/PdxTypeExportDUnitTest.java | 18 ++-
.../gemfire/redis/RedisDistDUnitTest.java | 15 ++-
.../test/dunit/tests/BasicDUnitTest.java | 44 ++++++--
.../tests/GetDefaultDiskStoreNameDUnitTest.java | 17 ++-
.../dunit/tests/GetTestMethodNameDUnitTest.java | 17 ++-
...ingGetPropertiesDisconnectsAllDUnitTest.java | 15 ++-
.../gemfire/test/dunit/tests/VMDUnitTest.java | 22 +++-
.../cache/query/cq/dunit/CqDataDUnitTest.java | 29 ++++-
.../dunit/CqDataOptimizedExecuteDUnitTest.java | 14 ++-
...qDataUsingPoolOptimizedExecuteDUnitTest.java | 14 ++-
.../cache/query/cq/dunit/CqPerfDUnitTest.java | 21 +++-
.../cq/dunit/CqPerfUsingPoolDUnitTest.java | 20 +++-
.../cache/query/cq/dunit/CqQueryDUnitTest.java | 49 +++++++-
.../dunit/CqQueryOptimizedExecuteDUnitTest.java | 17 ++-
.../cq/dunit/CqQueryUsingPoolDUnitTest.java | 34 +++++-
...QueryUsingPoolOptimizedExecuteDUnitTest.java | 14 ++-
.../cq/dunit/CqResultSetUsingPoolDUnitTest.java | 27 ++++-
...ltSetUsingPoolOptimizedExecuteDUnitTest.java | 15 ++-
.../cache/query/cq/dunit/CqStateDUnitTest.java | 15 ++-
.../cache/query/cq/dunit/CqStatsDUnitTest.java | 18 ++-
.../dunit/CqStatsOptimizedExecuteDUnitTest.java | 14 ++-
.../cq/dunit/CqStatsUsingPoolDUnitTest.java | 18 ++-
...StatsUsingPoolOptimizedExecuteDUnitTest.java | 14 ++-
.../PartitionedRegionCqQueryDUnitTest.java | 28 ++++-
...dRegionCqQueryOptimizedExecuteDUnitTest.java | 16 ++-
.../query/cq/dunit/PrCqUsingPoolDUnitTest.java | 30 ++++-
.../PrCqUsingPoolOptimizedExecuteDUnitTest.java | 14 ++-
.../cache/query/dunit/PdxQueryCQDUnitTest.java | 17 ++-
.../dunit/QueryIndexUpdateRIDUnitTest.java | 24 +++-
.../query/dunit/QueryMonitorDUnitTest.java | 25 ++++-
.../cache/snapshot/ClientSnapshotDUnitTest.java | 20 +++-
.../cache/PRDeltaPropagationDUnitTest.java | 42 +++++--
.../cache/RemoteCQTransactionDUnitTest.java | 22 +++-
.../internal/cache/ha/CQListGIIDUnitTest.java | 21 +++-
.../sockets/ClientToServerDeltaDUnitTest.java | 31 ++++-
.../DeltaPropagationWithCQDUnitTest.java | 22 +++-
...ToRegionRelationCQRegistrationDUnitTest.java | 32 ++++--
.../sockets/DurableClientCrashDUnitTest.java | 16 ++-
.../sockets/DurableClientNetDownDUnitTest.java | 14 ++-
.../sockets/DurableClientSimpleDUnitTest.java | 41 ++++++-
.../CacheServerManagementDUnitTest.java | 16 ++-
.../internal/pulse/TestCQDUnitTest.java | 15 ++-
.../internal/pulse/TestClientsDUnitTest.java | 15 ++-
.../internal/pulse/TestServerDUnitTest.java | 15 ++-
.../cache/CacheXml70GatewayDUnitTest.java | 18 ++-
.../cache/CacheXml80GatewayDUnitTest.java | 17 ++-
.../internal/cache/UpdateVersionDUnitTest.java | 20 +++-
.../cache/wan/CacheClientNotifierDUnitTest.java | 15 ++-
.../cache/wan/Simple2CacheServerDUnitTest.java | 15 ++-
.../gemfire/internal/cache/wan/WANTestBase.java | 16 ++-
...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 | 17 ++-
.../CommonParallelGatewaySenderDUnitTest.java | 13 ++-
...onParallelGatewaySenderOffHeapDUnitTest.java | 14 ++-
...wWANConcurrencyCheckForDestroyDUnitTest.java | 20 +++-
.../wan/misc/NewWanAuthenticationDUnitTest.java | 17 ++-
.../cache/wan/misc/PDXNewWanDUnitTest.java | 30 ++++-
...dRegion_ParallelWANPersistenceDUnitTest.java | 15 ++-
...dRegion_ParallelWANPropogationDUnitTest.java | 15 ++-
.../SenderWithTransportFilterDUnitTest.java | 16 ++-
...downAllPersistentGatewaySenderDUnitTest.java | 15 ++-
.../wan/misc/WANLocatorServerDUnitTest.java | 15 ++-
.../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 | 27 ++++-
...llelGatewaySenderQueueOverflowDUnitTest.java | 15 ++-
.../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 | 18 ++-
...ersistenceEnabledGatewaySenderDUnitTest.java | 21 +++-
.../SerialWANPropagationLoopBackDUnitTest.java | 18 ++-
.../serial/SerialWANPropogationDUnitTest.java | 32 +++++-
...NPropogation_PartitionedRegionDUnitTest.java | 21 +++-
.../SerialWANPropogationsFeatureDUnitTest.java | 21 +++-
.../wan/serial/SerialWANStatsDUnitTest.java | 22 +++-
.../management/WANManagementDUnitTest.java | 17 ++-
.../pulse/TestRemoteClusterDUnitTest.java | 15 ++-
.../cli/commands/CommandOverHttpDUnitTest.java | 10 ++
.../ConnectCommandWithHttpAndSSLDUnitTest.java | 20 ++++
550 files changed, 10072 insertions(+), 1777 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/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 dc3986b..5d224e7 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 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/f83cc548/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 4d0abcd..76f654e 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,6 +17,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.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.execute.Function;
@@ -48,7 +57,8 @@ import java.util.List;
import java.util.Properties;
import java.util.Random;
-public class RestAPITestBase extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class RestAPITestBase extends JUnit4DistributedTestCase {
protected Cache cache = null;
protected List<String> restURLs = new ArrayList();
protected VM vm0 = null;
@@ -56,8 +66,8 @@ public class RestAPITestBase extends DistributedTestCase {
protected VM vm2 = null;
protected VM vm3 = null;
- public RestAPITestBase(String name) {
- super(name);
+ public RestAPITestBase() {
+ super();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/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 3717074..42fa1f8 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;
@@ -56,6 +65,7 @@ import java.util.*;
* @since 8.0
*/
+@Category(DistributedTest.class)
public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
private static final long serialVersionUID = -254776154266339226L;
@@ -146,8 +156,8 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
+ " \"middleName\": \"kiran12\"," + " \"lastName\": \"Patel\","
+ " \"birthDate\": \"23/08/2012\"," + "\"gender\": \"MALE\"" + "}" + "]";
- public RestAPIsAndInterOpsDUnitTest(String name) {
- super(name);
+ public RestAPIsAndInterOpsDUnitTest() {
+ super();
this.helper = new ManagementTestBase(name);
}
@@ -758,6 +768,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/f83cc548/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..032b9dc 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,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.execute.FunctionContext;
import com.gemstone.gemfire.cache.execute.FunctionService;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
@@ -27,10 +36,11 @@ import org.apache.http.client.methods.CloseableHttpResponse;
import java.util.ArrayList;
import java.util.Collections;
+@Category(DistributedTest.class)
public class RestAPIsOnGroupsFunctionExecutionDUnitTest extends RestAPITestBase {
- public RestAPIsOnGroupsFunctionExecutionDUnitTest(String name) {
- super(name);
+ public RestAPIsOnGroupsFunctionExecutionDUnitTest() {
+ super();
}
@Override
@@ -48,6 +58,7 @@ public class RestAPIsOnGroupsFunctionExecutionDUnitTest extends RestAPITestBase
vm2.invoke("registerFunction(new OnGroupsFunction())", () -> FunctionService.registerFunction(new OnGroupsFunction()));
}
+ @Test
public void testonGroupsExecutionOnAllMembers() {
setupCacheWithGroupsAndFunction();
@@ -61,6 +72,7 @@ public class RestAPIsOnGroupsFunctionExecutionDUnitTest extends RestAPITestBase
restURLs.clear();
}
+ @Test
public void testonGroupsExecutionOnAllMembersWithFilter() {
setupCacheWithGroupsAndFunction();
@@ -74,6 +86,7 @@ public class RestAPIsOnGroupsFunctionExecutionDUnitTest extends RestAPITestBase
restURLs.clear();
}
+ @Test
public void testBasicP2PFunctionSelectedGroup() {
setupCacheWithGroupsAndFunction();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/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 fd6b312..00b08ad 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,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.Cache;
import com.gemstone.gemfire.cache.CacheClosedException;
import com.gemstone.gemfire.cache.CacheFactory;
@@ -30,12 +39,13 @@ import org.apache.http.client.methods.CloseableHttpResponse;
import java.util.Properties;
+@Category(DistributedTest.class)
public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase {
private static final long serialVersionUID = 1L;
- public RestAPIsOnMembersFunctionExecutionDUnitTest(String name) {
- super(name);
+ public RestAPIsOnMembersFunctionExecutionDUnitTest() {
+ super();
}
private class OnMembersFunction extends RestFunctionTemplate {
@@ -82,12 +92,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";
@@ -100,6 +110,7 @@ public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase
return OnMembersFunction.Id;
}
+ @Test
public void testFunctionExecutionOnAllMembers() {
createCacheForVMs();
@@ -120,6 +131,7 @@ public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase
restURLs.add(vm3.invoke("createCacheAndRegisterFunction",() -> createCacheAndRegisterFunction(vm3.getHost().getHostName(), "m4")));
}
+ @Test
public void testFunctionExecutionEOnSelectedMembers() {
createCacheForVMs();
@@ -133,6 +145,7 @@ public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase
restURLs.clear();
}
+ @Test
public void testFunctionExecutionOnMembersWithFilter() {
createCacheForVMs();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
index 7b006d7..9681dad 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
@@ -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 java.util.Properties;
/**
* @since 8.0
*/
+@Category(DistributedTest.class)
public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
private static final long serialVersionUID = -254776154266339226L;
@@ -65,8 +75,8 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
private File jks;
- public RestAPIsWithSSLDUnitTest(String name) {
- super(name);
+ public RestAPIsWithSSLDUnitTest() {
+ super();
this.jks = findTrustedJKS();
}
@@ -400,6 +410,7 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
// Actual Tests starts here.
+ @Test
public void testSimpleSSL() throws Exception {
Properties props = new Properties();
@@ -411,6 +422,7 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
validateConnection(restEndpoint, "SSL");
}
+ @Test
public void testSSLWithoutKeyStoreType() throws Exception {
Properties props = new Properties();
props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_ENABLED_NAME, "true");
@@ -421,6 +433,7 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
validateConnection(restEndpoint, "SSL");
}
+ @Test
public void testSSLWithSSLProtocol() throws Exception {
Properties props = new Properties();
props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_ENABLED_NAME, "true");
@@ -432,6 +445,7 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
validateConnection(restEndpoint, "SSL");
}
+ @Test
public void testSSLWithTLSProtocol() throws Exception {
Properties props = new Properties();
props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_ENABLED_NAME, "true");
@@ -443,6 +457,7 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
validateConnection(restEndpoint, "TLS");
}
+ @Test
public void testSSLWithTLSv11Protocol() throws Exception {
Properties props = new Properties();
props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_ENABLED_NAME, "true");
@@ -454,6 +469,7 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
validateConnection(restEndpoint, "TLSv1.1");
}
+ @Test
public void testSSLWithTLSv12Protocol() throws Exception {
Properties props = new Properties();
props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_ENABLED_NAME, "true");
@@ -465,6 +481,7 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
validateConnection(restEndpoint, "TLSv1.2");
}
+ @Test
public void testWithMultipleProtocol() throws Exception {
Properties props = new Properties();
props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_ENABLED_NAME, "true");
@@ -476,6 +493,7 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
validateConnection(restEndpoint, "TLSv1.2");
}
+ @Test
public void testSSLWithCipherSuite() throws Exception {
System.setProperty("javax.net.debug", "ssl");
Properties props = new Properties();
@@ -495,6 +513,7 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
validateConnection(restEndpoint, "TLSv1.2");
}
+ @Test
public void testSSLWithMultipleCipherSuite() throws Exception {
Properties props = new Properties();
props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_ENABLED_NAME, "true");
@@ -513,6 +532,7 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
validateConnection(restEndpoint, "TLSv1.2");
}
+ @Test
public void testMutualAuthentication() throws Exception {
Properties props = new Properties();
props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_ENABLED_NAME, "true");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
index 192b60e..0a76c67 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache;
+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 java.util.Properties;
import com.gemstone.gemfire.cache.client.PoolManager;
@@ -34,7 +43,8 @@ import com.gemstone.gemfire.test.dunit.VM;
* verifies the count of clear operation
*
*/
-public class CacheRegionClearStatsDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class CacheRegionClearStatsDUnitTest extends JUnit4DistributedTestCase {
/** the cache */
private static GemFireCacheImpl cache = null;
@@ -56,8 +66,8 @@ public class CacheRegionClearStatsDUnitTest extends DistributedTestCase {
private static final int clearOp = 2;
/** constructor */
- public CacheRegionClearStatsDUnitTest(String name) {
- super(name);
+ public CacheRegionClearStatsDUnitTest() {
+ super();
}
@Override
@@ -78,11 +88,11 @@ public class CacheRegionClearStatsDUnitTest extends DistributedTestCase {
public static void createClientCache(String host, Integer port1)
throws Exception {
- new CacheRegionClearStatsDUnitTest("temp");
+ new CacheRegionClearStatsDUnitTest();
Properties props = new Properties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "");
- new CacheRegionClearStatsDUnitTest("temp").createCache(props);
+ new CacheRegionClearStatsDUnitTest().createCache(props);
PoolImpl p = (PoolImpl)PoolManager.createFactory().addServer(host,
port1.intValue()).setSubscriptionEnabled(false)
.setThreadLocalConnections(true).setMinConnections(1).setReadTimeout(
@@ -103,7 +113,7 @@ public class CacheRegionClearStatsDUnitTest extends DistributedTestCase {
}
private static Integer createCache(DataPolicy dataPolicy) throws Exception {
- new CacheRegionClearStatsDUnitTest("temp").createCache(new Properties());
+ new CacheRegionClearStatsDUnitTest().createCache(new Properties());
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
factory.setDataPolicy(dataPolicy);
@@ -123,11 +133,11 @@ public class CacheRegionClearStatsDUnitTest extends DistributedTestCase {
public static void createClientCacheDisk(String host, Integer port1)
throws Exception {
- new CacheRegionClearStatsDUnitTest("temp");
+ new CacheRegionClearStatsDUnitTest();
Properties props = new Properties();
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "");
- new CacheRegionClearStatsDUnitTest("temp").createCache(props);
+ new CacheRegionClearStatsDUnitTest().createCache(props);
PoolImpl p = (PoolImpl)PoolManager.createFactory().addServer(host,
port1.intValue()).setSubscriptionEnabled(false)
.setThreadLocalConnections(true).setMinConnections(1).setReadTimeout(
@@ -146,6 +156,7 @@ public class CacheRegionClearStatsDUnitTest extends DistributedTestCase {
* This test does the following (<b> clear stats counter </b>):<br>
* 1)Verifies that clear operation count matches with stats count<br>
*/
+ @Test
public void testClearStatsWithNormalRegion(){
Integer port1 = ((Integer)server1.invoke(() -> CacheRegionClearStatsDUnitTest.createServerCache()));
@@ -167,6 +178,7 @@ public class CacheRegionClearStatsDUnitTest extends DistributedTestCase {
* This test does the following (<b> clear stats counter when disk involved </b>):<br>
* 1)Verifies that clear operation count matches with stats count <br>
*/
+ @Test
public void testClearStatsWithDiskRegion(){
Integer port1 = ((Integer)server1.invoke(() -> CacheRegionClearStatsDUnitTest.createServerCacheDisk()));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java
index 12f5340..0966f8d 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java
@@ -15,6 +15,15 @@
* limitations under the License.
*/
package com.gemstone.gemfire.cache;
+
+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 java.io.IOException;
import java.util.Properties;
@@ -38,10 +47,11 @@ 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 {
+@Category(DistributedTest.class)
+public class ClientServerTimeSyncDUnitTest extends JUnit4CacheTestCase {
- public ClientServerTimeSyncDUnitTest(String name) {
- super(name);
+ public ClientServerTimeSyncDUnitTest() {
+ super();
}
@Ignore("Bug 52327")
@@ -117,6 +127,7 @@ public class ClientServerTimeSyncDUnitTest extends CacheTestCase {
}
}
+ @Test
public void testNothing() {
// place-holder to keep dunit runner from barfing
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
index 7495328..df76fcb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache;
+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 java.io.IOException;
import java.util.Properties;
@@ -38,13 +47,14 @@ import com.gemstone.gemfire.test.dunit.VM;
* a connection pool and a bridge loader.
*
*/
-public class ConnectionPoolAndLoaderDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class ConnectionPoolAndLoaderDUnitTest extends JUnit4CacheTestCase {
private static int bridgeServerPort;
protected boolean useLocator;
- public ConnectionPoolAndLoaderDUnitTest(String name) {
- super(name);
+ public ConnectionPoolAndLoaderDUnitTest() {
+ super();
}
@Override
@@ -66,6 +76,7 @@ public class ConnectionPoolAndLoaderDUnitTest extends CacheTestCase {
* Anything that is loaded on the client is put on the server..
*
*/
+ @Test
public void testPoolAndLoader() {
final String regionName = this.getName();
final Host host = Host.getHost(0);
@@ -145,6 +156,7 @@ public class ConnectionPoolAndLoaderDUnitTest extends CacheTestCase {
* local writer
* put on server
*/
+ @Test
public void testPoolAndWriter() {
final String regionName = this.getName();
final Host host = Host.getHost(0);
@@ -246,6 +258,7 @@ public class ConnectionPoolAndLoaderDUnitTest extends CacheTestCase {
* 3 server
* 4 loader
*/
+ @Test
public void testPoolLoadAndPeer() {
final String regionName = this.getName();
final Host host = Host.getHost(0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
index 1c0e411..3830c84 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.client;
+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 java.io.IOException;
import java.net.UnknownHostException;
import java.util.Stack;
@@ -47,7 +56,8 @@ import com.gemstone.gemfire.test.dunit.VM;
* @see com.gemstone.gemfire.test.dunit.DistributedTestCase
* @since 8.0
*/
-public class ClientServerRegisterInterestsDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class ClientServerRegisterInterestsDUnitTest extends JUnit4DistributedTestCase {
protected static final long WAIT_TIME_MILLISECONDS = TimeUnit.SECONDS.toMillis(5);
@@ -206,6 +216,7 @@ public class ClientServerRegisterInterestsDUnitTest extends DistributedTestCase
}
}
+ @Test
public void testClientRegisterInterests() {
ClientCache clientCache = setupGemFireClientCache();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
index fddf108..ff2f6fa 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.client.internal;
+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.Cache;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.client.NoAvailableLocatorsException;
@@ -43,6 +52,7 @@ import java.util.List;
* - dynamically discovering servers, locators, handling
* locator disappearance, etc.
*/
+@Category(DistributedTest.class)
public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
protected static final Object BRIDGE_LISTENER = "BRIDGE_LISTENER";
@@ -53,10 +63,11 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
IgnoredException.addIgnoredException("NoAvailableLocatorsException");
}
- public AutoConnectionSourceDUnitTest(String name) {
- super(name);
+ public AutoConnectionSourceDUnitTest() {
+ super();
}
+ @Test
public void testDiscoverBridgeServers() throws Exception {
final Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -78,6 +89,7 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
Assert.assertEquals("value", getInVM(vm1, "key"));
}
+ @Test
public void testNoLocators() {
final Host host = Host.getHost(0);
@@ -93,6 +105,7 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
}
}
+ @Test
public void testNoBridgeServer() {
final Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -110,6 +123,7 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
}
}
+ @Test
public void testDynamicallyFindBridgeServer() throws Exception {
final Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -138,6 +152,7 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
Assert.assertEquals("value2", getInVM(vm3, "key2"));
}
+ @Test
public void testDynamicallyFindLocators() throws Exception {
try {
final Host host = Host.getHost(0);
@@ -182,6 +197,7 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
}
}
+ @Test
public void testEmbeddedLocator() throws Exception {
final Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -218,6 +234,7 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
});
}
+ @Test
public void testServerGroups() throws Exception {
final Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -273,6 +290,7 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
Assert.assertEquals("value", getInVM(vm1, "B", "key7"));
}
+ @Test
public void testTwoServersInSameVM() throws Exception {
final Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -300,6 +318,7 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
checkEndpoints(vm2, new int[] { serverPort1 });
}
+ @Test
public void testClientMembershipListener() throws Exception {
final Host host = Host.getHost(0);
VM locatorVM = host.getVM(0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
index 15f5d52..910d3f3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.client.internal;
+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 java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -42,7 +51,8 @@ import com.gemstone.gemfire.util.test.TestUtil;
/**
* Tests cacheserver ssl support added. See https://svn.gemstone.com/trac/gemfire/ticket/48995 for details
*/
-public class CacheServerSSLConnectionDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class CacheServerSSLConnectionDUnitTest extends JUnit4DistributedTestCase {
private static final long serialVersionUID = 1L;
@@ -52,7 +62,7 @@ public class CacheServerSSLConnectionDUnitTest extends DistributedTestCase {
private static final String SERVER_KEY_STORE = "cacheserver.keystore";
private static final String SERVER_TRUST_STORE = "cacheserver.truststore";
- private static CacheServerSSLConnectionDUnitTest instance = new CacheServerSSLConnectionDUnitTest("CacheServerSSLConnectionDUnit");
+ private static CacheServerSSLConnectionDUnitTest instance = new CacheServerSSLConnectionDUnitTest();
private Cache cache;
private CacheServer cacheServer;
@@ -65,8 +75,8 @@ public class CacheServerSSLConnectionDUnitTest extends DistributedTestCase {
disconnectAllFromDS();
}
- public CacheServerSSLConnectionDUnitTest(String name) {
- super(name);
+ public CacheServerSSLConnectionDUnitTest() {
+ super();
}
public Cache createCache(Properties props) throws Exception
@@ -241,6 +251,7 @@ public class CacheServerSSLConnectionDUnitTest extends DistributedTestCase {
}
}
+ @Test
public void testCacheServerSSL() throws Exception {
final Host host = Host.getHost(0);
VM serverVM = host.getVM(1);
@@ -264,6 +275,7 @@ public class CacheServerSSLConnectionDUnitTest extends DistributedTestCase {
}
+ @Test
public void testNonSSLClient() throws Exception {
final Host host = Host.getHost(0);
VM serverVM = host.getVM(1);
@@ -306,6 +318,7 @@ public class CacheServerSSLConnectionDUnitTest extends DistributedTestCase {
}
}
+ @Test
public void testSSLClientWithNoAuth() throws Exception {
final Host host = Host.getHost(0);
VM serverVM = host.getVM(1);
@@ -342,6 +355,7 @@ public class CacheServerSSLConnectionDUnitTest extends DistributedTestCase {
}
}
+ @Test
public void testSSLClientWithNonSSLServer() throws Exception {
final Host host = Host.getHost(0);
VM serverVM = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java
index ea105d3..1bc2322 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.client.internal;
+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.Cache;
import com.gemstone.gemfire.cache.client.PoolManager;
import com.gemstone.gemfire.cache.client.internal.locator.ClientConnectionRequest;
@@ -55,6 +64,7 @@ import java.util.concurrent.TimeUnit;
/**
*
*/
+@Category(DistributedTest.class)
public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
/**
@@ -69,14 +79,15 @@ public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
private static final int ALLOWABLE_ERROR_IN_COUNT = 1;
protected static final long MAX_WAIT = 60000;
- public LocatorLoadBalancingDUnitTest(String name) {
- super(name);
+ public LocatorLoadBalancingDUnitTest() {
+ super();
}
/**
* Test the locator discovers a bridge server and is initialized with
* the correct load for that bridge server.
*/
+ @Test
public void testDiscovery() {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -112,6 +123,7 @@ public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
* Test that the locator will properly estimate the load for servers when
* it receives connection requests.
*/
+ @Test
public void testEstimation() throws IOException, ClassNotFoundException {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -169,6 +181,7 @@ public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
*
* @throws Exception
*/
+ @Test
public void testLoadMessaging() throws Exception {
final Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -219,6 +232,7 @@ public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
*
* @throws Exception
*/
+ @Test
public void testBalancing() throws Exception {
final Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -284,6 +298,7 @@ public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
*
* @throws Exception
*/
+ @Test
public void testIntersectingServerGroups() throws Exception {
final Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -367,6 +382,7 @@ public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
}
+ @Test
public void testCustomLoadProbe() throws Exception {
final Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
index 54c819e..a9a9967 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.client.internal;
+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.Pool;
import com.gemstone.gemfire.cache.client.PoolManager;
@@ -37,7 +46,7 @@ import java.util.*;
/**
*
*/
-public abstract class LocatorTestBase extends DistributedTestCase {
+public abstract class LocatorTestBase extends JUnit4DistributedTestCase {
protected static final String CACHE_KEY = "CACHE";
protected static final String LOCATOR_KEY = "LOCATOR";
protected static final String REGION_NAME = "A_REGION";
@@ -49,8 +58,8 @@ public abstract class LocatorTestBase extends DistributedTestCase {
*/
protected static final HashMap remoteObjects = new HashMap();
- public LocatorTestBase(String name) {
- super(name);
+ public LocatorTestBase() {
+ super();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
index dd146a6..aa70f8b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.client.internal;
+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 java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -41,7 +50,8 @@ import com.gemstone.gemfire.util.test.TestUtil;
/**
* Test for GEODE-396
*/
-public class SSLNoClientAuthDUnitTest extends DistributedTestCase {
+@Category(DistributedTest.class)
+public class SSLNoClientAuthDUnitTest extends JUnit4DistributedTestCase {
private static final long serialVersionUID = 1L;
private Cache cache;
@@ -52,15 +62,15 @@ public class SSLNoClientAuthDUnitTest extends DistributedTestCase {
private static final String DEFAULT_STORE = "default.keystore";
- private static SSLNoClientAuthDUnitTest instance = new SSLNoClientAuthDUnitTest("SSLNoClientAuthDUnitTest");
+ private static SSLNoClientAuthDUnitTest instance = new SSLNoClientAuthDUnitTest();
@Override
public final void preSetUp() throws Exception {
disconnectAllFromDS();
}
- public SSLNoClientAuthDUnitTest(String name) {
- super(name);
+ public SSLNoClientAuthDUnitTest() {
+ super();
}
public Cache createCache(Properties props) throws Exception
@@ -231,6 +241,7 @@ public class SSLNoClientAuthDUnitTest extends DistributedTestCase {
/**
* Test for GEODE-396
*/
+ @Test
public void testSSLServerWithNoAuth() throws Exception {
final Host host = Host.getHost(0);
VM serverVM = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/management/ResourceManagerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/ResourceManagerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/ResourceManagerDUnitTest.java
index b8d5008..8bf509b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/ResourceManagerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/ResourceManagerDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.management;
+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 java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
@@ -75,19 +84,21 @@ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
* TODO: javadoc this test properly and cleanup the helper methods to be
* more flexible and understandable
*/
-public class ResourceManagerDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class ResourceManagerDUnitTest extends JUnit4CacheTestCase {
private static final Logger logger = LogService.getLogger();
public static final int SYSTEM_LISTENERS = 1;
public ResourceManagerDUnitTest(final String name) {
- super(name);
+ super();
}
/**
* Creates a cache in the controller and exercises all methods on the
* ResourceManager without having any partitioned regions defined.
*/
+ @Test
public void testResourceManagerBasics() {
Cache cache = getCache();
@@ -131,6 +142,7 @@ public class ResourceManagerDUnitTest extends CacheTestCase {
* Creates partitioned regions in multiple vms and fully exercises the
* getPartitionedRegionDetails API on ResourceManager.
*/
+ @Test
public void testGetPartitionedRegionDetails() {
// two regions
final String[] regionPath = new String[] {
@@ -299,6 +311,7 @@ public class ResourceManagerDUnitTest extends CacheTestCase {
* Creates partitioned regions in multiple vms and fully exercises the
* internal-only getInternalPRDetails API on ResourceManager.
*/
+ @Test
public void testGetInternalPRDetails() {
// two regions
final String[] regionPath = new String[] {
@@ -681,6 +694,7 @@ public class ResourceManagerDUnitTest extends CacheTestCase {
});
}
+ @Test
public void testDeposePrimaryBucketMessage() {
final String[] regionPath = new String[] {
getUniqueName() + "-PR-0"
@@ -749,6 +763,7 @@ public class ResourceManagerDUnitTest extends CacheTestCase {
assertTrue(deposedPrimary);
}
+ @Test
public void testBecomePrimaryBucketMessage() {
final String[] regionPath = new String[] {
getUniqueName() + "-PR-0"
@@ -959,6 +974,7 @@ public class ResourceManagerDUnitTest extends CacheTestCase {
});
}
+ @Test
public void testRemoveDuringGetEntry() {
doOpDuringBucketRemove(new OpDuringBucketRemove() {
public void runit(PartitionedRegion pr, Object key, Object value) {
@@ -971,6 +987,7 @@ public class ResourceManagerDUnitTest extends CacheTestCase {
}
@Category(FlakyTest.class) // GEODE-755: thread unsafe test hook (bucketReadHook), remove bucket fails, possible product bug in rebalancing
+ @Test
public void testRemoveDuringGet() {
doOpDuringBucketRemove(new OpDuringBucketRemove() {
public void runit(PartitionedRegion pr, Object key, Object value) {
@@ -980,6 +997,7 @@ public class ResourceManagerDUnitTest extends CacheTestCase {
}
@Category(FlakyTest.class) // GEODE-673: thread unsafe test hook (bucketReadHook), remove bucket fails, possible product bug in rebalancing
+ @Test
public void testRemoveDuringContainsKey() {
doOpDuringBucketRemove(new OpDuringBucketRemove() {
public void runit(PartitionedRegion pr, Object key, Object value) {
@@ -988,6 +1006,7 @@ public class ResourceManagerDUnitTest extends CacheTestCase {
});
}
+ @Test
public void testRemoveDuringContainsValueForKey() {
doOpDuringBucketRemove(new OpDuringBucketRemove() {
public void runit(PartitionedRegion pr, Object key, Object value) {
@@ -996,6 +1015,7 @@ public class ResourceManagerDUnitTest extends CacheTestCase {
});
}
+ @Test
public void testRemoveDuringKeySet() {
doOpDuringBucketRemove(new OpDuringBucketRemove() {
public void runit(PartitionedRegion pr, Object key, Object value) {
@@ -1004,6 +1024,7 @@ public class ResourceManagerDUnitTest extends CacheTestCase {
});
}
+ @Test
public void testRemoveDuringValues() {
doOpDuringBucketRemove(new OpDuringBucketRemove() {
public void runit(PartitionedRegion pr, Object key, Object value) {
@@ -1012,6 +1033,7 @@ public class ResourceManagerDUnitTest extends CacheTestCase {
});
}
+ @Test
public void testRemoveDuringEntrySet() {
doOpDuringBucketRemove(new OpDuringBucketRemove() {
public void runit(PartitionedRegion pr, Object key, Object value) {
@@ -1024,6 +1046,7 @@ public class ResourceManagerDUnitTest extends CacheTestCase {
});
}
+ @Test
public void testRemoveDuringQuery() {
doOpDuringBucketRemove(new OpDuringBucketRemove() {
public void runit(PartitionedRegion pr, Object key, Object value) {
@@ -1040,6 +1063,7 @@ public class ResourceManagerDUnitTest extends CacheTestCase {
});
}
+ @Test
public void testRemoveBucketMessage() {
final String[] regionPath = new String[] {
getUniqueName() + "-PR-0"
@@ -1139,6 +1163,7 @@ public class ResourceManagerDUnitTest extends CacheTestCase {
* to make sure that all colocated buckets are removed together.
*/
@Category(FlakyTest.class) // GEODE-928: RemoveBucketMessage failure?
+ @Test
public void testRemoveColocatedBuckets() {
final String[] regionPath = new String[] {
getUniqueName() + "-PR-0",
@@ -1259,6 +1284,7 @@ public class ResourceManagerDUnitTest extends CacheTestCase {
* Creates a bucket on two members. Then brings up a third member and creates
* an extra redundant copy of the bucket on it.
*/
+ @Test
public void testCreateRedundantBucket() {
final String[] regionPath = new String[] {
getUniqueName() + "-PR-0"
@@ -1370,6 +1396,7 @@ public class ResourceManagerDUnitTest extends CacheTestCase {
* Creates colocated buckets on two members. Then brings up a third member
* and creates an extra redundant copy of the buckets on it.
*/
+ @Test
public void testCreateRedundantColocatedBuckets() {
final String[] regionPath = new String[] {
getUniqueName() + "-PR-0",
@@ -1508,6 +1535,7 @@ public class ResourceManagerDUnitTest extends CacheTestCase {
* Creates a bucket on two members. Then brings up a third member and moves
* the non-primary bucket to it.
*/
+ @Test
public void testMoveBucket() {
final String[] regionPath = new String[] {
getUniqueName() + "-PR-0"
@@ -1652,6 +1680,7 @@ public class ResourceManagerDUnitTest extends CacheTestCase {
* Creates colocated buckets on two members. Then brings up a third member
* and moves the non-primary colocated buckets to it.
*/
+ @Test
public void testMoveColocatedBuckets() {
final String[] regionPath = new String[] {
getUniqueName() + "-PR-0",
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f83cc548/geode-core/src/test/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelperDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelperDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelperDUnitTest.java
index 6910089..b96d1e5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelperDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelperDUnitTest.java
@@ -16,6 +16,15 @@
*/
package com.gemstone.gemfire.cache.partition;
+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 java.net.UnknownHostException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -53,12 +62,14 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.internal.cache.partitioned.fixed.QuarterPartitionResolver;
-public class PartitionRegionHelperDUnitTest extends CacheTestCase {
+@Category(DistributedTest.class)
+public class PartitionRegionHelperDUnitTest extends JUnit4CacheTestCase {
- public PartitionRegionHelperDUnitTest(String name) {
- super(name);
+ public PartitionRegionHelperDUnitTest() {
+ super();
}
+ @Test
public void testAssignBucketsToPartitions() throws Throwable {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -124,6 +135,7 @@ public class PartitionRegionHelperDUnitTest extends CacheTestCase {
}
+ @Test
public void testAssignBucketsToPartitions_FPR() throws Throwable {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -288,6 +300,7 @@ public class PartitionRegionHelperDUnitTest extends CacheTestCase {
}
+ @Test
public void testMembersForKey() throws Exception {
Host host = Host.getHost(0);
VM accessor = host.getVM(0);
@@ -520,6 +533,7 @@ public class PartitionRegionHelperDUnitTest extends CacheTestCase {
}
}
+ @Test
public void testMoveSingleBucket() {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
@@ -618,6 +632,7 @@ public class PartitionRegionHelperDUnitTest extends CacheTestCase {
});
}
+ @Test
public void testMovePercentage() {
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);