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/02/01 21:56:04 UTC
[47/50] [abbrv] incubator-geode git commit: Refactor dunit
Refactor dunit
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/0d759cb3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/0d759cb3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/0d759cb3
Branch: refs/heads/feature/GEODE-773-2
Commit: 0d759cb30d016aba9ae4c0c681b04bca7778d1dd
Parents: ed17d4c
Author: Kirk Lund <kl...@pivotal.io>
Authored: Mon Feb 1 11:33:30 2016 -0800
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Mon Feb 1 11:33:30 2016 -0800
----------------------------------------------------------------------
.../cache/CacheRegionClearStatsDUnitTest.java | 3 +-
.../cache/ClientServerTimeSyncDUnitTest.java | 5 +-
.../ClientServerRegisterInterestsDUnitTest.java | 3 +-
.../internal/AutoConnectionSourceDUnitTest.java | 3 +-
.../CacheServerSSLConnectionDUnitTest.java | 7 +-
.../cache/client/internal/LocatorTestBase.java | 5 +-
.../management/MemoryThresholdsDUnitTest.java | 28 +--
.../MemoryThresholdsOffHeapDUnitTest.java | 18 +-
.../management/ResourceManagerDUnitTest.java | 5 +-
.../PartitionRegionHelperDUnitTest.java | 12 +-
.../query/dunit/CompactRangeIndexDUnitTest.java | 3 +-
.../query/dunit/PdxStringQueryDUnitTest.java | 92 ++++----
.../dunit/QueryDataInconsistencyDUnitTest.java | 7 +-
.../dunit/QueryIndexUsingXMLDUnitTest.java | 26 +--
.../QueryUsingFunctionContextDUnitTest.java | 22 +-
.../query/dunit/QueryUsingPoolDUnitTest.java | 130 +++++------
.../cache/query/dunit/RemoteQueryDUnitTest.java | 85 ++++----
...esourceManagerWithQueryMonitorDUnitTest.java | 5 +-
.../query/dunit/SelectStarQueryDUnitTest.java | 73 +++----
...rrentIndexInitOnOverflowRegionDUnitTest.java | 5 +-
...pdateWithInplaceObjectModFalseDUnitTest.java | 9 +-
...ConcurrentIndexUpdateWithoutWLDUnitTest.java | 13 +-
.../index/CopyOnReadIndexDUnitTest.java | 3 +-
.../IndexTrackingQueryObserverDUnitTest.java | 9 +-
...itializeIndexEntryDestroyQueryDUnitTest.java | 11 +-
.../index/PutAllWithIndexPerfDUnitTest.java | 7 +-
.../PRBasicIndexCreationDUnitTest.java | 5 +-
.../PRColocatedEquiJoinDUnitTest.java | 3 +-
.../partitioned/PRQueryCacheCloseDUnitTest.java | 5 +-
.../query/partitioned/PRQueryDUnitHelper.java | 13 +-
.../query/partitioned/PRQueryDUnitTest.java | 5 +-
.../PRQueryRegionCloseDUnitTest.java | 3 +-
.../PRQueryRegionDestroyedDUnitTest.java | 3 +-
.../PRQueryRemoteNodeExceptionDUnitTest.java | 11 +-
.../gemfire/cache30/Bug35214DUnitTest.java | 3 +-
.../gemfire/cache30/Bug38741DUnitTest.java | 3 +-
.../gemfire/cache30/CacheLoaderTestCase.java | 3 +-
.../gemfire/cache30/CacheMapTxnDUnitTest.java | 5 +-
.../gemstone/gemfire/cache30/CacheTestCase.java | 22 +-
.../gemfire/cache30/CacheXml30DUnitTest.java | 22 +-
.../gemfire/cache30/CacheXml41DUnitTest.java | 13 +-
.../gemfire/cache30/CacheXml57DUnitTest.java | 15 +-
.../gemfire/cache30/CacheXml60DUnitTest.java | 8 +-
.../gemfire/cache30/CacheXml65DUnitTest.java | 24 ++-
.../gemfire/cache30/CacheXml66DUnitTest.java | 6 +-
.../gemfire/cache30/CacheXml80DUnitTest.java | 3 +-
.../gemfire/cache30/CacheXml81DUnitTest.java | 4 +-
.../gemfire/cache30/CacheXml90DUnitTest.java | 7 +-
.../gemfire/cache30/CacheXmlTestCase.java | 5 +-
.../gemfire/cache30/ClearMultiVmDUnitTest.java | 7 +-
.../cache30/ClientMembershipDUnitTest.java | 10 +-
.../cache30/ClientServerCCEDUnitTest.java | 3 +-
.../DistributedAckRegionCCEDUnitTest.java | 12 +-
.../cache30/DistributedAckRegionDUnitTest.java | 7 +-
.../DistributedNoAckRegionCCEDUnitTest.java | 3 +-
.../DistributedNoAckRegionDUnitTest.java | 9 +-
.../cache30/GlobalRegionCCEDUnitTest.java | 5 +-
.../gemfire/cache30/GlobalRegionDUnitTest.java | 15 +-
.../gemfire/cache30/LocalRegionDUnitTest.java | 3 +-
.../gemfire/cache30/MultiVMRegionTestCase.java | 105 ++++-----
.../PRBucketSynchronizationDUnitTest.java | 5 +-
.../cache30/PartitionedRegionDUnitTest.java | 13 +-
.../cache30/PreloadedRegionTestCase.java | 5 +-
.../cache30/PutAllCallBkSingleVMDUnitTest.java | 3 +-
.../cache30/RRSynchronizationDUnitTest.java | 3 +-
.../gemfire/cache30/ReconnectDUnitTest.java | 22 +-
.../gemfire/cache30/SearchAndLoadDUnitTest.java | 52 ++---
.../gemfire/cache30/TXDistributedDUnitTest.java | 36 ++--
.../cache30/TXRestrictionsDUnitTest.java | 3 +-
.../distributed/DistributedMemberDUnitTest.java | 3 +-
.../gemfire/distributed/LocatorDUnitTest.java | 31 +--
.../ConsoleDistributionManagerDUnitTest.java | 3 +-
.../internal/DistributionManagerDUnitTest.java | 5 +-
.../internal/ProductUseLogDUnitTest.java | 3 +-
.../GemFireDeadlockDetectorDUnitTest.java | 5 +-
.../TcpServerBackwardCompatDUnitTest.java | 6 +-
.../disttx/DistributedTransactionDUnitTest.java | 5 +-
.../ClassNotFoundExceptionDUnitTest.java | 3 +-
.../gemfire/internal/JarDeployerDUnitTest.java | 7 +-
.../gemfire/internal/cache/BackupDUnitTest.java | 3 +-
.../internal/cache/Bug39079DUnitTest.java | 3 +-
.../internal/cache/Bug40299DUnitTest.java | 3 +-
.../internal/cache/Bug41091DUnitTest.java | 5 +-
.../internal/cache/Bug41957DUnitTest.java | 3 +-
.../cache/ClientServerGetAllDUnitTest.java | 8 +-
...ServerInvalidAndDestroyedEntryDUnitTest.java | 3 +-
.../ClientServerTransactionCCEDUnitTest.java | 9 +-
.../cache/ClientServerTransactionDUnitTest.java | 11 +-
.../ConcurrentDestroySubRegionDUnitTest.java | 5 +-
.../cache/ConcurrentMapOpsDUnitTest.java | 15 +-
.../cache/ConnectDisconnectDUnitTest.java | 3 +-
.../cache/DeltaPropagationDUnitTest.java | 18 +-
...DistrbutedRegionProfileOffHeapDUnitTest.java | 3 +-
.../internal/cache/EventTrackerDUnitTest.java | 7 +-
.../cache/EvictionObjectSizerDUnitTest.java | 3 +-
.../internal/cache/EvictionStatsDUnitTest.java | 3 +-
.../internal/cache/EvictionTestBase.java | 3 +-
.../cache/FixedPRSinglehopDUnitTest.java | 5 +-
.../internal/cache/GIIDeltaDUnitTest.java | 18 +-
.../internal/cache/GIIFlowControlDUnitTest.java | 14 +-
.../internal/cache/GridAdvisorDUnitTest.java | 9 +-
.../internal/cache/HABug36773DUnitTest.java | 7 +-
.../cache/InterruptClientServerDUnitTest.java | 3 +-
.../internal/cache/MapClearGIIDUnitTest.java | 7 +-
.../cache/OffHeapEvictionDUnitTest.java | 3 +-
.../cache/OffHeapEvictionStatsDUnitTest.java | 3 +-
.../internal/cache/PRBadToDataDUnitTest.java | 3 +-
...gionBucketCreationDistributionDUnitTest.java | 17 +-
.../PartitionedRegionCacheCloseDUnitTest.java | 3 +-
.../PartitionedRegionCreationDUnitTest.java | 16 +-
...rtitionedRegionDelayedRecoveryDUnitTest.java | 3 +-
.../PartitionedRegionDestroyDUnitTest.java | 3 +-
.../PartitionedRegionEntryCountDUnitTest.java | 3 +-
.../PartitionedRegionEvictionDUnitTest.java | 9 +-
.../cache/PartitionedRegionHADUnitTest.java | 7 +-
...onedRegionHAFailureAndRecoveryDUnitTest.java | 5 +-
.../PartitionedRegionMultipleDUnitTest.java | 15 +-
.../cache/PartitionedRegionPRIDDUnitTest.java | 5 +-
.../cache/PartitionedRegionQueryDUnitTest.java | 23 +-
.../PartitionedRegionSingleHopDUnitTest.java | 20 +-
...RegionSingleHopWithServerGroupDUnitTest.java | 12 +-
.../cache/PartitionedRegionSizeDUnitTest.java | 3 +-
.../cache/PartitionedRegionStatsDUnitTest.java | 7 +-
.../PartitionedRegionTestUtilsDUnitTest.java | 13 +-
.../PartitionedRegionWithSameNameDUnitTest.java | 3 +-
.../internal/cache/PutAllDAckDUnitTest.java | 5 +-
.../internal/cache/PutAllGlobalDUnitTest.java | 9 +-
.../cache/RemoteTransactionDUnitTest.java | 3 +-
.../internal/cache/RemoveAllDAckDUnitTest.java | 3 +-
.../internal/cache/SingleHopStatsDUnitTest.java | 3 +-
.../internal/cache/SizingFlagDUnitTest.java | 3 +-
.../internal/cache/SystemFailureDUnitTest.java | 2 +-
.../control/RebalanceOperationDUnitTest.java | 11 +-
.../ClientServerFunctionExecutionDUnitTest.java | 14 +-
.../execute/ColocationFailoverDUnitTest.java | 3 +-
...ributedRegionFunctionExecutionDUnitTest.java | 40 ++--
.../execute/FunctionServiceStatsDUnitTest.java | 19 +-
.../cache/execute/LocalDataSetDUnitTest.java | 5 +-
.../execute/LocalDataSetIndexingDUnitTest.java | 2 +-
.../LocalFunctionExecutionDUnitTest.java | 7 +-
.../MemberFunctionExecutionDUnitTest.java | 13 +-
.../MultiRegionFunctionExecutionDUnitTest.java | 2 +-
.../OnGroupsFunctionExecutionDUnitTest.java | 15 +-
...tServerRegionFunctionExecutionDUnitTest.java | 28 +--
...egionFunctionExecutionFailoverDUnitTest.java | 32 +--
...onFunctionExecutionNoSingleHopDUnitTest.java | 32 +--
...onExecutionSelectorNoSingleHopDUnitTest.java | 48 +++--
...gionFunctionExecutionSingleHopDUnitTest.java | 40 ++--
.../cache/execute/PRClientServerTestBase.java | 17 +-
.../cache/execute/PRColocationDUnitTest.java | 34 +--
.../execute/PRCustomPartitioningDUnitTest.java | 9 +-
.../execute/PRFunctionExecutionDUnitTest.java | 22 +-
.../PRFunctionExecutionTimeOutDUnitTest.java | 5 +-
.../execute/PRPerformanceTestDUnitTest.java | 3 +-
.../cache/execute/PRTransactionDUnitTest.java | 5 +-
.../execute/SingleHopGetAllPutAllDUnitTest.java | 5 +-
.../cache/ha/Bug36853EventsExpiryDUnitTest.java | 5 +-
.../internal/cache/ha/Bug48571DUnitTest.java | 3 +-
.../internal/cache/ha/FailoverDUnitTest.java | 9 +-
.../internal/cache/ha/HADuplicateDUnitTest.java | 5 +-
.../cache/ha/HAEventIdPropagationDUnitTest.java | 3 +-
.../internal/cache/ha/HAGIIBugDUnitTest.java | 3 +-
.../internal/cache/ha/HAGIIDUnitTest.java | 11 +-
.../cache/ha/HARQueueNewImplDUnitTest.java | 13 +-
.../internal/cache/ha/HARegionDUnitTest.java | 10 +-
.../cache/ha/HARegionQueueDUnitTest.java | 14 +-
.../cache/ha/HASlowReceiverDUnitTest.java | 12 +-
.../ha/OperationsPropagationDUnitTest.java | 9 +-
.../cache/partitioned/Bug43684DUnitTest.java | 3 +-
.../partitioned/ElidedPutAllDUnitTest.java | 5 +-
.../PartitionedRegionLoaderWriterDUnitTest.java | 5 +-
...rtitionedRegionMetaDataCleanupDUnitTest.java | 14 +-
.../partitioned/PersistPRKRFDUnitTest.java | 7 +-
...tentColocatedPartitionedRegionDUnitTest.java | 28 +--
.../PersistentPartitionedRegionDUnitTest.java | 48 +++--
.../PersistentPartitionedRegionTestBase.java | 7 +-
.../cache/partitioned/ShutdownAllDUnitTest.java | 3 +-
...StreamingPartitionOperationOneDUnitTest.java | 3 +-
.../fixed/FixedPartitioningDUnitTest.java | 43 ++--
.../fixed/FixedPartitioningTestBase.java | 40 ++--
...ngWithColocationAndPersistenceDUnitTest.java | 15 +-
.../PersistentRVVRecoveryDUnitTest.java | 5 +-
.../PersistentRecoveryOrderDUnitTest.java | 20 +-
...mpatibilityHigherVersionClientDUnitTest.java | 3 +-
.../cache/tier/sockets/Bug36269DUnitTest.java | 7 +-
.../cache/tier/sockets/Bug36457DUnitTest.java | 3 +-
.../cache/tier/sockets/Bug36829DUnitTest.java | 5 +-
.../cache/tier/sockets/Bug36995DUnitTest.java | 3 +-
.../cache/tier/sockets/Bug37210DUnitTest.java | 7 +-
.../cache/tier/sockets/CacheServerTestUtil.java | 14 +-
.../CacheServerTransactionsDUnitTest.java | 5 +-
.../tier/sockets/ClearPropagationDUnitTest.java | 9 +-
.../tier/sockets/ClientConflationDUnitTest.java | 9 +-
.../sockets/ClientInterestNotifyDUnitTest.java | 9 +-
.../tier/sockets/ClientServerMiscDUnitTest.java | 30 +--
.../cache/tier/sockets/ConflationDUnitTest.java | 17 +-
.../DataSerializerPropogationDUnitTest.java | 36 ++--
.../DestroyEntryPropagationDUnitTest.java | 13 +-
.../sockets/DurableClientBug39997DUnitTest.java | 3 +-
.../DurableClientQueueSizeDUnitTest.java | 5 +-
.../DurableClientReconnectDUnitTest.java | 18 +-
.../sockets/DurableClientStatsDUnitTest.java | 3 +-
.../sockets/DurableRegistrationDUnitTest.java | 7 +-
.../sockets/DurableResponseMatrixDUnitTest.java | 18 +-
.../sockets/EventIDVerificationDUnitTest.java | 13 +-
.../EventIDVerificationInP2PDUnitTest.java | 11 +-
.../ForceInvalidateEvictionDUnitTest.java | 3 +-
.../tier/sockets/HAInterestPart1DUnitTest.java | 5 +-
.../tier/sockets/HAInterestPart2DUnitTest.java | 5 +-
.../cache/tier/sockets/HAInterestTestCase.java | 3 +-
.../sockets/HAStartupAndFailoverDUnitTest.java | 12 +-
.../InstantiatorPropagationDUnitTest.java | 41 ++--
.../tier/sockets/InterestListDUnitTest.java | 35 +--
.../sockets/InterestListEndpointDUnitTest.java | 4 +-
.../sockets/InterestListFailoverDUnitTest.java | 11 +-
.../sockets/InterestListRecoveryDUnitTest.java | 15 +-
.../sockets/InterestResultPolicyDUnitTest.java | 8 +-
.../sockets/RedundancyLevelPart1DUnitTest.java | 25 +--
.../sockets/RedundancyLevelPart2DUnitTest.java | 23 +-
.../sockets/RedundancyLevelPart3DUnitTest.java | 7 +-
.../tier/sockets/RedundancyLevelTestBase.java | 20 +-
.../tier/sockets/RegionCloseDUnitTest.java | 3 +-
.../sockets/RegisterInterestKeysDUnitTest.java | 5 +-
.../sockets/ReliableMessagingDUnitTest.java | 8 +-
.../sockets/UnregisterInterestDUnitTest.java | 5 +-
.../sockets/UpdatePropagationDUnitTest.java | 14 +-
.../VerifyEventIDGenerationInP2PDUnitTest.java | 5 +-
...UpdatesFromNonInterestEndPointDUnitTest.java | 7 +-
.../cache/wan/AsyncEventQueueTestBase.java | 42 ++--
.../ConcurrentAsyncEventQueueDUnitTest.java | 3 +-
.../CommonParallelAsyncEventQueueDUnitTest.java | 6 +-
.../CompressionCacheConfigDUnitTest.java | 6 +-
.../jta/dunit/IdleTimeOutDUnitTest.java | 3 +-
.../jta/dunit/LoginTimeOutDUnitTest.java | 3 +-
.../jta/dunit/MaxPoolSizeDUnitTest.java | 5 +-
.../jta/dunit/TransactionTimeOutDUnitTest.java | 5 +-
.../dunit/TxnManagerMultiThreadDUnitTest.java | 5 +-
.../internal/jta/dunit/TxnTimeOutDUnitTest.java | 15 +-
.../offheap/OutOfOffHeapMemoryDUnitTest.java | 3 +-
.../statistics/StatisticsDUnitTest.java | 3 +-
.../management/ClientHealthStatsDUnitTest.java | 3 +-
.../management/DistributedSystemDUnitTest.java | 5 +-
.../management/LocatorManagementDUnitTest.java | 5 +-
.../gemfire/management/ManagementTestBase.java | 3 +-
.../management/RegionManagementDUnitTest.java | 17 +-
...ersalMembershipListenerAdapterDUnitTest.java | 3 +-
.../stats/DistributedSystemStatsDUnitTest.java | 5 +-
.../internal/cli/CliUtilDUnitTest.java | 5 +-
.../cli/commands/ConfigCommandsDUnitTest.java | 7 +-
...eateAlterDestroyRegionCommandsDUnitTest.java | 3 +-
.../cli/commands/DeployCommandsDUnitTest.java | 5 +-
.../commands/DiskStoreCommandsDUnitTest.java | 5 +-
.../commands/GemfireDataCommandsDUnitTest.java | 12 +-
.../cli/commands/IndexCommandsDUnitTest.java | 5 +-
.../MiscellaneousCommandsDUnitTest.java | 5 +-
.../cli/commands/QueueCommandsDUnitTest.java | 3 +-
.../SharedConfigurationCommandsDUnitTest.java | 3 +-
.../cli/commands/ShowDeadlockDUnitTest.java | 3 +-
.../internal/pulse/TestClientIdsDUnitTest.java | 3 +-
.../pulse/TestSubscriptionsDUnitTest.java | 5 +-
.../ClientsWithVersioningRetryDUnitTest.java | 7 +-
.../pdx/DistributedSystemIdDUnitTest.java | 3 +-
.../pdx/PdxDeserializationDUnitTest.java | 5 +-
.../gemfire/redis/RedisDistDUnitTest.java | 5 +-
.../security/ClientAuthenticationDUnitTest.java | 3 +-
.../security/ClientAuthorizationDUnitTest.java | 3 +-
.../security/ClientAuthorizationTestBase.java | 3 +-
.../DeltaClientAuthorizationDUnitTest.java | 17 +-
.../DeltaClientPostAuthorizationDUnitTest.java | 8 +-
.../security/P2PAuthenticationDUnitTest.java | 3 +-
.../gemfire/security/SecurityTestUtil.java | 121 +++++------
.../com/gemstone/gemfire/test/dunit/Assert.java | 39 ++++
.../gemfire/test/dunit/DebuggerSupport.java | 5 +
.../gemfire/test/dunit/DistributedTestCase.java | 213 ++++---------------
.../gemfire/test/dunit/IgnoredException.java | 174 +++++++++++++++
.../com/gemstone/gemfire/test/dunit/Invoke.java | 22 ++
.../com/gemstone/gemfire/test/dunit/Jitter.java | 87 ++++++++
.../gemfire/test/dunit/NetworkSupport.java | 5 +
.../test/dunit/StoppableWaitCriterion.java | 9 +
.../gemstone/gemfire/test/dunit/Threads.java | 10 +
.../com/gemstone/gemfire/test/dunit/Wait.java | 10 +
.../gemfire/test/dunit/WaitCriterion.java | 6 +
.../test/dunit/tests/BasicDUnitTest.java | 5 +-
283 files changed, 2157 insertions(+), 1623 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
index 3502021..ea58055 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
@@ -25,6 +25,7 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.VM;
@@ -234,7 +235,7 @@ public class CacheRegionClearStatsDUnitTest extends DistributedTestCase {
r1.clear();
}
catch (Exception ex) {
- fail("failed while put", ex);
+ Assert.fail("failed while put", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java
index 2606a8f..eb74d0d 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java
@@ -29,6 +29,7 @@ import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.distributed.internal.DSClock;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -65,7 +66,7 @@ public class ClientServerTimeSyncDUnitTest extends CacheTestCase {
server.setPort(AvailablePortHelper.getRandomAvailableTCPPort());
server.start();
} catch (IOException e) {
- fail("Starting cache server failed.", e);
+ Assert.fail("Starting cache server failed.", e);
}
// now set an artificial time offset for the test
@@ -142,7 +143,7 @@ public class ClientServerTimeSyncDUnitTest extends CacheTestCase {
server.setPort(AvailablePortHelper.getRandomAvailableTCPPort());
server.start();
} catch (IOException e) {
- fail("Starting cache server failed.", e);
+ Assert.fail("Starting cache server failed.", e);
}
// now set an artificial time offset for the test
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
index 89c4e58..c24cd44 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
@@ -35,6 +35,7 @@ import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -68,7 +69,7 @@ public class ClientServerRegisterInterestsDUnitTest extends DistributedTestCase
super.setUp();
disconnectAllFromDS();
setupGemFireCacheServer();
- addExpectedException("java.net.ConnectException");
+ IgnoredException.addExpectedException("java.net.ConnectException");
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
index e8d4915..4503521 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
@@ -37,6 +37,7 @@ import com.gemstone.gemfire.management.membership.ClientMembership;
import com.gemstone.gemfire.management.membership.ClientMembershipEvent;
import com.gemstone.gemfire.management.membership.ClientMembershipListenerAdapter;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -55,7 +56,7 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
public void setUp() throws Exception {
super.setUp();
- addExpectedException("NoAvailableLocatorsException");
+ IgnoredException.addExpectedException("NoAvailableLocatorsException");
}
public AutoConnectionSourceDUnitTest(String name) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
index 3150edd..f7c0810 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
@@ -34,6 +34,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.security.AuthenticationRequiredException;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.util.test.TestUtil;
@@ -294,8 +295,8 @@ public class CacheServerSSLConnectionDUnitTest extends DistributedTestCase {
params[3] = cacheClientSslRequireAuth;
params[4] = TRUSTED_STORE;
params[5] = TRUSTED_STORE;
- ExpectedException expect = addExpectedException("javax.net.ssl.SSLException", serverVM);
- ExpectedException expect2 = addExpectedException("IOException", serverVM);
+ IgnoredException expect = IgnoredException.addExpectedException("javax.net.ssl.SSLException", serverVM);
+ IgnoredException expect2 = IgnoredException.addExpectedException("IOException", serverVM);
try{
//getLogWriter().info("Starting client with server endpoint " + hostName + ":" + port);
clientVM.invoke(CacheServerSSLConnectionDUnitTest.class, "setUpClientVMTaskNoSubscription", params);
@@ -384,7 +385,7 @@ public class CacheServerSSLConnectionDUnitTest extends DistributedTestCase {
params[3] = cacheClientSslRequireAuth;
params[4] = TRUSTED_STORE;
params[5] = TRUSTED_STORE;
- ExpectedException expect = addExpectedException("javax.net.ssl.SSLHandshakeException", serverVM);
+ IgnoredException expect = IgnoredException.addExpectedException("javax.net.ssl.SSLHandshakeException", serverVM);
try{
//getLogWriter().info("Starting client with server endpoint " + hostName + ":" + port);
clientVM.invoke(CacheServerSSLConnectionDUnitTest.class, "setUpClientVMTask", params);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
index 72f1a5c..5fbac8c 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
@@ -42,6 +42,7 @@ import com.gemstone.gemfire.distributed.Locator;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.PoolFactoryImpl;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
@@ -117,12 +118,12 @@ public abstract class LocatorTestBase extends DistributedTestCase {
try {
bindAddr = InetAddress.getByName(getServerHostName(vm.getHost()));
} catch (UnknownHostException uhe) {
- fail("While resolving bind address ", uhe);
+ Assert.fail("While resolving bind address ", uhe);
}
Locator locator = Locator.startLocatorAndDS(locatorPort, logFile, bindAddr, props);
remoteObjects.put(LOCATOR_KEY, locator);
} catch (IOException ex) {
- fail("While starting locator on port " + locatorPort, ex);
+ Assert.fail("While starting locator on port " + locatorPort, ex);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
index 9f84325..1171b83 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
@@ -79,9 +79,11 @@ import com.gemstone.gemfire.internal.cache.control.ResourceAdvisor;
import com.gemstone.gemfire.internal.cache.control.ResourceListener;
import com.gemstone.gemfire.internal.cache.control.TestMemoryThresholdListener;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -130,8 +132,8 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
public void setUp() throws Exception {
super.setUp();
invokeInEveryVM(this.setHeapMemoryMonitorTestMode);
- addExpectedException(expectedEx);
- addExpectedException(expectedBelow);
+ IgnoredException.addExpectedException(expectedEx);
+ IgnoredException.addExpectedException(expectedBelow);
}
@Override
@@ -814,7 +816,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
}
public void testDRFunctionExecutionRejection() throws Exception {
- addExpectedException("LowMemoryException");
+ IgnoredException.addExpectedException("LowMemoryException");
final Host host = Host.getHost(0);
final VM server1 = host.getVM(0);
final VM server2 = host.getVM(1);
@@ -915,7 +917,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
fail("expected low memory exception was not thrown");
} catch (FunctionException e) {
if (!(e.getCause().getCause() instanceof LowMemoryException)) {
- fail("unexpected exception ", e);
+ Assert.fail("unexpected exception ", e);
}
//expected
}
@@ -928,7 +930,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
// this test is DISABLED due to intermittent failures. See bug #52222
public void disabledtestPRFunctionExecutionRejection() throws Exception {
- addExpectedException("LowMemoryException");
+ IgnoredException.addExpectedException("LowMemoryException");
final Host host = Host.getHost(0);
final VM accessor = host.getVM(0);
final VM server1 = host.getVM(1);
@@ -1046,7 +1048,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
fail("expected low memory exception was not thrown");
} catch (FunctionException e) {
if (!(e.getCause().getCause() instanceof LowMemoryException)) {
- fail("unexpected exception", e);
+ Assert.fail("unexpected exception", e);
}
//expected
}
@@ -1187,7 +1189,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
fail("expected LowMemoryExcception was not thrown");
} catch (ServerOperationException e) {
if (!(e.getCause().getMessage().matches(".*low.*memory.*"))) {
- fail("unexpected exception", e);
+ Assert.fail("unexpected exception", e);
}
//expected
}
@@ -1305,14 +1307,14 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
}
} catch (ServerOperationException ex) {
if (!catchServerException) {
- fail("Unexpected exception: ", ex);
+ Assert.fail("Unexpected exception: ", ex);
}
if (!(ex.getCause() instanceof LowMemoryException)) {
- fail("Unexpected exception: ", ex);
+ Assert.fail("Unexpected exception: ", ex);
}
} catch (LowMemoryException low) {
if (!catchLowMemoryException) {
- fail("Unexpected exception: ", low);
+ Assert.fail("Unexpected exception: ", low);
}
}
return null;
@@ -1342,10 +1344,10 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
}
} catch (ServerOperationException ex) {
if (!catchServerException) {
- fail("Unexpected exception: ", ex);
+ Assert.fail("Unexpected exception: ", ex);
}
if (!(ex.getCause() instanceof LowMemoryException)) {
- fail("Unexpected exception: ", ex);
+ Assert.fail("Unexpected exception: ", ex);
}
for(Integer me: temp.keySet()) {
assertFalse("Key " + me + " should not exist", r.containsKey(me));
@@ -1353,7 +1355,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
} catch (LowMemoryException low) {
getLogWriter().info("Caught LowMemoryException", low);
if (!catchLowMemoryException) {
- fail("Unexpected exception: ", low);
+ Assert.fail("Unexpected exception: ", low);
}
for(Integer me: temp.keySet()) {
assertFalse("Key " + me + " should not exist", r.containsKey(me));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
index afe551b..922b2b4 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
@@ -68,9 +68,11 @@ import com.gemstone.gemfire.internal.cache.control.ResourceListener;
import com.gemstone.gemfire.internal.cache.control.TestMemoryThresholdListener;
import com.gemstone.gemfire.internal.cache.partitioned.RegionAdvisor;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -101,8 +103,8 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
@Override
public void setUp() throws Exception {
- addExpectedException(expectedEx);
- addExpectedException(expectedBelow);
+ IgnoredException.addExpectedException(expectedEx);
+ IgnoredException.addExpectedException(expectedBelow);
}
@@ -1318,14 +1320,14 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
}
} catch (ServerOperationException ex) {
if (!catchServerException) {
- fail("Unexpected exception: ", ex);
+ Assert.fail("Unexpected exception: ", ex);
}
if (!(ex.getCause() instanceof LowMemoryException)) {
- fail("Unexpected exception: ", ex);
+ Assert.fail("Unexpected exception: ", ex);
}
} catch (LowMemoryException low) {
if (!catchLowMemoryException) {
- fail("Unexpected exception: ", low);
+ Assert.fail("Unexpected exception: ", low);
}
}
return null;
@@ -1355,10 +1357,10 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
}
} catch (ServerOperationException ex) {
if (!catchServerException) {
- fail("Unexpected exception: ", ex);
+ Assert.fail("Unexpected exception: ", ex);
}
if (!(ex.getCause() instanceof LowMemoryException)) {
- fail("Unexpected exception: ", ex);
+ Assert.fail("Unexpected exception: ", ex);
}
for(Integer me: temp.keySet()) {
assertFalse("Key " + me + " should not exist", r.containsKey(me));
@@ -1366,7 +1368,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
} catch (LowMemoryException low) {
getLogWriter().info("Caught LowMemoryException", low);
if (!catchLowMemoryException) {
- fail("Unexpected exception: ", low);
+ Assert.fail("Unexpected exception: ", low);
}
for(Integer me: temp.keySet()) {
assertFalse("Key " + me + " should not exist", r.containsKey(me));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/ResourceManagerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/ResourceManagerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/ResourceManagerDUnitTest.java
index 19f0612..0595948 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/ResourceManagerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/ResourceManagerDUnitTest.java
@@ -61,6 +61,7 @@ import com.gemstone.gemfire.internal.cache.partitioned.RemoveBucketMessage;
import com.gemstone.gemfire.internal.cache.partitioned.RemoveBucketMessage.RemoveBucketResponse;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
import com.gemstone.gemfire.internal.logging.LogService;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
@@ -1022,9 +1023,9 @@ public class ResourceManagerDUnitTest extends CacheTestCase {
assertEquals(1, sr.size());
assertEquals(value, sr.iterator().next());
} catch (QueryException ex) {
- fail("didn't expect a QueryException", ex);
+ Assert.fail("didn't expect a QueryException", ex);
} catch (QueryInvalidException ex2) {
- fail("didn't expect QueryInvalidException", ex2);
+ Assert.fail("didn't expect QueryInvalidException", ex2);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelperDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelperDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelperDUnitTest.java
index f70e7a2..2eadc3d 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelperDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelperDUnitTest.java
@@ -43,8 +43,8 @@ import com.gemstone.gemfire.internal.cache.BucketRegion;
import com.gemstone.gemfire.internal.cache.ForceReattemptException;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegionHelper;
-import com.gemstone.gemfire.internal.cache.partitioned.fixed.FixedPartitioningTestBase;
import com.gemstone.gemfire.internal.cache.partitioned.fixed.FixedPartitioningTestBase.Months_Accessor;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
@@ -249,7 +249,7 @@ public class PartitionRegionHelperDUnitTest extends CacheTestCase {
date = sdf.parse(dateString);
}
catch (ParseException e) {
- FixedPartitioningTestBase.fail("Exception Occured while parseing date", e);
+ Assert.fail("Exception Occured while parseing date", e);
}
String value = month.toString() + 10;
region.put(date, value);
@@ -272,7 +272,7 @@ public class PartitionRegionHelperDUnitTest extends CacheTestCase {
date = sdf.parse(dateString);
}
catch (ParseException e) {
- FixedPartitioningTestBase.fail("Exception Occured while parseing date", e);
+ Assert.fail("Exception Occured while parseing date", e);
}
DistributedMember key1Pri = PartitionRegionHelper.getPrimaryMemberForKey(region, date);
assertNotNull(key1Pri);
@@ -588,7 +588,7 @@ public class PartitionRegionHelperDUnitTest extends CacheTestCase {
} catch(IllegalStateException expected) {
System.err.println(expected);
} catch (UnknownHostException e) {
- fail("Unknown host", e);
+ Assert.fail("Unknown host", e);
}
assertHasMembers(PartitionRegionHelper.getAllMembersForKey(region, 1), member0, member1);
@@ -668,7 +668,7 @@ public class PartitionRegionHelperDUnitTest extends CacheTestCase {
} catch(IllegalStateException expected) {
System.err.println(expected);
} catch (UnknownHostException e) {
- fail("Unknown host", e);
+ Assert.fail("Unknown host", e);
}
assertHasMembers(PartitionRegionHelper.getAllMembersForKey(region, 1), member0, member1);
@@ -679,7 +679,7 @@ public class PartitionRegionHelperDUnitTest extends CacheTestCase {
} catch(IllegalStateException expected) {
System.err.println(expected);
} catch (UnknownHostException e) {
- fail("Unknown host", e);
+ Assert.fail("Unknown host", e);
}
assertHasMembers(PartitionRegionHelper.getAllMembersForKey(region, 1), member0, member1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java
index f579e58..16d3d61 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CompactRangeIndexDUnitTest.java
@@ -25,6 +25,7 @@ import com.gemstone.gemfire.cache.query.internal.index.IndexManager;
import com.gemstone.gemfire.cache.query.internal.index.IndexManager.TestHook;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable.CacheSerializableRunnableException;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
@@ -145,7 +146,7 @@ public class CompactRangeIndexDUnitTest extends DistributedTestCase{
});
as0.join();
if(as0.exceptionOccurred()){
- fail("Query execution failed.", as0.getException());
+ Assert.fail("Query execution failed.", as0.getException());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java
index 52a3763..27485ea 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxStringQueryDUnitTest.java
@@ -61,8 +61,10 @@ import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.persistence.query.CloseableIterator;
import com.gemstone.gemfire.pdx.internal.PdxString;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -129,7 +131,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
try {
localQueryService = getCache().getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
Index index = null;
// create an index on statusIndexed is created
@@ -200,7 +202,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
remoteQueryService = (PoolManager.find(poolName)).getQueryService();
localQueryService = getCache().getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
for (int i=0; i < queryString.length; i++){
@@ -219,7 +221,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
getLogWriter().info("RR client local indexType:no index size of resultset: "+ rs[0][1].size() + " for query: " + queryString[i]);;
checkForPdxString(rs[0][1].asList(), queryString[i]);
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
try{
// to compare remote query results with and without index
@@ -236,7 +238,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
getLogWriter().info("RR local region2 size of resultset: "+ resWithIndexLocal[i].size() + " for query: " + queryString2[i]);;
checkForPdxString(resWithIndexLocal[i].asList(), queryString2[i]);
} catch (Exception e) {
- fail("Failed executing " + queryString2[i], e);
+ Assert.fail("Failed executing " + queryString2[i], e);
}
if(i < orderByQueryIndex){
@@ -306,7 +308,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
checkForPdxString(rs.asList(), queryString[i]);
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
try{
SelectResults rs = (SelectResults) localQueryService.newQuery(queryString2[i]).execute();
@@ -314,7 +316,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
// The results should not be PdxString
checkForPdxString(rs.asList(), queryString2[i]);
}catch (Exception e) {
- fail("Failed executing " + queryString2[i], e);
+ Assert.fail("Failed executing " + queryString2[i], e);
}
}
}
@@ -336,7 +338,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
// The results should not be PdxString
checkForPdxString(rs.asList(), queryString[i]);
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
}
}
@@ -358,7 +360,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
// The results should not be PdxString
checkForPdxString(rs.asList(), queryString[i]);
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
}
}
@@ -387,7 +389,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
try {
localQueryService = getCache().getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
// Verify the type of index created
Index index = null;
@@ -472,7 +474,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
remoteQueryService = (PoolManager.find(poolName)).getQueryService();
localQueryService = getCache().getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
for (int i=0; i < queryString.length; i++){
@@ -500,7 +502,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
compareResultsOrder(rs, false);
}
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
}
@@ -529,7 +531,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
// The results should not be PdxString
checkForPdxString(rs.asList(), queryString[i]);
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
}
}
@@ -550,7 +552,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
// The results should not be PdxString
checkForPdxString(rs.asList(), queryString[i]);
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
}
}
@@ -572,7 +574,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
// The results should not be PdxString
checkForPdxString(rs.asList(), queryString[i]);
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
}
}
@@ -600,7 +602,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
try {
localQueryService = getCache().getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
// Verify the type of index created
Index index = null;
@@ -680,7 +682,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
remoteQueryService = (PoolManager.find(poolName)).getQueryService();
localQueryService = getCache().getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
for (int i=0; i < queryString.length; i++){
@@ -708,7 +710,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
compareResultsOrder(rs, false);
}
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
}
}
@@ -736,7 +738,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
// The results should not be PdxString
checkForPdxString(rs.asList(), queryString[i]);
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
}
}
@@ -756,7 +758,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
// The results should not be PdxString
checkForPdxString(rs.asList(), queryString[i]);
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
}
}
@@ -776,7 +778,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
// The results should not be PdxString
checkForPdxString(rs.asList(), queryString[i]);
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
}
}
@@ -805,7 +807,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
try {
localQueryService = getCache().getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
Index index = null;
@@ -884,7 +886,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
remoteQueryService = (PoolManager.find(poolName)).getQueryService();
localQueryService = getCache().getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
for (int i=0; i < queryString.length; i++){
@@ -903,7 +905,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
getLogWriter().info("isPR: " + isPr+ " client local indexType:no index size of resultset: "+ rs[0][1].size() + " for query: " + queryString[i]);;
checkForPdxString(rs[0][1].asList(), queryString[i]);
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
try{
// to compare remote query results with and without index
@@ -920,7 +922,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
getLogWriter().info("isPR: " + isPr+ " local region2 size of resultset: "+ resWithIndexLocal[i].size() + " for query: " + queryString2[i]);;
checkForPdxString(resWithIndexLocal[i].asList(), queryString2[i]);
} catch (Exception e) {
- fail("Failed executing " + queryString2[i], e);
+ Assert.fail("Failed executing " + queryString2[i], e);
}
if(i < orderByQueryIndex){
@@ -990,7 +992,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
// The results should not be PdxString
checkForPdxString(rs.asList(), queryString[i]);
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
try{
SelectResults rs = (SelectResults) localQueryService.newQuery(queryString2[i]).execute();
@@ -998,7 +1000,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
// The results should not be PdxString
checkForPdxString(rs.asList(), queryString2[i]);
}catch (Exception e) {
- fail("Failed executing " + queryString2[i], e);
+ Assert.fail("Failed executing " + queryString2[i], e);
}
}
@@ -1020,7 +1022,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
// The results should not be PdxString
checkForPdxString(rs.asList(), queryString[i]);
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
}
}
@@ -1041,7 +1043,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
// The results should not be PdxString
checkForPdxString(rs.asList(), queryString[i]);
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
}
}
@@ -1070,7 +1072,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
try {
localQueryService = getCache().getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
// Verify the type of index created
Index index = null;
@@ -1169,7 +1171,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
remoteQueryService = (PoolManager.find(poolName)).getQueryService();
localQueryService = getCache().getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
for (int i=0; i < queryString.length; i++){
@@ -1197,7 +1199,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
compareResultsOrder(rs, isPr);
}
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
}
}
@@ -1224,7 +1226,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
// The results should not be PdxString
checkForPdxString(rs.asList(), queryString[i]);
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
}
}
@@ -1246,7 +1248,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
// The results should not be PdxString
checkForPdxString(rs.asList(), queryString[i]);
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
}
}
@@ -1268,7 +1270,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
// The results should not be PdxString
checkForPdxString(rs.asList(), queryString[i]);
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
}
}
@@ -1297,7 +1299,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
try {
localQueryService = getCache().getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
// Verify the type of index created
Index index = null;
@@ -1393,7 +1395,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
remoteQueryService = (PoolManager.find(poolName)).getQueryService();
localQueryService = getCache().getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
for (int i=0; i < queryString.length; i++){
@@ -1423,7 +1425,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
compareResultsOrder(rs, isPr);
}
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
}
}
@@ -1451,7 +1453,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
// The results should not be PdxString
checkForPdxString(rs.asList(), queryString[i]);
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
}
}
@@ -1473,7 +1475,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
// The results should not be PdxString
checkForPdxString(rs.asList(), queryString[i]);
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
}
}
@@ -1495,7 +1497,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
// The results should not be PdxString
checkForPdxString(rs.asList(), queryString[i]);
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
}
}
@@ -1524,7 +1526,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
try {
localQueryService = getCache().getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
// Verify the type of index created
Index index = null;
@@ -1633,7 +1635,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
remoteQueryService = (PoolManager.find(poolName)).getQueryService();
localQueryService = getCache().getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
// Querying the fields with null values
@@ -1655,7 +1657,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
checkForPdxString(res.asList(), qs[i]);
}
} catch (Exception e) {
- fail("Failed executing " + qs[i], e);
+ Assert.fail("Failed executing " + qs[i], e);
}
}
}
@@ -1897,7 +1899,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
try {
startBridgeServer(0, false);
} catch (Exception ex) {
- fail("While starting CacheServer", ex);
+ Assert.fail("While starting CacheServer", ex);
}
}
/**
@@ -1962,7 +1964,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
public void run2() throws CacheException {
// Create Cache.
getLonerSystem();
- addExpectedException("Connection refused");
+ IgnoredException.addExpectedException("Connection refused");
getCache();
PoolFactory cpf = PoolManager.createFactory();
cpf.setSubscriptionEnabled(subscriptionEnabled);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
index 5833883..50b2f23 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
@@ -40,6 +40,7 @@ import com.gemstone.gemfire.cache.query.partitioned.PRQueryDUnitHelper;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.internal.cache.execute.PRClientServerTestBase;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
@@ -264,7 +265,7 @@ public class QueryDataInconsistencyDUnitTest extends CacheTestCase {
}
} catch (Exception e) {
e.printStackTrace();
- fail("Query execution failed on server.", e);
+ Assert.fail("Query execution failed on server.", e);
IndexManager.testHook = null;
} finally {
hooked = false;//Let client put go further.
@@ -356,7 +357,7 @@ public class QueryDataInconsistencyDUnitTest extends CacheTestCase {
}
} catch (Exception e) {
e.printStackTrace();
- fail("Query execution failed on server.", e);
+ Assert.fail("Query execution failed on server.", e);
IndexManager.testHook = null;
} finally {
hooked = false;//Let client put go further.
@@ -447,7 +448,7 @@ public class QueryDataInconsistencyDUnitTest extends CacheTestCase {
}
} catch (Exception e) {
e.printStackTrace();
- fail("Query execution failed on server.", e);
+ Assert.fail("Query execution failed on server.", e);
IndexManager.testHook = null;
} finally {
hooked = false;//Let client put go further.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
index 1ebe01d..ba6d86c 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
@@ -61,9 +61,11 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
@@ -130,7 +132,7 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
public void setUp() throws Exception {
super.setUp();
//Workaround for #52008
- addExpectedException("Failed to create index");
+ IgnoredException.addExpectedException("Failed to create index");
}
public void tearDown2() throws Exception {
@@ -170,11 +172,11 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
DistributedTestCase.join(asyInvk1, 30 * 1000, getLogWriter());
if (asyInvk1.exceptionOccurred()) {
- fail("asyInvk1 failed", asyInvk1.getException());
+ Assert.fail("asyInvk1 failed", asyInvk1.getException());
}
DistributedTestCase.join(asyInvk0, 30 * 1000, getLogWriter());
if (asyInvk0.exceptionOccurred()) {
- fail("asyInvk0 failed", asyInvk0.getException());
+ Assert.fail("asyInvk0 failed", asyInvk0.getException());
}
// Check index for PR
@@ -440,7 +442,7 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
DistributedTestCase.join(asyInvk0, 30 * 1000, getLogWriter());
if (asyInvk0.exceptionOccurred()) {
- fail("asyInvk0 failed", asyInvk0.getException());
+ Assert.fail("asyInvk0 failed", asyInvk0.getException());
}
// LoadRegion
@@ -453,14 +455,14 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
DistributedTestCase.join(asyInvk1, 30 * 1000, getLogWriter());
if (asyInvk1.exceptionOccurred()) {
- fail("asyInvk1 failed", asyInvk1.getException());
+ Assert.fail("asyInvk1 failed", asyInvk1.getException());
}
vm1.invoke(prIndexCreationCheck(name, statusIndex, 50));
DistributedTestCase.join(asyInvk0, 30 * 1000, getLogWriter());
if (asyInvk0.exceptionOccurred()) {
- fail("asyInvk0 failed", asyInvk0.getException());
+ Assert.fail("asyInvk0 failed", asyInvk0.getException());
}
vm1.invoke(resetTestHook());
@@ -548,7 +550,7 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
AsyncInvocation asyInvk0 = vm0.invokeAsync(createIndexThrougXML("vm0testCreateAsyncIndexGIIAndQuery", name, fileName));
DistributedTestCase.join(asyInvk0, 30 * 1000, getLogWriter());
if (asyInvk0.exceptionOccurred()) {
- fail("asyInvk0 failed", asyInvk0.getException());
+ Assert.fail("asyInvk0 failed", asyInvk0.getException());
}
// LoadRegion
@@ -560,11 +562,11 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
DistributedTestCase.join(asyInvk1, 30 * 1000, getLogWriter());
if (asyInvk1.exceptionOccurred()) {
- fail("asyInvk1 failed", asyInvk1.getException());
+ Assert.fail("asyInvk1 failed", asyInvk1.getException());
}
DistributedTestCase.join(asyInvk0, 30 * 1000, getLogWriter());
if (asyInvk0.exceptionOccurred()) {
- fail("asyInvk0 failed", asyInvk0.getException());
+ Assert.fail("asyInvk0 failed", asyInvk0.getException());
}
vm0.invoke(prIndexCreationCheck(name, statusIndex, 50));
@@ -613,7 +615,7 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
DistributedTestCase.join(asyInvk0, 30 * 1000, getLogWriter());
if (asyInvk0.exceptionOccurred()) {
- fail("asyInvk0 failed", asyInvk0.getException());
+ Assert.fail("asyInvk0 failed", asyInvk0.getException());
}
vm1.invoke(prIndexCreationCheck(persistentRegName, "secIndex", 50));
@@ -956,13 +958,13 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
System.setProperty("gemfire.DISABLE_DISCONNECT_DS_ON_CACHE_CLOSE", "true");
cache = CacheFactory.create(system);
} catch (CacheExistsException e) {
- fail("the cache already exists", e);
+ Assert.fail("the cache already exists", e);
} catch (RuntimeException ex) {
throw ex;
} catch (Exception ex) {
- fail("Checked exception while initializing cache??", ex);
+ Assert.fail("Checked exception while initializing cache??", ex);
} finally {
System.clearProperty("gemfire.DISABLE_DISCONNECT_DS_ON_CACHE_CLOSE");
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
index 27619c0..ff445b4 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
@@ -55,7 +55,9 @@ import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.internal.cache.LocalDataSet;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.execute.PRClientServerTestBase;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -156,7 +158,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
* Test on Replicated Region.
*/
public void testQueriesWithFilterKeysOnReplicatedRegion() {
- addExpectedException("IllegalArgumentException");
+ IgnoredException.addExpectedException("IllegalArgumentException");
Object[][] r = new Object[queriesForRR.length][2];
@@ -226,7 +228,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
public void testInvalidQueries() {
- addExpectedException("Syntax error");
+ IgnoredException.addExpectedException("Syntax error");
client.invoke(new CacheSerializableRunnable("Test query on client and server") {
@Override
@@ -361,7 +363,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
*
*/
public void testQueriesWithFilterKeysOnPRWithBucketDestroy() {
- addExpectedException("QueryInvocationTargetException");
+ IgnoredException.addExpectedException("QueryInvocationTargetException");
Object[][] r = new Object[queries.length][2];
Set filter = new HashSet();
@@ -433,11 +435,11 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
*
*/
public void testQueriesWithFilterKeysOnPRWithRebalancing() {
- addExpectedException("QueryInvocationTargetException");
- addExpectedException("java.net.SocketException");
- addExpectedException("ServerConnectivityException");
- addExpectedException("FunctionException");
- addExpectedException("IOException");
+ IgnoredException.addExpectedException("QueryInvocationTargetException");
+ IgnoredException.addExpectedException("java.net.SocketException");
+ IgnoredException.addExpectedException("ServerConnectivityException");
+ IgnoredException.addExpectedException("FunctionException");
+ IgnoredException.addExpectedException("IOException");
// Close cache on server1
server1.invoke(new CacheSerializableRunnable("Set QueryObserver in cache on server1") {
@@ -512,7 +514,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
public void testNonColocatedRegionQueries() {
- addExpectedException("UnsupportedOperationException");
+ IgnoredException.addExpectedException("UnsupportedOperationException");
client.invoke(new CacheSerializableRunnable("Test query on non-colocated regions on server") {
@Override
public void run2() throws CacheException {
@@ -527,7 +529,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
fail("Function call did not fail for query with function context");
} catch (FunctionException e) {
if (!(e.getCause() instanceof UnsupportedOperationException)) {
- fail("Should have received an UnsupportedOperationException but received", e);
+ Assert.fail("Should have received an UnsupportedOperationException but received", e);
}
}
}