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:55:18 UTC
[01/50] [abbrv] incubator-geode git commit: GEODE-819: Fix dunit
imports in WAN and CQ tests
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-773-2 ed17d4cd5 -> 18401aa66
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java
index 13fd228..4cb03ae 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java
@@ -40,11 +40,10 @@ import com.gemstone.gemfire.internal.cache.PrimaryBucketException;
import com.gemstone.gemfire.internal.cache.PutAllPartialResultException;
import com.gemstone.gemfire.internal.cache.RegionQueue;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase;
-import dunit.DistributedTestCase.ExpectedException;
-import dunit.DistributedTestCase.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase.ExpectedException;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
public class ReplicatedRegion_ParallelWANPropogationDUnitTest extends WANTestBase{
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
index 03b1354..3fdc672 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
@@ -41,8 +41,7 @@ import com.gemstone.gemfire.internal.cache.wan.CompressionOutputStream;
import com.gemstone.gemfire.internal.cache.wan.InternalGatewaySenderFactory;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase.MyLocatorCallback;
-
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.VM;
public class SenderWithTransportFilterDUnitTest extends WANTestBase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
index 53243eb..647dded 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
@@ -27,11 +27,10 @@ import com.gemstone.gemfire.internal.cache.CacheObserverAdapter;
import com.gemstone.gemfire.internal.cache.CacheObserverHolder;
import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
public class ShutdownAllPersistentGatewaySenderDUnitTest extends WANTestBase {
private static final long MAX_WAIT = 70000;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
index 9f003b4..50bb4b9 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
@@ -35,8 +35,7 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.PoolFactoryImpl;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.Host;
+import com.gemstone.gemfire.test.dunit.Host;
public class WANLocatorServerDUnitTest extends WANTestBase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
index 7f582f3..c80a447 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
@@ -18,8 +18,7 @@ package com.gemstone.gemfire.internal.cache.wan.misc;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
public class WANSSLDUnitTest extends WANTestBase{
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
index 848bf4f..19e42c1 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
@@ -27,9 +27,8 @@ import com.gemstone.gemfire.GemFireConfigException;
import com.gemstone.gemfire.IncompatibleSystemException;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
-import dunit.Host;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.Host;
public class WanAutoDiscoveryDUnitTest extends WANTestBase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
index 871e6d1..19f6c4b 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
@@ -22,11 +22,10 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
import com.gemstone.gemfire.internal.cache.wan.GatewaySenderException;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase;
-import dunit.RMIException;
-import dunit.DistributedTestCase.ExpectedException;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.RMIException;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase.ExpectedException;
/**
* DUnit test for operations on ParallelGatewaySender
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
index 8c8233a..cb64868 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
@@ -38,8 +38,7 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.cache.RegionQueue;
import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* DUnit for ParallelSenderQueue overflow operations.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
index 48786a7..2d200bf 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
@@ -26,9 +26,8 @@ import com.gemstone.gemfire.cache.wan.GatewaySenderFactory;
import com.gemstone.gemfire.internal.cache.ColocationHelper;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase.ExpectedException;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase.ExpectedException;
public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
WANTestBase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
index aa83f68..7286403 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
@@ -17,8 +17,7 @@
package com.gemstone.gemfire.internal.cache.wan.parallel;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
/**
* @author skumar
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
index e1c315a..674de6a 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
@@ -21,8 +21,7 @@ import java.util.HashMap;
import java.util.List;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
public class ParallelWANPropagationConcurrentOpsDUnitTest extends WANTestBase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
index a43f4ba..5b93bc2 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
@@ -30,8 +30,7 @@ import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
import com.gemstone.gemfire.internal.cache.wan.BatchException70;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase.MyGatewayEventFilter;
-
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
public class ParallelWANPropagationDUnitTest extends WANTestBase {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
index c846254..4da0868 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
@@ -22,8 +22,7 @@ import java.util.Map;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase.MyGatewayEventFilter;
-
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
public class ParallelWANStatsDUnitTest extends WANTestBase{
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
index 54a641c..fd0b753 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.execute.*;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
//The tests here are to validate changes introduced because a distributed deadlock
//was found that caused issues for a production customer.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
index d0251e8..82bbce0 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
@@ -28,8 +28,7 @@ import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
import com.gemstone.gemfire.internal.cache.wan.MyGatewaySenderEventListener;
import com.gemstone.gemfire.internal.cache.wan.MyGatewaySenderEventListener2;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
/**
* @author skumar
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
index b9e4f7f..d30289b 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
@@ -25,9 +25,8 @@ import com.gemstone.gemfire.cache.wan.GatewaySender;
import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
import com.gemstone.gemfire.internal.cache.wan.GatewaySenderException;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
-import dunit.RMIException;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.RMIException;
/**
* @author skumar
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
index 3995d65..eec1341 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
@@ -41,8 +41,7 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.cache.RegionQueue;
import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.VM;
public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
index a95e9e4..ede5e09 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
@@ -18,8 +18,7 @@ package com.gemstone.gemfire.internal.cache.wan.serial;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
/**
* @author skumar
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
index 81a66ac..c33d7aa 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
@@ -25,8 +25,7 @@ import com.gemstone.gemfire.cache.client.ServerOperationException;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.internal.cache.wan.BatchException70;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
public class SerialWANPropogationDUnitTest extends WANTestBase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java
index 5356ffb..9ae58cc 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java
@@ -21,8 +21,7 @@ import com.gemstone.gemfire.CancelException;
import com.gemstone.gemfire.cache.CacheClosedException;
import com.gemstone.gemfire.internal.cache.ForceReattemptException;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
public class SerialWANPropogation_PartitionedRegionDUnitTest extends WANTestBase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
index 39f4d34..979439b 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
@@ -22,8 +22,7 @@ import java.util.Map;
import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase.MyGatewayEventFilter;
-
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
public class SerialWANStatsDUnitTest extends WANTestBase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
index bebf631..d0ea193 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
@@ -44,10 +44,9 @@ import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
import com.gemstone.gemfire.management.ManagementService;
import com.gemstone.gemfire.management.internal.cli.commands.CliCommandTestBase;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
public class WANCommandTestBase extends CliCommandTestBase{
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
index 5be0c45..a06b32e 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
@@ -29,9 +29,8 @@ import com.gemstone.gemfire.management.cli.Result;
import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.management.internal.cli.result.TabularResultData;
-
-import dunit.Host;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* DUnit tests for 'create gateway-receiver' command.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
index 1314eda..f38f5b9 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
@@ -27,9 +27,8 @@ import com.gemstone.gemfire.management.cli.Result;
import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.management.internal.cli.result.TabularResultData;
-
-import dunit.Host;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.VM;
public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase{
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
index 5c44015..439a74b 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
@@ -27,9 +27,8 @@ import com.gemstone.gemfire.management.cli.Result;
import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.management.internal.cli.result.TabularResultData;
-
-import dunit.Host;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.VM;
public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java
index 3fd4a88..08f6cac 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java
@@ -27,10 +27,9 @@ import com.gemstone.gemfire.distributed.Locator;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
import com.gemstone.gemfire.management.internal.MBeanJMXAdapter;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* Tests for WAN artifacts like Sender and Receiver. The purpose of this test is
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
index b35f230..79d5aa2 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
@@ -53,10 +53,11 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
import com.gemstone.gemfire.management.internal.configuration.domain.XmlEntity;
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.VM;
+
import org.apache.commons.io.FileUtils;
import java.io.File;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java
index 908fa65..46e2d3f 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java
@@ -35,10 +35,9 @@ import com.gemstone.gemfire.management.ManagementTestBase;
import com.gemstone.gemfire.management.RegionMXBean;
import com.gemstone.gemfire.management.internal.MBeanJMXAdapter;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* This is for testing remote Cluster
[36/50] [abbrv] incubator-geode git commit: GEODE-805: Fix javadoc
warnings.
Posted by kl...@apache.org.
GEODE-805: Fix javadoc warnings.
* Fix warnings reported by javadoc from the gradle build
* Fix all additional warnings reported by Eclispe IDE
* Add dependencies on com.google.code.findbugs:jsr305:3.0.1 and javax.enterprise:cdi-api:1.2
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/172135e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/172135e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/172135e2
Branch: refs/heads/feature/GEODE-773-2
Commit: 172135e272e58b0024e64055d8fe174e2d779e10
Parents: d22176b
Author: Kirk Lund <kl...@pivotal.io>
Authored: Thu Jan 28 16:36:03 2016 -0800
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Mon Feb 1 10:56:40 2016 -0800
----------------------------------------------------------------------
.../gemfire/admin/AdminDistributedSystem.java | 5 --
.../internal/AdminDistributedSystemImpl.java | 3 -
.../gemfire/admin/internal/package.html | 4 +-
.../gemfire/admin/jmx/internal/package.html | 6 +-
.../java/com/gemstone/gemfire/cache/Cache.java | 3 +-
.../gemstone/gemfire/cache/CacheFactory.java | 2 -
.../gemfire/cache/CacheTransactionManager.java | 2 +-
.../com/gemstone/gemfire/cache/DataPolicy.java | 1 -
.../gemfire/cache/DiskStoreFactory.java | 3 -
.../gemstone/gemfire/cache/RegionFactory.java | 2 -
.../gemfire/cache/client/ClientCache.java | 4 +-
.../cache/control/RebalanceOperation.java | 2 +-
.../gemfire/cache/control/ResourceManager.java | 2 +-
.../gemfire/cache/execute/ResultSender.java | 9 +-
.../gemfire/cache/hdfs/HDFSStoreFactory.java | 2 +-
.../org/apache/hadoop/io/SequenceFile.java | 24 +++---
.../com/gemstone/gemfire/cache/package.html | 83 +++++++++---------
.../gemfire/cache/query/QueryService.java | 6 +-
.../query/internal/CompiledSortCriterion.java | 11 ---
.../query/internal/index/AbstractIndex.java | 4 -
.../query/internal/index/PartitionedIndex.java | 2 +-
.../gemstone/gemfire/cache/server/package.html | 2 +-
.../gemfire/compression/SnappyCompressor.java | 3 +-
.../internal/DistributionConfigImpl.java | 2 +-
.../internal/DistributionManager.java | 5 +-
.../internal/InternalDistributedSystem.java | 2 +-
.../distributed/internal/InternalLocator.java | 5 +-
.../distributed/internal/ReplyProcessor21.java | 5 +-
.../internal/StartupMessageData.java | 4 +-
.../internal/deadlock/DeadlockDetector.java | 2 +-
.../internal/deadlock/UnsafeThreadLocal.java | 1 -
.../internal/direct/DirectChannel.java | 7 --
.../internal/locks/DLockGrantor.java | 33 ++++---
.../membership/InternalDistributedMember.java | 2 +-
.../internal/membership/MemberServices.java | 1 -
.../gms/interfaces/HealthMonitor.java | 1 -
.../membership/gms/interfaces/Manager.java | 1 -
.../gms/locator/FindCoordinatorResponse.java | 1 -
.../membership/gms/membership/GMSJoinLeave.java | 2 -
.../gms/mgr/GMSMembershipManager.java | 9 +-
.../internal/InternalDataSerializer.java | 2 -
.../gemfire/internal/admin/package.html | 4 +-
.../admin/remote/DistributionLocatorId.java | 1 -
.../gemfire/internal/admin/remote/package.html | 4 +-
.../gemfire/internal/cache/BucketAdvisor.java | 6 +-
.../gemfire/internal/cache/CacheObserver.java | 1 -
.../internal/cache/DistTXRollbackMessage.java | 2 +-
.../gemfire/internal/cache/DistTXState.java | 6 +-
.../gemfire/internal/cache/EventTracker.java | 2 +-
.../internal/cache/GemFireCacheImpl.java | 2 -
.../internal/cache/IdentityArrayList.java | 2 +-
.../internal/cache/InitialImageOperation.java | 6 +-
.../gemfire/internal/cache/LocalRegion.java | 22 +++--
.../internal/cache/PartitionedRegion.java | 2 +-
.../internal/cache/RemoteInvalidateMessage.java | 1 -
.../internal/cache/RemoteOperationMessage.java | 2 -
.../CompressedCachedDeserializable.java | 2 +-
.../internal/cache/control/ResourceAdvisor.java | 1 -
.../cache/control/ResourceListener.java | 2 +-
.../cache/execute/FunctionServiceStats.java | 1 -
.../cache/execute/InternalExecution.java | 2 -
.../cache/execute/InternalFunctionService.java | 14 +--
.../cache/execute/util/CommitFunction.java | 3 +-
.../cache/execute/util/RollbackFunction.java | 3 +-
.../StreamingPartitionOperation.java | 2 -
.../rebalance/PartitionedRegionLoadModel.java | 2 -
.../persistence/PersistenceAdvisorImpl.java | 4 -
.../cache/persistence/PersistentMemberView.java | 1 -
.../cache/tier/InternalClientMembership.java | 2 +-
.../cache/tier/sockets/CacheClientProxy.java | 2 +-
.../concurrent/CompactConcurrentHashSet2.java | 6 +-
.../gemfire/internal/jta/GlobalTransaction.java | 13 +--
.../internal/process/ProcessController.java | 2 +-
.../gemfire/internal/process/signal/Signal.java | 6 +-
.../internal/redis/ByteArrayWrapper.java | 2 +-
.../internal/redis/ByteToCommandDecoder.java | 2 +-
.../gemstone/gemfire/internal/redis/Coder.java | 2 +-
.../redis/RedisCommandParserException.java | 2 +-
.../internal/redis/RegionCreationException.java | 2 +-
.../gemfire/internal/redis/RegionProvider.java | 1 -
.../redis/executor/AbstractExecutor.java | 8 --
.../redis/executor/hll/HyperLogLogPlus.java | 1 -
.../gemfire/internal/shared/NativeCalls.java | 2 -
.../CustomEntryConcurrentHashMap.java | 14 +--
.../gemfire/management/internal/AgentUtil.java | 1 -
.../management/internal/FederatingManager.java | 2 -
.../management/internal/JmxManagerAdvisor.java | 1 -
.../management/internal/MBeanProxyFactory.java | 2 -
.../configuration/domain/CacheElement.java | 1 -
.../management/internal/web/domain/Link.java | 2 +-
.../internal/web/http/ClientHttpRequest.java | 2 +-
.../internal/web/http/HttpHeader.java | 2 +-
.../main/java/com/gemstone/gemfire/package.html | 6 +-
.../com/gemstone/gemfire/pdx/PdxInstance.java | 2 +-
.../gemfire/redis/GemFireRedisServer.java | 3 +-
.../security/GemFireSecurityException.java | 2 +-
.../src/test/java/com/examples/TestObject.java | 6 +-
.../com/examples/ds/PutDataSerializables.java | 6 +-
.../com/gemstone/gemfire/GemFireTestCase.java | 2 +-
.../internal/AutoConnectionSourceDUnitTest.java | 2 +-
.../management/MXMemoryPoolListenerExample.java | 4 -
.../management/MemoryThresholdsDUnitTest.java | 3 +-
.../MemoryThresholdsOffHeapDUnitTest.java | 3 -
.../gemfire/cache/query/QueryTestUtils.java | 10 ---
.../QueryUsingFunctionContextDUnitTest.java | 7 +-
.../query/functional/CountStarJUnitTest.java | 3 -
...ctResultsWithDupValuesInRegionJUnitTest.java | 3 -
.../PRQueryCacheClosedJUnitTest.java | 6 --
.../query/partitioned/PRQueryDUnitHelper.java | 38 --------
.../PRQueryRegionClosedJUnitTest.java | 6 --
.../PRQueryRegionDestroyedJUnitTest.java | 5 --
.../query/transaction/QueryAndJtaJUnitTest.java | 1 -
.../gemfire/cache30/CacheLogRollDUnitTest.java | 16 ----
.../gemfire/cache30/CacheXml81DUnitTest.java | 5 +-
.../MemLRUEvictionControllerDUnitTest.java | 2 +-
.../gemfire/cache30/TXOrderDUnitTest.java | 1 -
.../codeAnalysis/CompiledClassUtils.java | 1 -
.../distributed/AbstractLauncherJUnitTest.java | 1 -
.../distributed/LocatorLauncherJUnitTest.java | 1 -
.../distributed/ServerLauncherJUnitTest.java | 1 -
.../ConsoleDistributionManagerDUnitTest.java | 4 +-
.../InternalDistributedSystemJUnitTest.java | 2 +-
.../gemfire/distributed/internal/LDM.java | 2 +-
.../internal/SharedConfigurationJUnitTest.java | 2 +-
.../gemstone/gemfire/internal/ClassBuilder.java | 1 -
.../internal/DataSerializableJUnitTest.java | 2 +-
.../internal/cache/AbstractRegionJUnitTest.java | 2 +-
.../internal/cache/Bug37244JUnitTest.java | 3 -
.../internal/cache/Bug41733DUnitTest.java | 4 -
.../internal/cache/ConflationJUnitTest.java | 12 ---
.../gemfire/internal/cache/DiskIdJUnitTest.java | 2 -
.../internal/cache/DiskRegionHelperFactory.java | 3 -
.../internal/cache/DiskRegionTestingBase.java | 2 -
.../cache/DistributedCacheTestCase.java | 6 --
.../internal/cache/HABug36773DUnitTest.java | 4 -
.../HAOverflowMemObjectSizerDUnitTest.java | 5 +-
.../cache/IncrementalBackupDUnitTest.java | 1 -
...gionBucketCreationDistributionDUnitTest.java | 28 ------
.../PartitionedRegionCreationDUnitTest.java | 14 ---
.../cache/PartitionedRegionDUnitTestCase.java | 6 --
.../cache/PartitionedRegionHADUnitTest.java | 2 +-
.../cache/PartitionedRegionTestHelper.java | 17 ----
.../PartitionedRegionTestUtilsDUnitTest.java | 6 +-
.../PartitionedRegionWithSameNameDUnitTest.java | 6 --
.../cache/RemoteTransactionDUnitTest.java | 7 +-
.../control/RebalanceOperationDUnitTest.java | 2 -
.../execute/FunctionServiceStatsDUnitTest.java | 2 -
.../execute/PRFunctionExecutionDUnitTest.java | 9 +-
...ctionExecutionWithResultSenderDUnitTest.java | 2 -
.../mock/AlterMockRegionExtensionFunction.java | 2 +-
.../extension/mock/MockCacheExtension.java | 4 +-
.../cache/ha/Bug36853EventsExpiryDUnitTest.java | 3 -
.../internal/cache/ha/ConflatableObject.java | 2 +-
.../cache/ha/EventIdOptimizationJUnitTest.java | 8 +-
.../internal/cache/ha/HARegionJUnitTest.java | 8 +-
.../cache/ha/HARegionQueueDUnitTest.java | 3 -
.../cache/ha/HARegionQueueJUnitTest.java | 2 +-
.../internal/cache/ha/StatsBugDUnitTest.java | 4 +-
.../PartitionedRegionLoadModelJUnitTest.java | 6 +-
...tentColocatedPartitionedRegionDUnitTest.java | 2 +-
...rtitionedRegionWithTransactionDUnitTest.java | 6 --
.../cache/partitioned/ShutdownAllDUnitTest.java | 4 -
.../CacheServerMaxConnectionsJUnitTest.java | 3 -
.../cache/tier/sockets/CacheServerTestUtil.java | 4 -
.../tier/sockets/ClearPropagationDUnitTest.java | 4 -
.../sockets/ClientHealthMonitorJUnitTest.java | 3 -
.../DestroyEntryPropagationDUnitTest.java | 5 --
.../sockets/NewRegionAttributesDUnitTest.java | 2 -
.../sockets/UpdatePropagationDUnitTest.java | 4 -
.../tier/sockets/command/CommitCommandTest.java | 2 +-
.../compression/SnappyCompressorJUnitTest.java | 2 +-
.../jta/functional/TestXACacheLoader.java | 3 -
.../statistics/StatisticsDUnitTest.java | 1 -
.../internal/util/ArrayUtilsJUnitTest.java | 1 -
.../gemfire/internal/util/SerializableImpl.java | 2 -
.../util/SerializableImplWithValue.java | 2 -
.../management/CompositeTypeTestDUnitTest.java | 6 --
.../management/DiskManagementDUnitTest.java | 11 ---
.../management/LocatorManagementDUnitTest.java | 6 --
.../gemfire/management/ManagementTestBase.java | 9 --
...ersalMembershipListenerAdapterDUnitTest.java | 7 +-
.../internal/cli/GfshParserJUnitTest.java | 4 +-
.../cli/commands/ShowMetricsDUnitTest.java | 5 --
.../SharedConfigurationDUnitTest.java | 2 +-
.../configuration/utils/XmlUtilsJUnitTest.java | 8 +-
.../internal/pulse/TestClientIdsDUnitTest.java | 2 -
.../pulse/TestSubscriptionsDUnitTest.java | 2 -
.../WanCommandsControllerJUnitTest.java | 4 +-
.../security/P2PAuthenticationDUnitTest.java | 2 -
.../gemfire/test/dunit/DistributedTestCase.java | 10 +--
.../gemfire/test/dunit/RMIException.java | 2 +-
.../test/dunit/SerializableCallable.java | 2 +-
.../test/dunit/SerializableRunnable.java | 2 +-
.../com/gemstone/gemfire/test/dunit/VM.java | 6 +-
.../gemstone/gemfire/util/JSR166TestCase.java | 17 ++--
.../gemstone/persistence/logging/Logger.java | 2 +-
.../gemfire/GemfireSequenceDisplay.java | 7 --
gemfire-core/src/test/java/hydra/GsRandom.java | 1 -
.../src/test/java/hydra/log/AnyLogWriter.java | 4 +-
.../java/security/AuthzCredentialGenerator.java | 5 +-
.../test/java/security/CredentialGenerator.java | 2 +-
.../dunit/CqStatsOptimizedExecuteDUnitTest.java | 3 +-
...StatsUsingPoolOptimizedExecuteDUnitTest.java | 3 +-
.../cache/RemoteCQTransactionDUnitTest.java | 7 +-
.../joptsimple/internal/AbbreviationMap.java | 1 -
.../src/main/java/org/json/JSONObject.java | 3 -
.../cache/lucene/LuceneQueryFactory.java | 11 ++-
.../cache/lucene/LuceneQueryProvider.java | 2 +-
.../gemfire/cache/lucene/LuceneService.java | 9 +-
.../internal/repository/RepositoryManager.java | 1 -
.../tools/pulse/internal/data/DataBrowser.java | 3 -
.../pulse/internal/data/JMXDataUpdater.java | 91 --------------------
.../pulse/internal/data/JmxManagerFinder.java | 4 -
.../tools/pulse/internal/json/JSONObject.java | 3 -
.../tools/pulse/internal/json/JSONWriter.java | 2 +-
.../ClusterSelectedRegionsMemberService.java | 3 -
.../gemfire/cache/util/AutoBalancer.java | 4 +-
.../wan/GatewaySenderEventRemoteDispatcher.java | 1 -
.../gemfire/internal/cache/wan/WANTestBase.java | 1 -
.../wan/misc/WANConfigurationJUnitTest.java | 8 --
.../wan/wancommand/WANCommandTestBase.java | 2 -
gradle/dependency-versions.properties | 2 +
gradle/java.gradle | 2 +
223 files changed, 281 insertions(+), 859 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/admin/AdminDistributedSystem.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/AdminDistributedSystem.java b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/AdminDistributedSystem.java
index 441496c..7dd5220 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/AdminDistributedSystem.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/AdminDistributedSystem.java
@@ -366,9 +366,6 @@ public interface AdminDistributedSystem {
* The host of the member whose files were lost.
* @param directory
* The directory where those files resided.
- *
- * @throws RevokeFailedException if the persistent files are in fact
- * currently running on one of the members of the distributed system.
* @since 6.5
* @deprecated use {@link #revokePersistentMember(UUID)} instead
*/
@@ -385,8 +382,6 @@ public interface AdminDistributedSystem {
* The unique id of the disk store which you are revoking. The unique
* id can be discovered from {@link #getMissingPersistentMembers()}
*
- * @throws RevokeFailedException if the persistent files are in fact
- * currently running on one of the members of the distributed system.
* @since 7.0
*/
public void revokePersistentMember(UUID diskStoreID) throws AdminException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
index 8e67fed..5709fce 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
@@ -1494,9 +1494,6 @@ implements com.gemstone.gemfire.admin.AdminDistributedSystem,
* <code>true</code> when the member has joined, <code>false</code>
* when the member has left. Additionally also used to check if system
* member config is to be synchronized with the VM.
- *
- * @throws AdminException
- * if member configuration can not be synchronized with VM
*/
protected SystemMember findSystemMember(GemFireVM vm,
boolean compareConfig) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/package.html
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/package.html b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/package.html
index 87d71b8..13cf928 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/package.html
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/package.html
@@ -17,8 +17,8 @@ limitations under the License.
<HTML>
<BODY>
-<P>Contains the implementation of the external admin APIs from {@link
-com.gemstone.gemfire.admin}.</P>
+<P>Contains the implementation of the external admin APIs from
+<a href="{@docRoot}/com/gemstone/gemfire/admin/package-summary.html#package_description">com.gemstone.gemfire.admin</a>.</P>
<H2>Monitoring the "health" of GemFire</H2>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/package.html
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/package.html b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/package.html
index 9bccd40..1700ab7 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/package.html
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/package.html
@@ -17,8 +17,8 @@ limitations under the License.
<HTML>
<BODY>
-<P>Contains the implementation of the external JMX APIs from {@link
-com.gemstone.gemfire.admin.jmx}.</P>
+<P>Contains the implementation of the external JMX APIs from
+<a href="{@docRoot}/com/gemstone/gemfire/admin/jmx/package-summary.html#package_description">com.gemstone.gemfire.admin.jmx</a>.</P>
<H2>JMX Support in GemFire</H2>
@@ -33,7 +33,7 @@ Our goal was to provide JMX administrative support in GemFire. The design was i
From a functional stand point, the JMX support was supposed to provide most of the same administrative and operational monitoring that the console already provides. In some cases we limited the functionality due to security concerns and in others because it was hard to express the features as JMX beans. The JMX Agent also provides some functionality (such as Health monitoring) that is not currently in the console.
<p>
-The Agent communicates with the distributed system using the same distribution manager {@link com.gemstone.gemfire.distributed.internal.DistributionManager} as the console uses and thus has the same requirements that determine what distributed system it can manage. Although the Console currently supports managing multiple distributed systems, we decided that a given Agent should only be able to manage a single system. We have not tested the use of more than one Agent for the same system, however nothing currently prohibits this.
+The Agent communicates with the distributed system using the same distribution manager {@link com.gemstone.gemfire.distributed.internal.DistributionManager} as the console uses and thus has the same requirements that determine what distributed system it can manage. Although the Console currently supports managing multiple distributed systems, we decided that a given Agent should only be able to manage a single system. We have not tested the use of more than one Agent for the same system, however nothing currently prohibits this.
<p>
We decided to develop a simple public Admin API which in essence wraps the internal.admin API that the Console currently uses extensively. The Admin API also contains implementations of new functionality not in internal.admin. Our JMX support is an extension to this Admin API. In an overly simplified view, the GemFire JMX MBeans are ModelMBeans that manage instances of the Admin API objects housed in the Agent's MBeanServer.
<p>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/Cache.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/Cache.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/Cache.java
index 4ca420e..6de86be 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/Cache.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/Cache.java
@@ -247,7 +247,8 @@ public interface Cache extends GemFireCache {
* that will allow clients to access this cache.
* <p>For the default configuration see the constants in
* {@link com.gemstone.gemfire.cache.server.CacheServer}.
- * @see com.gemstone.gemfire.cache.server
+ *
+ * @see com.gemstone.gemfire.cache.server.CacheServer
*
* @since 5.7
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheFactory.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheFactory.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheFactory.java
index c1e30de..fe7ce59 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheFactory.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheFactory.java
@@ -205,8 +205,6 @@ public class CacheFactory {
* @throws RegionExistsException
* If the declarative caching XML file describes a region
* that already exists (including the root region).
- * @throws ManagementException
- * If the jmx manager can not be initialized.
* @since 6.5
*/
public Cache create()
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheTransactionManager.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheTransactionManager.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheTransactionManager.java
index 33412c8..1268ac5 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheTransactionManager.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheTransactionManager.java
@@ -87,7 +87,7 @@ import java.util.concurrent.TimeUnit;
* (see {@link AttributesFactory} for Scope). For both scopes, a
* consistent configuration (per VM) is enforced.
*
- * <p>Global Regions, client Regions (see {@link com.gemstone.gemfire.cache.client})
+ * <p>Global Regions, client Regions (see com.gemstone.gemfire.cache.client package)
* and persistent Regions (see {@link DiskWriteAttributes}) do not
* support transactions.
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DataPolicy.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DataPolicy.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DataPolicy.java
index 5f8a4c6..defb144 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DataPolicy.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DataPolicy.java
@@ -248,7 +248,6 @@ public class DataPolicy implements java.io.Serializable {
/** Return whether this policy does persistence on HDFS.
* @return true if this policy does persistence on HDFS.
- * @see #HDFS_PARTITION
*/
public boolean withHDFS() {
// return this == HDFS_PARTITION || this == HDFS_PERSISTENT_PARTITION;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DiskStoreFactory.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DiskStoreFactory.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DiskStoreFactory.java
index df9275f..9065c01 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DiskStoreFactory.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DiskStoreFactory.java
@@ -194,8 +194,6 @@ public interface DiskStoreFactory
*
* @param diskDirs directories to put the oplog files.
* @return a reference to <code>this</code>
- *
- * @throws GemfireIOException if a directory cannot be created
*/
public DiskStoreFactory setDiskDirs(File[] diskDirs);
@@ -209,7 +207,6 @@ public interface DiskStoreFactory
*
* @throws IllegalArgumentException if length of the size array
* does not match to the length of the dir array
- * @throws GemfireIOException if a directory cannot be created
*/
public DiskStoreFactory setDiskDirsAndSizes(File[] diskDirs,int[] diskDirSizes);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/RegionFactory.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/RegionFactory.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/RegionFactory.java
index 7af117b..214e878 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/RegionFactory.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/RegionFactory.java
@@ -698,7 +698,6 @@ public class RegionFactory<K,V>
* amongst them.
*
* @return a reference to this RegionFactory object
- * @throws GemfireIOException if a directory cannot be created
*
* @see AttributesFactory#setDiskDirs
* @deprecated as of 6.5 use {@link DiskStoreFactory#setDiskDirs} instead
@@ -716,7 +715,6 @@ public class RegionFactory<K,V>
* @return a reference to this RegionFactory object
* @throws IllegalArgumentException if length of the size array
* does not match to the length of the dir array
- * @throws GemfireIOException if a directory cannot be created
*
* @since 5.1
* @see AttributesFactory#setDiskDirsAndSizes
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCache.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCache.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCache.java
index 3d8c038..f17545d 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCache.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCache.java
@@ -128,12 +128,12 @@ public interface ClientCache extends GemFireCache {
* The {@link RegionService#getRegion} method will throw IllegalStateException
* if an attempt is made to get a region that has local storage.
*
- * @throws UnsupportedOperationException
- * when invoked with multiuser-authentication as false.
* @param userSecurityProperties
* the security properties of a user.
* @return the {@link RegionService} instance associated with a user and the given
* properties.
+ * @throws UnsupportedOperationException
+ * when invoked with multiuser-authentication as false.
*/
public RegionService createAuthenticatedView(Properties userSecurityProperties);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/control/RebalanceOperation.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/control/RebalanceOperation.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/control/RebalanceOperation.java
index 608a63e..38fabed 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/control/RebalanceOperation.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/control/RebalanceOperation.java
@@ -23,7 +23,7 @@ import java.util.concurrent.TimeoutException;
/**
* Operation for rebalancing resources used by the {@link
- * com.gemstone.gemfire.cache GemFire Cache}.
+ * com.gemstone.gemfire.cache.Cache}.
*
* @since 6.0
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/control/ResourceManager.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/control/ResourceManager.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/control/ResourceManager.java
index ab52816..8bd7416 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/control/ResourceManager.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/control/ResourceManager.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.cache.query.QueryService;
/**
* Provides support for managing resources used by the local
- * {@link com.gemstone.gemfire.cache GemFire Cache}.
+ * {@link com.gemstone.gemfire.cache.Cache}.
* <p>
* Re-balancing the GemFire Cache resources can be accomplished using a {@link
* RebalanceOperation}:
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/execute/ResultSender.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/execute/ResultSender.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/execute/ResultSender.java
index b592c52..8e701f7 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/execute/ResultSender.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/execute/ResultSender.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.cache.execute;
* adds the ability for an execute method to send a single result back, or break
* its result into multiple pieces and send each piece back to the calling
* thread's {@link ResultCollector}. For each result sent using this method,
- * {@link ResultCollector#addResult(DistributedMember, Object)} is called,
+ * {@link ResultCollector#addResult(com.gemstone.gemfire.distributed.DistributedMember, Object)} is called,
* making that result available to the calling thread immediately.
*
* <p>
@@ -50,13 +50,13 @@ package com.gemstone.gemfire.cache.execute;
*
* @since 6.0
*
- * @see ResultCollector#addResult(DistributedMember, Object)
+ * @see ResultCollector#addResult(com.gemstone.gemfire.distributed.DistributedMember, Object)
*
*/
public interface ResultSender<T> {
/**
* Sends a result back to the FunctionService calling thread and invokes
- * {@link ResultCollector#addResult(DistributedMember, Object)}.
+ * {@link ResultCollector#addResult(com.gemstone.gemfire.distributed.DistributedMember, Object)}.
*
* @param oneResult
*/
@@ -64,7 +64,7 @@ public interface ResultSender<T> {
/**
* Sends a result back to the FunctionService calling thread and invokes
- * {@link ResultCollector#addResult(DistributedMember, Object)} and then
+ * {@link ResultCollector#addResult(com.gemstone.gemfire.distributed.DistributedMember, Object)} and then
* {@link ResultCollector#endResults()} if it is the last instance of the
* Function to report results. The ResultCollector will keep waiting for
* results until it receives last result. Therefore, it is very important to
@@ -72,7 +72,6 @@ public interface ResultSender<T> {
*
* @throws IllegalStateException
* if called more than once
- * @param lastResult
*
* @see ResultCollector#endResults()
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/HDFSStoreFactory.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/HDFSStoreFactory.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/HDFSStoreFactory.java
index 493fe69..2856e9f 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/HDFSStoreFactory.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/HDFSStoreFactory.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.Cache;
/**
* Factory for creating instances of {@link HDFSStore}. To get an instance of
- * this factory call {@link Cache#createHDFSStoreFactory}.
+ * this factory call Cache#createHDFSStoreFactory.
* <P>
* Usage
* <ol>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/org/apache/hadoop/io/SequenceFile.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/org/apache/hadoop/io/SequenceFile.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/org/apache/hadoop/io/SequenceFile.java
index 8309e62..b13f499 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/org/apache/hadoop/io/SequenceFile.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/org/apache/hadoop/io/SequenceFile.java
@@ -317,7 +317,7 @@ public class SequenceFile {
* @param valClass The 'value' type.
* @return Returns the handle to the constructed SequenceFile Writer.
* @throws IOException
- * @deprecated Use {@link #createWriter(Configuration, Writer.Option...)}
+ * @deprecated Use {@link #createWriter(Configuration, com.gemstone.gemfire.cache.hdfs.internal.org.apache.hadoop.io.SequenceFile.Writer.Option...)}
* instead.
*/
@Deprecated
@@ -339,7 +339,7 @@ public class SequenceFile {
* @param compressionType The compression type.
* @return Returns the handle to the constructed SequenceFile Writer.
* @throws IOException
- * @deprecated Use {@link #createWriter(Configuration, Writer.Option...)}
+ * @deprecated Use {@link #createWriter(Configuration, com.gemstone.gemfire.cache.hdfs.internal.org.apache.hadoop.io.SequenceFile.Writer.Option...)}
* instead.
*/
@Deprecated
@@ -364,7 +364,7 @@ public class SequenceFile {
* @param progress The Progressable object to track progress.
* @return Returns the handle to the constructed SequenceFile Writer.
* @throws IOException
- * @deprecated Use {@link #createWriter(Configuration, Writer.Option...)}
+ * @deprecated Use {@link #createWriter(Configuration, com.gemstone.gemfire.cache.hdfs.internal.org.apache.hadoop.io.SequenceFile.Writer.Option...)}
* instead.
*/
@Deprecated
@@ -391,7 +391,7 @@ public class SequenceFile {
* @param codec The compression codec.
* @return Returns the handle to the constructed SequenceFile Writer.
* @throws IOException
- * @deprecated Use {@link #createWriter(Configuration, Writer.Option...)}
+ * @deprecated Use {@link #createWriter(Configuration, com.gemstone.gemfire.cache.hdfs.internal.org.apache.hadoop.io.SequenceFile.Writer.Option...)}
* instead.
*/
@Deprecated
@@ -419,7 +419,7 @@ public class SequenceFile {
* @param metadata The metadata of the file.
* @return Returns the handle to the constructed SequenceFile Writer.
* @throws IOException
- * @deprecated Use {@link #createWriter(Configuration, Writer.Option...)}
+ * @deprecated Use {@link #createWriter(Configuration, com.gemstone.gemfire.cache.hdfs.internal.org.apache.hadoop.io.SequenceFile.Writer.Option...)}
* instead.
*/
@Deprecated
@@ -453,7 +453,7 @@ public class SequenceFile {
* @param metadata The metadata of the file.
* @return Returns the handle to the constructed SequenceFile Writer.
* @throws IOException
- * @deprecated Use {@link #createWriter(Configuration, Writer.Option...)}
+ * @deprecated Use {@link #createWriter(Configuration, com.gemstone.gemfire.cache.hdfs.internal.org.apache.hadoop.io.SequenceFile.Writer.Option...)}
* instead.
*/
@Deprecated
@@ -548,7 +548,7 @@ public class SequenceFile {
* @param progress The Progressable object to track progress.
* @return Returns the handle to the constructed SequenceFile Writer.
* @throws IOException
- * @deprecated Use {@link #createWriter(Configuration, Writer.Option...)}
+ * @deprecated Use {@link #createWriter(Configuration, com.gemstone.gemfire.cache.hdfs.internal.org.apache.hadoop.io.SequenceFile.Writer.Option...)}
* instead.
*/
@Deprecated
@@ -576,7 +576,7 @@ public class SequenceFile {
* @param metadata The metadata of the file.
* @return Returns the handle to the constructed SequenceFile Writer.
* @throws IOException
- * @deprecated Use {@link #createWriter(Configuration, Writer.Option...)}
+ * @deprecated Use {@link #createWriter(Configuration, com.gemstone.gemfire.cache.hdfs.internal.org.apache.hadoop.io.SequenceFile.Writer.Option...)}
* instead.
*/
@Deprecated
@@ -601,7 +601,7 @@ public class SequenceFile {
* @param codec The compression codec.
* @return Returns the handle to the constructed SequenceFile Writer.
* @throws IOException
- * @deprecated Use {@link #createWriter(Configuration, Writer.Option...)}
+ * @deprecated Use {@link #createWriter(Configuration, com.gemstone.gemfire.cache.hdfs.internal.org.apache.hadoop.io.SequenceFile.Writer.Option...)}
* instead.
*/
@Deprecated
@@ -1126,7 +1126,7 @@ public class SequenceFile {
/** Create the named file.
* @deprecated Use
- * {@link SequenceFile#createWriter(Configuration, Writer.Option...)}
+ * {@link SequenceFile#createWriter(Configuration, com.gemstone.gemfire.cache.hdfs.internal.org.apache.hadoop.io.SequenceFile.Writer.Option...)}
* instead.
*/
@Deprecated
@@ -1139,7 +1139,7 @@ public class SequenceFile {
/** Create the named file with write-progress reporter.
* @deprecated Use
- * {@link SequenceFile#createWriter(Configuration, Writer.Option...)}
+ * {@link SequenceFile#createWriter(Configuration, com.gemstone.gemfire.cache.hdfs.internal.org.apache.hadoop.io.SequenceFile.Writer.Option...)}
* instead.
*/
@Deprecated
@@ -1153,7 +1153,7 @@ public class SequenceFile {
/** Create the named file with write-progress reporter.
* @deprecated Use
- * {@link SequenceFile#createWriter(Configuration, Writer.Option...)}
+ * {@link SequenceFile#createWriter(Configuration, com.gemstone.gemfire.cache.hdfs.internal.org.apache.hadoop.io.SequenceFile.Writer.Option...)}
* instead.
*/
@Deprecated
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/package.html
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/package.html b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/package.html
index 150d231..c4d72b1 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/package.html
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/package.html
@@ -55,7 +55,7 @@ Cache Servers}, or perhaps evaluating {@link
com.gemstone.gemfire.cache.execute.FunctionService#onRegion(Region) Region} data. A {@linkplain
com.gemstone.gemfire.cache.execute.ResultCollector} collects and
possibly processes those results for consumption. For more information look to the
-{@link com.gemstone.gemfire.cache.execute} package.
+<a href="{@docRoot}/com/gemstone/gemfire/cache/execute/package-summary.html#package_description">com.gemstone.gemfire.cache.execute</a> package.
</p>
<a name="distcache"><h2>Distributed Caching</h2><a href="#top">Back to Top</a>
@@ -79,7 +79,7 @@ the {@link com.gemstone.gemfire.distributed.DistributedSystem} to be configured.
<p>Application data is cached in a {@linkplain
com.gemstone.gemfire.cache.Region "region"}. The {@link
com.gemstone.gemfire.cache.RegionFactory} class provides the simpliest
-entry point into the {@linkplain com.gemstone.gemfire.cache.Region}
+entry point into the {@linkplain com.gemstone.gemfire.cache.Region}
API. A {@link com.gemstone.gemfire.cache.Region} implements {@link java.util.Map},
however, it also provides caching behavior such as data loading,
eviction control, and distribution. Every region has a name and
@@ -99,7 +99,7 @@ region.</p>
<a name="partition"><h2>Partitioned Regions</h2><a href="#top">Back to Top</a>
-<p>Region data can be partitioned across many distributed system members to create one large logical heap.
+<p>Region data can be partitioned across many distributed system members to create one large logical heap.
The data policy must be set to {@link com.gemstone.gemfire.cache.DataPolicy#PARTITION}
or {@link com.gemstone.gemfire.cache.DataPolicy#PERSISTENT_PARTITION}.
{@link com.gemstone.gemfire.cache.PartitionAttributes} are used to configure
@@ -116,7 +116,7 @@ the entire Region in the face of a full garbage collection cycle.</p>
<p>Partitioned Regions support custom partitioning with the use of a
{@link com.gemstone.gemfire.cache.PartitionResolver} and can be
-associated together or
+associated together or
{@linkplain com.gemstone.gemfire.cache.PartitionAttributesFactory#setColocatedWith(String)
colocated} to allow for efficient data usage.
</p>
@@ -246,7 +246,7 @@ The following table summarizes the different modes and their configuration.</p>
<td>Once the amount of data stored in the region exceeds the eviction
controller's threshold, least recently used data is written to
disk and removed from the VM until the region's size is below the
- threshold.</td>
+ threshold.</td>
</tr>
<tr>
@@ -333,7 +333,7 @@ Region's specify the disk store they are in by setting the
{@link com.gemstone.gemfire.cache.RegionAttributes#getDiskStoreName disk store name region attribute}.
<P>A {@linkplain com.gemstone.gemfire.cache.Region#put put} on a region
-that is configured to have a disk "backup" (by using a
+that is configured to have a disk "backup" (by using a
{@linkplain com.gemstone.gemfire.cache.DataPolicy#withPersistence
persistent data policy})
will result in the immediate scheduling of a
@@ -412,7 +412,7 @@ is typically used to update an external database.</p>
<a name="expiration"><h2>Expiration</h2></a><a href="#top">Back to Top</a>
-<p>Sometimes cached data has a limited lifetime. The region attributes
+<p>Sometimes cached data has a limited lifetime. The region attributes
{@linkplain com.gemstone.gemfire.cache.RegionAttributes#getRegionTimeToLive
regionTimeToLive}, {@linkplain
com.gemstone.gemfire.cache.RegionAttributes#getRegionIdleTimeout
@@ -450,7 +450,7 @@ setCacheListener} method. Each callback method on the
<code>CacheListener</code> receives a {@link
com.gemstone.gemfire.cache.CacheEvent} describing the operation
that caused the callback to be invoked and possibly containing information
-relevant to the operation
+relevant to the operation
(such as the old and new values of a region entry).</p>
<a name="eviction"><h2>Eviction Attributes</h2><a href="#top">Back to Top</a>
@@ -462,7 +462,7 @@ instance, an eviction controller could keep track of the sizes of the
entry values. Before a new entry is added, the eviction controller
could remove the entry with the largest value to free up space in
the cache instance for new data. GemFire provides {@link
-com.gemstone.gemfire.cache.EvictionAttributes} that will create an eviction controller
+com.gemstone.gemfire.cache.EvictionAttributes} that will create an eviction controller
that destroys the "least recently used" Region Entry once the Region
exceeds a given number of entries.</p>
@@ -494,12 +494,12 @@ href="doc-files/example3-cache.xml">example3</A>.
<a name="clientServer"><h2>Client/Server Caching</h2><a href="#top">Back to Top</a>
<p>GemFire caches can be configured in a client/server hierarchy.
-In this configuration, GemFire cache regions are configured as
+In this configuration, GemFire cache regions are configured as
clients to regions in GemFire server caches running in a separate
distributed system.
-The GemFire {@linkplain com.gemstone.gemfire.cache.server servers}
+The GemFire <a href="{@docRoot}/com/gemstone/gemfire/cache/server/package-summary.html#package_description">servers</a>
are generally run as cacheserver processes.
-{@linkplain com.gemstone.gemfire.cache.client Clients}
+<a href="{@docRoot}/com/gemstone/gemfire/cache/client/package-summary.html#package_description">Clients</a>
are configured with a
{@linkplain com.gemstone.gemfire.cache.client.ClientCache client cache}
which has a default
@@ -509,12 +509,11 @@ which are used by the client regions.
When a client updates its region, the update is forwarded to the server.
When a client get results in a local cache miss,
the get request is forwarded to the server.
-The clients may also subscribe to server-side events.
+The clients may also subscribe to server-side events.
For more information on the client see the
-{@linkplain com.gemstone.gemfire.cache.client client package}.
+<a href="{@docRoot}/com/gemstone/gemfire/cache/client/package-summary.html#package_description">client</a>.
For more information on the server see the
-{@linkplain com.gemstone.gemfire.cache.server server package}.
-</p>
+<a href="{@docRoot}/com/gemstone/gemfire/cache/server/package-summary.html#package_description">server</a>.</p>
<a name="tx"><h2>Cache Transactions</h2><a href="#top">Back to Top</a>
@@ -560,50 +559,50 @@ one action reflecting the sum of all three.
<a name="membership"><h2>Membership Attributes</h2><a href="#top">Back to Top</a>
-<p>The GemFire region can be configured to require the
-presence of one or more user-defined membership roles. Each {@link
+<p>The GemFire region can be configured to require the
+presence of one or more user-defined membership roles. Each {@link
com.gemstone.gemfire.distributed.Role} is assigned to any number of
applications when each application connects to the GemFire distributed
-system. {@link com.gemstone.gemfire.cache.MembershipAttributes} are
-then used to specify which {@linkplain
-com.gemstone.gemfire.cache.MembershipAttributes#getRequiredRoles roles
+system. {@link com.gemstone.gemfire.cache.MembershipAttributes} are
+then used to specify which {@linkplain
+com.gemstone.gemfire.cache.MembershipAttributes#getRequiredRoles roles
are required} to be online and present in that region's membership
for access to the cache region being configured.</p>
-<p>In addition to specifying which roles are required,
-<code>MembershipAttributes</code> are used to specify the {@link
-com.gemstone.gemfire.cache.LossAction}. The loss action determines how
-access to the region is affected when one or more required roles are
-offline and no longer present in the system membership. The region can be
-made completely {@linkplain
-com.gemstone.gemfire.cache.LossAction#NO_ACCESS "NO_ACCESS"},
-which means that the application cannot read from or write to that region.
-{@linkplain com.gemstone.gemfire.cache.LossAction#LIMITED_ACCESS
+<p>In addition to specifying which roles are required,
+<code>MembershipAttributes</code> are used to specify the {@link
+com.gemstone.gemfire.cache.LossAction}. The loss action determines how
+access to the region is affected when one or more required roles are
+offline and no longer present in the system membership. The region can be
+made completely {@linkplain
+com.gemstone.gemfire.cache.LossAction#NO_ACCESS "NO_ACCESS"},
+which means that the application cannot read from or write to that region.
+{@linkplain com.gemstone.gemfire.cache.LossAction#LIMITED_ACCESS
"LIMITED_ACCESS"} means that the application cannot write to that region.
-{@linkplain com.gemstone.gemfire.cache.LossAction#FULL_ACCESS
-"FULL_ACCESS"} means that the application can read from and write to that
-region as normal. If "FULL_ACCESS" is selected,
+{@linkplain com.gemstone.gemfire.cache.LossAction#FULL_ACCESS
+"FULL_ACCESS"} means that the application can read from and write to that
+region as normal. If "FULL_ACCESS" is selected,
then the application would only be aware of the missing required role if it
-registered a {@link com.gemstone.gemfire.cache.RegionRoleListener}.
-This listener provides callbacks to notify the application when required
+registered a {@link com.gemstone.gemfire.cache.RegionRoleListener}.
+This listener provides callbacks to notify the application when required
roles are gained or lost, thus providing for custom integration of required
roles with the application.</p>
<p>{@link com.gemstone.gemfire.cache.ResumptionAction} defined in the
<code>MembershipAttributes</code> specifies how the application responds
-to having a missing required role return to the distributed membership.
+to having a missing required role return to the distributed membership.
{@linkplain com.gemstone.gemfire.cache.ResumptionAction#NONE "None"}
-results in no special action, while {@linkplain
-com.gemstone.gemfire.cache.ResumptionAction#REINITIALIZE "Reinitialize"}
-causes the region to be reinitialized. Reinitializing the region will
-clear all entries from that region. If it is a replicate, the
-region will repopulate with entries available from other distributed
+results in no special action, while {@linkplain
+com.gemstone.gemfire.cache.ResumptionAction#REINITIALIZE "Reinitialize"}
+causes the region to be reinitialized. Reinitializing the region will
+clear all entries from that region. If it is a replicate, the
+region will repopulate with entries available from other distributed
members.</p>
<p>{@link com.gemstone.gemfire.cache.RequiredRoles} provides methods to
check for missing required roles for a region and to wait until all required
roles are present. In addition, this class can be used to check if a role
-is currently present in a region's membership.</p>
+is currently present in a region's membership.</p>
</body>
</hTML>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/QueryService.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/QueryService.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/QueryService.java
index d49e86e..63d8cbf 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/QueryService.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/QueryService.java
@@ -253,10 +253,6 @@ public interface QueryService {
* invalid syntax
* @throws IndexInvalidException if the arguments do not correctly specify an
* index
- * @throws IndexNameConflictException if an index with this name already
- * exists
- * @throws IndexExistsException if an index with these parameters already
- * exists with a different name
* @throws RegionNotFoundException if the region referred to in the fromClause
* doesn't exist
* @throws UnsupportedOperationException If Index is being created on a region
@@ -559,7 +555,7 @@ public interface QueryService {
/**
* Creates all the indexes that were defined using
* {@link #defineIndex(String, String, String)}
- * @throws {@link MultiIndexCreationException}
+ * @throws MultiIndexCreationException
* which consists a map of failed indexNames and the Exceptions.
*/
public List<Index> createDefinedIndexes() throws MultiIndexCreationException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledSortCriterion.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledSortCriterion.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledSortCriterion.java
index 1777014..2877068 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledSortCriterion.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledSortCriterion.java
@@ -66,17 +66,6 @@ public class CompiledSortCriterion extends AbstractCompiledValue {
*
* @param context
* @return Object
- * @throws FunctionDomainException
- * @throws TypeMismatchException
- * @throws NameResolutionException
- * @throws QueryInvocationTargetException
- *
- * public Object evaluate(ExecutionContext context) throws
- * FunctionDomainException, TypeMismatchException,
- * NameResolutionException, QueryInvocationTargetException {
- * if(this.columnIndex >= 0) { return
- * context.getFieldFromProjectedRow(this.columnIndex); }else {
- * return this.expr.evaluate(context); } }
*/
public Object evaluate(Object data, ExecutionContext context) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/AbstractIndex.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/AbstractIndex.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/AbstractIndex.java
index b65dc7e..f59d078 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/AbstractIndex.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/AbstractIndex.java
@@ -1459,10 +1459,6 @@ public abstract class AbstractIndex implements IndexProtocol
* @param value
* @param context
* @return True if Region and Index entries are consistent.
- * @throws QueryInvocationTargetException
- * @throws NameResolutionException
- * @throws TypeMismatchException
- * @throws FunctionDomainException
*/
protected boolean verifyEntryAndIndexVaue(RegionEntry re, Object value, ExecutionContext context) {
IMQEvaluator evaluator = (IMQEvaluator)getEvaluator();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/PartitionedIndex.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/PartitionedIndex.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/PartitionedIndex.java
index 70c57eb..deea142 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/PartitionedIndex.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/PartitionedIndex.java
@@ -428,7 +428,7 @@ public class PartitionedIndex extends AbstractIndex
* This will create extra {@link IndexStatistics} statistics for MapType
* PartitionedIndex.
* @param indexName
- * @return New {@link PartitionedIndexStatistics}
+ * @return new PartitionedIndexStatistics
*/
protected InternalIndexStatistics createExplicitStats(String indexName) {
return new PartitionedIndexStatistics(indexName);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/server/package.html
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/server/package.html b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/server/package.html
index 608fa13..42db083 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/server/package.html
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/server/package.html
@@ -35,7 +35,7 @@ in the GemFire <code>bin</code> directory.
To obtain an instance of <code>CacheServer</code> that has already been created
use {@link com.gemstone.gemfire.cache.Cache#getCacheServers}.
<p>
-See the {@link com.gemstone.gemfire.cache.client client} package for information
+See the <a href="{@docRoot}/com/gemstone/gemfire/cache/client/package-summary.html#package_description">client</a> package for information
on how to create clients that will connect to and access the cache in your
cache server.
</BODY>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/compression/SnappyCompressor.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/compression/SnappyCompressor.java b/gemfire-core/src/main/java/com/gemstone/gemfire/compression/SnappyCompressor.java
index 62d68e0..a257511 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/compression/SnappyCompressor.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/compression/SnappyCompressor.java
@@ -47,8 +47,7 @@ public final class SnappyCompressor implements Compressor, Serializable {
/**
* Create a new instance of the SnappyCompressor.
- *
- * @throws IllegaltStateException when the Snappy native library is unavailable
+ * @throws IllegalStateException when the Snappy native library is unavailable
*/
public SnappyCompressor() {
synchronized (defaultInstance) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
index dc1b309..190a137 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
@@ -316,7 +316,7 @@ public class DistributionConfigImpl
/**
- * port on which {@link GemFireRedisServer} is started
+ * port on which {@link com.gemstone.gemfire.redis.GemFireRedisServer} is started
*/
private int redisPort = DEFAULT_REDIS_PORT;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java
index 8ccf3ff..51bfb53 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java
@@ -126,7 +126,6 @@ import com.gemstone.gemfire.internal.util.concurrent.StoppableReentrantLock;
* @author David Whitlock
* @since 2.0
*
- * @see com.gemstone.gemfire.distributed.internal
* @see DistributionMessage#process
* @see IgnoredByManager
*/
@@ -273,7 +272,7 @@ public class DistributionManager
/**
* Executor for view related messages
*
- * @see com.gemstone.gemfire.distributed.internal.membership.jgroup.ViewMessage
+ * @see com.gemstone.gemfire.distributed.internal.membership.gms.messages.ViewAckMessage
* @see #STANDARD_EXECUTOR
*/
public static final int VIEW_EXECUTOR = 79;
@@ -454,7 +453,7 @@ public class DistributionManager
private ThreadPoolExecutor serialThread;
/** Message processing executor for view messages
- * @see com.gemstone.gemfire.distributed.internal.membership.jgroup.ViewMessage
+ * @see com.gemstone.gemfire.distributed.internal.membership.gms.messages.ViewAckMessage
*/
private ThreadPoolExecutor viewThread;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
index b3c636a..5762463 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
@@ -177,7 +177,7 @@ public class InternalDistributedSystem
/** Is this <code>DistributedSystem</code> connected to a
* distributed system?
*
- * @guarded.By {@link #isConnectedMutex} for writes
+ * Concurrency: volatile for reads and protected by synchronization of {@link #isConnectedMutex} for writes
*/
protected volatile boolean isConnected;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
index 0f27d36..b81732b 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
@@ -87,8 +87,7 @@ import com.gemstone.gemfire.management.internal.configuration.messages.SharedCon
/**
* Provides the implementation of a distribution <code>Locator</code>
- * as well as internal-only functionality. Currently, a distribution
- * locator is implemented using a JGroups {@link GossipServer}.
+ * as well as internal-only functionality.
*
* This class has APIs that perform essentially three layers of
* services. At the bottom layer is the JGroups location service. On
@@ -517,7 +516,6 @@ public class InternalLocator extends Locator implements ConnectListener {
* (e.g., mcast addr/port, other locators)
* @param cfg the config if being called from a distributed system; otherwise null.
* @param startDistributedSystem if true locator will start its own distributed system
- * @throws IOException
*/
private InternalLocator(
int port,
@@ -860,7 +858,6 @@ public class InternalLocator extends Locator implements ConnectListener {
* The distributed system which the server location services
* should use. If null, the method will try to find an already
* connected distributed system.
- * @throws ExecutionException
* @since 5.7
*/
public void startServerLocation(InternalDistributedSystem distributedSystem)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyProcessor21.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyProcessor21.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyProcessor21.java
index b219630..02dd102 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyProcessor21.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyProcessor21.java
@@ -98,9 +98,10 @@ public class ReplyProcessor21
//////////////////// Instance Methods ////////////////////
- /** The members that haven't replied yet
+ /**
+ * The members that haven't replied yet
*
- * @guarded.By {@link #members}
+ * Concurrency: protected by synchronization of itself
*/
protected final InternalDistributedMember[] members;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupMessageData.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupMessageData.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupMessageData.java
index 0c45c2c..caa96d6 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupMessageData.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupMessageData.java
@@ -53,8 +53,8 @@ class StartupMessageData {
/**
* Constructs a new instance with empty Properties. After construction
* the instance should optionally invoke one or more "write" methods such
- * as {@link #writeHostedLocators(Collection)} before invoking {@link
- * #toData(DataOutput)} to marshal the Properties into the DataOutput
+ * as {@link #writeHostedLocators(Collection)} before invoking
+ * <code>toData(DataOutput)</code> to marshal the Properties into the DataOutput
* (onto the wire).
*/
StartupMessageData() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/deadlock/DeadlockDetector.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/deadlock/DeadlockDetector.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/deadlock/DeadlockDetector.java
index 0d0482f..edcbcb8 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/deadlock/DeadlockDetector.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/deadlock/DeadlockDetector.java
@@ -104,7 +104,7 @@ public class DeadlockDetector {
* Threads may depend on locks, or on other resources that are tracked by the
* {@link DependencyMonitor}.
*
- * @arg locality a name tag to stick on entities to help associate them with
+ * @param locality a name tag to stick on entities to help associate them with
* this JVM and distinguish them from entities from other jvms
*
* @return All of the dependencies between threads and locks or other resources
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/deadlock/UnsafeThreadLocal.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/deadlock/UnsafeThreadLocal.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/deadlock/UnsafeThreadLocal.java
index 52634cd..7a6f07f 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/deadlock/UnsafeThreadLocal.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/deadlock/UnsafeThreadLocal.java
@@ -36,7 +36,6 @@ public class UnsafeThreadLocal<T> extends ThreadLocal<T> {
*
* Unlike get(), this method does not set the initial value if none is found
*
- * @throws NoSuchMethodException
* @throws SecurityException
*/
public T get(Thread thread) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/direct/DirectChannel.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/direct/DirectChannel.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/direct/DirectChannel.java
index a4245a0..06b40b8 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/direct/DirectChannel.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/direct/DirectChannel.java
@@ -133,13 +133,6 @@ public class DirectChannel {
return conduit.getCancelCriterion();
}
- /**
- * @param mgr
- * @param listener
- * @param dc
- * @param unused
- * @throws ConnectionException
- */
public DirectChannel(MembershipManager mgr, DirectChannelListener listener,
DistributionConfig dc)
throws ConnectionException {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantor.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantor.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantor.java
index a5b8e0f..cf63f57 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantor.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantor.java
@@ -191,7 +191,7 @@ public class DLockGrantor {
/**
* Identifies remote thread that has currently suspended locking or null.
*
- * @guarded.By {@link #suspendLock}
+ * Concurrency: protected by synchronization of {@link #suspendLock}
*/
protected RemoteThread lockingSuspendedBy = null;
@@ -203,7 +203,7 @@ public class DLockGrantor {
/**
* Identifies the lockId used by the remote thread to suspend locking.
*
- * @guarded.By {@link #suspendLock}
+ * Concurrency: protected by synchronization of {@link #suspendLock}
*/
protected int suspendedLockId = INVALID_LOCK_ID;
@@ -1919,9 +1919,10 @@ public class DLockGrantor {
* <p>
* Caller must synchronize on suspendLock.
*
+ * Concurrency: protected by synchronization of {@link #suspendLock}
+ *
* @param myRThread the remote thread that is about to suspend locking
* @param lockId the id of the lock request used to suspend locking
- * @guarded.By {@link #suspendLock}
*/
protected void suspendLocking(final RemoteThread myRThread, final int lockId) {
if (DEBUG_SUSPEND_LOCK) {
@@ -1961,8 +1962,9 @@ public class DLockGrantor {
* <p>
* Caller must synchronize on suspendLock.
*
+ * Concurrency: protected by synchronization of {@link #suspendLock}
+ *
* @return true if locking has been suspended
- * @guarded.By {@link #suspendLock}
*/
protected boolean isLockingSuspended() {
if (DEBUG_SUSPEND_LOCK) {
@@ -1989,8 +1991,9 @@ public class DLockGrantor {
* <p>
* Caller must synchronize on suspendLock.
*
+ * Concurrency: protected by synchronization of {@link #suspendLock}
+ *
* @return true if locking has been suspended by the remote thread
- * @guarded.By {@link #suspendLock}
*/
protected boolean isLockingSuspendedBy(final RemoteThread rThread) {
if (DEBUG_SUSPEND_LOCK) {
@@ -2184,7 +2187,7 @@ public class DLockGrantor {
* Caller must acquire destroyReadLock. Synchronizes on suspendLock,
* grantTokens and each grant token.
*
- * @guarded.By {@link #acquireDestroyReadLock(long)}
+ * Concurrency: protected by {@link #destroyLock} via invoking {@link #acquireDestroyReadLock(long)}
*/
protected void drainPermittedRequests() {
ArrayList drain = null;
@@ -2614,9 +2617,10 @@ public class DLockGrantor {
* token.
* <p>
* Caller must synchronize on this grant token.
+ *
+ * Concurrency: protected by synchronization of *this* DLockGrantToken
*
* @return true if there are pending requests waiting to lock this
- * @guarded.By this
*/
protected synchronized boolean hasWaitingRequests() {
if (this.pendingRequests == null) return false;
@@ -2663,9 +2667,10 @@ public class DLockGrantor {
* Call stack: DLockReleaseMessage -> releaseIfLocked ->
* getAndReleaseGrantIfLockedBy -> grant.releaseIfLockedBy
*
+ * Concurrency: protected by synchronization of *this* DLockGrantToken
+ *
* @param owner the member to release the lock for
* @param lockId the lock id that the member used to acquire the lock
- * @guarded.By this
*/
protected void releaseIfLockedBy(InternalDistributedMember owner,
int lockId) {
@@ -2701,11 +2706,12 @@ public class DLockGrantor {
* <p>
* Caller must synchronize on this grant token.
*
+ * Concurrency: protected by synchronization of *this* DLockGrantToken
+ *
* @param owner the member to check for lock ownership
* @param lockId the lock id that the member used for locking
* @return true if lock is currently leased by the owner with the
* specified lock id
- * @guarded.By this
*/
protected boolean isLockedBy(InternalDistributedMember owner,
int lockId) {
@@ -2889,8 +2895,9 @@ public class DLockGrantor {
* <p>
* Caller must synchronize on this grant token.
*
+ * Concurrency: protected by synchronization of *this* DLockGrantToken
+ *
* @return true if the lock was granted to next request
- * @guarded.By this
*/
protected boolean grantLockToNextRequest() {
final boolean isDebugEnabled_DLS = logger.isTraceEnabled(LogMarker.DLS);
@@ -3030,10 +3037,11 @@ public class DLockGrantor {
* <p>
* Caller must synchronize on this grant token.
*
+ * Concurrency: protected by synchronization of *this* DLockGrantToken
+ *
* @param checkForExpiration true if expiration should be attempted before
* checking if this grant token is currently granted
* @return true if this grant token is currently granted
- * @guarded.By this
*/
protected boolean isGranted(boolean checkForExpiration) {
if (checkForExpiration) {
@@ -3208,8 +3216,9 @@ public class DLockGrantor {
* <p>
* Caller must synchronize on this grant token.
*
+ * Concurrency: protected by synchronization of *this* DLockGrantToken
+ *
* @return the lease expiration time
- * @guarded.By this
*/
public long getLeaseExpireTime() {
return this.leaseExpireTime;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java
index a77c211..46c2eb3 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java
@@ -445,7 +445,7 @@ public final class InternalDistributedMember
* [GemStone] Returns the kind of VM that hosts the distribution manager with
* this address.
*
- * @see com.gemstone.gemfire.distributed.internal.DistributionManager#getDistributionManagerType
+ * @see com.gemstone.gemfire.distributed.internal.DistributionManager#getDMType()
* @see com.gemstone.gemfire.distributed.internal.DistributionManager#NORMAL_DM_TYPE
*/
public int getVmKind()
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MemberServices.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MemberServices.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MemberServices.java
index 3fb6ef2..e1484c9 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MemberServices.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MemberServices.java
@@ -69,7 +69,6 @@ public interface MemberServices {
/**
* Create a new MembershipManager
- * @param stopper TODO
* @param listener the listener to notify for callbacks
* @param transport holds configuration information that can be used by the manager to configure itself
* @param stats a gemfire statistics collection object for communications stats
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/interfaces/HealthMonitor.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/interfaces/HealthMonitor.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/interfaces/HealthMonitor.java
index 8b84dfe..3541f80 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/interfaces/HealthMonitor.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/interfaces/HealthMonitor.java
@@ -46,7 +46,6 @@ public interface HealthMonitor extends Service {
* @param mbr
* @param reason the reason this check is being performed
* @param initiateRemoval if the member should be removed if it is not available
- * @return
*/
public boolean checkIfAvailable(DistributedMember mbr, String reason, boolean initiateRemoval);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/interfaces/Manager.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/interfaces/Manager.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/interfaces/Manager.java
index dd119eb..8353af6 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/interfaces/Manager.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/interfaces/Manager.java
@@ -86,7 +86,6 @@ public interface Manager extends Service, MessageHandler {
/**
* returns the coordinator of the current membership view. This is
* who created and distributed the view. See NetView.
- * @return
*/
DistributedMember getCoordinator();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/FindCoordinatorResponse.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/FindCoordinatorResponse.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/FindCoordinatorResponse.java
index 7206339..0427cb4 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/FindCoordinatorResponse.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/FindCoordinatorResponse.java
@@ -85,7 +85,6 @@ public class FindCoordinatorResponse extends HighPriorityDistributionMessage
* When the response comes from a locator via TcpClient this
* will return the locators member ID. If the locator hasn't
* yet joined this may be null.
- * @return
*/
public InternalDistributedMember getSenderId() {
return senderId;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
index 6b09214..e4925d7 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
@@ -310,7 +310,6 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
* send a join request and wait for a reply. Process the reply.
* This may throw a SystemConnectException or an AuthenticationFailedException
*
- * @param coord
* @return true if the attempt succeeded, false if it timed out
*/
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value="WA_NOT_IN_LOOP")
@@ -1070,7 +1069,6 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
/**
* for testing, do not use in any other case as it is not thread safe
- * @param req
*/
JoinResponseMessage[] getJoinResponseMessage() {
return joinResponse;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
index 89809b5..d75b28d 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
@@ -637,7 +637,8 @@ public class GMSMembershipManager implements MembershipManager, Manager
/**
* the timer used to perform periodic tasks
- * @guarded.By latestViewLock
+ *
+ * Concurrency: protected by {@link #latestViewLock} ReentrantReadWriteLock
*/
private SystemTimer cleanupTimer;
@@ -2057,7 +2058,8 @@ public class GMSMembershipManager implements MembershipManager, Manager
* has the side effect of removing the member from the
* list if it was shunned too far in the past.
*
- * @guarded.By latestViewLock
+ * Concurrency: protected by {@link #latestViewLock} ReentrantReadWriteLock
+ *
* @return true if the given member is a zombie
*/
public boolean isShunned(DistributedMember m) {
@@ -2088,7 +2090,8 @@ public class GMSMembershipManager implements MembershipManager, Manager
* <p>
* Like isShunned, this method holds the view lock while executing
*
- * @guarded.By latestViewLock
+ * Concurrency: protected by {@link #latestViewLock} ReentrantReadWriteLock
+ *
* @param m the member in question
* @return true if the given member is a surprise member
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java
index 09809b2..b92d1e9 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java
@@ -1969,8 +1969,6 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
*
* @throws IOException
* A problem occurs while writing to <code>out</code>
- *
- * @see #writeTimeUnit
*/
public static TimeUnit readTimeUnit(DataInput in)
throws IOException {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/package.html
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/package.html b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/package.html
index efcc8f2..79da925 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/package.html
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/package.html
@@ -22,8 +22,8 @@ starting, and monitoring) of various GemFire components. This API is
used by tools such as the GemFire Console to obtain information about
the members of a GemFire distributed system. This package contains
interfaces that specify the behavior of the internal administration
-API. The implementation of these interfaces is in the {@link
-com.gemstone.gemfire.internal.admin.remote} package.</P>
+API. The implementation of these interfaces is in the
+<a href="{@docRoot}/com/gemstone/gemfire/internal/admin/remote/package-summary.html#package_description">com.gemstone.gemfire.internal.admin.remote</a> package.</P>
</BODY>
</HTML>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DistributionLocatorId.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DistributionLocatorId.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DistributionLocatorId.java
index ff21a2e..b58898f 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DistributionLocatorId.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DistributionLocatorId.java
@@ -378,7 +378,6 @@ public class DistributionLocatorId implements java.io.Serializable {
*
* @param locatorIds collection of DistributionLocatorId instances
* @return collection of String instances
- * @throws UnknownHostException
* @see #marshal()
*/
public static Collection<String> asStrings(Collection<DistributionLocatorId> locatorIds) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/package.html
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/package.html b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/package.html
index 2f0fa6e..a2fef69 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/package.html
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/package.html
@@ -17,8 +17,8 @@ limitations under the License.
<HTML>
<BODY>
-<P>Provides an implementation of the {@linkplain
-com.gemstone.gemfire.internal.admin internal admin API} that uses
+<P>Provides an implementation of the
+<a href="{@docRoot}/com/gemstone/gemfire/internal/admin/package-summary.html#package_description">internal admin API</a> that uses
GemFire's distribution mechanism to obtain information about members
of a distributed system. The below diagram describes the
relationships between the various classes in this package.</P>
[45/50] [abbrv] incubator-geode git commit: Refactor dunit
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitHelper.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitHelper.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitHelper.java
index 333cb07..75b4c65 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitHelper.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitHelper.java
@@ -83,6 +83,7 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegionDUnitTestCase;
import com.gemstone.gemfire.internal.cache.control.InternalResourceManager;
import com.gemstone.gemfire.internal.cache.control.InternalResourceManager.ResourceObserverAdapter;
import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.SerializableRunnableIF;
import com.gemstone.gemfire.util.test.TestUtil;
@@ -1832,7 +1833,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
//Wait for recovery to finish
cdl.await();
} catch (InterruptedException e) {
- fail("interupted", e);
+ Assert.fail("interupted", e);
} finally {
InternalResourceManager.setResourceObserver(null);
}
@@ -2124,7 +2125,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
*/
}
catch (Exception ex) {
- fail("Creating Index in this vm failed : ", ex);
+ Assert.fail("Creating Index in this vm failed : ", ex);
}
}
};
@@ -2171,7 +2172,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
}
fail("Multi index creation failed, " + sb);
} else {
- fail("Creating Index in this vm failed : ", ex);
+ Assert.fail("Creating Index in this vm failed : ", ex);
}
}
assertNotNull("Indexes should have been created.", indexes);
@@ -2215,7 +2216,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
}
catch (Exception ex) {
- fail("Creating Index in this vm failed : ", ex);
+ Assert.fail("Creating Index in this vm failed : ", ex);
}
}
};
@@ -2290,7 +2291,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
pw.close();
}
catch (IOException ex) {
- fail("IOException during cache.xml generation to " + file, ex);
+ Assert.fail("IOException during cache.xml generation to " + file, ex);
}
}
@@ -2435,7 +2436,7 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
}
catch (RegionNotFoundException exx) {
// TODO Auto-generated catch block
- fail("Region Not found in this vm ", exx);
+ Assert.fail("Region Not found in this vm ", exx);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitTest.java
index 9912f08..b43cf4f 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitTest.java
@@ -46,6 +46,7 @@ import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDUnitTestCase;
import com.gemstone.gemfire.internal.cache.PartitionedRegionQueryEvaluator;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -399,7 +400,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
final MyTestHook th = new MyTestHook();
// add expected exception strings
- final ExpectedException ex = addExpectedException("Data loss detected");
+ final IgnoredException ex = IgnoredException.addExpectedException("Data loss detected");
try {
Object[] params = new Object[0];
final DefaultQuery query = (DefaultQuery)getCache().getQueryService()
@@ -682,7 +683,7 @@ public class PRQueryDUnitTest extends PartitionedRegionDUnitTestCase
});
// add expected exception strings
- final ExpectedException ex = addExpectedException("Data loss detected",
+ final IgnoredException ex = IgnoredException.addExpectedException("Data loss detected",
accessor);
accessor.invoke(new SerializableCallable(
"Create bucket and test dataloss query") {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java
index 56a643c..21a6897 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionCloseDUnitTest.java
@@ -32,6 +32,7 @@ import java.util.Random;
import com.gemstone.gemfire.cache.query.data.PortfolioData;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDUnitTestCase;
+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;
@@ -193,7 +194,7 @@ public class PRQueryRegionCloseDUnitTest extends PartitionedRegionDUnitTestCase
} while (t != null);
if (!isForceReattempt) {
- fail("Unexpected exception during query", async0.getException());
+ Assert.fail("Unexpected exception during query", async0.getException());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java
index 3401d27..a6ce465 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionDestroyedDUnitTest.java
@@ -32,6 +32,7 @@ import java.util.Random;
import com.gemstone.gemfire.cache.query.data.PortfolioData;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDUnitTestCase;
+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;
@@ -209,7 +210,7 @@ public class PRQueryRegionDestroyedDUnitTest extends PartitionedRegionDUnitTestC
} while (t != null);
if (!isForceReattempt) {
- fail("Unexpected exception during query", async0.getException());
+ Assert.fail("Unexpected exception during query", async0.getException());
}
}
getLogWriter()
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java
index 830d35b..4789d1f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java
@@ -41,6 +41,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionMessageObserver;
import com.gemstone.gemfire.internal.cache.BucketRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDUnitTestCase;
+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.SerializableRunnable;
@@ -221,7 +222,7 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT
// ex.printStackTrace();
getLogWriter().info("PRQueryRemoteNodeExceptionDUnitTest: Test received Exception from local node successfully.");
} else {
- fail("PRQueryRemoteNodeExceptionDUnitTest: Test did not receive Exception as expected from local node rather received", ex);
+ Assert.fail("PRQueryRemoteNodeExceptionDUnitTest: Test did not receive Exception as expected from local node rather received", ex);
}
}
if (!gotException) {
@@ -352,7 +353,7 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT
ex.printStackTrace();
getLogWriter().info("PRQueryRemoteNodeExceptionDUnitTest: Test received Exception from remote node successfully.");
} else {
- fail("PRQueryRemoteNodeExceptionDUnitTest: Test did not receive Exception as expected from remote node rather received", ex);
+ Assert.fail("PRQueryRemoteNodeExceptionDUnitTest: Test did not receive Exception as expected from remote node rather received", ex);
}
}
if (!gotException) {
@@ -485,7 +486,7 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT
getLogWriter().info(ex.getMessage());
getLogWriter().info("PRQueryRemoteNodeExceptionDUnitTest: Test received Exception from local node successfully.");
} else {
- fail("PRQueryRemoteNodeExceptionDUnitTest: Test did not receive Exception as expected from local node rather received", ex);
+ Assert.fail("PRQueryRemoteNodeExceptionDUnitTest: Test did not receive Exception as expected from local node rather received", ex);
}
}
if (!gotException) {
@@ -628,7 +629,7 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT
getLogWriter().info(ex.getMessage());
getLogWriter().info("PRQueryRemoteNodeExceptionDUnitTest: Test received Exception from remote node successfully as region.destroy happened before cache.close().");
} else {
- fail("PRQueryRemoteNodeExceptionDUnitTest: Test did not receive Exception as expected from local node rather received", ex);
+ Assert.fail("PRQueryRemoteNodeExceptionDUnitTest: Test did not receive Exception as expected from local node rather received", ex);
}
}
if (!gotException) {
@@ -772,7 +773,7 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT
getLogWriter().info("PRQueryRemoteNodeExceptionDUnitTest: Query executed successfully with ForceReattemptException on local and remote both.");
} catch (Exception ex) {
gotException = true;
- fail("PRQueryRemoteNodeExceptionDUnitTest#testPRWithLocalAndRemoteException: Test received Exception", ex);
+ Assert.fail("PRQueryRemoteNodeExceptionDUnitTest#testPRWithLocalAndRemoteException: Test received Exception", ex);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug35214DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug35214DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug35214DUnitTest.java
index 04b214f..de2d042 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug35214DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug35214DUnitTest.java
@@ -29,6 +29,7 @@ import com.gemstone.gemfire.cache.RegionEvent;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
import com.gemstone.gemfire.internal.cache.LocalRegion;
+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;
@@ -156,7 +157,7 @@ public class Bug35214DUnitTest extends CacheTestCase {
throw e;
}
catch (Throwable e1) {
- fail("failed due to "+e1, e1);
+ Assert.fail("failed due to "+e1, e1);
}
System.setProperty(LocalRegion.EXPIRY_MS_PROPERTY, "true");
com.gemstone.gemfire.internal.cache.InitialImageOperation.slowImageProcessing = 30;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java
index 417456f..9cf476f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java
@@ -50,6 +50,7 @@ import com.gemstone.gemfire.internal.cache.ha.HARegionQueue;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy;
import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
import com.gemstone.gemfire.internal.cache.tier.sockets.ClientUpdateMessageImpl;
+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;
@@ -313,7 +314,7 @@ public class Bug38741DUnitTest extends ClientServerTestCase {
SerializationCountingValue scv = (SerializationCountingValue)cd.getDeserializedForReading();
assertEquals(1, scv.count.get());
} catch (IOException fail) {
- fail("Unexpected IOException", fail);
+ Assert.fail("Unexpected IOException", fail);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheLoaderTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheLoaderTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheLoaderTestCase.java
index fc23365..6a4917c 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheLoaderTestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheLoaderTestCase.java
@@ -26,6 +26,7 @@ import com.gemstone.gemfire.cache.LoaderHelper;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.TimeoutException;
+import com.gemstone.gemfire.test.dunit.Assert;
/**
* An abstract class whose test methods test the functionality of
@@ -68,7 +69,7 @@ public abstract class CacheLoaderTestCase
}
} catch (TimeoutException ex) {
- fail("Why did I time out?", ex);
+ Assert.fail("Why did I time out?", ex);
}
Object argument = helper.getArgument();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java
index 588ec7e..a4a0c1c 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java
@@ -35,6 +35,7 @@ import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.UnsupportedOperationInTransactionException;
import com.gemstone.gemfire.distributed.DistributedSystem;
+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;
@@ -149,11 +150,11 @@ public class CacheMapTxnDUnitTest extends DistributedTestCase{
DistributedTestCase.join(o3, 30 * 1000, getLogWriter());
if(o2.exceptionOccurred()){
- fail("o2 failed", o2.getException());
+ Assert.fail("o2 failed", o2.getException());
}
if(o3.exceptionOccurred()){
- fail("o3 failed", o3.getException());
+ Assert.fail("o3 failed", o3.getException());
}
}//end of testMiscMethods
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java
index 7f32a46..fc836b7 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java
@@ -54,8 +54,10 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation;
import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator;
import com.gemstone.gemfire.internal.logging.LogService;
+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.VM;
/**
@@ -113,13 +115,13 @@ public abstract class CacheTestCase extends DistributedTestCase {
}
cache = c;
} 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");
}
@@ -137,13 +139,13 @@ public abstract class CacheTestCase extends DistributedTestCase {
Cache c = CacheFactory.create(getLonerSystem());
cache = c;
} 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");
}
@@ -163,13 +165,13 @@ public abstract class CacheTestCase extends DistributedTestCase {
Cache c = CacheFactory.create(getLonerSystemWithEnforceUniqueHost());
cache = c;
} 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");
}
@@ -200,7 +202,7 @@ public abstract class CacheTestCase extends DistributedTestCase {
CacheXmlGenerator.generate(cache, pw);
pw.close();
} catch (IOException ex) {
- fail("IOException during cache.xml generation to " + file, ex);
+ Assert.fail("IOException during cache.xml generation to " + file, ex);
}
cache = null;
GemFireCacheImpl.testCacheXml = file;
@@ -226,7 +228,7 @@ public abstract class CacheTestCase extends DistributedTestCase {
CacheXmlGenerator.generate(cache, pw, useSchema, xmlVersion);
pw.close();
} catch (IOException ex) {
- fail("IOException during cache.xml generation to " + file, ex);
+ Assert.fail("IOException during cache.xml generation to " + file, ex);
}
cache = null;
GemFireCacheImpl.testCacheXml = file;
@@ -274,7 +276,7 @@ public abstract class CacheTestCase extends DistributedTestCase {
createCache(client, cf);
}
if (client && cache != null) {
- addExpectedException("java.net.ConnectException");
+ IgnoredException.addExpectedException("java.net.ConnectException");
}
return cache;
}
@@ -308,7 +310,7 @@ public abstract class CacheTestCase extends DistributedTestCase {
cache = (Cache)factory.create();
}
if (cache != null) {
- addExpectedException("java.net.ConnectException");
+ IgnoredException.addExpectedException("java.net.ConnectException");
}
return (ClientCache)cache;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml30DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml30DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml30DUnitTest.java
index 6df49b2..9b2e7a5 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml30DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml30DUnitTest.java
@@ -61,7 +61,7 @@ import com.gemstone.gemfire.internal.cache.xmlcache.ClientCacheCreation;
import com.gemstone.gemfire.internal.cache.xmlcache.Declarable2;
import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation;
import com.gemstone.gemfire.internal.cache.xmlcache.RegionCreation;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.util.test.TestUtil;
/**
@@ -96,7 +96,7 @@ public class CacheXml30DUnitTest extends CacheXmlTestCase {
setXmlFile(nonExistent);
// System.out.println("testNonExistentFile - set: " + System.currentTimeMillis());
- ExpectedException expectedException = CacheTestCase.addExpectedException(LocalizedStrings.
+ IgnoredException expectedException = IgnoredException.addExpectedException(LocalizedStrings.
GemFireCache_DECLARATIVE_CACHE_XML_FILERESOURCE_0_DOES_NOT_EXIST.toLocalizedString(nonExistent.getPath()));
try {
getCache();
@@ -119,7 +119,7 @@ public class CacheXml30DUnitTest extends CacheXmlTestCase {
dir.deleteOnExit();
setXmlFile(dir);
- ExpectedException expectedException = CacheTestCase.addExpectedException(LocalizedStrings.
+ IgnoredException expectedException = IgnoredException.addExpectedException(LocalizedStrings.
GemFireCache_DECLARATIVE_XML_FILE_0_IS_NOT_A_FILE.toLocalizedString(dir));
try {
getCache();
@@ -293,7 +293,7 @@ public class CacheXml30DUnitTest extends CacheXmlTestCase {
public void testMalformed() {
setXmlFile(findFile("malformed.xml"));
- ExpectedException expectedException = DistributedTestCase.addExpectedException("While reading Cache XML file");
+ IgnoredException expectedException = IgnoredException.addExpectedException("While reading Cache XML file");
try {
getCache();
fail("Should have thrown a CacheXmlException");
@@ -311,7 +311,7 @@ public class CacheXml30DUnitTest extends CacheXmlTestCase {
public void testBadInt() {
setXmlFile(findFile("badInt.xml"));
- ExpectedException expectedException = DistributedTestCase.addExpectedException("While reading Cache XML file");
+ IgnoredException expectedException = IgnoredException.addExpectedException("While reading Cache XML file");
try {
getCache();
fail("Should have thrown a CacheXmlException");
@@ -333,7 +333,7 @@ public class CacheXml30DUnitTest extends CacheXmlTestCase {
public void testBadFloat() {
setXmlFile(findFile("badFloat.xml"));
- ExpectedException expectedException = DistributedTestCase.addExpectedException("While reading Cache XML file");
+ IgnoredException expectedException = IgnoredException.addExpectedException("While reading Cache XML file");
try {
getCache();
fail("Should have thrown a CacheXmlException");
@@ -352,7 +352,7 @@ public class CacheXml30DUnitTest extends CacheXmlTestCase {
public void testBadScope() {
setXmlFile(findFile("badScope.xml"));
- ExpectedException expectedException = DistributedTestCase.addExpectedException("While reading Cache XML file");
+ IgnoredException expectedException = IgnoredException.addExpectedException("While reading Cache XML file");
try {
getCache();
fail("Should have thrown a CacheXmlException");
@@ -371,7 +371,7 @@ public class CacheXml30DUnitTest extends CacheXmlTestCase {
public void testBadKeyConstraintClass() {
setXmlFile(findFile("badKeyConstraintClass.xml"));
- ExpectedException expectedException = DistributedTestCase.addExpectedException("While reading Cache XML file");
+ IgnoredException expectedException = IgnoredException.addExpectedException("While reading Cache XML file");
try {
getCache();
fail("Should have thrown a CacheXmlException");
@@ -390,7 +390,7 @@ public class CacheXml30DUnitTest extends CacheXmlTestCase {
public void testCallbackNotDeclarable() {
setXmlFile(findFile("callbackNotDeclarable.xml"));
- ExpectedException expectedException = DistributedTestCase.addExpectedException("While reading Cache XML file");
+ IgnoredException expectedException = IgnoredException.addExpectedException("While reading Cache XML file");
try {
getCache();
fail("Should have thrown a CacheXmlException");
@@ -412,7 +412,7 @@ public class CacheXml30DUnitTest extends CacheXmlTestCase {
public void testCallbackWithException() {
setXmlFile(findFile("callbackWithException.xml"));
- ExpectedException expectedException = DistributedTestCase.addExpectedException("While reading Cache XML file");
+ IgnoredException expectedException = IgnoredException.addExpectedException("While reading Cache XML file");
try {
getCache();
fail("Should have thrown a CacheXmlException");
@@ -434,7 +434,7 @@ public class CacheXml30DUnitTest extends CacheXmlTestCase {
public void testLoaderNotLoader() {
setXmlFile(findFile("loaderNotLoader.xml"));
- ExpectedException expectedException = DistributedTestCase.addExpectedException("While reading Cache XML file");
+ IgnoredException expectedException = IgnoredException.addExpectedException("While reading Cache XML file");
try {
getCache();
fail("Should have thrown a CacheXmlException");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml41DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml41DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml41DUnitTest.java
index bc1f7e4..051b3ea 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml41DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml41DUnitTest.java
@@ -42,7 +42,8 @@ import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml;
import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator;
import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Assert;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
/**
* Tests the declarative caching functionality introduced in GemFire 4.1.
@@ -162,7 +163,7 @@ public class CacheXml41DUnitTest extends CacheXml40DUnitTest
{
setXmlFile(findFile("unknownNamedAttributes.xml"));
- ExpectedException expectedException = CacheTestCase.addExpectedException(LocalizedStrings.RegionAttributesCreation_CANNOT_REFERENCE_NONEXISTING_REGION_ATTRIBUTES_NAMED_0.toLocalizedString());
+ IgnoredException expectedException = IgnoredException.addExpectedException(LocalizedStrings.RegionAttributesCreation_CANNOT_REFERENCE_NONEXISTING_REGION_ATTRIBUTES_NAMED_0.toLocalizedString());
try {
getCache();
fail("Should have thrown an IllegalStateException");
@@ -198,7 +199,7 @@ public class CacheXml41DUnitTest extends CacheXml40DUnitTest
setXmlFile(findFile("sameRootRegion.xml"));
- ExpectedException expectedException = DistributedTestCase.addExpectedException("While reading Cache XML file");
+ IgnoredException expectedException = IgnoredException.addExpectedException("While reading Cache XML file");
try {
getCache();
fail("Should have thrown a CacheXmlException");
@@ -209,7 +210,7 @@ public class CacheXml41DUnitTest extends CacheXml40DUnitTest
assertTrue(cause instanceof SAXException);
cause = ((SAXException)cause).getException();
if (!(cause instanceof RegionExistsException)) {
- fail("Expected a RegionExistsException, not a "
+ Assert.fail("Expected a RegionExistsException, not a "
+ cause.getClass().getName(), cause);
}
} finally {
@@ -242,7 +243,7 @@ public class CacheXml41DUnitTest extends CacheXml40DUnitTest
setXmlFile(findFile("sameSubregion.xml"));
- ExpectedException expectedException = DistributedTestCase.addExpectedException("While reading Cache XML file");
+ IgnoredException expectedException = IgnoredException.addExpectedException("While reading Cache XML file");
try {
getCache();
fail("Should have thrown a CacheXmlException");
@@ -253,7 +254,7 @@ public class CacheXml41DUnitTest extends CacheXml40DUnitTest
assertTrue(cause instanceof SAXException);
cause = ((SAXException)cause).getException();
if (!(cause instanceof RegionExistsException)) {
- fail("Expected a RegionExistsException, not a "
+ Assert.fail("Expected a RegionExistsException, not a "
+ cause.getClass().getName(), cause);
}
} finally {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml57DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml57DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml57DUnitTest.java
index be78e26..25400b7 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml57DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml57DUnitTest.java
@@ -53,6 +53,7 @@ import com.gemstone.gemfire.internal.cache.xmlcache.Declarable2;
import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation;
import com.gemstone.gemfire.internal.cache.xmlcache.RegionCreation;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -207,7 +208,7 @@ public class CacheXml57DUnitTest extends CacheXml55DUnitTest
RegionAttributesCreation attrs = new RegionAttributesCreation(cache);
attrs.setPoolName("mypool");
cache.createVMRegion("rootNORMAL", attrs);
- addExpectedException("Connection refused: connect");
+ IgnoredException.addExpectedException("Connection refused: connect");
testXml(cache);
Cache c = getCache();
assertNotNull(c);
@@ -326,7 +327,7 @@ public class CacheXml57DUnitTest extends CacheXml55DUnitTest
RegionAttributesCreation attrs = new RegionAttributesCreation(cache);
attrs.setPoolName("mypool");
cache.createVMRegion("rootNORMAL", attrs);
- ExpectedException expectedException = CacheTestCase.addExpectedException(LocalizedStrings.AbstractRegion_THE_CONNECTION_POOL_0_HAS_NOT_BEEN_CREATED.toLocalizedString("mypool"));
+ IgnoredException expectedException = IgnoredException.addExpectedException(LocalizedStrings.AbstractRegion_THE_CONNECTION_POOL_0_HAS_NOT_BEEN_CREATED.toLocalizedString("mypool"));
try {
testXml(cache);
fail("expected IllegalStateException");
@@ -344,7 +345,7 @@ public class CacheXml57DUnitTest extends CacheXml55DUnitTest
// now make sure declarative cache can't create the same pool
CacheCreation cache = new CacheCreation();
cache.createPoolFactory().addLocator(ALIAS2, 12345).create("mypool");
- ExpectedException expectedException = CacheTestCase.addExpectedException(LocalizedStrings.PoolManagerImpl_POOL_NAMED_0_ALREADY_EXISTS.toLocalizedString("mypool"));
+ IgnoredException expectedException = IgnoredException.addExpectedException(LocalizedStrings.PoolManagerImpl_POOL_NAMED_0_ALREADY_EXISTS.toLocalizedString("mypool"));
try {
testXml(cache);
fail("expected IllegalStateException");
@@ -358,10 +359,10 @@ public class CacheXml57DUnitTest extends CacheXml55DUnitTest
}
public void testDynamicRegionFactoryConnectionPool() throws CacheException, IOException {
- addExpectedException("Connection reset");
- addExpectedException("SocketTimeoutException");
- addExpectedException("ServerConnectivityException");
- addExpectedException("Socket Closed");
+ IgnoredException.addExpectedException("Connection reset");
+ IgnoredException.addExpectedException("SocketTimeoutException");
+ IgnoredException.addExpectedException("ServerConnectivityException");
+ IgnoredException.addExpectedException("Socket Closed");
getSystem();
VM vm0 = Host.getHost(0).getVM(0);
final int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml60DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml60DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml60DUnitTest.java
index 3a20c07..0f29664 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml60DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml60DUnitTest.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation;
import com.gemstone.gemfire.internal.cache.xmlcache.ResourceManagerCreation;
import com.gemstone.gemfire.internal.cache.xmlcache.SerializerCreation;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
/**
* Tests 6.0 cache.xml features.
@@ -192,7 +192,7 @@ public class CacheXml60DUnitTest extends CacheXml58DUnitTest
rmc.setEvictionHeapPercentage(high);
rmc.setCriticalHeapPercentage(low);
cache.setResourceManagerCreation(rmc);
- ExpectedException expectedException = CacheTestCase.addExpectedException(LocalizedStrings.MemoryMonitor_EVICTION_PERCENTAGE_LTE_CRITICAL_PERCENTAGE.toLocalizedString());
+ IgnoredException expectedException = IgnoredException.addExpectedException(LocalizedStrings.MemoryMonitor_EVICTION_PERCENTAGE_LTE_CRITICAL_PERCENTAGE.toLocalizedString());
try {
testXml(cache);
assertTrue(false);
@@ -310,7 +310,7 @@ public class CacheXml60DUnitTest extends CacheXml58DUnitTest
closeCache();
cc.setSerializerCreation(sc);
- ExpectedException expectedException = DistributedTestCase.addExpectedException("While reading Cache XML file");
+ IgnoredException expectedException = IgnoredException.addExpectedException("While reading Cache XML file");
try {
testXml(cc);
fail("Instantiator should not have registered due to bad class.");
@@ -324,7 +324,7 @@ public class CacheXml60DUnitTest extends CacheXml58DUnitTest
closeCache();
cc.setSerializerCreation(sc);
- ExpectedException expectedException1 = DistributedTestCase.addExpectedException("While reading Cache XML file");
+ IgnoredException expectedException1 = IgnoredException.addExpectedException("While reading Cache XML file");
try {
testXml(cc);
fail("Serializer should not have registered due to bad class.");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml65DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml65DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml65DUnitTest.java
index e4d62f0..a9b20ac 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml65DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml65DUnitTest.java
@@ -60,6 +60,8 @@ import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation;
import com.gemstone.gemfire.internal.cache.xmlcache.RegionCreation;
import com.gemstone.gemfire.internal.cache.xmlcache.ResourceManagerCreation;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.test.dunit.Assert;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
/**
* Tests 6.5 cache.xml features.
@@ -247,7 +249,7 @@ public class CacheXml65DUnitTest extends CacheXml61DUnitTest {
attrs.setPoolName("mypool");
attrs.setDataPolicy(DataPolicy.EMPTY); // required for multiuser mode
cache.createVMRegion("rootNORMAL", attrs);
- addExpectedException("Connection refused: connect");
+ IgnoredException.addExpectedException("Connection refused: connect");
testXml(cache);
Cache c = getCache();
assertNotNull(c);
@@ -296,7 +298,7 @@ public class CacheXml65DUnitTest extends CacheXml61DUnitTest {
} catch (IllegalStateException e) {
assertTrue(e.getMessage().contains(LocalizedStrings.DiskStore_IS_USED_IN_NONPERSISTENT_REGION.toLocalizedString()));
} catch (Exception ex) {
- fail("Unexpected exception", ex);
+ Assert.fail("Unexpected exception", ex);
}
EvictionAttributes ea = EvictionAttributes.createLRUEntryAttributes(1000, EvictionAction.OVERFLOW_TO_DISK);
@@ -304,9 +306,9 @@ public class CacheXml65DUnitTest extends CacheXml61DUnitTest {
try {
root = (RegionCreation)cache.createRegion("root", attrs);
} catch (IllegalStateException e) {
- fail("With eviction of overflow to disk, region can specify disk store name", e);
+ Assert.fail("With eviction of overflow to disk, region can specify disk store name", e);
} catch (Exception ex) {
- fail("Unexpected exception", ex);
+ Assert.fail("Unexpected exception", ex);
}
File dir = new File("testDiskStoreValidation");
@@ -323,7 +325,7 @@ public class CacheXml65DUnitTest extends CacheXml61DUnitTest {
assertTrue(e.getMessage().contains(LocalizedStrings.DiskStore_Deprecated_API_0_Cannot_Mix_With_DiskStore_1
.toLocalizedString(new Object[] {"setDiskDirs or setDiskWriteAttributes", getUniqueName()})));
} catch (Exception ex) {
- fail("Unexpected exception", ex);
+ Assert.fail("Unexpected exception", ex);
}
try {
@@ -335,7 +337,7 @@ public class CacheXml65DUnitTest extends CacheXml61DUnitTest {
assertTrue(e.getMessage().contains(LocalizedStrings.DiskStore_Deprecated_API_0_Cannot_Mix_With_DiskStore_1
.toLocalizedString(new Object[] {"setDiskDirs", getUniqueName()})));
} catch (Exception ex) {
- fail("Unexpected exception", ex);
+ Assert.fail("Unexpected exception", ex);
}
testXml(cache);
@@ -369,7 +371,7 @@ public class CacheXml65DUnitTest extends CacheXml61DUnitTest {
try {
root = (RegionCreation)cache.createRegion("root", ra);
} catch (Exception ex) {
- fail("Unexpected exception", ex);
+ Assert.fail("Unexpected exception", ex);
}
factory = new AttributesFactory();
@@ -383,7 +385,7 @@ public class CacheXml65DUnitTest extends CacheXml61DUnitTest {
try {
root2 = (RegionCreation)cache.createRegion("root2", ra);
} catch (Exception ex) {
- fail("Unexpected exception", ex);
+ Assert.fail("Unexpected exception", ex);
}
factory = new AttributesFactory();
@@ -397,7 +399,7 @@ public class CacheXml65DUnitTest extends CacheXml61DUnitTest {
try {
root3 = (RegionCreation)cache.createRegion("root3", ra);
} catch (Exception ex) {
- fail("Unexpected exception", ex);
+ Assert.fail("Unexpected exception", ex);
}
testXml(cache);
@@ -418,7 +420,7 @@ public class CacheXml65DUnitTest extends CacheXml61DUnitTest {
try {
root = (RegionCreation)cache.createRegion("root", ra);
} catch (Exception ex) {
- fail("Unexpected exception", ex);
+ Assert.fail("Unexpected exception", ex);
}
testXml(cache);
@@ -481,7 +483,7 @@ public class CacheXml65DUnitTest extends CacheXml61DUnitTest {
LocalizedStrings.DiskStore_Deprecated_API_0_Cannot_Mix_With_DiskStore_1
.toLocalizedString(new Object[] {"setOverflowDirectory", getUniqueName()})));
} catch (Exception ex) {
- fail("Unexpected exception", ex);
+ Assert.fail("Unexpected exception", ex);
}
cache.getLogger().config(
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml66DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml66DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml66DUnitTest.java
index ce07ecb..352ea81 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml66DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml66DUnitTest.java
@@ -41,6 +41,8 @@ import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml;
import com.gemstone.gemfire.internal.cache.xmlcache.ClientCacheCreation;
import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.test.dunit.Assert;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
/**
* Tests 7.0 cache.xml feature : Fixed Partitioning.
@@ -157,7 +159,7 @@ public class CacheXml66DUnitTest extends CacheXml65DUnitTest{
catch (Exception illegal) {
if (!((illegal instanceof IllegalStateException) && (illegal.getMessage()
.contains("can not be specified in PartitionAttributesFactory")))) {
- fail("Expected IllegalStateException ", illegal);
+ Assert.fail("Expected IllegalStateException ", illegal);
}
RegionAttributesCreation attrs = new RegionAttributesCreation();
@@ -353,7 +355,7 @@ public class CacheXml66DUnitTest extends CacheXml65DUnitTest{
CacheTransactionManagerCreation txMgrCreation = new CacheTransactionManagerCreation();
txMgrCreation.setWriter(new TestTransactionWriter());
cc.addCacheTransactionManagerCreation(txMgrCreation);
- ExpectedException expectedException = addExpectedException(LocalizedStrings.TXManager_NO_WRITER_ON_CLIENT.toLocalizedString());
+ IgnoredException expectedException = IgnoredException.addExpectedException(LocalizedStrings.TXManager_NO_WRITER_ON_CLIENT.toLocalizedString());
try {
testXml(cc);
fail("expected exception not thrown");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml80DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml80DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml80DUnitTest.java
index 5ce9b65..eda3d78 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml80DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml80DUnitTest.java
@@ -47,6 +47,7 @@ import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml;
import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator;
import com.gemstone.gemfire.internal.cache.xmlcache.DiskStoreAttributesCreation;
import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation;
+import com.gemstone.gemfire.test.dunit.Assert;
/**
* @author dsmith
@@ -121,7 +122,7 @@ public class CacheXml80DUnitTest extends CacheXml70DUnitTest {
pw.close();
}
catch (IOException ex) {
- fail("IOException during cache.xml generation to " + file, ex);
+ Assert.fail("IOException during cache.xml generation to " + file, ex);
}
c.close();
GemFireCacheImpl.testCacheXml = file;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml81DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml81DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml81DUnitTest.java
index ac2e2ba..700072e 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml81DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml81DUnitTest.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation;
import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml;
import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation;
import com.gemstone.gemfire.internal.cache.xmlcache.XmlParser;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
/**
* Tests 8.1 schema based configuration. From this point all config test cases
@@ -141,7 +141,7 @@ public class CacheXml81DUnitTest extends CacheXml80DUnitTest {
assertEquals(0, extension.onCreateCounter.get());
assertEquals(0, extension.getXmlGeneratorCounter.get());
- ExpectedException expectedException = DistributedTestCase.addExpectedException("While reading Cache XML file");
+ IgnoredException expectedException = IgnoredException.addExpectedException("While reading Cache XML file");
try {
testXml(cache);
fail("Excepted CacheXmlException");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml90DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml90DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml90DUnitTest.java
index a3df9e9..8cadd8b 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml90DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml90DUnitTest.java
@@ -29,6 +29,7 @@ import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml;
import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation;
import com.gemstone.gemfire.internal.cache.xmlcache.ResourceManagerCreation;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
public class CacheXml90DUnitTest extends CacheXml81DUnitTest {
@@ -90,7 +91,7 @@ public class CacheXml90DUnitTest extends CacheXml81DUnitTest {
assertNotNull(regionBefore);
assertEquals(true, regionBefore.getAttributes().getOffHeap());
- ExpectedException expectedException = CacheTestCase.addExpectedException(LocalizedStrings.
+ IgnoredException expectedException = IgnoredException.addExpectedException(LocalizedStrings.
LocalRegion_THE_REGION_0_WAS_CONFIGURED_TO_USE_OFF_HEAP_MEMORY_BUT_OFF_HEAP_NOT_CONFIGURED.toLocalizedString("/"+regionName));
try {
testXml(cache);
@@ -124,7 +125,7 @@ public class CacheXml90DUnitTest extends CacheXml81DUnitTest {
assertNotNull(subRegionBefore);
assertEquals(true, subRegionBefore.getAttributes().getOffHeap());
- ExpectedException expectedException = CacheTestCase.addExpectedException(LocalizedStrings.
+ IgnoredException expectedException = IgnoredException.addExpectedException(LocalizedStrings.
LocalRegion_THE_REGION_0_WAS_CONFIGURED_TO_USE_OFF_HEAP_MEMORY_BUT_OFF_HEAP_NOT_CONFIGURED.toLocalizedString("/"+rootRegionName+"/"+subRegionName));
try {
testXml(cache);
@@ -181,7 +182,7 @@ public class CacheXml90DUnitTest extends CacheXml81DUnitTest {
rmc.setEvictionOffHeapPercentage(high);
rmc.setCriticalOffHeapPercentage(low);
cache.setResourceManagerCreation(rmc);
- ExpectedException expectedException = CacheTestCase.addExpectedException(LocalizedStrings.MemoryMonitor_EVICTION_PERCENTAGE_LTE_CRITICAL_PERCENTAGE.toLocalizedString());
+ IgnoredException expectedException = IgnoredException.addExpectedException(LocalizedStrings.MemoryMonitor_EVICTION_PERCENTAGE_LTE_CRITICAL_PERCENTAGE.toLocalizedString());
try {
testXml(cache);
assertTrue(false);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
index 555f75a..8615899 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
@@ -29,6 +29,7 @@ import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation;
import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml;
import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator;
import com.gemstone.gemfire.internal.cache.xmlcache.ClientCacheCreation;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.util.test.TestUtil;
public class CacheXmlTestCase extends CacheTestCase {
@@ -123,7 +124,7 @@ public class CacheXmlTestCase extends CacheTestCase {
} catch (IOException ex) {
String s = "While generating XML";
- fail(s, ex);
+ Assert.fail(s, ex);
}
setXmlFile(file);
@@ -146,7 +147,7 @@ public class CacheXmlTestCase extends CacheTestCase {
useSchema, version);
CacheXmlGenerator.generate(cache, new PrintWriter(sw, true),
useSchema, version);
- fail(sw.toString(), re);
+ Assert.fail(sw.toString(), re);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java
index 5a87127..9711e02 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java
@@ -36,6 +36,7 @@ import com.gemstone.gemfire.cache.RegionDestroyedException;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.UnsupportedOperationInTransactionException;
import com.gemstone.gemfire.distributed.DistributedSystem;
+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;
@@ -215,11 +216,11 @@ public class ClearMultiVmDUnitTest extends DistributedTestCase{
DistributedTestCase.join(as2, 30 * 1000, getLogWriter());
if(as1.exceptionOccurred()){
- fail("as1 failed", as1.getException());
+ Assert.fail("as1 failed", as1.getException());
}
if(as2.exceptionOccurred()){
- fail("as2 failed", as2.getException());
+ Assert.fail("as2 failed", as2.getException());
}
int j = vm0.invokeInt(ClearMultiVmDUnitTest.class, "sizeMethod");
@@ -329,7 +330,7 @@ public class ClearMultiVmDUnitTest extends DistributedTestCase{
DistributedTestCase.join(async1, 30 * 1000, getLogWriter());
if(async1.exceptionOccurred()){
- fail("async1 failed", async1.getException());
+ Assert.fail("async1 failed", async1.getException());
}
SerializableRunnable validate = new
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
index 5589453..6cd8bb1 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
@@ -53,8 +53,10 @@ import com.gemstone.gemfire.internal.logging.InternalLogWriter;
import com.gemstone.gemfire.management.membership.ClientMembership;
import com.gemstone.gemfire.management.membership.ClientMembershipEvent;
import com.gemstone.gemfire.management.membership.ClientMembershipListener;
+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.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
@@ -119,7 +121,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
never arrives.
*/
public void testConnectionTimeout() throws Exception {
- addExpectedException("failed accepting client connection");
+ IgnoredException.addExpectedException("failed accepting client connection");
final Host host = Host.getHost(0);
final String hostName = getServerHostName(host);
final VM vm0 = host.getVM(0);
@@ -727,7 +729,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
* crashes or departs gracefully, the client will detect this as a crash.
*/
public void testClientMembershipEventsInClient() throws Exception {
- addExpectedException("IOException");
+ IgnoredException.addExpectedException("IOException");
final boolean[] fired = new boolean[3];
final DistributedMember[] member = new DistributedMember[3];
final String[] memberId = new String[3];
@@ -850,7 +852,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
assertNotNull(getRootRegion().getSubregion(name));
}
catch (CacheException ex) {
- fail("While creating Region on Edge", ex);
+ Assert.fail("While creating Region on Edge", ex);
}
synchronized(listener) {
if (!fired[JOINED] && !fired[CRASHED]) {
@@ -1301,7 +1303,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
final String name = this.getUniqueName();
final int[] ports = new int[1];
- addExpectedException("ConnectException");
+ IgnoredException.addExpectedException("ConnectException");
// create BridgeServer in controller vm...
getLogWriter().info("[testGetConnectedClients] Create BridgeServer");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
index 181fea7..59c2388 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
@@ -44,6 +44,7 @@ import com.gemstone.gemfire.internal.cache.TombstoneService;
import com.gemstone.gemfire.internal.cache.ha.HARegionQueue;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy;
+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;
@@ -440,7 +441,7 @@ public class ClientServerCCEDUnitTest extends CacheTestCase {
assertTrue("expected key object_"+i+" to be in the cache but it isn't", TestRegion.containsKey("object_"+i));
}
} catch (NullPointerException e) {
- fail("caught NPE", e);
+ Assert.fail("caught NPE", e);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
index 0ba2e27..c7c90a7 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
@@ -252,7 +252,7 @@ public class DistributedAckRegionCCEDUnitTest extends DistributedAckRegionDUnitT
"fake_id", "fake_id_ustring", DistributionManager.NORMAL_DM_TYPE, null, null);
tag.setMemberID(mbr);
} catch (UnknownHostException e) {
- fail("could not create member id", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("could not create member id", e);
}
// generate an event to distribute that contains the fake version tag
@@ -269,7 +269,7 @@ public class DistributedAckRegionCCEDUnitTest extends DistributedAckRegionDUnitT
try {
partialCreate.getResult();
} catch (Throwable e) {
- fail("async invocation in vm2 failed", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("async invocation in vm2 failed", e);
}
}
@@ -322,7 +322,7 @@ public class DistributedAckRegionCCEDUnitTest extends DistributedAckRegionDUnitT
CCRegion.put("cckey0", "ccvalue");
CCRegion.put("cckey0", "ccvalue"); // version number will end up at 4
} catch (CacheException ex) {
- fail("While creating region", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While creating region", ex);
}
}
};
@@ -342,7 +342,7 @@ public class DistributedAckRegionCCEDUnitTest extends DistributedAckRegionDUnitT
try {
entry.makeTombstone(CCRegion, tag);
} catch (RegionClearedException e) {
- fail("region was mysteriously cleared during unit testing", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("region was mysteriously cleared during unit testing", e);
}
}
});
@@ -406,7 +406,7 @@ public class DistributedAckRegionCCEDUnitTest extends DistributedAckRegionDUnitT
long gcCount = CCRegion.getCachePerfStats().getTombstoneGCCount();
assertTrue("expected a few GCs, but not " + (gcCount - initialCount), gcCount < (initialCount + 20));
} catch (CacheException ex) {
- fail("While creating region", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While creating region", ex);
} finally {
TombstoneService.EXPIRED_TOMBSTONE_LIMIT = saveExpiredTombstoneLimit;
TombstoneService.FORCE_GC_MEMORY_EVENTS = false;
@@ -460,7 +460,7 @@ public class DistributedAckRegionCCEDUnitTest extends DistributedAckRegionDUnitT
}
assertEquals("expected no conflated events", 0, CCRegion.getCachePerfStats().getConflatedEventsCount());
} catch (CacheException ex) {
- fail("While creating region", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While creating region", ex);
}
}
};
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
index 27da3d6..c1ca077 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
@@ -25,6 +25,7 @@ import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -90,7 +91,7 @@ public class DistributedAckRegionDUnitTest extends MultiVMRegionTestCase {
createRegion(name, "INCOMPATIBLE_ROOT", getRegionAttributes());
} catch (CacheException ex) {
- fail("While creating ACK region", ex);
+ Assert.fail("While creating ACK region", ex);
}
}
});
@@ -109,7 +110,7 @@ public class DistributedAckRegionDUnitTest extends MultiVMRegionTestCase {
}
} catch (CacheException ex) {
- fail("While creating GLOBAL Region", ex);
+ Assert.fail("While creating GLOBAL Region", ex);
}
}
});
@@ -127,7 +128,7 @@ public class DistributedAckRegionDUnitTest extends MultiVMRegionTestCase {
}
} catch (CacheException ex) {
- fail("While creating NOACK Region", ex);
+ Assert.fail("While creating NOACK Region", ex);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
index c65101e..dae0c05 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
@@ -33,6 +33,7 @@ import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.cache.LocalRegion;
+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.SerializableRunnable;
@@ -314,7 +315,7 @@ public class DistributedNoAckRegionCCEDUnitTest extends
}
CCRegion = (LocalRegion)f.create(name);
} catch (CacheException ex) {
- fail("While creating region", ex);
+ Assert.fail("While creating region", ex);
}
}
};
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionDUnitTest.java
index aa39758..21b1e3e 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionDUnitTest.java
@@ -28,6 +28,7 @@ import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
import com.gemstone.gemfire.internal.cache.DistributedRegion;
import com.gemstone.gemfire.internal.cache.StateFlushOperation;
+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;
@@ -104,7 +105,7 @@ public class DistributedNoAckRegionDUnitTest
assertTrue(getRootRegion("INCOMPATIBLE_ROOT").getAttributes().getScope().isDistributedNoAck());
assertTrue(region.getAttributes().getScope().isDistributedNoAck());
} catch (CacheException ex) {
- fail("While creating NO ACK region", ex);
+ Assert.fail("While creating NO ACK region", ex);
}
}
});
@@ -126,7 +127,7 @@ public class DistributedNoAckRegionDUnitTest
// assertNull(getRootRegion());
} catch (CacheException ex) {
- fail("While creating GLOBAL Region", ex);
+ Assert.fail("While creating GLOBAL Region", ex);
}
}
});
@@ -147,7 +148,7 @@ public class DistributedNoAckRegionDUnitTest
// assertNull(getRootRegion());
} catch (CacheException ex) {
- fail("While creating ACK Region", ex);
+ Assert.fail("While creating ACK Region", ex);
}
}
});
@@ -272,7 +273,7 @@ public class DistributedNoAckRegionDUnitTest
} // finally
getLogWriter().info("testBug30705: at end of test");
if (async.exceptionOccurred()) {
- fail("Got exception", async.getException());
+ Assert.fail("Got exception", async.getException());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java
index 22b303f..c328995 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java
@@ -36,6 +36,7 @@ import com.gemstone.gemfire.internal.cache.RegionClearedException;
import com.gemstone.gemfire.internal.cache.RegionEntry;
import com.gemstone.gemfire.internal.cache.TombstoneService;
import com.gemstone.gemfire.internal.cache.versions.VersionTag;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -167,7 +168,7 @@ public class GlobalRegionCCEDUnitTest extends GlobalRegionDUnitTest {
CCRegion.put("cckey0", "ccvalue");
CCRegion.put("cckey0", "ccvalue"); // version number will end up at 4
} catch (CacheException ex) {
- fail("While creating region", ex);
+ Assert.fail("While creating region", ex);
}
}
};
@@ -189,7 +190,7 @@ public class GlobalRegionCCEDUnitTest extends GlobalRegionDUnitTest {
try {
entry.makeTombstone(CCRegion, tag);
} catch (RegionClearedException e) {
- fail("region was mysteriously cleared during unit testing", e);
+ Assert.fail("region was mysteriously cleared during unit testing", e);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionDUnitTest.java
index f08b66f..006dcff 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionDUnitTest.java
@@ -31,6 +31,7 @@ import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.TimeoutException;
+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;
@@ -86,7 +87,7 @@ public class GlobalRegionDUnitTest extends MultiVMRegionTestCase {
try {
createRegion(name, "INCOMPATIBLE_ROOT", getRegionAttributes());
} catch (CacheException ex) {
- fail("While creating GLOBAL region", ex);
+ Assert.fail("While creating GLOBAL region", ex);
}
assertTrue(getRootRegion("INCOMPATIBLE_ROOT").getAttributes().getScope().isGlobal());
}
@@ -108,7 +109,7 @@ public class GlobalRegionDUnitTest extends MultiVMRegionTestCase {
}
} catch (CacheException ex) {
- fail("While creating GLOBAL Region", ex);
+ Assert.fail("While creating GLOBAL Region", ex);
}
}
});
@@ -134,7 +135,7 @@ public class GlobalRegionDUnitTest extends MultiVMRegionTestCase {
}
} catch (CacheException ex) {
- fail("While creating GLOBAL Region", ex);
+ Assert.fail("While creating GLOBAL Region", ex);
}
}
});
@@ -245,7 +246,7 @@ public class GlobalRegionDUnitTest extends MultiVMRegionTestCase {
SystemFailure.setFailure((VirtualMachineError)e); // don't throw
}
String s = "Uncaught exception in thread " + t;
- fail(s, e);
+ Assert.fail(s, e);
}
};
@@ -284,9 +285,9 @@ public class GlobalRegionDUnitTest extends MultiVMRegionTestCase {
}
} catch (InterruptedException ex) {
- fail("While incrementing", ex);
+ Assert.fail("While incrementing", ex);
} catch (Exception ex) {
- fail("While incrementing", ex);
+ Assert.fail("While incrementing", ex);
}
}
catch (VirtualMachineError e) {
@@ -317,7 +318,7 @@ public class GlobalRegionDUnitTest extends MultiVMRegionTestCase {
for (int i = 0; i < vmCount; i++) {
DistributedTestCase.join(invokes[i], 5 * 60 * 1000, getLogWriter());
if (invokes[i].exceptionOccurred()) {
- fail("invocation failed", invokes[i].getException());
+ Assert.fail("invocation failed", invokes[i].getException());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/LocalRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/LocalRegionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/LocalRegionDUnitTest.java
index 0ea842d..2ed532b 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/LocalRegionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/LocalRegionDUnitTest.java
@@ -26,6 +26,7 @@ import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.TimeoutException;
+import com.gemstone.gemfire.test.dunit.Assert;
/**
* Tests the functionality of a {@link Scope#LOCAL locally scoped}
@@ -124,7 +125,7 @@ public class LocalRegionDUnitTest extends CacheListenerTestCase {
helper.netSearch(true);
} catch (TimeoutException ex) {
- fail("Why did I timeout?", ex);
+ Assert.fail("Why did I timeout?", ex);
}
return null;
[08/50] [abbrv] incubator-geode git commit: GEODE-610: Add NOTICEs
from dependent projects
Posted by kl...@apache.org.
GEODE-610: Add NOTICEs from dependent projects
For the binary distribution, each Apache-licensed jar that is
distributed with a NOTICE file must be included in the NOTICE
file that we include with the distribution. I manually extracted
the NOTICE files from the dependent jars and merged the text.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3bd930fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3bd930fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3bd930fd
Branch: refs/heads/feature/GEODE-773-2
Commit: 3bd930fd45bef7a15f6aa84268dcbf66ed6694a6
Parents: 49a984c
Author: Anthony Baker <ab...@apache.org>
Authored: Mon Jan 25 11:33:19 2016 -0800
Committer: Anthony Baker <ab...@apache.org>
Committed: Wed Jan 27 10:50:02 2016 -0800
----------------------------------------------------------------------
gemfire-assembly/src/main/dist/NOTICE | 462 +++++++++++++++++++++++++++++
1 file changed, 462 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bd930fd/gemfire-assembly/src/main/dist/NOTICE
----------------------------------------------------------------------
diff --git a/gemfire-assembly/src/main/dist/NOTICE b/gemfire-assembly/src/main/dist/NOTICE
index 3f5dd07..b429715 100644
--- a/gemfire-assembly/src/main/dist/NOTICE
+++ b/gemfire-assembly/src/main/dist/NOTICE
@@ -3,3 +3,465 @@ Copyright 2016 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+
+
+The following NOTICEs pertain to software distributed with this project.
+
+Apache Commons FileUpload
+Copyright 2002-2014 The Apache Software Foundation
+
+Apache Commons IO
+Copyright 2002-2012 The Apache Software Foundation
+
+Apache Commons Lang
+Copyright 2001-2010 The Apache Software Foundation
+
+// ------------------------------------------------------------------
+// NOTICE file corresponding to the section 4d of The Apache License,
+// Version 2.0, in this case for Commons Logging
+// ------------------------------------------------------------------
+
+Commons Logging
+Copyright 2001-2007 The Apache Software Foundation
+
+This product includes/uses software(s) developed by 'an unknown organization'
+ - Unnamed - avalon-framework:avalon-framework:jar:4.1.3
+ - Unnamed - log4j:log4j:jar:1.2.12
+ - Unnamed - logkit:logkit:jar:1.0.1
+
+HBase
+Copyright 2015 The Apache Software Foundation
+
+# Jackson JSON processor
+
+Jackson is a high-performance, Free/Open Source JSON processing library.
+It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
+been in development since 2007.
+It is currently developed by a community of developers, as well as supported
+commercially by FasterXML.com.
+
+## Licensing
+
+Jackson core and extension components may licensed under different licenses.
+To find the details that apply to this artifact see the accompanying LICENSE file.
+For more information, including possible other licensing options, contact
+FasterXML.com (http://fasterxml.com).
+
+## Credits
+
+A list of contributors may be found from CREDITS file, which is included
+in some artifacts (usually source distributions); but is always available
+from the source code management (SCM) system project uses.
+
+Java ClassMate library was originally written by Tatu Saloranta (tatu.saloranta@iki.fi)
+
+Other developers who have contributed code are:
+
+* Brian Langel
+
+Apache Log4j API
+Copyright 1999-2015 Apache Software Foundation
+
+Apache Log4j Core
+Copyright 1999-2012 Apache Software Foundation
+
+ResolverUtil.java
+Copyright 2005-2006 Tim Fennell
+
+Apache Log4j Commons Logging Bridge
+Copyright 1999-2015 Apache Software Foundation
+
+Apache Log4j JUL Adapter
+Copyright 1999-2015 Apache Software Foundation
+
+Apache Log4j SLF4J Binding
+Copyright 1999-2015 Apache Software Foundation
+
+Apache Lucene
+Copyright 2014 The Apache Software Foundation
+
+Includes software from other Apache Software Foundation projects,
+including, but not limited to:
+ - Apache Ant
+ - Apache Jakarta Regexp
+ - Apache Commons
+ - Apache Xerces
+
+ICU4J, (under analysis/icu) is licensed under an MIT styles license
+and Copyright (c) 1995-2008 International Business Machines Corporation and others
+
+Some data files (under analysis/icu/src/data) are derived from Unicode data such
+as the Unicode Character Database. See http://unicode.org/copyright.html for more
+details.
+
+Brics Automaton (under core/src/java/org/apache/lucene/util/automaton) is
+BSD-licensed, created by Anders Møller. See http://www.brics.dk/automaton/
+
+The levenshtein automata tables (under core/src/java/org/apache/lucene/util/automaton) were
+automatically generated with the moman/finenight FSA library, created by
+Jean-Philippe Barrette-LaPierre. This library is available under an MIT license,
+see http://sites.google.com/site/rrettesite/moman and
+http://bitbucket.org/jpbarrette/moman/overview/
+
+The class org.apache.lucene.util.WeakIdentityMap was derived from
+the Apache CXF project and is Apache License 2.0.
+
+The Google Code Prettify is Apache License 2.0.
+See http://code.google.com/p/google-code-prettify/
+
+JUnit (junit-4.10) is licensed under the Common Public License v. 1.0
+See http://junit.sourceforge.net/cpl-v10.html
+
+This product includes code (JaspellTernarySearchTrie) from Java Spelling Checkin
+g Package (jaspell): http://jaspell.sourceforge.net/
+License: The BSD License (http://www.opensource.org/licenses/bsd-license.php)
+
+The snowball stemmers in
+ analysis/common/src/java/net/sf/snowball
+were developed by Martin Porter and Richard Boulton.
+The snowball stopword lists in
+ analysis/common/src/resources/org/apache/lucene/analysis/snowball
+were developed by Martin Porter and Richard Boulton.
+The full snowball package is available from
+ http://snowball.tartarus.org/
+
+The KStem stemmer in
+ analysis/common/src/org/apache/lucene/analysis/en
+was developed by Bob Krovetz and Sergio Guzman-Lara (CIIR-UMass Amherst)
+under the BSD-license.
+
+The Arabic,Persian,Romanian,Bulgarian, and Hindi analyzers (common) come with a default
+stopword list that is BSD-licensed created by Jacques Savoy. These files reside in:
+analysis/common/src/resources/org/apache/lucene/analysis/ar/stopwords.txt,
+analysis/common/src/resources/org/apache/lucene/analysis/fa/stopwords.txt,
+analysis/common/src/resources/org/apache/lucene/analysis/ro/stopwords.txt,
+analysis/common/src/resources/org/apache/lucene/analysis/bg/stopwords.txt,
+analysis/common/src/resources/org/apache/lucene/analysis/hi/stopwords.txt
+See http://members.unine.ch/jacques.savoy/clef/index.html.
+
+The German,Spanish,Finnish,French,Hungarian,Italian,Portuguese,Russian and Swedish light stemmers
+(common) are based on BSD-licensed reference implementations created by Jacques Savoy and
+Ljiljana Dolamic. These files reside in:
+analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemmer.java
+analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemmer.java
+analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemmer.java
+analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemmer.java
+analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemmer.java
+analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemmer.java
+analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemmer.java
+analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemmer.java
+analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemmer.java
+analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemmer.java
+analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemmer.java
+
+The Stempel analyzer (stempel) includes BSD-licensed software developed
+by the Egothor project http://egothor.sf.net/, created by Leo Galambos, Martin Kvapil,
+and Edmond Nolan.
+
+The Polish analyzer (stempel) comes with a default
+stopword list that is BSD-licensed created by the Carrot2 project. The file resides
+in stempel/src/resources/org/apache/lucene/analysis/pl/stopwords.txt.
+See http://project.carrot2.org/license.html.
+
+The SmartChineseAnalyzer source code (smartcn) was
+provided by Xiaoping Gao and copyright 2009 by www.imdict.net.
+
+WordBreakTestUnicode_*.java (under modules/analysis/common/src/test/)
+is derived from Unicode data such as the Unicode Character Database.
+See http://unicode.org/copyright.html for more details.
+
+The Morfologik analyzer (morfologik) includes BSD-licensed software
+developed by Dawid Weiss and Marcin Miłkowski (http://morfologik.blogspot.com/).
+
+Morfologik uses data from Polish ispell/myspell dictionary
+(http://www.sjp.pl/slownik/en/) licenced on the terms of (inter alia)
+LGPL and Creative Commons ShareAlike.
+
+Morfologic includes data from BSD-licensed dictionary of Polish (SGJP)
+(http://sgjp.pl/morfeusz/)
+
+Servlet-api.jar and javax.servlet-*.jar are under the CDDL license, the original
+source code for this can be found at http://www.eclipse.org/jetty/downloads.php
+
+===========================================================================
+Kuromoji Japanese Morphological Analyzer - Apache Lucene Integration
+===========================================================================
+
+This software includes a binary and/or source version of data from
+
+ mecab-ipadic-2.7.0-20070801
+
+which can be obtained from
+
+ http://atilika.com/releases/mecab-ipadic/mecab-ipadic-2.7.0-20070801.tar.gz
+
+or
+
+ http://jaist.dl.sourceforge.net/project/mecab/mecab-ipadic/2.7.0-20070801/mecab-ipadic-2.7.0-20070801.tar.gz
+
+===========================================================================
+mecab-ipadic-2.7.0-20070801 Notice
+===========================================================================
+
+Nara Institute of Science and Technology (NAIST),
+the copyright holders, disclaims all warranties with regard to this
+software, including all implied warranties of merchantability and
+fitness, in no event shall NAIST be liable for
+any special, indirect or consequential damages or any damages
+whatsoever resulting from loss of use, data or profits, whether in an
+action of contract, negligence or other tortuous action, arising out
+of or in connection with the use or performance of this software.
+
+A large portion of the dictionary entries
+originate from ICOT Free Software. The following conditions for ICOT
+Free Software applies to the current dictionary as well.
+
+Each User may also freely distribute the Program, whether in its
+original form or modified, to any third party or parties, PROVIDED
+that the provisions of Section 3 ("NO WARRANTY") will ALWAYS appear
+on, or be attached to, the Program, which is distributed substantially
+in the same form as set out herein and that such intended
+distribution, if actually made, will neither violate or otherwise
+contravene any of the laws and regulations of the countries having
+jurisdiction over the User or the intended distribution itself.
+
+NO WARRANTY
+
+The program was produced on an experimental basis in the course of the
+research and development conducted during the project and is provided
+to users as so produced on an experimental basis. Accordingly, the
+program is provided without any warranty whatsoever, whether express,
+implied, statutory or otherwise. The term "warranty" used herein
+includes, but is not limited to, any warranty of the quality,
+performance, merchantability and fitness for a particular purpose of
+the program and the nonexistence of any infringement or violation of
+any right of any third party.
+
+Each user of the program will agree and understand, and be deemed to
+have agreed and understood, that there is no warranty whatsoever for
+the program and, accordingly, the entire risk arising from or
+otherwise connected with the program is assumed by the user.
+
+Therefore, neither ICOT, the copyright holder, or any other
+organization that participated in or was otherwise related to the
+development of the program and their respective officials, directors,
+officers and other employees shall be held liable for any and all
+damages, including, without limitation, general, special, incidental
+and consequential damages, arising out of or otherwise in connection
+with the use or inability to use the program or any product, material
+or result produced or otherwise obtained by using the program,
+regardless of whether they have been advised of, or otherwise had
+knowledge of, the possibility of such damages at any time during the
+project or thereafter. Each user will be deemed to have agreed to the
+foregoing by his or her commencement of use of the program. The term
+"use" as used herein includes, but is not limited to, the use,
+modification, copying and distribution of the program and the
+production of secondary products from the program.
+
+In the case where the program, whether in its original form or
+modified, was distributed or delivered to or received by a user from
+any person, organization or entity other than ICOT, unless it makes or
+grants independently of ICOT any specific warranty to the user in
+writing, such person, organization or entity, will also be exempted
+from and not be held liable to the user for any such damages as noted
+above as far as the program is concerned.
+
+
+ The Netty Project
+ =================
+
+Please visit the Netty web site for more information:
+
+ * http://netty.io/
+
+Copyright 2011 The Netty Project
+
+The Netty Project licenses this file to you under the Apache License,
+version 2.0 (the "License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at:
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations
+under the License.
+
+Also, please refer to each LICENSE.<component>.txt file, which is located in
+the 'license' directory of the distribution file, for the license terms of the
+components that this product depends on.
+
+-------------------------------------------------------------------------------
+This product contains the extensions to Java Collections Framework which has
+been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene:
+
+ * LICENSE:
+ * license/LICENSE.jsr166y.txt (Public Domain)
+ * HOMEPAGE:
+ * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/
+ * http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/
+
+This product contains a modified version of Robert Harder's Public Domain
+Base64 Encoder and Decoder, which can be obtained at:
+
+ * LICENSE:
+ * license/LICENSE.base64.txt (Public Domain)
+ * HOMEPAGE:
+ * http://iharder.sourceforge.net/current/java/base64/
+
+This product contains a modified portion of 'Webbit', an event based
+WebSocket and HTTP server, which can be obtained at:
+
+ * LICENSE:
+ * license/LICENSE.webbit.txt (BSD License)
+ * HOMEPAGE:
+ * https://github.com/joewalnes/webbit
+
+This product contains a modified portion of 'SLF4J', a simple logging
+facade for Java, which can be obtained at:
+
+ * LICENSE:
+ * license/LICENSE.slf4j.txt (MIT License)
+ * HOMEPAGE:
+ * http://www.slf4j.org/
+
+
+This product contains a modified version of Roland Kuhn's ASL2
+AbstractNodeQueue, which is based on Dmitriy Vyukov's non-intrusive MPSC queue.
+It can be obtained at:
+
+ * LICENSE:
+ * license/LICENSE.abstractnodequeue.txt (Public Domain)
+ * HOMEPAGE:
+ * https://github.com/akka/akka/blob/wip-2.2.3-for-scala-2.11/akka-actor/src/main/java/akka/dispatch/AbstractNodeQueue.java
+
+This product contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM,
+ which can be obtained at:
+
+ * LICENSE:
+ * license/LICENSE.jctools.txt (ASL2 License)
+ * HOMEPAGE:
+ * https://github.com/JCTools/JCTools
+
+
+This product optionally depends on 'JZlib', a re-implementation of zlib in
+pure Java, which can be obtained at:
+
+ * LICENSE:
+ * license/LICENSE.jzlib.txt (BSD style License)
+ * HOMEPAGE:
+ * http://www.jcraft.com/jzlib/
+
+This product optionally depends on 'Protocol Buffers', Google's data
+interchange format, which can be obtained at:
+
+ * LICENSE:
+ * license/LICENSE.protobuf.txt (New BSD License)
+ * HOMEPAGE:
+ * http://code.google.com/p/protobuf/
+
+This product optionally depends on 'Bouncy Castle Crypto APIs' to generate
+a temporary self-signed X.509 certificate when the JVM does not provide the
+equivalent functionality. It can be obtained at:
+
+ * LICENSE:
+ * license/LICENSE.bouncycastle.txt (MIT License)
+ * HOMEPAGE:
+ * http://www.bouncycastle.org/
+
+This product optionally depends on 'Snappy', a compression library produced
+by Google Inc, which can be obtained at:
+
+ * LICENSE:
+ * license/LICENSE.snappy.txt (New BSD License)
+ * HOMEPAGE:
+ * http://code.google.com/p/snappy/
+
+This product optionally depends on 'JBoss Marshalling', an alternative Java
+serialization API, which can be obtained at:
+
+ * LICENSE:
+ * license/LICENSE.jboss-marshalling.txt (GNU LGPL 2.1)
+ * HOMEPAGE:
+ * http://www.jboss.org/jbossmarshalling
+
+This product optionally depends on 'Caliper', Google's micro-
+benchmarking framework, which can be obtained at:
+
+ * LICENSE:
+ * license/LICENSE.caliper.txt (Apache License 2.0)
+ * HOMEPAGE:
+ * http://code.google.com/p/caliper/
+
+This product optionally depends on 'Apache Commons Logging', a logging
+framework, which can be obtained at:
+
+ * LICENSE:
+ * license/LICENSE.commons-logging.txt (Apache License 2.0)
+ * HOMEPAGE:
+ * http://commons.apache.org/logging/
+
+This product optionally depends on 'Apache Log4J', a logging framework, which
+can be obtained at:
+
+ * LICENSE:
+ * license/LICENSE.log4j.txt (Apache License 2.0)
+ * HOMEPAGE:
+ * http://logging.apache.org/log4j/
+
+Spring Framework 3.2.12.RELEASE
+Copyright (c) 2002-2014 Pivotal, Inc.
+
+This product is licensed to you under the Apache License, Version 2.0
+(the "License"). You may not use this product except in compliance with
+the License.
+
+This product may include a number of subcomponents with separate
+copyright notices and license terms. Your use of the source code for
+these subcomponents is subject to the terms and conditions of the
+subcomponent's license, as noted in the license.txt file.
+
+ ======================================================================
+ == NOTICE file corresponding to section 4 d of the Apache License, ==
+ == Version 2.0, for the Spring Framework distribution. ==
+ ======================================================================
+
+ This product includes software developed by
+ the Apache Software Foundation (http://www.apache.org).
+
+ The end-user documentation included with a redistribution, if any,
+ must include the following acknowledgement:
+
+ "This product includes software developed by the Spring Framework
+ Project (http://www.springframework.org)."
+
+ Alternately, this acknowledgement may appear in the software itself,
+ if and wherever such third-party acknowledgements normally appear.
+
+ The names "Spring", "Spring Framework", and "Spring GemFire" must
+ not be used to endorse or promote products derived from this
+ software without prior written permission. For written permission,
+ please contact enquiries@springsource.com.
+
+ ======================================================================
+ == NOTICE file corresponding to section 4 d of the Apache License, ==
+ == Version 2.0, for the Spring Framework distribution. ==
+ ======================================================================
+
+ This product includes software developed by
+ the Apache Software Foundation (http://www.apache.org).
+
+ The end-user documentation included with a redistribution, if any,
+ must include the following acknowledgement:
+
+ "This product includes software developed by the Spring Framework
+ Project (http://www.springframework.org)."
+
+ Alternately, this acknowledgement may appear in the software itself,
+ if and wherever such third-party acknowledgements normally appear.
+
+ The names "Spring", "Spring Framework", and "Spring Shell" must
+ not be used to endorse or promote products derived from this
+ software without prior written permission. For written permission,
+ please contact enquiries@springsource.com.
[42/50] [abbrv] incubator-geode git commit: Refactor dunit
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java
index b192a43..d995f35 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllDAckDUnitTest.java
@@ -38,6 +38,7 @@ import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.util.CacheWriterAdapter;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.distributed.DistributedSystem;
+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;
@@ -144,7 +145,7 @@ public class PutAllDAckDUnitTest extends DistributedTestCase {
obj = region.put(ob, str);
}
}catch(Exception ex){
- fail("Failed while region.put", ex);
+ Assert.fail("Failed while region.put", ex);
}
return obj;
}//end of putMethod
@@ -162,7 +163,7 @@ public class PutAllDAckDUnitTest extends DistributedTestCase {
region.putAll(m);
}catch(Exception ex){
- fail("Failed while region.putAll", ex);
+ Assert.fail("Failed while region.putAll", ex);
}
}//end of putAllMethod
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java
index 0aa77f0..a7274d5 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PutAllGlobalDUnitTest.java
@@ -44,6 +44,7 @@ import com.gemstone.gemfire.cache.util.CacheWriterAdapter;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.locks.DLockGrantor;
+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;
@@ -196,7 +197,7 @@ public class PutAllGlobalDUnitTest extends DistributedTestCase {
}
}
catch(Exception ex){
- fail("async2 threw unexpected exception", ex);
+ Assert.fail("async2 threw unexpected exception", ex);
//ex.printStackTrace();
}
}
@@ -205,12 +206,12 @@ public class PutAllGlobalDUnitTest extends DistributedTestCase {
DistributedTestCase.join(async2, 30 * 1000, getLogWriter());
if (async2.exceptionOccurred()) {
DistributedTestCase.join(async1, 30 * 1000, getLogWriter());
- fail("async2 failed", async2.getException());
+ Assert.fail("async2 failed", async2.getException());
}
DistributedTestCase.join(async1, 30 * 1000, getLogWriter());
if (async1.exceptionOccurred()) {
- fail("async1 failed", async1.getException());
+ Assert.fail("async1 failed", async1.getException());
}
}//end of test case1
@@ -231,7 +232,7 @@ public class PutAllGlobalDUnitTest extends DistributedTestCase {
}catch(Exception ex){
// ex.printStackTrace();
- fail("Failed while region.putAll", ex);
+ Assert.fail("Failed while region.putAll", ex);
}
}//end of putAllMethod
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java
index 8a58653..8467650 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java
@@ -98,6 +98,7 @@ import com.gemstone.gemfire.internal.cache.execute.data.OrderId;
import com.gemstone.gemfire.internal.cache.versions.VersionTag;
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;
@@ -3919,7 +3920,7 @@ protected static class ClientListener extends CacheListenerAdapter {
//Putting a string key causes this, the partition resolver
//doesn't handle it.
- addExpectedException("IllegalStateException");
+ IgnoredException.addExpectedException("IllegalStateException");
assertEquals(Status.STATUS_ACTIVE, tx.getStatus());
final CountDownLatch latch = new CountDownLatch(1);
Thread t = new Thread(new Runnable() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java
index 7ccdd6a..02ed1cd 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoveAllDAckDUnitTest.java
@@ -36,6 +36,7 @@ import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.util.CacheWriterAdapter;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.distributed.DistributedSystem;
+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;
@@ -139,7 +140,7 @@ public class RemoveAllDAckDUnitTest extends DistributedTestCase {
obj = region.put(ob, str);
}
}catch(Exception ex){
- fail("Failed while region.put", ex);
+ Assert.fail("Failed while region.put", ex);
}
return obj;
}//end of putMethod
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java
index a6023c7..502654b 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java
@@ -41,6 +41,7 @@ import com.gemstone.gemfire.internal.cache.execute.data.CustId;
import com.gemstone.gemfire.internal.cache.execute.data.OrderId;
import com.gemstone.gemfire.internal.cache.execute.data.ShipmentId;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -239,7 +240,7 @@ public class SingleHopStatsDUnitTest extends CacheTestCase{
server.start();
}
catch (IOException e) {
- fail("Failed to start server ", e);
+ Assert.fail("Failed to start server ", e);
}
if (colocation.equals("No_Colocation")) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SizingFlagDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SizingFlagDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SizingFlagDUnitTest.java
index 19170f2..90360ef 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SizingFlagDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SizingFlagDUnitTest.java
@@ -46,6 +46,7 @@ import com.gemstone.gemfire.distributed.DistributedMember;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+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;
@@ -358,7 +359,7 @@ public class SizingFlagDUnitTest extends CacheTestCase {
try {
region.getAttributesMutator().addCacheListener(new TestCacheListener());
} catch (Exception e) {
- fail("couldn't create index", e);
+ Assert.fail("couldn't create index", e);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java
index e3858fb..ac132ae 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java
@@ -398,7 +398,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
protected static Boolean verifyConnected() {
if (SystemFailure.getFailure() != null) {
- fail("System failure present!", SystemFailure.getFailure());
+ com.gemstone.gemfire.test.dunit.Assert.fail("System failure present!", SystemFailure.getFailure());
return Boolean.FALSE;
}
GemFireCacheImpl gfc = (GemFireCacheImpl)cache;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java
index 1c25dcc..003e867 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java
@@ -73,6 +73,7 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegionDataStore;
import com.gemstone.gemfire.internal.cache.control.InternalResourceManager.ResourceObserverAdapter;
import com.gemstone.gemfire.internal.cache.partitioned.BucketCountLoadProbe;
import com.gemstone.gemfire.internal.cache.partitioned.LoadProbe;
+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;
@@ -610,7 +611,7 @@ public class RebalanceOperationDUnitTest extends CacheTestCase {
try {
barrier.await(MAX_WAIT, TimeUnit.SECONDS);
} catch (Exception e) {
- fail("failed waiting for barrier", e);
+ Assert.fail("failed waiting for barrier", e);
}
observerCalled = true;
} else {
@@ -819,9 +820,9 @@ public class RebalanceOperationDUnitTest extends CacheTestCase {
.simulate()
.getResults(MAX_WAIT, TimeUnit.SECONDS);
} catch (InterruptedException e) {
- fail("Interrupted waiting on rebalance", e);
+ Assert.fail("Interrupted waiting on rebalance", e);
} catch (TimeoutException e) {
- fail("Timeout waiting on rebalance", e);
+ Assert.fail("Timeout waiting on rebalance", e);
}
} else {
try {
@@ -831,9 +832,9 @@ public class RebalanceOperationDUnitTest extends CacheTestCase {
.start()
.getResults(MAX_WAIT, TimeUnit.SECONDS);
} catch (InterruptedException e) {
- fail("Interrupted waiting on rebalance", e);
+ Assert.fail("Interrupted waiting on rebalance", e);
} catch (TimeoutException e) {
- fail("Timeout waiting on rebalance", e);
+ Assert.fail("Timeout waiting on rebalance", e);
}
}
assertEquals(Collections.emptySet(), manager.getRebalanceOperations());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
index 1e78da2..61fd881 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ClientServerFunctionExecutionDUnitTest.java
@@ -33,8 +33,10 @@ import com.gemstone.gemfire.cache.execute.ResultCollector;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.cache.functions.TestFunction;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
+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.IgnoredException;
import java.io.Serializable;
import java.util.ArrayList;
@@ -59,7 +61,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa
public void setUp() throws Exception {
super.setUp();
- addExpectedException("java.net.ConnectException");
+ IgnoredException.addExpectedException("java.net.ConnectException");
}
@@ -300,7 +302,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa
//The test code appears to trigger this because the first
//call to the function disconnects from the DS but does not call
//last result;
- addExpectedException("did not send last result");
+ IgnoredException.addExpectedException("did not send last result");
createScenario();
server1.invoke(
@@ -337,8 +339,8 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa
//The test code appears to trigger this because the first
//call to the function disconnects from the DS but does not call
//last result;
- addExpectedException("Socket Closed");
- addExpectedException("did not send last result");
+ IgnoredException.addExpectedException("Socket Closed");
+ IgnoredException.addExpectedException("did not send last result");
createScenario();
server1.invoke(
@@ -379,7 +381,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa
//The test code appears to trigger this because the first
//call to the function disconnects from the DS but does not call
//last result;
- addExpectedException("did not send last result");
+ IgnoredException.addExpectedException("did not send last result");
createScenario();
server1.invoke(
ClientServerFunctionExecutionDUnitTest.class,
@@ -678,7 +680,7 @@ public class ClientServerFunctionExecutionDUnitTest extends PRClientServerTestBa
assertTrue(((Integer)list.get(1)) == 5);
} catch (Exception ex) {
ex.printStackTrace();
- fail("This is not expected Exception", ex);
+ Assert.fail("This is not expected Exception", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java
index 81b9984..365470c 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/ColocationFailoverDUnitTest.java
@@ -39,6 +39,7 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.partitioned.RegionAdvisor;
import com.gemstone.gemfire.internal.logging.InternalLogWriter;
+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.SerializableRunnable;
@@ -374,7 +375,7 @@ public class ColocationFailoverDUnitTest extends DistributedTestCase {
assertNotNull(cache);
}
catch (Exception e) {
- fail("Failed while creating the cache", e);
+ Assert.fail("Failed while creating the cache", e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
index 286a5bd..20a8306 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
@@ -52,8 +52,10 @@ import com.gemstone.gemfire.internal.cache.functions.DistribuedRegionFunctionFun
import com.gemstone.gemfire.internal.cache.functions.DistributedRegionFunction;
import com.gemstone.gemfire.internal.cache.functions.TestFunction;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
+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.IgnoredException;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.VM;
@@ -314,7 +316,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends
"registerFunction", new Object[] { new Boolean(true), new Integer(5) });
// add expected exception to avoid suspect strings
- final ExpectedException ex = addExpectedException("I have been thrown");
+ final IgnoredException ex = IgnoredException.addExpectedException("I have been thrown");
replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class,
"executeFunctionFunctionInvocationTargetException");
ex.remove();
@@ -361,7 +363,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends
new Integer(0) });
// add expected exception to avoid suspect strings
- final ExpectedException ex = addExpectedException("I have been thrown");
+ final IgnoredException ex = IgnoredException.addExpectedException("I have been thrown");
replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class,
"executeFunctionFunctionInvocationTargetExceptionWithoutHA");
ex.remove();
@@ -401,7 +403,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends
"registerFunction", new Object[] { new Boolean(true), new Integer(5) });
// add expected exception to avoid suspect strings
- final ExpectedException ex = addExpectedException("I have been thrown");
+ final IgnoredException ex = IgnoredException.addExpectedException("I have been thrown");
executeFunctionFunctionInvocationTargetException();
ex.remove();
}
@@ -443,7 +445,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends
new Integer(0) });
// add expected exception to avoid suspect strings
- final ExpectedException ex = addExpectedException("I have been thrown");
+ final IgnoredException ex = IgnoredException.addExpectedException("I have been thrown");
executeFunctionFunctionInvocationTargetExceptionWithoutHA();
ex.remove();
}
@@ -533,7 +535,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends
DistributedTestCase.join(async[0], 50 * 1000, getLogWriter());
if (async[0].getException() != null) {
- fail("UnExpected Exception Occured : ", async[0].getException());
+ Assert.fail("UnExpected Exception Occured : ", async[0].getException());
}
List l = (List)async[0].getReturnValue();
assertEquals(5001, l.size());
@@ -634,9 +636,9 @@ public class DistributedRegionFunctionExecutionDUnitTest extends
createClientAndPopulateClientRegion(DataPolicy.EMPTY, port1, port2);
// add ExpectedException's to servers since client can connect to any
// one of those
- final ExpectedException expectedEx = addExpectedException(
+ final IgnoredException expectedEx = IgnoredException.addExpectedException(
"did not send last result", empty1);
- final ExpectedException expectedEx2 = addExpectedException(
+ final IgnoredException expectedEx2 = IgnoredException.addExpectedException(
"did not send last result", empty2);
try {
executeFunction_NoLastResult();
@@ -689,7 +691,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends
"closeCacheHA");
DistributedTestCase.join(async[0], 4 * 60 * 1000, getLogWriter());
if (async[0].getException() != null) {
- fail("UnExpected Exception Occured : ", async[0].getException());
+ Assert.fail("UnExpected Exception Occured : ", async[0].getException());
}
List l = (List)async[0].getReturnValue();
assertEquals(5001, l.size());
@@ -730,7 +732,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends
createClientAndPopulateClientRegion(DataPolicy.EMPTY, port1, port2);
// add expected exception
- final ExpectedException ex = addExpectedException(
+ final IgnoredException ex = IgnoredException.addExpectedException(
"DataPolicy.NORMAL is not supported");
try {
executeFunction();
@@ -846,7 +848,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends
createClientAndPopulateClientRegion(DataPolicy.EMPTY, port1, port2);
// add expected exception to avoid suspect strings
- final ExpectedException ex = addExpectedException("I have been thrown");
+ final IgnoredException ex = IgnoredException.addExpectedException("I have been thrown");
executeFunctionFunctionInvocationTargetException_ClientServer();
ex.remove();
}
@@ -897,7 +899,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends
createClientAndPopulateClientRegion(DataPolicy.EMPTY, port1, port2);
// add expected exception to avoid suspect strings
- final ExpectedException ex = addExpectedException("I have been thrown");
+ final IgnoredException ex = IgnoredException.addExpectedException("I have been thrown");
executeFunctionFunctionInvocationTargetException_ClientServer_WithoutHA();
ex.remove();
}
@@ -939,7 +941,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends
"registerFunction", new Object[] { new Boolean(true), new Integer(5) });
// add expected exception to avoid suspect strings
- final ExpectedException ex = addExpectedException("I have been thrown");
+ final IgnoredException ex = IgnoredException.addExpectedException("I have been thrown");
executeFunctionFunctionInvocationTargetException_ClientServer();
ex.remove();
}
@@ -989,7 +991,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends
new Integer(0) });
// add expected exception to avoid suspect strings
- final ExpectedException ex = addExpectedException("I have been thrown");
+ final IgnoredException ex = IgnoredException.addExpectedException("I have been thrown");
executeFunctionFunctionInvocationTargetException_ClientServer_WithoutHA();
ex.remove();
}
@@ -1079,7 +1081,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends
}
public void testFunctionWithNoResultThrowsException(){
- addExpectedException("RuntimeException");
+ IgnoredException.addExpectedException("RuntimeException");
replicate1.invoke(DistributedRegionFunctionExecutionDUnitTest.class,
"createCacheInVm");
replicate2.invoke(DistributedRegionFunctionExecutionDUnitTest.class,
@@ -1134,7 +1136,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends
catch (Exception e) {
getLogWriter().info("Exception Occured : " + e.getMessage());
e.printStackTrace();
- fail("Test failed", e);
+ Assert.fail("Test failed", e);
}
}
@@ -1314,7 +1316,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends
}
catch (Exception e) {
e.printStackTrace();
- fail("This is not expected Exception", e);
+ Assert.fail("This is not expected Exception", e);
}
}
@@ -1344,7 +1346,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends
}
catch (Exception e) {
e.printStackTrace();
- fail("This is not expected Exception", e);
+ Assert.fail("This is not expected Exception", e);
}
}
@@ -1459,7 +1461,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends
server.start();
}
catch (IOException e) {
- fail("Failed to start the Server", e);
+ Assert.fail("Failed to start the Server", e);
}
assertTrue(server.isRunning());
return new Integer(server.getPort());
@@ -1496,7 +1498,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends
FunctionService.registerFunction(function);
}
catch (Exception e) {
- fail(
+ Assert.fail(
"DistributedRegionFunctionExecutionDUnitTest#createCache() Failed while creating the cache",
e);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java
index 3c36a60..f695d0b 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java
@@ -52,6 +52,7 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegionTestHelper;
import com.gemstone.gemfire.internal.cache.functions.TestFunction;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
+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;
@@ -398,13 +399,13 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase{
server.start();
}
catch (IOException e) {
- fail("Failed to start the Server", e);
+ Assert.fail("Failed to start the Server", e);
}
assertTrue(server.isRunning());
return new Integer(server.getPort());
}
catch (Exception e) {
- fail(
+ Assert.fail(
"FunctionServiceStatsDUnitTest#createCache() Failed while creating the cache",
e);
throw e;
@@ -460,7 +461,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase{
return Boolean.TRUE;
}
catch (Exception e) {
- fail(
+ Assert.fail(
"FunctionServiceStatsDUnitTest#createCache() Failed while creating the cache",
e);
throw e;
@@ -517,12 +518,12 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase{
}
catch (FunctionException e) {
e.printStackTrace();
- fail("test failed due to", e);
+ Assert.fail("test failed due to", e);
throw e;
}
catch (Exception e) {
e.printStackTrace();
- fail("test failed due to", e);
+ Assert.fail("test failed due to", e);
throw e;
}
@@ -1028,12 +1029,12 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase{
}
catch (FunctionException e) {
e.printStackTrace();
- fail("test failed due to", e);
+ Assert.fail("test failed due to", e);
return Boolean.FALSE;
}
catch (Exception e) {
e.printStackTrace();
- fail("test failed due to", e);
+ Assert.fail("test failed due to", e);
return Boolean.FALSE;
}
@@ -1090,7 +1091,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase{
assertNotNull(ds);
}
catch (Exception e) {
- fail("Failed while creating the Distribued System", e);
+ Assert.fail("Failed while creating the Distribued System", e);
}
return Boolean.TRUE;
}
@@ -1149,7 +1150,7 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase{
catch (Exception e) {
getLogWriter().info("Exception Occured : " + e.getMessage());
e.printStackTrace();
- fail("Test failed", e);
+ Assert.fail("Test failed", e);
}
return Boolean.TRUE;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetDUnitTest.java
index 5dfb429..cb63a35 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetDUnitTest.java
@@ -44,6 +44,7 @@ import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.functions.LocalDataSetFunction;
+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;
@@ -204,7 +205,7 @@ public class LocalDataSetDUnitTest extends CacheTestCase {
}
catch (Exception e) {
e.printStackTrace();
- fail("Test failed due to ", e);
+ Assert.fail("Test failed due to ", e);
}
}
private void registerFunctions() {
@@ -249,7 +250,7 @@ public class LocalDataSetDUnitTest extends CacheTestCase {
assertNotNull(cache);
}
catch (Exception e) {
- fail("Failed while creating the cache", e);
+ Assert.fail("Failed while creating the cache", e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetIndexingDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetIndexingDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetIndexingDUnitTest.java
index 8b0d4ba..1d933e3 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetIndexingDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalDataSetIndexingDUnitTest.java
@@ -124,7 +124,7 @@ public class LocalDataSetIndexingDUnitTest extends CacheTestCase {
"/pr2 e2");
}
catch (Exception e) {
- fail("Test failed due to Exception in index creation ", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("Test failed due to Exception in index creation ", e);
}
}
};
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
index f58d349..7dd8c1c 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/LocalFunctionExecutionDUnitTest.java
@@ -34,6 +34,7 @@ import com.gemstone.gemfire.cache.execute.ResultCollector;
import com.gemstone.gemfire.distributed.DistributedMember;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.cache.functions.TestFunction;
+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.SerializableRunnable;
@@ -96,7 +97,7 @@ public class LocalFunctionExecutionDUnitTest extends DistributedTestCase{
assertNotNull(cache);
}
catch (Exception e) {
- fail("Failed while creating the cache", e);
+ Assert.fail("Failed while creating the cache", e);
}
}
@@ -144,7 +145,7 @@ public class LocalFunctionExecutionDUnitTest extends DistributedTestCase{
FunctionService.registerFunction(function1);
ResultCollector rc = FunctionService.onRegion(region).withArgs(Boolean.TRUE).execute(function1.getId());
rc.getResult();
- fail("Exception should occur",new Exception("Test Failed"));
+ Assert.fail("Exception should occur",new Exception("Test Failed"));
}
catch (Exception e) {
assertTrue(e.getMessage().contains("I have been thrown from TestFunction"));
@@ -158,7 +159,7 @@ public class LocalFunctionExecutionDUnitTest extends DistributedTestCase{
DistributedMember localmember = system.getDistributedMember();
ResultCollector rc = FunctionService.onMember(system, localmember).withArgs(Boolean.TRUE).execute(function1.getId());
rc.getResult();
- fail("Exception should occur",new Exception("Test Failed"));
+ Assert.fail("Exception should occur",new Exception("Test Failed"));
}
catch (Exception e) {
assertTrue(e.getMessage().contains("I have been thrown from TestFunction"));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
index 9508726..275dda9 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
@@ -48,6 +48,7 @@ import com.gemstone.gemfire.i18n.LogWriterI18n;
import com.gemstone.gemfire.internal.ClassBuilder;
import com.gemstone.gemfire.internal.cache.functions.TestFunction;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+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;
@@ -340,7 +341,7 @@ public class MemberFunctionExecutionDUnitTest extends CacheTestCase {
fail("Should have seen an exception");
} catch (Exception e) {
if(!(e.getCause() instanceof FunctionInvocationTargetException)) {
- fail("failed", e);
+ Assert.fail("failed", e);
}
}
@@ -396,7 +397,7 @@ public class MemberFunctionExecutionDUnitTest extends CacheTestCase {
catch (Exception e) {
getLogWriter().info("Exception Occured : "+ e.getMessage());
e.printStackTrace();
- fail("Test failed",e);
+ Assert.fail("Test failed",e);
}
}
/*
@@ -452,7 +453,7 @@ public class MemberFunctionExecutionDUnitTest extends CacheTestCase {
catch (Exception e) {
getLogWriter().info("Exception Occured : "+ e.getMessage());
e.printStackTrace();
- fail("Test failed",e);
+ Assert.fail("Test failed",e);
}
}
@@ -492,7 +493,7 @@ public class MemberFunctionExecutionDUnitTest extends CacheTestCase {
catch (Exception e) {
getLogWriter().info("Exception Occured : "+ e.getMessage());
e.printStackTrace();
- fail("Test failed",e);
+ Assert.fail("Test failed",e);
}
}
@@ -594,7 +595,7 @@ public class MemberFunctionExecutionDUnitTest extends CacheTestCase {
catch (Exception e) {
getLogWriter().info("Exception Occured : "+ e.getMessage());
e.printStackTrace();
- fail("Test failed",e);
+ Assert.fail("Test failed",e);
}
}
@@ -658,7 +659,7 @@ public class MemberFunctionExecutionDUnitTest extends CacheTestCase {
FunctionService.registerFunction(new TestFunction(true,TestFunction.TEST_FUNCTION_NO_LASTRESULT));
}
catch (Exception e) {
- fail("Failed while creating the Distribued System", e);
+ Assert.fail("Failed while creating the Distribued System", e);
}
return ds;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java
index b9f0dc2..d4a8826 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionExecutionDUnitTest.java
@@ -153,7 +153,7 @@ public class MultiRegionFunctionExecutionDUnitTest extends CacheTestCase {
assertNotNull(cache);
}
catch (Exception e) {
- fail("Failed while creating the cache", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("Failed while creating the cache", e);
}
}
@SuppressWarnings("unchecked")
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
index fd5b1a4..ec6126c 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
@@ -44,6 +44,7 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
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.SerializableCallable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -492,7 +493,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase {
//The test function deliberately throws a null pointer exception.
//which is logged.
- addExpectedException(NullPointerException.class.getSimpleName());
+ IgnoredException.addExpectedException(NullPointerException.class.getSimpleName());
initVM(vm0, "g0,mg", regionName, false);
initVM(vm1, "g1", regionName, false);
@@ -862,7 +863,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase {
ccf.set("log-level", getDUnitLogLevel());
ClientCache c = ccf.create();
- ExpectedException ex = addExpectedException("No member found");
+ IgnoredException ex = IgnoredException.addExpectedException("No member found");
try {
InternalFunctionService.onServer(c, "no such group").execute(new OnGroupsFunction()).getResult();
fail("expected exception not thrown");
@@ -942,7 +943,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase {
ccf.set("log-level", getDUnitLogLevel());
ClientCache c = ccf.create();
- ExpectedException expected = addExpectedException("No member found");
+ IgnoredException expected = IgnoredException.addExpectedException("No member found");
try {
InternalFunctionService.onServers(c, "no such group").execute(new OnGroupsFunction()).getResult();
fail("expected exception not thrown");
@@ -951,7 +952,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase {
expected.remove();
}
- addExpectedException("NullPointerException");
+ IgnoredException.addExpectedException("NullPointerException");
Execution e = InternalFunctionService.onServers(c, "mg");
ArrayList<String> args = new ArrayList<String>();
args.add("runtime");
@@ -1024,7 +1025,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase {
args.add("disconnect");
e = e.withArgs(args);
- addExpectedException("FunctionInvocationTargetException");
+ IgnoredException.addExpectedException("FunctionInvocationTargetException");
try {
e.execute(new OnGroupsExceptionFunction()).getResult();
fail("expected exception not thrown");
@@ -1073,7 +1074,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase {
args.add("disconnect");
args.add("g2");
e = e.withArgs(args);
- addExpectedException("FunctionInvocationTargetException");
+ IgnoredException.addExpectedException("FunctionInvocationTargetException");
try {
e.execute(new OnGroupsExceptionFunction()).getResult();
fail("expected exception not thrown");
@@ -1152,7 +1153,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase {
public void testNoAckGroupsFunction() {
//Workaround for #52005. This is a product bug
//that should be fixed
- addExpectedException("Cannot return any result");
+ IgnoredException.addExpectedException("Cannot return any result");
Host host = Host.getHost(0);
final VM server0 = host.getVM(0);
final VM server1 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
index 72780f1..b2594f6 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
@@ -56,8 +56,10 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.functions.TestFunction;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
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.IgnoredException;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServerTestBase {
@@ -211,7 +213,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
isByName = new Boolean(true);
toRegister = new Boolean(true);
- final ExpectedException ex = addExpectedException("did not send last result");
+ final IgnoredException ex = IgnoredException.addExpectedException("did not send last result");
client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class,
"serverSingleKeyExecution_NoLastResult", new Object[] { isByName,
toRegister });
@@ -522,7 +524,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
} catch (Exception ex) {
ex.printStackTrace();
getLogWriter().info("Exception : ", ex);
- fail("Test failed after the execute operation", ex);
+ Assert.fail("Test failed after the execute operation", ex);
}
}
@@ -872,7 +874,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
assertEquals(origVals, foundVals);
}catch(Exception e){
- fail("Test failed after the put operation", e);
+ Assert.fail("Test failed after the put operation", e);
}
}
@@ -994,7 +996,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
}
}catch(Exception e){
- fail("Test failed after the put operation", e);
+ Assert.fail("Test failed after the put operation", e);
}
}
@@ -1024,7 +1026,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
}catch (Exception ex) {
ex.printStackTrace();
getLogWriter().info("Exception : " , ex);
- fail("Test failed after the put operation",ex);
+ Assert.fail("Test failed after the put operation",ex);
}
}
@@ -1127,7 +1129,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
}
catch (Throwable e) {
e.printStackTrace();
- fail("This is not expected Exception", e);
+ Assert.fail("This is not expected Exception", e);
}
}
@@ -1163,7 +1165,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
.toLocalizedString("return any"))));
}
catch (Exception notexpected) {
- fail("Test failed during execute or sleeping", notexpected);
+ Assert.fail("Test failed during execute or sleeping", notexpected);
} finally {
cache.getLogger().info("<ExpectedException action=remove>" +
"FunctionException" +
@@ -1246,7 +1248,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
}catch (Exception ex) {
ex.printStackTrace();
getLogWriter().info("Exception : " , ex);
- fail("Test failed after the put operation",ex);
+ Assert.fail("Test failed after the put operation",ex);
}
}
@@ -1301,7 +1303,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
catch (Exception ex) {
ex.printStackTrace();
getLogWriter().info("Exception : ", ex);
- fail("Test failed after the put operation", ex);
+ Assert.fail("Test failed after the put operation", ex);
}
try {
@@ -1321,7 +1323,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
catch (Exception ex) {
ex.printStackTrace();
getLogWriter().info("Exception : ", ex);
- fail("Test failed after the put operation", ex);
+ Assert.fail("Test failed after the put operation", ex);
}
}
@@ -1383,7 +1385,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
}catch (Exception ex) {
ex.printStackTrace();
getLogWriter().info("Exception : " , ex);
- fail("Test failed after the put operation",ex);
+ Assert.fail("Test failed after the put operation",ex);
}
Region region2 = cache.getRegion(PartitionedRegionName+"2");
@@ -1454,7 +1456,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
}
catch (Exception ex) {
ex.printStackTrace();
- fail("This is not expected Exception", ex);
+ Assert.fail("This is not expected Exception", ex);
}
}
@@ -1557,7 +1559,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
}catch (Exception ex) {
ex.printStackTrace();
getLogWriter().info("Exception : " , ex);
- fail("Test failed after the put operation",ex);
+ Assert.fail("Test failed after the put operation",ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
index 5ee1472..50a6b6a 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
@@ -44,9 +44,11 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.cache.functions.TestFunction;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
+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;
@@ -64,10 +66,10 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends
@Override
public void setUp() throws Exception {
super.setUp();
- addExpectedException("Connection reset");
- addExpectedException("SocketTimeoutException");
- addExpectedException("ServerConnectivityException");
- addExpectedException("Socket Closed");
+ IgnoredException.addExpectedException("Connection reset");
+ IgnoredException.addExpectedException("SocketTimeoutException");
+ IgnoredException.addExpectedException("ServerConnectivityException");
+ IgnoredException.addExpectedException("Socket Closed");
}
@Override
@@ -90,7 +92,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends
*/
public void testServerFailoverWithTwoServerAliveHA()
throws InterruptedException {
- addExpectedException("FunctionInvocationTargetException");
+ IgnoredException.addExpectedException("FunctionInvocationTargetException");
ArrayList commonAttributes = createCommonServerAttributes(
"TestPartitionedRegion", null, 1, 13, null);
createClientServerScenarion(commonAttributes, 20, 20, 20);
@@ -118,7 +120,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends
new Integer(2) });
DistributedTestCase.join(async[0], 6 * 60 * 1000, getLogWriter());
if (async[0].getException() != null) {
- fail("UnExpected Exception Occured : ", async[0].getException());
+ Assert.fail("UnExpected Exception Occured : ", async[0].getException());
}
List l = (List)async[0].getReturnValue();
assertEquals(2, l.size());
@@ -130,7 +132,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends
*/
public void testServerCacheClosedFailoverWithTwoServerAliveHA()
throws InterruptedException {
- addExpectedException("FunctionInvocationTargetException");
+ IgnoredException.addExpectedException("FunctionInvocationTargetException");
ArrayList commonAttributes = createCommonServerAttributes(
"TestPartitionedRegion", null, 1, 13, null);
createClientServerScenarion(commonAttributes, 20, 20, 20);
@@ -158,7 +160,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends
new Integer(2) });
DistributedTestCase.join(async[0], 5 * 60 * 1000, getLogWriter());
if (async[0].getException() != null) {
- fail("UnExpected Exception Occured : ", async[0].getException());
+ Assert.fail("UnExpected Exception Occured : ", async[0].getException());
}
List l = (List)async[0].getReturnValue();
assertEquals(2, l.size());
@@ -180,7 +182,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends
public void testOnRegionFailoverWithTwoServerDownHA()
throws InterruptedException {
- addExpectedException("FunctionInvocationTargetException");
+ IgnoredException.addExpectedException("FunctionInvocationTargetException");
createScenario();
server1.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class,
@@ -211,7 +213,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends
// retry attempts is 2
public void testOnRegionFailoverWithOneServerDownHA()
throws InterruptedException {
- addExpectedException("FunctionInvocationTargetException");
+ IgnoredException.addExpectedException("FunctionInvocationTargetException");
createScenario();
server1.invokeAsync(PRClientServerRegionFunctionExecutionDUnitTest.class,
@@ -245,7 +247,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends
*/
public void testOnRegionFailoverNonHA() throws InterruptedException { // See #47489 before enabling it
createScenario();
- addExpectedException("FunctionInvocationTargetException");
+ IgnoredException.addExpectedException("FunctionInvocationTargetException");
server1.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class,
"createReplicatedRegion");
@@ -341,7 +343,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends
public void testServerBucketMovedException() throws InterruptedException {
- addExpectedException("BucketMovedException");
+ IgnoredException.addExpectedException("BucketMovedException");
final Host host = Host.getHost(0);
VM server1 = host.getVM(0);
VM server2 = host.getVM(1);
@@ -400,7 +402,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends
public void testServerBucketMovedException_LocalServer()
throws InterruptedException {
- addExpectedException("BucketMovedException");
+ IgnoredException.addExpectedException("BucketMovedException");
final Host host = Host.getHost(0);
VM server1 = host.getVM(0);
@@ -467,7 +469,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends
locator = Locator.startLocatorAndDS(locatorPort, logFile, null, props);
}
catch (IOException e) {
- fail("Unable to start locator ", e);
+ Assert.fail("Unable to start locator ", e);
}
}
@@ -492,7 +494,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends
server.start();
}
catch (IOException e) {
- fail("Failed to start server ", e);
+ Assert.fail("Failed to start server ", e);
}
PartitionAttributesFactory paf = new PartitionAttributesFactory();
if (isAccessor) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
index 0344a55..9091155 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java
@@ -47,8 +47,10 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.functions.TestFunction;
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.IgnoredException;
public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends
PRClientServerTestBase {
@@ -329,7 +331,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends
*/
public void testServerFailoverWithTwoServerAliveHA()
throws InterruptedException {
- addExpectedException("FunctionInvocationTargetException");
+ IgnoredException.addExpectedException("FunctionInvocationTargetException");
ArrayList commonAttributes = createCommonServerAttributes(
"TestPartitionedRegion", null, 1, 13, null);
createClientServerScenarion(commonAttributes, 20, 20, 20);
@@ -364,7 +366,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends
new Integer(2) });
DistributedTestCase.join(async[0], 6 * 60 * 1000, getLogWriter());
if (async[0].getException() != null) {
- fail("UnExpected Exception Occured : ", async[0].getException());
+ Assert.fail("UnExpected Exception Occured : ", async[0].getException());
}
List l = (List)async[0].getReturnValue();
@@ -377,7 +379,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends
*/
public void testServerCacheClosedFailoverWithTwoServerAliveHA()
throws InterruptedException {
- addExpectedException("FunctionInvocationTargetException");
+ IgnoredException.addExpectedException("FunctionInvocationTargetException");
ArrayList commonAttributes = createCommonServerAttributes(
"TestPartitionedRegion", null, 1, 13, null);
createClientServerScenarion(commonAttributes, 20, 20, 20);
@@ -412,7 +414,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends
new Integer(2) });
DistributedTestCase.join(async[0], 5 * 60 * 1000, getLogWriter());
if (async[0].getException() != null) {
- fail("UnExpected Exception Occured : ", async[0].getException());
+ Assert.fail("UnExpected Exception Occured : ", async[0].getException());
}
List l = (List)async[0].getReturnValue();
assertEquals(2, l.size());
@@ -692,7 +694,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends
}
catch (Exception e) {
- fail("Test failed after the put operation", e);
+ Assert.fail("Test failed after the put operation", e);
}
}
@@ -722,7 +724,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends
}
catch (Exception e) {
- fail("Test failed after the put operation", e);
+ Assert.fail("Test failed after the put operation", e);
}
}
@@ -752,7 +754,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends
}
catch (Exception e) {
- fail("Test failed after the put operation", e);
+ Assert.fail("Test failed after the put operation", e);
}
}
@@ -847,7 +849,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends
}
catch (Exception e) {
- fail("Test failed after the put operation", e);
+ Assert.fail("Test failed after the put operation", e);
}
}
@@ -885,7 +887,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends
}
catch (Exception e) {
- fail("Test failed after the function execution", e);
+ Assert.fail("Test failed after the function execution", e);
}
}
@@ -917,7 +919,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends
catch (Exception ex) {
ex.printStackTrace();
getLogWriter().info("Exception : ", ex);
- fail("Test failed after the put operation", ex);
+ Assert.fail("Test failed after the put operation", ex);
}
}
@@ -1018,7 +1020,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends
}
catch (Throwable e) {
e.printStackTrace();
- fail("This is not expected Exception", e);
+ Assert.fail("This is not expected Exception", e);
}
}
@@ -1059,7 +1061,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends
.toLocalizedString("return any"))));
}
catch (Exception notexpected) {
- fail("Test failed during execute or sleeping", notexpected);
+ Assert.fail("Test failed during execute or sleeping", notexpected);
}
finally {
cache.getLogger().info(
@@ -1115,7 +1117,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends
catch (Exception ex) {
ex.printStackTrace();
getLogWriter().info("Exception : ", ex);
- fail("Test failed after the put operation", ex);
+ Assert.fail("Test failed after the put operation", ex);
}
}
@@ -1141,7 +1143,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends
}
catch (Exception ex) {
ex.printStackTrace();
- fail("This is not expected Exception", ex);
+ Assert.fail("This is not expected Exception", ex);
}
}
@@ -1241,7 +1243,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends
catch (Exception ex) {
ex.printStackTrace();
getLogWriter().info("Exception : ", ex);
- fail("Test failed after the put operation", ex);
+ Assert.fail("Test failed after the put operation", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
index cf97932..0765533 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java
@@ -47,8 +47,10 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.functions.TestFunction;
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.IgnoredException;
public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest extends
PRClientServerTestBase {
@@ -286,11 +288,11 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e
*/
public void testServerFailoverWithTwoServerAliveHA()
throws InterruptedException {
- addExpectedException("FunctionInvocationTargetException");
- addExpectedException("Connection reset");
- addExpectedException("SocketTimeoutException");
- addExpectedException("ServerConnectivityException");
- addExpectedException("Socket Closed");
+ IgnoredException.addExpectedException("FunctionInvocationTargetException");
+ IgnoredException.addExpectedException("Connection reset");
+ IgnoredException.addExpectedException("SocketTimeoutException");
+ IgnoredException.addExpectedException("ServerConnectivityException");
+ IgnoredException.addExpectedException("Socket Closed");
ArrayList commonAttributes = createCommonServerAttributes(
"TestPartitionedRegion", null, 1, 13, null);
createClientServerScenarion(commonAttributes, 20, 20, 20);
@@ -325,7 +327,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e
new Integer(2) });
DistributedTestCase.join(async[0], 6 * 60 * 1000, getLogWriter());
if (async[0].getException() != null) {
- fail("UnExpected Exception Occured : ", async[0].getException());
+ Assert.fail("UnExpected Exception Occured : ", async[0].getException());
}
List l = (List)async[0].getReturnValue();
@@ -338,11 +340,11 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e
*/
public void testServerCacheClosedFailoverWithTwoServerAliveHA()
throws InterruptedException {
- addExpectedException("FunctionInvocationTargetException");
- addExpectedException("Connection reset");
- addExpectedException("SocketTimeoutException");
- addExpectedException("ServerConnectivityException");
- addExpectedException("Socket Closed");
+ IgnoredException.addExpectedException("FunctionInvocationTargetException");
+ IgnoredException.addExpectedException("Connection reset");
+ IgnoredException.addExpectedException("SocketTimeoutException");
+ IgnoredException.addExpectedException("ServerConnectivityException");
+ IgnoredException.addExpectedException("Socket Closed");
ArrayList commonAttributes = createCommonServerAttributes(
"TestPartitionedRegion", null, 1, 13, null);
createClientServerScenarion(commonAttributes, 20, 20, 20);
@@ -377,7 +379,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e
new Integer(2) });
DistributedTestCase.join(async[0], 5 * 60 * 1000, getLogWriter());
if (async[0].getException() != null) {
- fail("UnExpected Exception Occured : ", async[0].getException());
+ Assert.fail("UnExpected Exception Occured : ", async[0].getException());
}
List l = (List)async[0].getReturnValue();
assertEquals(2, l.size());
@@ -651,7 +653,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e
}
catch (Exception e) {
- fail("Test failed after the put operation", e);
+ Assert.fail("Test failed after the put operation", e);
}
}
@@ -681,7 +683,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e
}
catch (Exception e) {
- fail("Test failed after the put operation", e);
+ Assert.fail("Test failed after the put operation", e);
}
}
@@ -711,7 +713,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e
}
catch (Exception e) {
- fail("Test failed after the put operation", e);
+ Assert.fail("Test failed after the put operation", e);
}
}
@@ -806,7 +808,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e
}
catch (Exception e) {
- fail("Test failed after the put operation", e);
+ Assert.fail("Test failed after the put operation", e);
}
}
@@ -843,7 +845,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e
}
catch (Exception e) {
- fail("Test failed after the function execution", e);
+ Assert.fail("Test failed after the function execution", e);
}
}
@@ -875,7 +877,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e
catch (Exception ex) {
ex.printStackTrace();
getLogWriter().info("Exception : ", ex);
- fail("Test failed after the put operation", ex);
+ Assert.fail("Test failed after the put operation", ex);
}
}
@@ -976,7 +978,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e
}
catch (Throwable e) {
e.printStackTrace();
- fail("This is not expected Exception", e);
+ Assert.fail("This is not expected Exception", e);
}
}
@@ -1017,7 +1019,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e
.toLocalizedString("return any"))));
}
catch (Exception notexpected) {
- fail("Test failed during execute or sleeping", notexpected);
+ Assert.fail("Test failed during execute or sleeping", notexpected);
}
finally {
cache.getLogger().info(
@@ -1073,7 +1075,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e
catch (Exception ex) {
ex.printStackTrace();
getLogWriter().info("Exception : ", ex);
- fail("Test failed after the put operation", ex);
+ Assert.fail("Test failed after the put operation", ex);
}
}
@@ -1099,7 +1101,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e
}
catch (Exception ex) {
ex.printStackTrace();
- fail("This is not expected Exception", ex);
+ Assert.fail("This is not expected Exception", ex);
}
}
@@ -1199,7 +1201,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e
catch (Exception ex) {
ex.printStackTrace();
getLogWriter().info("Exception : ", ex);
- fail("Test failed after the put operation", ex);
+ Assert.fail("Test failed after the put operation", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
index d6f2fd8..bb0b184 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java
@@ -47,8 +47,10 @@ import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.functions.TestFunction;
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.IgnoredException;
public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest extends PRClientServerTestBase {
private static final String TEST_FUNCTION7 = TestFunction.TEST_FUNCTION7;
@@ -64,8 +66,8 @@ import com.gemstone.gemfire.test.dunit.DistributedTestCase;
@Override
public void setUp() throws Exception {
//Workaround for bug #52004
- addExpectedException("InternalFunctionInvocationTargetException");
- addExpectedException("Connection refused");
+ IgnoredException.addExpectedException("InternalFunctionInvocationTargetException");
+ IgnoredException.addExpectedException("Connection refused");
super.setUp();
}
@@ -132,7 +134,7 @@ import com.gemstone.gemfire.test.dunit.DistributedTestCase;
registerFunctionAtServer(function);
isByName = Boolean.TRUE;
// add expected exception for server going down after wait
- final ExpectedException expectedEx = addExpectedException(
+ final IgnoredException expectedEx = IgnoredException.addExpectedException(
DistributedSystemDisconnectedException.class.getName(), server1);
try {
client.invoke(
@@ -252,8 +254,8 @@ import com.gemstone.gemfire.test.dunit.DistributedTestCase;
* After 5th attempt function will send Boolean as last result.
*/
public void testserverMultiKeyExecution_FunctionInvocationTargetException() {
- addExpectedException("FunctionException: IOException while sending");
- addExpectedException("java.net.SocketException: Software caused connection abort");
+ IgnoredException.addExpectedException("FunctionException: IOException while sending");
+ IgnoredException.addExpectedException("java.net.SocketException: Software caused connection abort");
createScenario();
client.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class,
"serverMultiKeyExecution_FunctionInvocationTargetException");
@@ -264,7 +266,7 @@ import com.gemstone.gemfire.test.dunit.DistributedTestCase;
* object and using the name of the function
*/
public void testserverMultiKeyExecutionNoResult_byName(){
- addExpectedException("Cannot send result");
+ IgnoredException.addExpectedException("Cannot send result");
createScenario();
Function function = new TestFunction(false,TEST_FUNCTION7);
registerFunctionAtServer(function);
@@ -350,7 +352,7 @@ import com.gemstone.gemfire.test.dunit.DistributedTestCase;
new Integer(2) });
DistributedTestCase.join(async[0], 6 * 60 * 1000, getLogWriter());
if (async[0].getException() != null) {
- fail("UnExpected Exception Occured : ", async[0].getException());
+ Assert.fail("UnExpected Exception Occured : ", async[0].getException());
}
List l = (List)async[0].getReturnValue();
@@ -379,7 +381,7 @@ import com.gemstone.gemfire.test.dunit.DistributedTestCase;
client.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, "verifyDeadAndLiveServers",new Object[]{new Integer(1),new Integer(2)});
DistributedTestCase.join(async[0], 5 * 60 * 1000, getLogWriter());
if(async[0].getException() != null){
- fail("UnExpected Exception Occured : ", async[0].getException());
+ Assert.fail("UnExpected Exception Occured : ", async[0].getException());
}
List l = (List)async[0].getReturnValue();
assertEquals(2, l.size());
@@ -644,7 +646,7 @@ import com.gemstone.gemfire.test.dunit.DistributedTestCase;
assertEquals(origVals, foundVals);
}catch(Exception e){
- fail("Test failed after the put operation", e);
+ Assert.fail("Test failed after the put operation", e);
}
}
@@ -674,7 +676,7 @@ import com.gemstone.gemfire.test.dunit.DistributedTestCase;
assertTrue(secondResultMap.equals(origVals));
}catch(Exception e){
- fail("Test failed after the put operation", e);
+ Assert.fail("Test failed after the put operation", e);
}
}
@@ -703,7 +705,7 @@ import com.gemstone.gemfire.test.dunit.DistributedTestCase;
assertTrue(secondResultMap.equals(origVals));
}catch(Exception e){
- fail("Test failed after the put operation", e);
+ Assert.fail("Test failed after the put operation", e);
}
}
@@ -797,7 +799,7 @@ import com.gemstone.gemfire.test.dunit.DistributedTestCase;
assertEquals(origVals, foundVals);
}catch(Exception e){
- fail("Test failed after the put operation", e);
+ Assert.fail("Test failed after the put operation", e);
}
}
@@ -832,7 +834,7 @@ import com.gemstone.gemfire.test.dunit.DistributedTestCase;
}
}catch(Exception e){
- fail("Test failed after the function execution", e);
+ Assert.fail("Test failed after the function execution", e);
}
}
@@ -862,7 +864,7 @@ import com.gemstone.gemfire.test.dunit.DistributedTestCase;
}catch (Exception ex) {
ex.printStackTrace();
getLogWriter().info("Exception : " , ex);
- fail("Test failed after the put operation",ex);
+ Assert.fail("Test failed after the put operation",ex);
}
}
@@ -965,7 +967,7 @@ import com.gemstone.gemfire.test.dunit.DistributedTestCase;
}
catch (Throwable e) {
e.printStackTrace();
- fail("This is not expected Exception", e);
+ Assert.fail("This is not expected Exception", e);
}
}
@@ -1003,7 +1005,7 @@ import com.gemstone.gemfire.test.dunit.DistributedTestCase;
.toLocalizedString("return any"))));
}
catch (Exception notexpected) {
- fail("Test failed during execute or sleeping", notexpected);
+ Assert.fail("Test failed during execute or sleeping", notexpected);
} finally {
cache.getLogger().info("<ExpectedException action=remove>" +
"FunctionException" +
@@ -1057,7 +1059,7 @@ import com.gemstone.gemfire.test.dunit.DistributedTestCase;
}catch (Exception ex) {
ex.printStackTrace();
getLogWriter().info("Exception : " , ex);
- fail("Test failed after the put operation",ex);
+ Assert.fail("Test failed after the put operation",ex);
}
}
@@ -1083,7 +1085,7 @@ import com.gemstone.gemfire.test.dunit.DistributedTestCase;
}
catch (Exception ex) {
ex.printStackTrace();
- fail("This is not expected Exception", ex);
+ Assert.fail("This is not expected Exception", ex);
}
}
@@ -1186,7 +1188,7 @@ import com.gemstone.gemfire.test.dunit.DistributedTestCase;
}catch (Exception ex) {
ex.printStackTrace();
getLogWriter().info("Exception : " , ex);
- fail("Test failed after the put operation",ex);
+ Assert.fail("Test failed after the put operation",ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
index 7026ead..739deb5 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
@@ -51,6 +51,7 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.functions.TestFunction;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
+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.SerializableRunnable;
@@ -151,7 +152,7 @@ public class PRClientServerTestBase extends CacheTestCase {
server1.start();
}
catch (IOException e) {
- fail("Failed to start the Server", e);
+ Assert.fail("Failed to start the Server", e);
}
assertTrue(server1.isRunning());
@@ -183,7 +184,7 @@ public class PRClientServerTestBase extends CacheTestCase {
server1.start();
}
catch (IOException e) {
- fail("Failed to start the Server", e);
+ Assert.fail("Failed to start the Server", e);
}
assertTrue(server1.isRunning());
@@ -216,7 +217,7 @@ public class PRClientServerTestBase extends CacheTestCase {
server1.start();
}
catch (IOException e) {
- fail("Failed to start the Server", e);
+ Assert.fail("Failed to start the Server", e);
}
assertTrue(server1.isRunning());
@@ -231,7 +232,7 @@ public class PRClientServerTestBase extends CacheTestCase {
server1.start();
}
catch (IOException e) {
- fail("Failed to start the Server", e);
+ Assert.fail("Failed to start the Server", e);
}
assertTrue(server1.isRunning());
@@ -254,7 +255,7 @@ public class PRClientServerTestBase extends CacheTestCase {
server1.start();
}
catch (IOException e) {
- fail("Failed to start the Server", e);
+ Assert.fail("Failed to start the Server", e);
}
assertTrue(server1.isRunning());
@@ -675,7 +676,7 @@ public class PRClientServerTestBase extends CacheTestCase {
assertNotNull(cache);
}
catch (Exception e) {
- fail("Failed while creating the cache", e);
+ Assert.fail("Failed while creating the cache", e);
}
}
@@ -798,7 +799,7 @@ public class PRClientServerTestBase extends CacheTestCase {
}catch(Exception e){
- fail("Test failed ", e);
+ Assert.fail("Test failed ", e);
}
}
@@ -839,7 +840,7 @@ public class PRClientServerTestBase extends CacheTestCase {
}
assertTrue(expectedBucketSet.isEmpty());
}catch(Exception e){
- fail("Test failed ", e);
+ Assert.fail("Test failed ", e);
}
[47/50] [abbrv] incubator-geode git commit: Refactor dunit
Posted by kl...@apache.org.
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);
}
}
}
[10/50] [abbrv] incubator-geode git commit: Fixed typo while
comparing two network address.
Posted by kl...@apache.org.
Fixed typo while comparing two network address.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8a8571f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8a8571f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8a8571f4
Branch: refs/heads/feature/GEODE-773-2
Commit: 8a8571f43e4dbefa02d00e4d57a8f7965ed4fa09
Parents: 3bd930f
Author: Hitesh Khamesra <hk...@pivotal.io>
Authored: Wed Jan 27 10:07:01 2016 -0800
Committer: Hitesh Khamesra <hk...@pivotal.io>
Committed: Wed Jan 27 15:52:56 2016 -0800
----------------------------------------------------------------------
.../gemfire/cache/client/internal/AutoConnectionSourceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8a8571f4/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceImpl.java
index 1098fbe..6fe1c6b 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceImpl.java
@@ -75,7 +75,7 @@ public class AutoConnectionSourceImpl implements ConnectionSource {
return 0;
}
- int result = o1.getAddress().getCanonicalHostName().compareTo(o1.getAddress().getCanonicalHostName());
+ int result = o1.getAddress().getCanonicalHostName().compareTo(o2.getAddress().getCanonicalHostName());
if(result != 0) {
return result;
}
[15/50] [abbrv] incubator-geode git commit: GEODE-873: Allowing for
possible retry in testParallelPregationHA
Posted by kl...@apache.org.
GEODE-873: Allowing for possible retry in testParallelPregationHA
It's possible a put could be retried due to the member shutdown in this
test. If there is a retry, the stats may get incremented by one more
event.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/441c29cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/441c29cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/441c29cd
Branch: refs/heads/feature/GEODE-773-2
Commit: 441c29cdb1df3a29b75dee6d1b99b6506cb80cde
Parents: 2260630
Author: Dan Smith <up...@apache.org>
Authored: Wed Jan 27 17:25:30 2016 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Thu Jan 28 09:38:00 2016 -0800
----------------------------------------------------------------------
.../cache/wan/parallel/ParallelWANStatsDUnitTest.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/441c29cd/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
index 4da0868..529e378 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
@@ -306,7 +306,7 @@ public class ParallelWANStatsDUnitTest extends WANTestBase{
vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {100, 1000, 1000 });
vm3.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {100, 1000, 1000 });
}
-
+
public void testParallelPropagationHA() throws Exception {
Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
"createFirstLocatorWithDSId", new Object[] { 1 });
@@ -365,8 +365,11 @@ public class ParallelWANStatsDUnitTest extends WANTestBase{
WANTestBase.class, "getSenderStats", new Object[] { "ln", 0});
assertEquals(0, v5List.get(0) + v6List.get(0) + v7List.get(0) ); //queue size
- assertEquals(30000, v5List.get(1) + v6List.get(1) + v7List.get(1)); //eventsReceived
- assertEquals(30000, v5List.get(2) + v6List.get(2) + v7List.get(2)); //events queued
+ int receivedEvents = v5List.get(1) + v6List.get(1) + v7List.get(1);
+ //We may see a single retried event on all members due to the kill
+ assertTrue("Received " + receivedEvents, 30000 <= receivedEvents && 30003 >= receivedEvents); //eventsReceived
+ int queuedEvents = v5List.get(2) + v6List.get(2) + v7List.get(2);
+ assertTrue("Queued " + queuedEvents, 30000 <= queuedEvents && 30003 >= queuedEvents); //eventsQueued
//assertTrue(10000 <= v5List.get(3) + v6List.get(3) + v7List.get(3)); //events distributed : its quite possible that vm4 has distributed some of the events
//assertTrue(v5List.get(4) + v6List.get(4) + v7List.get(4) > 1000); //batches distributed : its quite possible that vm4 has distributed some of the batches.
assertEquals(0, v5List.get(5) + v6List.get(5) + v7List.get(5)); //batches redistributed
[07/50] [abbrv] incubator-geode git commit: GEODE-852: do not rename
the GemFireVersion.properties file
Posted by kl...@apache.org.
GEODE-852: do not rename the GemFireVersion.properties file
* closes #80 (committed by klund)
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/49a984c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/49a984c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/49a984c2
Branch: refs/heads/feature/GEODE-773-2
Commit: 49a984c23918eabfd6f573aac0b66c51e731490e
Parents: 4e211e2
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Wed Jan 27 09:18:35 2016 -0800
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Wed Jan 27 10:12:40 2016 -0800
----------------------------------------------------------------------
gemfire-pulse/build.gradle | 55 +++-----------------
.../pulse/internal/data/PulseConstants.java | 4 +-
.../gemfire/tools/pulse/tests/PulseTest.java | 32 +++++-------
3 files changed, 22 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/49a984c2/gemfire-pulse/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-pulse/build.gradle b/gemfire-pulse/build.gradle
index 4c1135d..78043cd 100755
--- a/gemfire-pulse/build.gradle
+++ b/gemfire-pulse/build.gradle
@@ -78,60 +78,17 @@ def generatedResources = "$buildDir/generated-resources/main"
sourceSets {
main {
- output.dir(generatedResources, builtBy: 'createPulsePropFile')
+ output.dir(generatedResources, builtBy: 'copyGemFireVersionFile')
}
}
-// Creates the version properties file and writes it to the resources dir
-task createPulsePropFile {
- description 'Creates a new Pule properties file with build/ version information'
- def propertiesFile = file(generatedResources + "/pulseversion.properties");
- outputs.file propertiesFile
- inputs.dir compileJava.destinationDir
-
- doLast {
- try {
- def grgit = org.ajoberstar.grgit.Grgit.open()
- ext.branch = grgit.branch.getCurrent().name
- ext.commitId = grgit.head().id
- ext.sourceDate = grgit.head().getDate().format('yyyy-MM-dd HH:mm:ss Z')
- grgit.close()
- } catch (Exception e) {
- logger.warn('***** Unable to find Git workspace. Using default version information *****')
- ext.branch = 'UNKNOWN'
- ext.commitId = 'UNKNOWN'
- ext.sourceDate = 'UNKNOWN'
- }
- // Build machine & java information - for screen output only
- ext.osArch = System.getProperty('os.arch')
- ext.osName = System.getProperty('os.name')
- ext.osVersion = System.getProperty('os.version')
- ext.jdkVersion = System.getProperty('java.version')
-
- ext.buildDate = new Date().format('yyyy-MM-dd HH:mm:ss Z')
- ext.buildNumber = new Date().format('MMddyy')
-
- def props = [
- "pulse.version" : version,
- "Build-Id" : ext.buildNumber,
- "Build-Date" : ext.buildDate,
- "Source-Date" : ext.sourceDate,
- "Source-Revision" : ext.commitId,
- "Source-Repository" : ext.branch
- ] as Properties
-
- propertiesFile.getParentFile().mkdirs();
- new FileOutputStream(propertiesFile).withStream { fos ->
- props.store(fos, '')
- }
- }
+task copyGemFireVersionFile(type: Copy) {
+ from project(':gemfire-core').buildDir.absolutePath + "/generated-resources/main/com/gemstone/gemfire/internal/GemFireVersion.properties"
+ into generatedResources
}
jar {
from sourceSets.main.output
- doFirst {
- project.createPulsePropFile
- }
}
eclipse.classpath.file {
@@ -150,9 +107,9 @@ artifacts {
archives war
}
-def pulseWarFile = "gemfire-pulse-"+version+".war"
-
war {
classpath configurations.runtime
classpath project(':gemfire-core').webJar.archivePath
}
+
+uiTest.dependsOn war
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/49a984c2/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/PulseConstants.java
----------------------------------------------------------------------
diff --git a/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/PulseConstants.java b/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/PulseConstants.java
index 9c22a03..9c5732e 100644
--- a/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/PulseConstants.java
+++ b/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/PulseConstants.java
@@ -37,8 +37,8 @@ public class PulseConstants {
public static final String APPLICATION_COUNTRY = "US";
// Pulse version details properties from properties file
- public static final String PULSE_VERSION_PROPERTIES_FILE = "pulseversion.properties";
- public static final String PROPERTY_PULSE_VERSION = "pulse.version";
+ public static final String PULSE_VERSION_PROPERTIES_FILE = "GemFireVersion.properties";
+ public static final String PROPERTY_PULSE_VERSION = "Product-Version";
public static final String PROPERTY_BUILD_ID = "Build-Id";
public static final String PROPERTY_BUILD_DATE = "Build-Date";
public static final String PROPERTY_SOURCE_DATE = "Source-Date";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/49a984c2/gemfire-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTest.java
----------------------------------------------------------------------
diff --git a/gemfire-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTest.java b/gemfire-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTest.java
index d30c14c..ec06085 100644
--- a/gemfire-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTest.java
+++ b/gemfire-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTest.java
@@ -18,23 +18,10 @@
*/
package com.vmware.gemfire.tools.pulse.tests;
-import java.io.*;
-import java.text.DecimalFormat;
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
-
-import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import com.gemstone.gemfire.test.junit.categories.UITest;
-import com.gemstone.gemfire.test.junit.categories.UnitTest;
import junit.framework.Assert;
-
import org.apache.catalina.startup.Tomcat;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.FixMethodOrder;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.*;
import org.junit.experimental.categories.Category;
import org.junit.runners.MethodSorters;
import org.openqa.selenium.By;
@@ -47,6 +34,15 @@ import org.openqa.selenium.support.ui.ExpectedCondition;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.DecimalFormat;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
@Category(UITest.class)
@FixMethodOrder(MethodSorters.JVM)
public class PulseTest {
@@ -181,13 +177,13 @@ public class PulseTest {
String warPath = null;
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
InputStream inputStream = classLoader
- .getResourceAsStream("pulseversion.properties");
+ .getResourceAsStream("GemFireVersion.properties");
Properties properties = new Properties();
properties.load(inputStream);
- String version = properties.getProperty("pulse.version");
+ String version = properties.getProperty("Product-Version");
warPath = "gemfire-pulse-"+version+".war";
- String propFilePath = classLoader.getResource("pulseversion.properties").getPath();
- warPath = propFilePath.substring(0, propFilePath.indexOf("resources"))+"libs/"+warPath;
+ String propFilePath = classLoader.getResource("GemFireVersion.properties").getPath();
+ warPath = propFilePath.substring(0, propFilePath.indexOf("generated-resources"))+"libs/"+warPath;
return warPath;
}
[39/50] [abbrv] incubator-geode git commit: Refactor dunit
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java
index 4e8b82d..efb5dcd 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationInP2PDUnitTest.java
@@ -31,6 +31,7 @@ import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.cache.EventID;
import com.gemstone.gemfire.internal.cache.InternalCacheEvent;
+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;
@@ -216,7 +217,7 @@ public class EventIDVerificationInP2PDUnitTest extends DistributedTestCase
assertEquals(r.getEntry("key-1").getValue(), "key-1");
}
catch (Exception ex) {
- fail("failed while createEntries()", ex);
+ Assert.fail("failed while createEntries()", ex);
}
}
@@ -232,7 +233,7 @@ public class EventIDVerificationInP2PDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
- fail("failed while r.put()", ex);
+ Assert.fail("failed while r.put()", ex);
}
}
@@ -244,7 +245,7 @@ public class EventIDVerificationInP2PDUnitTest extends DistributedTestCase
r.destroy("key-1");
}
catch (Exception ex) {
- fail("test failed due to exception in destroy ", ex);
+ Assert.fail("test failed due to exception in destroy ", ex);
}
}
@@ -256,7 +257,7 @@ public class EventIDVerificationInP2PDUnitTest extends DistributedTestCase
r.destroyRegion();
}
catch (Exception ex) {
- fail("test failed due to exception in destroyRegion ", ex);
+ Assert.fail("test failed due to exception in destroyRegion ", ex);
}
}
@@ -268,7 +269,7 @@ public class EventIDVerificationInP2PDUnitTest extends DistributedTestCase
r.invalidateRegion();
}
catch (Exception ex) {
- fail("test failed due to exception in invalidateRegion ", ex);
+ Assert.fail("test failed due to exception in invalidateRegion ", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java
index 3d89089..806d702 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java
@@ -43,6 +43,7 @@ import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.CachedDeserializable;
import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.cache.Token;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -366,7 +367,7 @@ public class ForceInvalidateEvictionDUnitTest extends CacheTestCase {
try {
server.start();
} catch (IOException e) {
- fail("IO Exception", e);
+ Assert.fail("IO Exception", e);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java
index e82faae..52e23c0 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java
@@ -16,6 +16,7 @@
*/
package com.gemstone.gemfire.internal.cache.tier.sockets;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.VM;
@SuppressWarnings("serial")
@@ -166,8 +167,8 @@ public class HAInterestPart1DUnitTest extends HAInterestTestCase {
* client ( create CCP) as welll as register IL
*/
public void testInterstRegistrationOnRecoveredEPbyDSM() throws Exception {
- addExpectedException("SocketException");
- addExpectedException("Unexpected IOException");
+ IgnoredException.addExpectedException("SocketException");
+ IgnoredException.addExpectedException("Unexpected IOException");
createClientPoolCache(this.getName(), getServerHostName(server1.getHost()));
createEntriesK1andK2();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
index 28bee9f..9d4b286 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
@@ -20,6 +20,7 @@ import com.gemstone.gemfire.cache.EntryDestroyedException;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.client.ServerConnectivityException;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.VM;
@SuppressWarnings({"rawtypes", "serial"})
@@ -140,7 +141,7 @@ public class HAInterestPart2DUnitTest extends HAInterestTestCase {
* is primary
*/
public void testRefreshEntriesFromPrimaryWhenDSMDetectsServerLive() throws Exception {
- addExpectedException(ServerConnectivityException.class.getName());
+ IgnoredException.addExpectedException(ServerConnectivityException.class.getName());
PORT1 = ((Integer) server1.invoke(HAInterestTestCase.class, "createServerCache")).intValue();
server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2");
@@ -311,7 +312,7 @@ public class HAInterestPart2DUnitTest extends HAInterestTestCase {
* new endpoint to register interest
*/
public void testInterestRecoveryFailure() throws Exception {
- addExpectedException("Server unreachable");
+ IgnoredException.addExpectedException("Server unreachable");
PORT1 = ((Integer) server1.invoke(HAInterestTestCase.class, "createServerCache")).intValue();
server1.invoke(HAInterestTestCase.class, "createEntriesK1andK2");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java
index a80b21c..58ee502 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java
@@ -41,6 +41,7 @@ import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.cache.tier.InterestType;
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.VM;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
@@ -108,7 +109,7 @@ public class HAInterestTestCase extends DistributedTestCase {
PORT2 = ((Integer) server2.invoke(HAInterestTestCase.class, "createServerCache")).intValue();
PORT3 = ((Integer) server3.invoke(HAInterestTestCase.class, "createServerCache")).intValue();
exceptionOccured = false;
- addExpectedException("java.net.ConnectException: Connection refused: connect");
+ IgnoredException.addExpectedException("java.net.ConnectException: Connection refused: connect");
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
index 54ef4c0..6f52785 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
@@ -38,8 +38,10 @@ import com.gemstone.gemfire.distributed.internal.ServerLocation;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
+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.VM;
import com.gemstone.gemfire.internal.cache.CacheServerImpl;
@@ -81,8 +83,8 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase
server2 = host.getVM(1);
server3 = host.getVM(2);
- addExpectedException("java.io.IOException");
- addExpectedException("SocketException");
+ IgnoredException.addExpectedException("java.io.IOException");
+ IgnoredException.addExpectedException("SocketException");
// start servers first
PORT1 = ((Integer) server1.invoke(HAStartupAndFailoverDUnitTest.class, "createServerCache"));
@@ -305,7 +307,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase
r1.put("key-3", "server-value-3");
}
catch (Exception ex) {
- fail("failed while r.put()", ex);
+ Assert.fail("failed while r.put()", ex);
}
}
@@ -393,7 +395,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase
assertNotNull(" Primary endpoint should not be null", pool.getPrimaryName());
assertTrue("Endpoint List should not be Empty as all server are live",pool.getConnectedServerCount() > 0);
}catch(Exception e){
- fail("failed while verifyPrimaryShouldNotBeNullAndEPListShouldNotBeEmpty()", e);
+ Assert.fail("failed while verifyPrimaryShouldNotBeNullAndEPListShouldNotBeEmpty()", e);
}
}
@@ -404,7 +406,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase
} catch (NoSubscriptionServersAvailableException e) {
// pass
} catch(Exception e){
- fail("failed while verifyPrimaryShouldBeNullAndEPListShouldBeEmpty()", e);
+ Assert.fail("failed while verifyPrimaryShouldBeNullAndEPListShouldBeEmpty()", e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
index 17ef1cc..3246bdd 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
@@ -45,6 +45,7 @@ import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.cache.EventID;
+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;
@@ -192,7 +193,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
obj.init(0);
}
catch (Exception e) {
- fail("Test failed due to exception in TestObject1", e);
+ Assert.fail("Test failed due to exception in TestObject1", e);
}
}
@@ -204,7 +205,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
obj.init(0);
}
catch (Exception e) {
- fail("Test failed due to exception in TestObject2", e);
+ Assert.fail("Test failed due to exception in TestObject2", e);
}
}
@@ -216,7 +217,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
obj.init(0);
}
catch (Exception e) {
- fail("Test failed due to exception in TestObject3", e);
+ Assert.fail("Test failed due to exception in TestObject3", e);
}
}
@@ -228,7 +229,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
obj.init(0);
}
catch (Exception e) {
- fail("Test failed due to exception in TestObject4", e);
+ Assert.fail("Test failed due to exception in TestObject4", e);
}
}
@@ -240,7 +241,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
obj.init(0);
}
catch (Exception e) {
- fail("Test failed due to exception in TestObject5", e);
+ Assert.fail("Test failed due to exception in TestObject5", e);
}
}
@@ -252,7 +253,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
obj.init(0);
}
catch (Exception e) {
- fail("Test failed due to exception in TestObject6", e);
+ Assert.fail("Test failed due to exception in TestObject6", e);
}
}
@@ -264,7 +265,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
obj.init(0);
}
catch (Exception e) {
- fail("Test failed due to exception in TestObject7", e);
+ Assert.fail("Test failed due to exception in TestObject7", e);
}
}
@@ -276,7 +277,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
obj.init(0);
}
catch (Exception e) {
- fail("Test failed due to exception in TestObject8", e);
+ Assert.fail("Test failed due to exception in TestObject8", e);
}
}
@@ -288,7 +289,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
obj.init(0);
}
catch (Exception e) {
- fail("Test failed due to exception in TestObject9", e);
+ Assert.fail("Test failed due to exception in TestObject9", e);
}
}
@@ -300,7 +301,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
obj.init(0);
}
catch (Exception e) {
- fail("Test failed due to exception in TestObject10", e);
+ Assert.fail("Test failed due to exception in TestObject10", e);
}
}
@@ -312,7 +313,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
obj.init(0);
}
catch (Exception e) {
- fail("Test failed due to exception in TestObject11", e);
+ Assert.fail("Test failed due to exception in TestObject11", e);
}
}
@@ -324,7 +325,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
obj.init(0);
}
catch (Exception e) {
- fail("Test failed due to exception in TestObject11", e);
+ Assert.fail("Test failed due to exception in TestObject11", e);
}
}
@@ -336,7 +337,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
obj.init(0);
}
catch (Exception e) {
- fail("Test failed due to exception in TestObject13", e);
+ Assert.fail("Test failed due to exception in TestObject13", e);
}
}
@@ -348,7 +349,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
obj.init(0);
}
catch (Exception e) {
- fail("Test failed due to exception in TestObject14", e);
+ Assert.fail("Test failed due to exception in TestObject14", e);
}
}
@@ -360,7 +361,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
obj.init(0);
}
catch (Exception e) {
- fail("Test failed due to exception in TestObject15", e);
+ Assert.fail("Test failed due to exception in TestObject15", e);
}
}
@@ -372,7 +373,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
obj.init(0);
}
catch (Exception e) {
- fail("Test failed due to exception in TestObject16", e);
+ Assert.fail("Test failed due to exception in TestObject16", e);
}
}
@@ -384,7 +385,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
obj.init(0);
}
catch (Exception e) {
- fail("Test failed due to exception in TestObject17", e);
+ Assert.fail("Test failed due to exception in TestObject17", e);
}
}
@@ -396,7 +397,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
obj.init(0);
}
catch (Exception e) {
- fail("Test failed due to exception in TestObject18", e);
+ Assert.fail("Test failed due to exception in TestObject18", e);
}
}
@@ -408,7 +409,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
obj.init(0);
}
catch (Exception e) {
- fail("Test failed due to exception in TestObject19", e);
+ Assert.fail("Test failed due to exception in TestObject19", e);
}
}
@@ -420,7 +421,7 @@ public class InstantiatorPropagationDUnitTest extends DistributedTestCase {
obj.init(0);
}
catch (Exception e) {
- fail("Test failed due to exception in TestObject20", e);
+ Assert.fail("Test failed due to exception in TestObject20", e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
index 8bc4e42..a4ce75b 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
@@ -47,6 +47,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.CacheServerImpl;
+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.SerializableRunnable;
@@ -413,7 +414,7 @@ public class InterestListDUnitTest extends DistributedTestCase
server = addCacheServer();
port2 = server.getPort();
} catch (Exception ex) {
- fail("Cache creation threw an exception", ex);
+ Assert.fail("Cache creation threw an exception", ex);
}
addRegisterInterestListener();
@@ -742,7 +743,7 @@ public class InterestListDUnitTest extends DistributedTestCase
assertEquals(r.getEntry(key2).getValue(), key2_originalValue);
}
catch (Exception ex) {
- fail("failed while createEntries()", ex);
+ Assert.fail("failed while createEntries()", ex);
}
}
@@ -759,7 +760,7 @@ public class InterestListDUnitTest extends DistributedTestCase
registerKeyOnly(key);
}
catch (Exception ex) {
- fail("failed while registering key(" + key + ")", ex);
+ Assert.fail("failed while registering key(" + key + ")", ex);
}
}
@@ -777,7 +778,7 @@ public class InterestListDUnitTest extends DistributedTestCase
InterestResultPolicy.KEYS_VALUES, false);
}
} catch (Exception ex) {
- fail("failed while registering key(" + key + ")", ex);
+ Assert.fail("failed while registering key(" + key + ")", ex);
}
}
@@ -801,7 +802,7 @@ public class InterestListDUnitTest extends DistributedTestCase
r.registerInterest("ALL_KEYS");
}
catch (Exception ex) {
- fail("failed while registering ALL_KEYS", ex);
+ Assert.fail("failed while registering ALL_KEYS", ex);
}
}
@@ -817,7 +818,7 @@ public class InterestListDUnitTest extends DistributedTestCase
assertEquals(r.getEntry(key2).getValue(), "vm1-key-2");
}
catch (Exception ex) {
- fail("failed while put_ALL_KEY()", ex);
+ Assert.fail("failed while put_ALL_KEY()", ex);
}
}
@@ -830,7 +831,7 @@ public class InterestListDUnitTest extends DistributedTestCase
assertEquals(r.getEntry(key2).getValue(), "vm1-key-2");
}
catch (Exception ex) {
- fail("failed while validate_ALL_KEY", ex);
+ Assert.fail("failed while validate_ALL_KEY", ex);
}
}
@@ -845,7 +846,7 @@ public class InterestListDUnitTest extends DistributedTestCase
r.registerInterest(list);
}
catch (Exception ex) {
- fail("failed while registering keys" + list + "", ex);
+ Assert.fail("failed while registering keys" + list + "", ex);
}
}
@@ -860,7 +861,7 @@ public class InterestListDUnitTest extends DistributedTestCase
r.registerInterest(list);
}
catch (Exception ex) {
- fail("failed while registering keys" + list + "", ex);
+ Assert.fail("failed while registering keys" + list + "", ex);
}
}
@@ -877,7 +878,7 @@ public class InterestListDUnitTest extends DistributedTestCase
unregisterKeyOnly(key);
}
catch (Exception ex) {
- fail("failed while un-registering key(" + key + ")", ex);
+ Assert.fail("failed while un-registering key(" + key + ")", ex);
}
}
@@ -895,7 +896,7 @@ public class InterestListDUnitTest extends DistributedTestCase
}
}
catch (Exception ex) {
- fail("failed while un-registering key(" + key + ") for client " + clientId, ex);
+ Assert.fail("failed while un-registering key(" + key + ") for client " + clientId, ex);
}
}
@@ -934,7 +935,7 @@ public class InterestListDUnitTest extends DistributedTestCase
assertEquals(r.getEntry(key).getValue(), value);
}
catch (Exception ex) {
- fail("failed while r.put()", ex);
+ Assert.fail("failed while r.put()", ex);
}
}
@@ -960,7 +961,7 @@ public class InterestListDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
- fail("failed while r.put()", ex);
+ Assert.fail("failed while r.put()", ex);
}
}
@@ -977,7 +978,7 @@ public class InterestListDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
- fail("failed while r.put()", ex);
+ Assert.fail("failed while r.put()", ex);
}
}
@@ -1003,7 +1004,7 @@ public class InterestListDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
- fail("failed while r.putAgain()", ex);
+ Assert.fail("failed while r.putAgain()", ex);
}
}
@@ -1045,7 +1046,7 @@ public class InterestListDUnitTest extends DistributedTestCase
assertEquals(value, r.getEntry(key).getValue());
}
catch (Exception ex) {
- fail("failed while validateSingleEntry()", ex);
+ Assert.fail("failed while validateSingleEntry()", ex);
}
}
@@ -1067,7 +1068,7 @@ public class InterestListDUnitTest extends DistributedTestCase
}
}
catch (Exception ex) {
- fail("failed while r.put()", ex);
+ Assert.fail("failed while r.put()", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
index 1faa051..8183961 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
@@ -416,7 +416,7 @@ public class InterestListEndpointDUnitTest extends DistributedTestCase
}
}
catch (Exception ex) {
- fail("failed while verifyIfNotInterestListEndpointAndThenPut()", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("failed while verifyIfNotInterestListEndpointAndThenPut()", ex);
}
}
@@ -428,7 +428,7 @@ public class InterestListEndpointDUnitTest extends DistributedTestCase
r.registerInterest(k1, InterestResultPolicy.KEYS);
}
catch (Exception ex) {
- fail("failed while region.registerInterest()", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("failed while region.registerInterest()", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
index 1b0ecb1..b977d52 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java
@@ -25,6 +25,7 @@ import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.cache.client.*;
import com.gemstone.gemfire.internal.AvailablePort;
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.VM;
@@ -165,7 +166,7 @@ public class InterestListFailoverDUnitTest extends DistributedTestCase
assertEquals(r.getEntry("key-6").getValue(), "key-6");
}
catch (Exception ex) {
- fail("failed while createEntries()", ex);
+ Assert.fail("failed while createEntries()", ex);
}
}
@@ -182,7 +183,7 @@ public class InterestListFailoverDUnitTest extends DistributedTestCase
}
}
catch (Exception ex) {
- fail("failed while createEntries()", ex);
+ Assert.fail("failed while createEntries()", ex);
}
}
@@ -201,7 +202,7 @@ public class InterestListFailoverDUnitTest extends DistributedTestCase
return new Integer(p.getPrimaryPort());
}
catch (Exception ex) {
- fail("failed while registering keys k1 to k5", ex);
+ Assert.fail("failed while registering keys k1 to k5", ex);
return null;
}
}
@@ -247,7 +248,7 @@ public class InterestListFailoverDUnitTest extends DistributedTestCase
assertEquals(r.getEntry("key-6").getValue(), "vm2-key-6" + v);
}
catch (Exception ex) {
- fail("failed while r.put()", ex);
+ Assert.fail("failed while r.put()", ex);
}
}
@@ -294,7 +295,7 @@ public class InterestListFailoverDUnitTest extends DistributedTestCase
assertEquals("key-6", r.getEntry("key-6").getValue());
}
catch (Exception ex) {
- fail("failed while r.put()", ex);
+ Assert.fail("failed while r.put()", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
index 5359cb8..90470d8 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
@@ -39,6 +39,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import com.gemstone.gemfire.internal.cache.LocalRegion;
+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;
@@ -177,7 +178,7 @@ public class InterestListRecoveryDUnitTest extends DistributedTestCase
assertNotNull(pool);
return (pool.getPrimaryPort() == PORT1);
} catch (Exception ex) {
- fail("while isInterestListRegisteredToServer1", ex);
+ Assert.fail("while isInterestListRegisteredToServer1", ex);
}
// never reached
return false;
@@ -257,7 +258,7 @@ public class InterestListRecoveryDUnitTest extends DistributedTestCase
}
}
catch (Exception ex) {
- fail("failed while createEntries()", ex);
+ Assert.fail("failed while createEntries()", ex);
}
}
@@ -270,7 +271,7 @@ public class InterestListRecoveryDUnitTest extends DistributedTestCase
}
}
catch (Exception ex) {
- fail("failed while registering keys", ex);
+ Assert.fail("failed while registering keys", ex);
}
}
@@ -283,7 +284,7 @@ public class InterestListRecoveryDUnitTest extends DistributedTestCase
}
}
catch (Exception ex) {
- fail("failed while un-registering keys", ex);
+ Assert.fail("failed while un-registering keys", ex);
}
}
@@ -295,7 +296,7 @@ public class InterestListRecoveryDUnitTest extends DistributedTestCase
//ConnectionProxyImpl.markServerUnavailable(server);
}
catch (Exception ex) {
- fail("while setting server unavailable "+ server, ex);
+ Assert.fail("while setting server unavailable "+ server, ex);
}
}
public static void setServerAvailable(String server)
@@ -305,7 +306,7 @@ public class InterestListRecoveryDUnitTest extends DistributedTestCase
//ConnectionProxyImpl.markServerAvailable(server);
}
catch (Exception ex) {
- fail("while setting server available "+ server, ex);
+ Assert.fail("while setting server available "+ server, ex);
}
}
@@ -333,7 +334,7 @@ public class InterestListRecoveryDUnitTest extends DistributedTestCase
r1.put(key, "server-"+key);
}
catch (Exception ex) {
- fail("failed while r.put()", ex);
+ Assert.fail("failed while r.put()", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
index 5e74812..82d8780 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
@@ -33,7 +33,9 @@ import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
+import com.gemstone.gemfire.test.dunit.Assert;
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.cache.client.*;
@@ -59,7 +61,7 @@ public class InterestResultPolicyDUnitTest extends DistributedTestCase
private static final String REGION_NAME = "InterestResultPolicyDUnitTest_region" ;
- private ExpectedException expectedEx;
+ private IgnoredException expectedEx;
/**
* Creates a test instance with the given name
@@ -93,7 +95,7 @@ public class InterestResultPolicyDUnitTest extends DistributedTestCase
public void tearDown2() throws Exception
{
// might get ServerConnectivityExceptions during shutdown
- this.expectedEx = addExpectedException(ServerConnectivityException.class
+ this.expectedEx = IgnoredException.addExpectedException(ServerConnectivityException.class
.getName());
// close server
vm0.invoke(InterestResultPolicyDUnitTest.class, "closeCache");
@@ -334,7 +336,7 @@ public class InterestResultPolicyDUnitTest extends DistributedTestCase
region1.registerInterest(keylist, policy);
}
catch (CacheWriterException e) {
- fail("failed to register interestlist for the client", e);
+ Assert.fail("failed to register interestlist for the client", e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
index 879d878..f68b86a 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
@@ -16,6 +16,7 @@
*/
package com.gemstone.gemfire.internal.cache.tier.sockets;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
@@ -77,7 +78,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
DistributedTestCase.waitForCriterion(wc, 30 * 1000, 1000, true);
}
catch (Exception ex) {
- fail(
+ Assert.fail(
"test failed due to exception in test RedundancyNotSpecifiedNonPrimaryServerFail ",
ex);
}
@@ -128,7 +129,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
assertEquals(SERVER2, pool.getPrimaryName());
}
catch (Exception ex) {
- fail(
+ Assert.fail(
"test failed due to exception in test RedundancyNotSpecifiedPrimaryServerFails ",
ex);
}/*finally {
@@ -166,7 +167,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
//assertEquals(1, proxy.getDeadServers().size());
}
catch (Exception ex) {
- fail(
+ Assert.fail(
"test failed due to exception in test testRedundancySpecifiedNonFailoverEPFails ",
ex);
}
@@ -206,7 +207,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
//assertEquals(1, proxy.getDeadServers().size());
}
catch (Exception ex) {
- fail(
+ Assert.fail(
"test failed due to exception in test testRedundancySpecifiedNonFailoverEPFailsDetectionByCCU ",
ex);
}
@@ -245,7 +246,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
//assertEquals(1, proxy.getDeadServers().size());
}
catch (Exception ex) {
- fail(
+ Assert.fail(
"test failed due to exception in test testRedundancySpecifiedNonFailoverEPFailsDetectionByRegisterInterest ",
ex);
}
@@ -284,7 +285,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
//assertEquals(1, proxy.getDeadServers().size());
}
catch (Exception ex) {
- fail(
+ Assert.fail(
"test failed due to exception in test testRedundancySpecifiedNonFailoverEPFailsDetectionByUnregisterInterest ",
ex);
}
@@ -322,7 +323,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
// assertEquals(1, proxy.getDeadServers().size());
}
catch (Exception ex) {
- fail(
+ Assert.fail(
"test failed due to exception in test testRedundancySpecifiedNonFailoverEPFailsDetectionByPut ",
ex);
}
@@ -361,7 +362,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
//assertEquals(1, proxy.getDeadServers().size());
}
catch (Exception ex) {
- fail(
+ Assert.fail(
"test failed due to exception in test testRedundancySpecifiedNonFailoverEPFails ",
ex);
}
@@ -402,7 +403,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
//assertEquals(1, proxy.getDeadServers().size());
}
catch (Exception ex) {
- fail(
+ Assert.fail(
"test failed due to exception in test testRedundancySpecifiedNonPrimaryEPFailsDetectionByCCU ",
ex);
}
@@ -443,7 +444,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
//assertEquals(1, proxy.getDeadServers().size());
}
catch (Exception ex) {
- fail(
+ Assert.fail(
"test failed due to exception in test testRedundancySpecifiedNonPrimaryEPFailsDetectionByRegisterInterest ",
ex);
}
@@ -483,7 +484,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
//assertEquals(1, proxy.getDeadServers().size());
}
catch (Exception ex) {
- fail(
+ Assert.fail(
"test failed due to exception in test testRedundancySpecifiedNonPrimaryEPFailsDetectionByUnregisterInterest ",
ex);
}
@@ -527,7 +528,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
//assertEquals(1, proxy.getDeadServers().size());
}
catch (Exception ex) {
- fail(
+ Assert.fail(
"test failed due to exception in test testRedundancySpecifiedNonPrimaryEPFailsDetectionByPut ",
ex);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java
index 1c83206..3765226 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart2DUnitTest.java
@@ -16,6 +16,7 @@
*/
package com.gemstone.gemfire.internal.cache.tier.sockets;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
@@ -79,7 +80,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
//assertEquals(1, proxy.getDeadServers().size());
}
catch (Exception ex) {
- fail(
+ Assert.fail(
"test failed due to exception in test testRedundancySpecifiedPrimaryEPFails ",
ex);
}
@@ -120,7 +121,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
//assertEquals(1, proxy.getDeadServers().size());
}
catch (Exception ex) {
- fail(
+ Assert.fail(
"test failed due to exception in test testRedundancySpecifiedPrimaryEPFailsDetectionByCCU ",
ex);
}
@@ -161,7 +162,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
//assertEquals(1, proxy.getDeadServers().size());
}
catch (Exception ex) {
- fail(
+ Assert.fail(
"test failed due to exception in test testRedundancySpecifiedPrimaryEPFailsDetectionByRegisterInterest ",
ex);
}
@@ -201,7 +202,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
//assertEquals(1, proxy.getDeadServers().size());
}
catch (Exception ex) {
- fail(
+ Assert.fail(
"test failed due to exception in test testRedundancySpecifiedPrimaryEPFailsDetectionByUnregisterInterest ",
ex);
}
@@ -241,7 +242,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
//assertEquals(1, proxy.getDeadServers().size());
}
catch (Exception ex) {
- fail(
+ Assert.fail(
"test failed due to exception in test testRedundancySpecifiedPrimaryEPFailsDetectionByPut ",
ex);
}
@@ -279,7 +280,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
"verifyInterestRegistration");
}
catch (Exception ex) {
- fail(
+ Assert.fail(
"test failed due to exception in test testRedundancySpecifiedPrimarySecondaryEPFails ",
ex);
}
@@ -338,7 +339,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
server2.invoke(RedundancyLevelTestBase.class, "verifyNoCCP");
}
catch (Exception ex) {
- fail(
+ Assert.fail(
"test failed due to exception in test testRedundancySpecifiedEPFails ",
ex);
}
@@ -397,7 +398,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
}
catch (Exception ex) {
- fail("test failed due to exception in test noRedundancyLevelServerFail ",
+ Assert.fail("test failed due to exception in test noRedundancyLevelServerFail ",
ex);
}
@@ -438,7 +439,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
}
catch (Exception ex) {
- fail("test failed due to exception in test noRedundancyLevelServerFail ",
+ Assert.fail("test failed due to exception in test noRedundancyLevelServerFail ",
ex);
}
}
@@ -482,7 +483,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
"verifyInterestRegistration");
}
catch (Exception ex) {
- fail("test failed due to exception in test noRedundancyLevelServerFail ",
+ Assert.fail("test failed due to exception in test noRedundancyLevelServerFail ",
ex);
}
}
@@ -527,7 +528,7 @@ public class RedundancyLevelPart2DUnitTest extends RedundancyLevelTestBase
}
catch (Exception ex) {
ex.printStackTrace();
- fail(
+ Assert.fail(
"test failed due to exception in test testRedundancySpecifiedMoreThanEPs ",
ex);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
index c1266e7..1244898 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
@@ -18,6 +18,7 @@ package com.gemstone.gemfire.internal.cache.tier.sockets;
import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
+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.cache.client.internal.PoolImpl;
@@ -136,7 +137,7 @@ public class RedundancyLevelPart3DUnitTest extends RedundancyLevelTestBase
}
catch (Exception ex) {
ex.printStackTrace();
- fail(
+ Assert.fail(
"test failed due to exception in test testRedundancySpecifiedMoreThanEPs ",
ex);
}
@@ -188,7 +189,7 @@ public class RedundancyLevelPart3DUnitTest extends RedundancyLevelTestBase
}
catch (Exception ex) {
ex.printStackTrace();
- fail(
+ Assert.fail(
"test failed due to exception in test testRedundancySpecifiedMoreThanEPs ",
ex);
}
@@ -237,7 +238,7 @@ public class RedundancyLevelPart3DUnitTest extends RedundancyLevelTestBase
}
catch (Exception ex) {
ex.printStackTrace();
- fail(
+ Assert.fail(
"test failed due to exception in test testRedundancySpecifiedMoreThanEPs ",
ex);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
index 7f95f8b..6caa6a3 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
@@ -40,8 +40,10 @@ import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.ClientServerObserver;
import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
+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.VM;
import com.gemstone.gemfire.internal.cache.CacheServerImpl;
@@ -107,7 +109,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase
server2 = host.getVM(2);
server3 = host.getVM(3);
- addExpectedException("java.net.SocketException||java.net.ConnectException");
+ IgnoredException.addExpectedException("java.net.SocketException||java.net.ConnectException");
// start servers first
PORT1 = ((Integer)server0.invoke(RedundancyLevelTestBase.class,
@@ -210,7 +212,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase
}
catch (Exception ex) {
- fail("while setting verifyDispatcherIsAlive ", ex);
+ Assert.fail("while setting verifyDispatcherIsAlive ", ex);
}
}
@@ -256,7 +258,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase
}
catch (Exception ex) {
- fail("while setting verifyDispatcherIsNotAlive ", ex);
+ Assert.fail("while setting verifyDispatcherIsNotAlive ", ex);
}
}
@@ -326,7 +328,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase
assertEquals(r1.getEntry(k2).getValue(), k2);
}
catch (Exception ex) {
- fail("failed while createEntries()", ex);
+ Assert.fail("failed while createEntries()", ex);
}
}
@@ -342,7 +344,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase
}
catch (Exception ex) {
ex.printStackTrace();
- fail("failed while region.registerK1AndK2()", ex);
+ Assert.fail("failed while region.registerK1AndK2()", ex);
}
}
public static void unregisterInterest()
@@ -352,7 +354,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase
r.unregisterInterest("k1");
}
catch (Exception e) {
- fail("test failed due to ", e);
+ Assert.fail("test failed due to ", e);
}
}
@@ -404,7 +406,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase
DistributedTestCase.waitForCriterion(wc, 3 * 60 * 1000, 1000, true);
}
catch (Exception ex) {
- fail("exception in verifyCCP()", ex);
+ Assert.fail("exception in verifyCCP()", ex);
}
}
@@ -489,7 +491,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase
}
}
catch (Exception e) {
- fail("failed while stopServer()", e);
+ Assert.fail("failed while stopServer()", e);
}
}
@@ -503,7 +505,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase
bs.start();
}
catch (Exception ex) {
- fail("while startServer() ", ex);
+ Assert.fail("while startServer() ", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
index 88b684c..9debcd9 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
@@ -32,6 +32,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy;
+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;
@@ -181,7 +182,7 @@ public class RegionCloseDUnitTest extends DistributedTestCase
pool.destroy();
}
catch (Exception ex) {
- fail("failed while region close", ex);
+ Assert.fail("failed while region close", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
index 691f98d..6c874e2 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
@@ -23,6 +23,7 @@ import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
+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;
@@ -136,7 +137,7 @@ public class RegisterInterestKeysDUnitTest extends DistributedTestCase
assertEquals(r1.getEntry("key1").getValue(), "key-1");
}
catch (Exception ex) {
- fail("failed while createEntriesK1()", ex);
+ Assert.fail("failed while createEntriesK1()", ex);
}
}
@@ -220,7 +221,7 @@ public class RegisterInterestKeysDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
- fail("failed while registering interest", ex);
+ Assert.fail("failed while registering interest", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
index ffab9b9..3985120 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
@@ -40,8 +40,10 @@ import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.cache.ha.HAHelper;
import com.gemstone.gemfire.internal.cache.ha.HARegionQueue;
import com.gemstone.gemfire.internal.cache.ha.ThreadIdentifier;
+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.VM;
/**
@@ -107,7 +109,7 @@ public class ReliableMessagingDUnitTest extends DistributedTestCase
* QRM to other redundant servers.
*/
public void testPeriodicAckSendByClientPrimaryFailover() throws Exception {
- addExpectedException("java.net.ConnectException");
+ IgnoredException.addExpectedException("java.net.ConnectException");
createEntries();
setClientServerObserverForBeforeSendingClientAck();
server1.invoke(ReliableMessagingDUnitTest.class, "putOnServer");
@@ -235,7 +237,7 @@ public class ReliableMessagingDUnitTest extends DistributedTestCase
Thread.sleep(ms);
}
catch (InterruptedException e) {
- fail("Interrupted", e);
+ Assert.fail("Interrupted", e);
}
}
@@ -264,7 +266,7 @@ public class ReliableMessagingDUnitTest extends DistributedTestCase
}
}
catch (Exception e) {
- fail("failed while stopServer()", e);
+ Assert.fail("failed while stopServer()", e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
index c4ebead..288b9a6 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
@@ -37,6 +37,7 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.FilterProfile;
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;
@@ -214,7 +215,7 @@ public class UnregisterInterestDUnitTest extends DistributedTestCase {
checkFilters(value, valueInv);
break;
default:
- fail("Invalid interest type: " + interestType, new IllegalArgumentException("Invalid interest type: " + interestType));
+ Assert.fail("Invalid interest type: " + interestType, new IllegalArgumentException("Invalid interest type: " + interestType));
}
}
@@ -258,7 +259,7 @@ public class UnregisterInterestDUnitTest extends DistributedTestCase {
case filter:
break;
default:
- fail("Invalid interest type: " + interestType, new IllegalArgumentException("Invalid interest type: " + interestType));
+ Assert.fail("Invalid interest type: " + interestType, new IllegalArgumentException("Invalid interest type: " + interestType));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
index c21cbcb..deded3d 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
@@ -44,8 +44,10 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.ServerLocation;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.EventID;
+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.VM;
/**
@@ -127,8 +129,8 @@ public class UpdatePropagationDUnitTest extends DistributedTestCase
client2.invoke(getClass(), "createClientCache", new Object[] {
getServerHostName(server1.getHost()), new Integer(PORT1),new Integer(PORT2)});
- addExpectedException("java.net.SocketException");
- addExpectedException("Unexpected IOException");
+ IgnoredException.addExpectedException("java.net.SocketException");
+ IgnoredException.addExpectedException("Unexpected IOException");
}
@@ -465,7 +467,7 @@ public class UpdatePropagationDUnitTest extends DistributedTestCase
}
}
catch (Exception ex) {
- fail("failed while createEntriesK1andK2()", ex);
+ Assert.fail("failed while createEntriesK1andK2()", ex);
}
}
@@ -541,7 +543,7 @@ public class UpdatePropagationDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
- fail("failed while registering interest", ex);
+ Assert.fail("failed while registering interest", ex);
}
}
@@ -555,7 +557,7 @@ public class UpdatePropagationDUnitTest extends DistributedTestCase
assertEquals("key-2", r.getEntry("key2").getValue());
}
catch (Exception ex) {
- fail("failed while verifyNoUpdates()", ex);
+ Assert.fail("failed while verifyNoUpdates()", ex);
}
}
@@ -575,7 +577,7 @@ public class UpdatePropagationDUnitTest extends DistributedTestCase
}
}
catch (Exception ex) {
- fail("failed while region", ex);
+ Assert.fail("failed while region", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
index 16fb199..75e6f7a 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyEventIDGenerationInP2PDUnitTest.java
@@ -30,6 +30,7 @@ import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.cache.EntryEventImpl;
import com.gemstone.gemfire.internal.cache.EventID;
+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;
@@ -148,7 +149,7 @@ public class VerifyEventIDGenerationInP2PDUnitTest extends DistributedTestCase
assertEquals(r.getEntry("key-1").getValue(), "key-1");
}
catch (Exception ex) {
- fail("failed while createEntries()", ex);
+ Assert.fail("failed while createEntries()", ex);
}
}
@@ -160,7 +161,7 @@ public class VerifyEventIDGenerationInP2PDUnitTest extends DistributedTestCase
r.get("key-1");
}
catch (Exception ex) {
- fail("failed while r.put()", ex);
+ Assert.fail("failed while r.put()", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
index d1c3da7..14fcdf0 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
@@ -33,6 +33,7 @@ import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.EntryEventImpl;
import com.gemstone.gemfire.internal.cache.EventID;
import com.gemstone.gemfire.internal.cache.LocalRegion;
+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;
@@ -155,7 +156,7 @@ public class VerifyUpdatesFromNonInterestEndPointDUnitTest extends DistributedTe
assertEquals(r1.getEntry("key-2").getValue(), "key-2");
}
catch (Exception ex) {
- fail("failed while createEntries()", ex);
+ Assert.fail("failed while createEntries()", ex);
}
}
@@ -217,7 +218,7 @@ public class VerifyUpdatesFromNonInterestEndPointDUnitTest extends DistributedTe
}
catch (Exception ex) {
- fail("failed while registerKey()", ex);
+ Assert.fail("failed while registerKey()", ex);
}
}
@@ -231,7 +232,7 @@ public class VerifyUpdatesFromNonInterestEndPointDUnitTest extends DistributedTe
assertEquals("key-2", r.getEntry("key-2").getValue());
}
catch (Exception ex) {
- fail("failed while verifyPut()", ex);
+ Assert.fail("failed while verifyPut()", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
index ce0f422..bb728f9 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
@@ -75,7 +75,9 @@ import com.gemstone.gemfire.internal.cache.ForceReattemptException;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.RegionQueue;
+import com.gemstone.gemfire.test.dunit.Assert;
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;
@@ -180,7 +182,7 @@ public class AsyncEventQueueTestBase extends DistributedTestCase {
public static void createReplicatedRegionWithAsyncEventQueue(
String regionName, String asyncQueueIds, Boolean offHeap) {
- ExpectedException exp1 = addExpectedException(ForceReattemptException.class
+ IgnoredException exp1 = IgnoredException.addExpectedException(ForceReattemptException.class
.getName());
try {
AttributesFactory fact = new AttributesFactory();
@@ -223,7 +225,7 @@ public class AsyncEventQueueTestBase extends DistributedTestCase {
public static void createReplicatedRegionWithSenderAndAsyncEventQueue(
String regionName, String senderIds, String asyncChannelId, Boolean offHeap) {
- ExpectedException exp = addExpectedException(ForceReattemptException.class
+ IgnoredException exp = IgnoredException.addExpectedException(ForceReattemptException.class
.getName());
try {
@@ -367,7 +369,7 @@ public class AsyncEventQueueTestBase extends DistributedTestCase {
Integer batchSize, boolean isConflation, boolean isPersistent,
String diskStoreName, boolean isDiskSynchronous, int nDispatchers) {
- ExpectedException exp = addExpectedException(ForceReattemptException.class
+ IgnoredException exp = IgnoredException.addExpectedException(ForceReattemptException.class
.getName());
try {
@@ -590,9 +592,9 @@ public class AsyncEventQueueTestBase extends DistributedTestCase {
public static void createPartitionedRegion(String regionName,
String senderIds, Integer redundantCopies, Integer totalNumBuckets) {
- ExpectedException exp = addExpectedException(ForceReattemptException.class
+ IgnoredException exp = IgnoredException.addExpectedException(ForceReattemptException.class
.getName());
- ExpectedException exp1 = addExpectedException(PartitionOfflineException.class
+ IgnoredException exp1 = IgnoredException.addExpectedException(PartitionOfflineException.class
.getName());
try {
AttributesFactory fact = new AttributesFactory();
@@ -621,9 +623,9 @@ public class AsyncEventQueueTestBase extends DistributedTestCase {
public static void createPartitionedRegionWithAsyncEventQueue(
String regionName, String asyncEventQueueId, Boolean offHeap) {
- ExpectedException exp = addExpectedException(ForceReattemptException.class
+ IgnoredException exp = IgnoredException.addExpectedException(ForceReattemptException.class
.getName());
- ExpectedException exp1 = addExpectedException(PartitionOfflineException.class
+ IgnoredException exp1 = IgnoredException.addExpectedException(PartitionOfflineException.class
.getName());
try {
AttributesFactory fact = new AttributesFactory();
@@ -646,9 +648,9 @@ public class AsyncEventQueueTestBase extends DistributedTestCase {
String regionName, String asyncEventQueueId, Integer totalNumBuckets,
String colocatedWith) {
- ExpectedException exp = addExpectedException(ForceReattemptException.class
+ IgnoredException exp = IgnoredException.addExpectedException(ForceReattemptException.class
.getName());
- ExpectedException exp1 = addExpectedException(PartitionOfflineException.class
+ IgnoredException exp1 = IgnoredException.addExpectedException(PartitionOfflineException.class
.getName());
try {
AttributesFactory fact = new AttributesFactory();
@@ -687,7 +689,7 @@ public class AsyncEventQueueTestBase extends DistributedTestCase {
*/
public static void createPRWithRedundantCopyWithAsyncEventQueue(
String regionName, String asyncEventQueueId, Boolean offHeap) {
- ExpectedException exp = addExpectedException(ForceReattemptException.class
+ IgnoredException exp = IgnoredException.addExpectedException(ForceReattemptException.class
.getName());
try {
@@ -891,7 +893,7 @@ public class AsyncEventQueueTestBase extends DistributedTestCase {
boolean isParallel, Integer maxMemory, Integer batchSize,
boolean isConflation, boolean isPersistent, GatewayEventFilter filter,
boolean isManulaStart) {
- final ExpectedException exln = addExpectedException("Could not connect");
+ final IgnoredException exln = IgnoredException.addExpectedException("Could not connect");
try {
File persistentDirectory = new File(dsName + "_disk_"
+ System.currentTimeMillis() + "_" + VM.getCurrentVMNum());
@@ -1027,14 +1029,14 @@ public class AsyncEventQueueTestBase extends DistributedTestCase {
}
catch (InterruptedException e) {
- fail("Interrupted", e);
+ Assert.fail("Interrupted", e);
}
}
public static void doPuts(String regionName, int numPuts) {
- ExpectedException exp1 = addExpectedException(InterruptedException.class
+ IgnoredException exp1 = IgnoredException.addExpectedException(InterruptedException.class
.getName());
- ExpectedException exp2 = addExpectedException(GatewaySenderException.class
+ IgnoredException exp2 = IgnoredException.addExpectedException(GatewaySenderException.class
.getName());
try {
Region r = cache.getRegion(Region.SEPARATOR + regionName);
@@ -1094,7 +1096,7 @@ public class AsyncEventQueueTestBase extends DistributedTestCase {
public static void doNextPuts(String regionName, int start, int numPuts) {
// waitForSitesToUpdate();
- ExpectedException exp = addExpectedException(CacheClosedException.class
+ IgnoredException exp = IgnoredException.addExpectedException(CacheClosedException.class
.getName());
try {
Region r = cache.getRegion(Region.SEPARATOR + regionName);
@@ -1109,9 +1111,9 @@ public class AsyncEventQueueTestBase extends DistributedTestCase {
}
public static void validateRegionSize(String regionName, final int regionSize) {
- ExpectedException exp = addExpectedException(ForceReattemptException.class
+ IgnoredException exp = IgnoredException.addExpectedException(ForceReattemptException.class
.getName());
- ExpectedException exp1 = addExpectedException(CacheClosedException.class
+ IgnoredException exp1 = IgnoredException.addExpectedException(CacheClosedException.class
.getName());
try {
@@ -1467,10 +1469,10 @@ public class AsyncEventQueueTestBase extends DistributedTestCase {
}
public static Boolean killSender(String senderId) {
- final ExpectedException exln = addExpectedException("Could not connect");
- ExpectedException exp = addExpectedException(CacheClosedException.class
+ final IgnoredException exln = IgnoredException.addExpectedException("Could not connect");
+ IgnoredException exp = IgnoredException.addExpectedException(CacheClosedException.class
.getName());
- ExpectedException exp1 = addExpectedException(ForceReattemptException.class
+ IgnoredException exp1 = IgnoredException.addExpectedException(ForceReattemptException.class
.getName());
try {
Set<GatewaySender> senders = cache.getGatewaySenders();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java
index 0e6efa0..741f442 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java
@@ -19,6 +19,7 @@ package com.gemstone.gemfire.internal.cache.wan.concurrent;
import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueFactoryImpl;
import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
import com.gemstone.gemfire.internal.cache.wan.AsyncEventQueueTestBase;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
/**
@@ -183,7 +184,7 @@ public class ConcurrentAsyncEventQueueDUnitTest extends AsyncEventQueueTestBase
inv2.join();
inv3.join();
} catch (InterruptedException ie) {
- fail(
+ Assert.fail(
"Cought interrupted exception while waiting for the task tgo complete.",
ie);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java
index 5b9d3bd..8960179 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java
@@ -17,6 +17,8 @@
package com.gemstone.gemfire.internal.cache.wan.misc;
import com.gemstone.gemfire.internal.cache.wan.AsyncEventQueueTestBase;
+import com.gemstone.gemfire.test.dunit.Assert;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
/**
* @author skumar
@@ -35,7 +37,7 @@ public class CommonParallelAsyncEventQueueDUnitTest extends AsyncEventQueueTestB
}
public void testSameSenderWithNonColocatedRegions() throws Exception {
- addExpectedException("cannot have the same parallel async");
+ IgnoredException.addExpectedException("cannot have the same parallel async");
Integer lnPort = (Integer)vm0.invoke(AsyncEventQueueTestBase.class,
"createFirstLocatorWithDSId", new Object[] { 1 });
vm4.invoke(AsyncEventQueueTestBase.class, "createCache", new Object[] { lnPort });
@@ -52,7 +54,7 @@ public class CommonParallelAsyncEventQueueDUnitTest extends AsyncEventQueueTestB
if (!(e.getCause() instanceof IllegalStateException)
|| !(e.getCause().getMessage()
.contains("cannot have the same parallel async event queue id"))) {
- fail("Expected IllegalStateException", e);
+ Assert.fail("Expected IllegalStateException", e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheConfigDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheConfigDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheConfigDUnitTest.java
index 84c9193..aadeb46 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheConfigDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheConfigDUnitTest.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.compression.Compressor;
import com.gemstone.gemfire.compression.SnappyCompressor;
import com.gemstone.gemfire.internal.cache.LocalRegion;
-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.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
@@ -96,9 +96,9 @@ public class CompressionCacheConfigDUnitTest extends CacheTestCase {
* @throws Exception
*/
public void testCreateCacheWithBadCompressor() throws Exception {
- addExpectedException("Unable to load class BAD_COMPRESSOR");
+ IgnoredException.addExpectedException("Unable to load class BAD_COMPRESSOR");
File cacheXml = createCacheXml(BAD_COMPRESSOR);
- ExpectedException expectedException = DistributedTestCase.addExpectedException("While reading Cache XML file");
+ IgnoredException expectedException = IgnoredException.addExpectedException("While reading Cache XML file");
try {
assertFalse(createCacheOnVM(getVM(0), cacheXml.getCanonicalPath()));
} finally {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
index c340ae3..9e36e88 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
@@ -37,6 +37,7 @@ import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.OSProcess;
import com.gemstone.gemfire.internal.jta.CacheUtils;
+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;
@@ -266,7 +267,7 @@ public class IdleTimeOutDUnitTest extends DistributedTestCase {
"runTest2");
DistributedTestCase.join(asyncObj, 30 * 1000, getLogWriter());
if(asyncObj.exceptionOccurred()){
- fail("asyncObj failed", asyncObj.getException());
+ Assert.fail("asyncObj failed", asyncObj.getException());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java
index 6be7241..d3aac82 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java
@@ -40,6 +40,7 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.OSProcess;
import com.gemstone.gemfire.internal.jta.CacheUtils;
import com.gemstone.gemfire.internal.logging.LogService;
+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;
@@ -250,7 +251,7 @@ public class LoginTimeOutDUnitTest extends DistributedTestCase {
AsyncInvocation test2 = vm0.invokeAsync(LoginTimeOutDUnitTest.class, "runTest2");
DistributedTestCase.join(test2, 120 * 1000, getLogWriter());
if(test2.exceptionOccurred()){
- fail("asyncObj failed", test2.getException());
+ Assert.fail("asyncObj failed", test2.getException());
}
DistributedTestCase.join(test1, 30000, getLogWriter());
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
index 5e31e12..609b3af 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
@@ -37,6 +37,7 @@ import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.OSProcess;
import com.gemstone.gemfire.internal.jta.CacheUtils;
+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;
@@ -269,7 +270,7 @@ public class MaxPoolSizeDUnitTest extends DistributedTestCase {
"runTest1");
DistributedTestCase.join(asyncObj, 30 * 1000, getLogWriter());
if(asyncObj.exceptionOccurred()){
- fail("asyncObj failed", asyncObj.getException());
+ Assert.fail("asyncObj failed", asyncObj.getException());
}
}
@@ -300,7 +301,7 @@ public class MaxPoolSizeDUnitTest extends DistributedTestCase {
}
catch (SQLException e) {
if (count < (MAX_CONNECTIONS-1)) {
- fail("runTest1 SQL Exception", e);
+ Assert.fail("runTest1 SQL Exception", e);
}
else {
getLogWriter().fine("Success SQLException caught at connection #"
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
index 22b8bff..6b443c4 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
@@ -41,6 +41,7 @@ import com.gemstone.gemfire.internal.OSProcess;
import com.gemstone.gemfire.internal.datasource.GemFireTransactionDataSource;
import com.gemstone.gemfire.internal.jta.CacheUtils;
import com.gemstone.gemfire.internal.jta.UserTransactionImpl;
+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;
@@ -138,10 +139,10 @@ public class TransactionTimeOutDUnitTest extends DistributedTestCase {
DistributedTestCase.join(async1, 30 * 1000, getLogWriter());
DistributedTestCase.join(async2, 30 * 1000, getLogWriter());
if(async1.exceptionOccurred()){
- fail("async1 failed", async1.getException());
+ Assert.fail("async1 failed", async1.getException());
}
if(async2.exceptionOccurred()){
- fail("async2 failed", async2.getException());
+ Assert.fail("async2 failed", async2.getException());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
index 83e29af..16fb461 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
@@ -42,6 +42,7 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.OSProcess;
import com.gemstone.gemfire.internal.jta.CacheUtils;
import com.gemstone.gemfire.internal.jta.JTAUtils;
+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;
@@ -424,7 +425,7 @@ public class TxnManagerMultiThreadDUnitTest extends DistributedTestCase {
TxnManagerMultiThreadDUnitTest.class, "callCommitThreads");
DistributedTestCase.join(asyncObj1, 30 * 1000, getLogWriter());
if(asyncObj1.exceptionOccurred()){
- fail("asyncObj1 failed", asyncObj1.getException());
+ Assert.fail("asyncObj1 failed", asyncObj1.getException());
}
vm0.invoke(TxnManagerMultiThreadDUnitTest.class, "getNumberOfRows");
}//end of testAllCommit
@@ -457,7 +458,7 @@ public class TxnManagerMultiThreadDUnitTest extends DistributedTestCase {
TxnManagerMultiThreadDUnitTest.class, "callCommitandRollbackThreads");
DistributedTestCase.join(asyncObj1, 30 * 1000, getLogWriter());
if(asyncObj1.exceptionOccurred()){
- fail("asyncObj1 failed", asyncObj1.getException());
+ Assert.fail("asyncObj1 failed", asyncObj1.getException());
}
vm0.invoke(TxnManagerMultiThreadDUnitTest.class, "getNumberOfRows");
}//end of test3Commit2Rollback
[26/50] [abbrv] incubator-geode git commit: GEODE-875: CI failure:
ParallelGatewaySenderOperationsOffHeapDUnitTest.testParallelGatewaySender_SingleNode_UserPR_localDestroy_SimultenuousPut_RecreateRegion
Posted by kl...@apache.org.
GEODE-875: CI failure: ParallelGatewaySenderOperationsOffHeapDUnitTest.testParallelGatewaySender_SingleNode_UserPR_localDestroy_SimultenuousPut_RecreateRegion
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/c6e0d2d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/c6e0d2d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/c6e0d2d9
Branch: refs/heads/feature/GEODE-773-2
Commit: c6e0d2d954923fa83236e057f29698f8cbb83cbf
Parents: f30e497
Author: Barry Oglesby <bo...@pivotal.io>
Authored: Fri Jan 29 13:07:29 2016 -0800
Committer: Barry Oglesby <bo...@pivotal.io>
Committed: Fri Jan 29 13:07:29 2016 -0800
----------------------------------------------------------------------
.../gemfire/internal/cache/wan/WANTestBase.java | 6 +
...allelGatewaySenderOperation_2_DUnitTest.java | 180 +-
...tewaySenderOperation_2_OffHeapDUnitTest.java | 16 +
...tewaySenderOperation_2_OffHeapDUnitTest.java | 16 +
...allelGatewaySenderOperation_2_DUnitTest.java | 22 +
...arallelGatewaySenderOperationsDUnitTest.java | 1642 ++----------------
6 files changed, 276 insertions(+), 1606 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c6e0d2d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
index a212baa..b3d49d3 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
@@ -4836,6 +4836,12 @@ public class WANTestBase extends DistributedTestCase{
return new Integer[] { lnPort, nyPort };
}
+ protected void validateRegionSizes(String regionName, int expectedRegionSize, VM... vms) {
+ for (VM vm : vms) {
+ vm.invoke(() -> validateRegionSize(regionName, expectedRegionSize));
+ }
+ }
+
public static class MyLocatorCallback extends
LocatorDiscoveryCallbackAdapter {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c6e0d2d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
index 694fc1f..5533dc3 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
@@ -106,51 +106,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
vm4.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
}
-
- //to test that while localDestroy is in progress, put operation does not successed
- public void testParallelGatewaySender_SingleNode_UserPR_localDestroy_SimultenuousPut_RecreateRegion() throws Exception {
- Integer[] locatorPorts = createLNAndNYLocators();
- Integer lnPort = locatorPorts[0];
- Integer nyPort = locatorPorts[1];
-
- try {
- createAndStartSender(vm4, lnPort, 5, false, true);
-
- createReceiverAndDoPutsInPausedSender(nyPort);
-
- AsyncInvocation putAsync = vm4.invokeAsync(WANTestBase.class,
- "doPutsFrom", new Object[] { testName + "_PR", 100, 2000 });
- AsyncInvocation localDestroyAsync = vm4.invokeAsync(WANTestBase.class,
- "localDestroyRegion", new Object[] { testName + "_PR" });
- try {
- putAsync.join();
- localDestroyAsync.join();
- } catch (InterruptedException e) {
- e.printStackTrace();
- fail("Interrupted the async invocation.");
- }
-
- if (localDestroyAsync.getException() != null) {
- fail("Not Expected Exception got", putAsync.getException());
- }
-
- if (putAsync.getException() != null
- && !(putAsync.getException() instanceof RegionDestroyedException)) {
- fail("Expected RegionDestroyedException but got",
- putAsync.getException());
- }
- vm4.invoke(() -> resumeSender("ln"));
-
- pause(500); // paused if there is any element which is received on remote
- // site
-
- recreatePRDoPutsAndValidateRegionSizes(0, false);
- } finally {
- vm4.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
- }
- }
-
public void testParallelGatewaySender_SingleNode_UserPR_Destroy_SimultenuousPut_RecreateRegion() throws Exception {
Integer[] locatorPorts = createLNAndNYLocators();
Integer lnPort = locatorPorts[0];
@@ -268,31 +224,6 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
}
}
- private void createReceiverAndDoPutsInPausedSender(int port) {
- // Note: This is a test-specific method used by several tests to do puts from vm4 to vm2.
- String regionName = testName + "_PR";
- vm2.invoke(() -> createReceiver(port));
- vm2.invoke(() -> createPartitionedRegion(regionName, null, 1, 10, isOffHeap()));
- vm4.invoke(() -> doPuts(regionName, 10));
- vm4.invoke(() -> validateRegionSize(regionName, 10));
- // since sender is paused, no dispatching
- vm2.invoke(() -> validateRegionSize(regionName, 0));
- }
-
- private void recreatePRDoPutsAndValidateRegionSizes(int expectedRegionSize, boolean resumeSender) {
- // Note: This is a test-specific method used by several test to recreate a partitioned region,
- // do puts and validate region sizes in vm2 and vm4.
- // since shadowPR is locally destroyed, so no data to dispatch
- String regionName = testName + "_PR";
- vm2.invoke(() -> validateRegionSize(regionName, expectedRegionSize));
- if (resumeSender) {
- vm4.invoke(() -> resumeSender("ln"));
- }
- vm4.invoke(() -> createPartitionedRegion(regionName, "ln", 1, 10, isOffHeap()));
- vm4.invoke(() -> doPutsFrom(regionName, 10, 20));
- validateRegionSizes(regionName, 10, vm4, vm2);
- }
-
public void testParallelGatewaySenders_SingleNode_UserPR_localDestroy_RecreateRegion() throws Exception {
Integer[] locatorPorts = createLNAndNYLocators();
Integer lnPort = locatorPorts[0];
@@ -396,8 +327,8 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
vm7.invoke(() -> createReceiver(tkPort));
try {
- createAndStartTwoSenders(vm4, lnPort);
- createAndStartTwoSenders(vm5, lnPort);
+ createAndStartTwoSenders(vm4, lnPort, 4);
+ createAndStartTwoSenders(vm5, lnPort, 4);
String regionName = testName + "_PR";
vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
@@ -434,16 +365,6 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
}
}
- private void createAndStartTwoSenders(VM vm, int port) {
- // Note: This is a test-specific method used to create and start 2 senders.
- vm.invoke(() -> createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME(port));
- vm.invoke(() -> createPartitionedRegion(testName + "_PR", "ln1,ln2", 1, 100, isOffHeap()));
- vm.invoke(() -> createConcurrentSender("ln1", 2, true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY));
- vm.invoke(() -> createConcurrentSender("ln2", 3, true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY));
- vm.invoke(() -> startSender("ln1"));
- vm.invoke(() -> startSender("ln2"));
- }
-
public void testParallelGatewaySender_ColocatedPartitionedRegions_localDestroy() throws Exception {
Integer[] locatorPorts = createLNAndNYLocators();
Integer lnPort = locatorPorts[0];
@@ -482,12 +403,6 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
}
}
- private void validateRegionSizes(String regionName, int expectedRegionSize, VM... vms) {
- for (VM vm : vms) {
- vm.invoke(() -> validateRegionSize(regionName, expectedRegionSize));
- }
- }
-
public void testParallelGatewaySender_ColocatedPartitionedRegions_destroy() throws Exception {
Integer[] locatorPorts = createLNAndNYLocators();
Integer lnPort = locatorPorts[0];
@@ -523,30 +438,6 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
}
}
- private void createAndStartSenderWithCustomerOrderShipmentRegion(VM vm, int port, int concurrencyLevel, boolean manualStart) {
- vm.invoke(() -> createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME(port));
- vm.invoke(() -> createCustomerOrderShipmentPartitionedRegion(null, "ln", 1, 100, isOffHeap()));
- vm.invoke(() -> createConcurrentSender("ln", 2, true, 100, 10, false, false, null, manualStart, concurrencyLevel, OrderPolicy.KEY));
- vm.invoke(() -> startSender("ln"));
- }
-
- private void createAndStartSender(VM vm, int port, int concurrencyLevel, boolean manualStart, boolean pause) {
- vm.invoke(() -> createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME(port));
- vm.invoke(() -> createConcurrentSender("ln", 2, true, 100, 10, false, false, null, manualStart, concurrencyLevel, OrderPolicy.KEY));
- vm.invoke(() -> startSender("ln"));
- if (pause) {
- vm.invoke(() -> pauseSender("ln"));
- }
- vm.invoke(() -> createPartitionedRegion(testName + "_PR", "ln", 1, 10, isOffHeap()));
- getLogWriter().info("Created PRs on local site");
- }
-
- public static void createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME(
- Integer locPort) {
- createCache(false, locPort);
- AbstractGatewaySender.MAXIMUM_SHUTDOWN_WAIT_TIME = -1;
- }
-
public static void clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME() {
AbstractGatewaySender.MAXIMUM_SHUTDOWN_WAIT_TIME = 0;
}
@@ -576,4 +467,71 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
};
DistributedTestCase.waitForCriterion(wc, 120000, 500, true);
}
+
+ protected static void createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME(
+ Integer locPort) {
+ createCache(false, locPort);
+ AbstractGatewaySender.MAXIMUM_SHUTDOWN_WAIT_TIME = -1;
+ }
+
+ protected void createAndStartSender(VM vm, int port, int concurrencyLevel, boolean manualStart, boolean pause) {
+ vm.invoke(() -> createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME(port));
+ createSender(vm, concurrencyLevel, manualStart);
+ vm.invoke(() -> startSender("ln"));
+ if (pause) {
+ vm.invoke(() -> pauseSender("ln"));
+ }
+ vm.invoke(() -> createPartitionedRegion(testName + "_PR", "ln", 1, 10, isOffHeap()));
+ getLogWriter().info("Created PRs on local site");
+ }
+
+ protected void createReceiverAndDoPutsInPausedSender(int port) {
+ // Note: This is a test-specific method used by several tests to do puts from vm4 to vm2.
+ String regionName = testName + "_PR";
+ vm2.invoke(() -> createReceiver(port));
+ vm2.invoke(() -> createPartitionedRegion(regionName, null, 1, 10, isOffHeap()));
+ vm4.invoke(() -> doPuts(regionName, 10));
+ vm4.invoke(() -> validateRegionSize(regionName, 10));
+ // since sender is paused, no dispatching
+ vm2.invoke(() -> validateRegionSize(regionName, 0));
+ }
+
+ protected void recreatePRDoPutsAndValidateRegionSizes(int expectedRegionSize, boolean resumeSender) {
+ // Note: This is a test-specific method used by several test to recreate a partitioned region,
+ // do puts and validate region sizes in vm2 and vm4.
+ // since shadowPR is locally destroyed, so no data to dispatch
+ String regionName = testName + "_PR";
+ vm2.invoke(() -> validateRegionSize(regionName, expectedRegionSize));
+ if (resumeSender) {
+ vm4.invoke(() -> resumeSender("ln"));
+ }
+ vm4.invoke(() -> createPartitionedRegion(regionName, "ln", 1, 10, isOffHeap()));
+ vm4.invoke(() -> doPutsFrom(regionName, 10, 20));
+ validateRegionSizes(regionName, 10, vm4, vm2);
+ }
+
+ protected void createAndStartTwoSenders(VM vm, int port, int concurrencyLevel) {
+ // Note: This is a test-specific method used to create and start 2 senders.
+ vm.invoke(() -> createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME(port));
+ vm.invoke(() -> createPartitionedRegion(testName + "_PR", "ln1,ln2", 1, 100, isOffHeap()));
+ createSenders(vm, concurrencyLevel);
+ vm.invoke(() -> startSender("ln1"));
+ vm.invoke(() -> startSender("ln2"));
+ }
+
+ protected void createAndStartSenderWithCustomerOrderShipmentRegion(VM vm, int port, int concurrencyLevel, boolean manualStart) {
+ vm.invoke(() -> createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME(port));
+ vm.invoke(() -> createCustomerOrderShipmentPartitionedRegion(null, "ln", 1, 100, isOffHeap()));
+ createSender(vm, concurrencyLevel, manualStart);
+ vm.invoke(() -> startSender("ln"));
+ }
+
+ protected void createSender(VM vm, int concurrencyLevel, boolean manualStart) {
+ vm.invoke(() -> createConcurrentSender("ln", 2, true, 100, 10, false, false, null, manualStart, concurrencyLevel, OrderPolicy.KEY));
+ }
+
+ protected void createSenders(VM vm, int concurrencyLevel) {
+ vm.invoke(() -> createConcurrentSender("ln1", 2, true, 100, 10, false, false, null, true, concurrencyLevel, OrderPolicy.KEY));
+ vm.invoke(() -> createConcurrentSender("ln2", 3, true, 100, 10, false, false, null, true, concurrencyLevel, OrderPolicy.KEY));
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c6e0d2d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
new file mode 100644
index 0000000..3be8284
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
@@ -0,0 +1,16 @@
+package com.gemstone.gemfire.internal.cache.wan.offheap;
+
+import com.gemstone.gemfire.internal.cache.wan.concurrent.ConcurrentParallelGatewaySenderOperation_2_DUnitTest;
+
+public class ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest
+ extends ConcurrentParallelGatewaySenderOperation_2_DUnitTest {
+
+ public ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest(String name) {
+ super(name);
+ }
+
+ @Override
+ public boolean isOffHeap() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c6e0d2d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
new file mode 100644
index 0000000..8657d3b
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
@@ -0,0 +1,16 @@
+package com.gemstone.gemfire.internal.cache.wan.offheap;
+
+import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelGatewaySenderOperation_2_DUnitTest;
+
+public class ParallelGatewaySenderOperation_2_OffHeapDUnitTest
+ extends ParallelGatewaySenderOperation_2_DUnitTest{
+
+ public ParallelGatewaySenderOperation_2_OffHeapDUnitTest(String name) {
+ super(name);
+ }
+
+ @Override
+ public boolean isOffHeap() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c6e0d2d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperation_2_DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperation_2_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperation_2_DUnitTest.java
new file mode 100644
index 0000000..0d9c32e
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperation_2_DUnitTest.java
@@ -0,0 +1,22 @@
+package com.gemstone.gemfire.internal.cache.wan.parallel;
+
+import com.gemstone.gemfire.internal.cache.wan.concurrent.ConcurrentParallelGatewaySenderOperation_2_DUnitTest;
+import com.gemstone.gemfire.test.dunit.VM;
+
+public class ParallelGatewaySenderOperation_2_DUnitTest extends ConcurrentParallelGatewaySenderOperation_2_DUnitTest {
+
+ private static final long serialVersionUID = 1L;
+
+ public ParallelGatewaySenderOperation_2_DUnitTest(String name) {
+ super(name);
+ }
+
+ protected void createSender(VM vm, int concurrencyLevel, boolean manualStart) {
+ vm.invoke(() -> createSender("ln", 2, true, 100, 10, false, false, null, manualStart));
+ }
+
+ protected void createSenders(VM vm, int concurrencyLevel) {
+ vm.invoke(() -> createSender("ln1", 2, true, 100, 10, false, false, null, true));
+ vm.invoke(() -> createSender("ln2", 3, true, 100, 10, false, false, null, true));
+ }
+}
[13/50] [abbrv] incubator-geode git commit: GEODE-852:
copyGemFireVersionFile needs to make sure gemfire-core builds first
Posted by kl...@apache.org.
GEODE-852: copyGemFireVersionFile needs to make sure gemfire-core builds first
* This closes #81 (klund)
* Renamed copyPulsePropFile to copyGemFireVersionFile (klund)
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/6df4b8ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/6df4b8ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/6df4b8ff
Branch: refs/heads/feature/GEODE-773-2
Commit: 6df4b8ffd54dfc0ab191740fcebcb11ad14f0d7a
Parents: c01506b
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Wed Jan 27 10:45:47 2016 -0800
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Thu Jan 28 09:35:08 2016 -0800
----------------------------------------------------------------------
gemfire-pulse/build.gradle | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df4b8ff/gemfire-pulse/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-pulse/build.gradle b/gemfire-pulse/build.gradle
index 78043cd..3d694e5 100755
--- a/gemfire-pulse/build.gradle
+++ b/gemfire-pulse/build.gradle
@@ -83,6 +83,7 @@ sourceSets {
}
task copyGemFireVersionFile(type: Copy) {
+ inputs.dir project(':gemfire-core').sourceSets.main.output
from project(':gemfire-core').buildDir.absolutePath + "/generated-resources/main/com/gemstone/gemfire/internal/GemFireVersion.properties"
into generatedResources
}
[12/50] [abbrv] incubator-geode git commit: GEODE-871: build-up of
sockets in TIME_WAIT on locator machine
Posted by kl...@apache.org.
GEODE-871: build-up of sockets in TIME_WAIT on locator machine
This change-set alters the client to abort its TCP/IP connection to
the locator by enabling SO_LINGER and setting the timeout to zero
before it closes the connection. The Locator closes its connection
first, which puts it into TIME_WAIT. The client then aborts the
connection, which cleans up the Locator's TIME_WAIT connection.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/c01506b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/c01506b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/c01506b2
Branch: refs/heads/feature/GEODE-773-2
Commit: c01506b27e233538ecc2ca5a81ca113c15cc388a
Parents: 8a8571f
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Thu Jan 28 08:31:19 2016 -0800
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Thu Jan 28 08:33:13 2016 -0800
----------------------------------------------------------------------
.../distributed/internal/tcpserver/TcpClient.java | 8 +++++---
.../distributed/internal/tcpserver/TcpServer.java | 17 +----------------
2 files changed, 6 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c01506b2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpClient.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpClient.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpClient.java
index 47f50b3..836416b 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpClient.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpClient.java
@@ -167,14 +167,15 @@ public class TcpClient {
}
return null;
} finally {
- if (out != null) {
- out.close();
- }
try {
+ sock.setSoLinger(true, 0); // initiate an abort on close to shut down the locator's socket
sock.close();
} catch(Exception e) {
logger.error("Error closing socket ", e);
}
+ if (out != null) {
+ out.close();
+ }
}
}
@@ -223,6 +224,7 @@ public class TcpClient {
}
} finally {
try {
+ sock.setSoLinger(true, 0); // initiate an abort on close to shut down the server's socket
sock.close();
} catch(Exception e) {
logger.error("Error closing socket ", e);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c01506b2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
index f52b9ab..e5ad416 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
@@ -398,7 +398,6 @@ public class TcpServer {
DataSerializer.writeObject(response, output);
output.flush();
- output.close();
}
handler.endResponse(request,startTime);
@@ -467,24 +466,10 @@ public class TcpServer {
t.printStackTrace();
}
} finally {
- // Normal path closes input first, so let's do that here...
- if (input != null) {
- try {
- input.close();
- } catch (IOException e) {
- log.warn(
- "Exception closing input stream", e);
- }
- }
-
- // Closing the ObjectInputStream is supposed to close
- // the underlying InputStream, but we do it here just for
- // good measure. Closing a closed socket is a no-op.
try {
sock.close();
} catch (IOException e) {
- log.warn(
- "Exception closing socket", e);
+ // ignore
}
}
}
[44/50] [abbrv] incubator-geode git commit: Refactor dunit
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
index 2bb172e..058a7eb 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
@@ -120,6 +120,7 @@ import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
/**
@@ -461,7 +462,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
queue.put(value);
} catch (InterruptedException ex) {
- fail("Why was I interrupted?", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("Why was I interrupted?", ex);
}
}
});
@@ -483,7 +484,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertEquals(i, value.intValue());
} catch (InterruptedException ex) {
- fail("Why was I interrupted?", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("Why was I interrupted?", ex);
}
}
}
@@ -505,10 +506,10 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
DistributedTestCase.join(ai1, 30 * 1000, getLogWriter());
if (ai0.exceptionOccurred()) {
- fail("ai0 failed", ai0.getException());
+ com.gemstone.gemfire.test.dunit.Assert.fail("ai0 failed", ai0.getException());
} else if (ai1.exceptionOccurred()) {
- fail("ai1 failed", ai1.getException());
+ com.gemstone.gemfire.test.dunit.Assert.fail("ai1 failed", ai1.getException());
}
}
@@ -1212,7 +1213,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
try {
assertEquals(newValue, DataSerializer.readObject(dis));
} catch (Exception e) {
- fail("Unexpected Exception", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("Unexpected Exception", e);
}
}
};
@@ -1265,7 +1266,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
try {
assertEquals(newValue, DataSerializer.readObject(dis));
} catch (Exception e) {
- fail("Unexpected Exception", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("Unexpected Exception", e);
}
}
};
@@ -1749,7 +1750,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertEquals(value, result);
return result;
} catch (TimeoutException ex) {
- fail("Why did I time out?", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("Why did I time out?", ex);
}
return null;
}
@@ -1843,7 +1844,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertEquals(value, result);
return result;
} catch (TimeoutException ex) {
- fail("Why did I time out?", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("Why did I time out?", ex);
}
return null;
}
@@ -2302,7 +2303,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
} catch (CacheWriterException ex) {
if (region.isDestroyed()) {
- fail("should not have an exception if region is destroyed", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("should not have an exception if region is destroyed", ex);
}
assertEquals(1, region.size());
if (region.getAttributes().getOffHeap() && !(region instanceof PartitionedRegion)) {
@@ -2596,7 +2597,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertNull(helper.netSearch(true));
} catch (TimeoutException ex) {
- fail("Why did I time out?", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("Why did I time out?", ex);
}
return value;
}
@@ -2683,7 +2684,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
getSystem().getLogWriter().info("testDistributedPut: Created Region");
}
catch (CacheException e) {
- fail("While creating region", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While creating region", e);
}
}
};
@@ -2700,7 +2701,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
}
}
catch (CacheException e) {
- fail("While creating region", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While creating region", e);
}
}
};
@@ -4457,10 +4458,10 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
DistributedTestCase.join(async, 30 * 1000, getLogWriter());
}
if (async.exceptionOccurred()) {
- fail("async failed", async.getException());
+ com.gemstone.gemfire.test.dunit.Assert.fail("async failed", async.getException());
}
if (asyncGII.exceptionOccurred()) {
- fail("asyncGII failed", asyncGII.getException());
+ com.gemstone.gemfire.test.dunit.Assert.fail("asyncGII failed", asyncGII.getException());
}
// Locally destroy the region in vm0 so we know that they are not found by
@@ -4788,10 +4789,10 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
}
if (async.exceptionOccurred()) {
- fail("async failed", async.getException());
+ com.gemstone.gemfire.test.dunit.Assert.fail("async failed", async.getException());
}
if (asyncGII.exceptionOccurred()) {
- fail("asyncGII failed", asyncGII.getException());
+ com.gemstone.gemfire.test.dunit.Assert.fail("asyncGII failed", asyncGII.getException());
}
// Locally destroy the region in vm0 so we know that they are not found by
@@ -5365,7 +5366,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
}
});
- ExpectedException ex = addExpectedException("RegionDestroyedException");
+ IgnoredException ex = IgnoredException.addExpectedException("RegionDestroyedException");
try {
// in the meantime, do the get initial image in vm2
AsyncInvocation asyncGII = vm2.invokeAsync(new CacheSerializableRunnable("Create Mirrored Region") {
@@ -5406,7 +5407,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
// wait for nonblocking operations to complete
DistributedTestCase.join(async, 30 * 1000, getLogWriter());
if (async.exceptionOccurred()) {
- fail("async invocation failed", async.getException());
+ com.gemstone.gemfire.test.dunit.Assert.fail("async invocation failed", async.getException());
}
vm2.invoke(new SerializableRunnable("Set fast image processing") {
@@ -5426,10 +5427,10 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
DistributedTestCase.join(async, 30 * 1000, getLogWriter());
}
if (async.exceptionOccurred()) {
- fail("async failed", async.getException());
+ com.gemstone.gemfire.test.dunit.Assert.fail("async failed", async.getException());
}
if (asyncGII.exceptionOccurred()) {
- fail("asyncGII failed", asyncGII.getException());
+ com.gemstone.gemfire.test.dunit.Assert.fail("asyncGII failed", asyncGII.getException());
}
} finally {
ex.remove();
@@ -6071,7 +6072,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
getSystem().getLogWriter().info("testTXSimpleOps: Created region");
}
catch (CacheException e) {
- fail("While creating region", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While creating region", e);
}
}
};
@@ -6088,7 +6089,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
getSystem().getLogWriter().info("testTXSimpleOps: Created Key");
}
catch (CacheException e) {
- fail("While creating region", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While creating region", e);
}
}
};
@@ -6371,7 +6372,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
flushIfNecessary(rgn);
}
catch (CacheException e) {
- fail("While creating region", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While creating region", e);
}
}
};
@@ -6593,7 +6594,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
getSystem().getLogWriter().info("testTXMultiRegion: Created region1");
}
catch (CacheException e) {
- fail("While creating region", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While creating region", e);
}
}
};
@@ -6605,7 +6606,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
getSystem().getLogWriter().info("testTXMultiRegion: Created key");
}
catch (CacheException e) {
- fail("While creating region", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While creating region", e);
}
}
};
@@ -6620,7 +6621,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
getSystem().getLogWriter().info("testTXMultiRegion: Created region2");
}
catch (CacheException e) {
- fail("While creating region", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While creating region", e);
}
}
};
@@ -6633,7 +6634,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
getSystem().getLogWriter().info("testTXMultiRegion: Created Key");
}
catch (CacheException e) {
- fail("While creating region", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While creating region", e);
}
}
};
@@ -6648,7 +6649,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
getSystem().getLogWriter().info("testTXMultiRegion: Created Region");
}
catch (CacheException e) {
- fail("While creating region", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While creating region", e);
}
}
};
@@ -6661,7 +6662,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
getSystem().getLogWriter().info("testTXMultiRegion: Created Key");
}
catch (CacheException e) {
- fail("While creating region", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While creating region", e);
}
}
};
@@ -7334,7 +7335,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
createRegion(rgnName, rgnAtts.create());
}
catch (CacheException e) {
- fail("While creating region", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While creating region", e);
}
}
};
@@ -7350,7 +7351,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
createRegion(rgnName, rgnAtts.create());
}
catch (CacheException e) {
- fail("While creating region", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While creating region", e);
}
}
};
@@ -7474,7 +7475,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
}
}
catch (CacheException e) {
- fail("While creating region", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While creating region", e);
}
}
};
@@ -7775,7 +7776,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
try {
rgn1.create("key", null);
} catch (CacheException e) {
- fail("While creating key", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While creating key", e);
}
}
});
@@ -7960,11 +7961,11 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
try {
bridge.start();
} catch (IOException ex) {
- fail("While creating bridge", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While creating bridge", ex);
}
}
} catch (CacheException ex) {
- fail("While creating region", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While creating region", ex);
}
}
};
@@ -8047,7 +8048,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
RegionFactory f = getCache().createRegionFactory(getRegionAttributes());
CCRegion = (LocalRegion)f.create(name);
} catch (CacheException ex) {
- fail("While creating region", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While creating region", ex);
}
}
};
@@ -8065,7 +8066,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertTrue("expected some event conflation", events>0);
}
} catch (CacheException e) {
- fail("while performing concurrent operations", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("while performing concurrent operations", e);
}
// } catch (InterruptedException e) {
// fail("someone interrupted my sleep");
@@ -8126,7 +8127,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
long events = CCRegion.getCachePerfStats().getDeltaFailedUpdates();
assertTrue("expected some failed deltas", events>0);
} catch (CacheException e) {
- fail("while performing concurrent operations", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("while performing concurrent operations", e);
}
}
};
@@ -8235,7 +8236,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
boolean includeClear = true;
doOpsLoop(msToRun, includeClear);
} catch (CacheException e) {
- fail("while performing concurrent operations", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("while performing concurrent operations", e);
}
}
};
@@ -8250,7 +8251,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
f.setDiskSynchronous(syncDiskWrite);
CCRegion = (LocalRegion)f.create(name);
} catch (CacheException ex) {
- fail("While creating region", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While creating region", ex);
}
}
};
@@ -8349,7 +8350,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
}
CCRegion = (LocalRegion)f.create(name);
} catch (CacheException ex) {
- fail("While creating region", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While creating region", ex);
}
}
};
@@ -8365,7 +8366,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
try {
doOpsLoop(5000, true);
} catch (CacheException e) {
- fail("while performing concurrent operations", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("while performing concurrent operations", e);
}
// } catch (InterruptedException e) {
// fail("someone interrupted my sleep");
@@ -8460,7 +8461,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
sendSerialMessageToAll(); // flush the ops
}
} catch (CacheException ex) {
- fail("While creating region", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While creating region", ex);
}
}
};
@@ -8483,7 +8484,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
sendSerialMessageToAll(); // flush the ops
}
} catch (CacheException e) {
- fail("while performing destroy operations", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("while performing destroy operations", e);
}
// OSProcess.printStacks(0, getLogWriter(), false);
}
@@ -8565,7 +8566,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
getLogWriter().info("tombstone service state: " + CCRegion.getCache().getTombstoneService());
throw e;
} catch (CacheException e) {
- fail("while performing create/destroy operations", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("while performing create/destroy operations", e);
} finally {
TombstoneService.GC_MEMORY_THRESHOLD = oldLimit;
}
@@ -8600,7 +8601,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
sendSerialMessageToAll(); // flush the ops
}
} catch (CacheException e) {
- fail("while performing create operations", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("while performing create operations", e);
}
}
});
@@ -8680,7 +8681,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
}
CCRegion = (LocalRegion)f.create(name);
} catch (CacheException ex) {
- fail("While creating region", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While creating region", ex);
}
}
};
@@ -8700,7 +8701,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertTrue("expected some event conflation", events>0);
}
} catch (CacheException e) {
- fail("while performing concurrent operations", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("while performing concurrent operations", e);
}
}
};
@@ -8861,7 +8862,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
}
CCRegion = (LocalRegion)f.create(name);
} catch (CacheException ex) {
- fail("While creating region", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While creating region", ex);
}
}
};
@@ -8881,7 +8882,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
assertTrue("expected some event conflation", events>0);
}
} catch (CacheException e) {
- fail("while performing concurrent operations", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("while performing concurrent operations", e);
}
}
};
@@ -8999,7 +9000,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
}
CCRegion = (LocalRegion)f.create(regionName);
} catch (CacheException ex) {
- fail("While creating region", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While creating region", ex);
}
}
};
@@ -9052,7 +9053,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
}
}
if (!failed) {
- fail("asyncInvocation 0 returned exception", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("asyncInvocation 0 returned exception", e);
}
}
return failed;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PRBucketSynchronizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PRBucketSynchronizationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PRBucketSynchronizationDUnitTest.java
index c81a55f..2eef23a 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PRBucketSynchronizationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PRBucketSynchronizationDUnitTest.java
@@ -41,6 +41,7 @@ import com.gemstone.gemfire.internal.cache.versions.VMVersionTag;
import com.gemstone.gemfire.internal.cache.versions.VersionSource;
import com.gemstone.gemfire.internal.cache.versions.VersionTag;
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.VM;
@@ -80,8 +81,8 @@ public class PRBucketSynchronizationDUnitTest extends CacheTestCase {
* did not see secondary buckets perform a delta-GII.
*/
public void doBucketsSyncOnPrimaryLoss(TestType typeOfTest) {
- addExpectedException("killing member's ds");
- addExpectedException("killing member's ds");
+ IgnoredException.addExpectedException("killing member's ds");
+ IgnoredException.addExpectedException("killing member's ds");
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionDUnitTest.java
index 234203f..ef5c338 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionDUnitTest.java
@@ -41,6 +41,7 @@ import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
import com.gemstone.gemfire.internal.cache.PartitionedRegionException;
import com.gemstone.gemfire.internal.logging.InternalLogWriter;
import com.gemstone.gemfire.internal.logging.PureLogWriter;
+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;
@@ -227,7 +228,7 @@ public class PartitionedRegionDUnitTest extends MultiVMRegionTestCase {
createRegion(name, "INCOMPATIBLE_ROOT", getRegionAttributes());
} catch (CacheException ex) {
- fail("While creating Partitioned region", ex);
+ Assert.fail("While creating Partitioned region", ex);
}
}
});
@@ -245,7 +246,7 @@ public class PartitionedRegionDUnitTest extends MultiVMRegionTestCase {
}
} catch (CacheException ex) {
- fail("While creating Partitioned Region", ex);
+ Assert.fail("While creating Partitioned Region", ex);
}
}
});
@@ -259,7 +260,7 @@ public class PartitionedRegionDUnitTest extends MultiVMRegionTestCase {
try {
createRegion(regionName, "root", getRegionAttributes());
} catch (CacheException ex) {
- fail("While creating Partitioned region", ex);
+ Assert.fail("While creating Partitioned region", ex);
}
}
};
@@ -293,7 +294,7 @@ public class PartitionedRegionDUnitTest extends MultiVMRegionTestCase {
}
}
catch (Exception ex) {
- fail("while creating or populating partitioned region", ex);
+ Assert.fail("while creating or populating partitioned region", ex);
}
finally {
if (region != null) {
@@ -360,7 +361,7 @@ public class PartitionedRegionDUnitTest extends MultiVMRegionTestCase {
}
catch (Exception ex2) {
}
- fail("Unexpected exception", ex);
+ Assert.fail("Unexpected exception", ex);
}
}
});
@@ -496,7 +497,7 @@ public class PartitionedRegionDUnitTest extends MultiVMRegionTestCase {
try {
createRegion(regionName, "root", getRegionAttributes());
} catch (CacheException ex) {
- fail("While creating Partitioned region", ex);
+ Assert.fail("While creating Partitioned region", ex);
}
}
};
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PreloadedRegionTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PreloadedRegionTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PreloadedRegionTestCase.java
index 97bae11..86dfcc7 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PreloadedRegionTestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PreloadedRegionTestCase.java
@@ -22,6 +22,7 @@ import com.gemstone.gemfire.cache.DataPolicy;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -62,7 +63,7 @@ public class PreloadedRegionTestCase extends MultiVMRegionTestCase {
getSystem().getLogWriter().info("testDistributedCreate: Created Region");
}
catch (CacheException e) {
- fail("While creating region", e);
+ Assert.fail("While creating region", e);
}
}
};
@@ -76,7 +77,7 @@ public class PreloadedRegionTestCase extends MultiVMRegionTestCase {
getSystem().getLogWriter().info("testDistributedCReate: Created Key");
}
catch (CacheException e) {
- fail("While creating region", e);
+ Assert.fail("While creating region", e);
}
}
};
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkSingleVMDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkSingleVMDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkSingleVMDUnitTest.java
index 572ad53..ad35385 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkSingleVMDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/PutAllCallBkSingleVMDUnitTest.java
@@ -39,6 +39,7 @@ import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
import com.gemstone.gemfire.cache.util.CacheWriterAdapter;
import com.gemstone.gemfire.distributed.DistributedSystem;
+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;
@@ -186,7 +187,7 @@ public class PutAllCallBkSingleVMDUnitTest extends DistributedTestCase{
obj = region.put(ob, str);
}
}catch(Exception ex){
- fail("Failed while region.put", ex);
+ Assert.fail("Failed while region.put", ex);
}
return obj;
}//end of putMethod
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RRSynchronizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RRSynchronizationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RRSynchronizationDUnitTest.java
index e707ea8..47746cb 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RRSynchronizationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RRSynchronizationDUnitTest.java
@@ -45,6 +45,7 @@ import com.gemstone.gemfire.internal.cache.versions.VMVersionTag;
import com.gemstone.gemfire.internal.cache.versions.VersionSource;
import com.gemstone.gemfire.internal.cache.versions.VersionTag;
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.VM;
@@ -85,7 +86,7 @@ public class RRSynchronizationDUnitTest extends CacheTestCase {
* distributed in the 7.0 release.
*/
public void doRegionsSyncOnPeerLoss(TestType typeOfTest) {
- addExpectedException("killing member's ds");
+ IgnoredException.addExpectedException("killing member's ds");
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
index b4a73bc..28a291d 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
@@ -54,9 +54,11 @@ import com.gemstone.gemfire.distributed.internal.membership.gms.mgr.GMSMembershi
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator;
+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;
@@ -90,10 +92,10 @@ public class ReconnectDUnitTest extends CacheTestCase
locatorPort = locPort;
Properties props = getDistributedSystemProperties();
locator = Locator.startLocatorAndDS(locatorPort, new File(""), props);
- addExpectedException("com.gemstone.gemfire.ForcedDisconnectException||Possible loss of quorum");
+ IgnoredException.addExpectedException("com.gemstone.gemfire.ForcedDisconnectException||Possible loss of quorum");
// MembershipManagerHelper.getMembershipManager(InternalDistributedSystem.getConnectedInstance()).setDebugJGroups(true);
} catch (IOException e) {
- fail("unable to start locator", e);
+ Assert.fail("unable to start locator", e);
}
}
});
@@ -165,7 +167,7 @@ public class ReconnectDUnitTest extends CacheTestCase
// quorum check fails, then succeeds
public void testReconnectWithQuorum() throws Exception {
- addExpectedException("killing member's ds");
+ IgnoredException.addExpectedException("killing member's ds");
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
@@ -195,7 +197,7 @@ public class ReconnectDUnitTest extends CacheTestCase
props.put("max-num-reconnect-tries", "2");
props.put("log-file", "autoReconnectVM"+VM.getCurrentVMNum()+"_"+getPID()+".log");
Cache cache = new CacheFactory(props).create();
- addExpectedException("com.gemstone.gemfire.ForcedDisconnectException||Possible loss of quorum");
+ IgnoredException.addExpectedException("com.gemstone.gemfire.ForcedDisconnectException||Possible loss of quorum");
Region myRegion = cache.getRegion("root/myRegion");
ReconnectDUnitTest.savedSystem = cache.getDistributedSystem();
myRegion.put("MyKey1", "MyValue1");
@@ -247,7 +249,7 @@ public class ReconnectDUnitTest extends CacheTestCase
public void doTestReconnectOnForcedDisconnect(final boolean createInAppToo) throws Exception {
- addExpectedException("killing member's ds");
+ IgnoredException.addExpectedException("killing member's ds");
// getSystem().disconnect();
// getLogWriter().fine("Cache Closed ");
@@ -472,7 +474,7 @@ public class ReconnectDUnitTest extends CacheTestCase
try {
Locator.startLocatorAndDS(secondLocPort, null, props);
} catch (IOException e) {
- fail("exception starting locator", e);
+ Assert.fail("exception starting locator", e);
}
}
});
@@ -603,7 +605,7 @@ public class ReconnectDUnitTest extends CacheTestCase
pw.close();
}
catch (IOException ex) {
- fail("IOException during cache.xml generation to " + file, ex);
+ Assert.fail("IOException during cache.xml generation to " + file, ex);
}
closeCache();
getSystem().disconnect();
@@ -736,7 +738,7 @@ public class ReconnectDUnitTest extends CacheTestCase
pw.close();
}
catch (IOException ex) {
- fail("IOException during cache.xml generation to " + file, ex);
+ Assert.fail("IOException during cache.xml generation to " + file, ex);
}
closeCache();
//disconnectFromDS();
@@ -812,12 +814,12 @@ public class ReconnectDUnitTest extends CacheTestCase
}
if (roleLossAsync.getException() != null){
- fail("Exception in Vm0", roleLossAsync.getException());
+ Assert.fail("Exception in Vm0", roleLossAsync.getException());
}
DistributedTestCase.join(avkVm1, 30 * 1000, getLogWriter());
if (avkVm1.getException() != null){
- fail("Exception in Vm1", avkVm1.getException());
+ Assert.fail("Exception in Vm1", avkVm1.getException());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/SearchAndLoadDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/SearchAndLoadDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/SearchAndLoadDUnitTest.java
index ace3e4b..47ab179 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/SearchAndLoadDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/SearchAndLoadDUnitTest.java
@@ -33,9 +33,11 @@ import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.RegionEvent;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.TimeoutException;
+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;
@@ -130,7 +132,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
region.create(objectName,null);
}
catch (CacheException ex) {
- fail("While creating ACK region", ex);
+ Assert.fail("While creating ACK region", ex);
}
}
});
@@ -148,7 +150,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
}
catch (CacheException ex) {
- fail("While creating ACK region", ex);
+ Assert.fail("While creating ACK region", ex);
}
}
});
@@ -166,7 +168,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
}
catch (CacheException ex) {
- fail("While creating ACK region", ex);
+ Assert.fail("While creating ACK region", ex);
}
}
});
@@ -181,10 +183,10 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
// System.err.println("Results is " + result.toString() + " Key is " + objectName.toString());
}
catch(CacheLoaderException cle) {
- fail("While Get a value", cle);
+ Assert.fail("While Get a value", cle);
}
catch(TimeoutException te) {
- fail("While Get a value", te);
+ Assert.fail("While Get a value", te);
}
}
@@ -259,7 +261,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
Region region = createRegion(name,factory.create());
region.create(objectName, null);
- addExpectedException(exceptionString);
+ IgnoredException.addExpectedException(exceptionString);
}
});
@@ -378,10 +380,10 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
assertNull(result);
}
catch(CacheLoaderException cle) {
- fail("While getting value for ACK region", cle);
+ Assert.fail("While getting value for ACK region", cle);
}
catch(TimeoutException te) {
- fail("While getting value for ACK region", te);
+ Assert.fail("While getting value for ACK region", te);
}
}
@@ -426,7 +428,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
}
catch (CacheException ex) {
- fail("While creating ACK region", ex);
+ Assert.fail("While creating ACK region", ex);
}
}
});
@@ -449,7 +451,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
createRegion(name,factory.create());
}
catch (CacheException ex) {
- fail("While creating ACK region", ex);
+ Assert.fail("While creating ACK region", ex);
}
}
});
@@ -464,7 +466,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
}
catch(CacheLoaderException cle) {
- fail("While getting value for ACK region", cle);
+ Assert.fail("While getting value for ACK region", cle);
}
/* catch(EntryNotFoundException enfe) {
@@ -472,7 +474,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
}*/
catch(TimeoutException te) {
- fail("While getting value for ACK region", te);
+ Assert.fail("While getting value for ACK region", te);
}
}
@@ -522,7 +524,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
region.create(objectName,null);
}
catch (CacheException ex) {
- fail("While creating ACK region", ex);
+ Assert.fail("While creating ACK region", ex);
}
}
});
@@ -549,7 +551,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
createRegion(name,factory.create());
}
catch (CacheException ex) {
- fail("While creating ACK region", ex);
+ Assert.fail("While creating ACK region", ex);
}
}
};
@@ -566,7 +568,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
}
catch(CacheLoaderException cle) {
- fail("While getting value for ACK region", cle);
+ Assert.fail("While getting value for ACK region", cle);
}
/* catch(EntryNotFoundException enfe) {
@@ -574,7 +576,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
}*/
catch(TimeoutException te) {
- fail("While getting value for ACK region", te);
+ Assert.fail("While getting value for ACK region", te);
}
}
@@ -640,7 +642,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
}
catch (CacheException ex) {
- fail("While creating ACK region", ex);
+ Assert.fail("While creating ACK region", ex);
}
}
});
@@ -665,7 +667,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
createRegion(name,factory.create());
}
catch (CacheException ex) {
- fail("While creating ACK region", ex);
+ Assert.fail("While creating ACK region", ex);
}
}
});
@@ -731,7 +733,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
}
catch (CacheException ex) {
- fail("While creating ACK region", ex);
+ Assert.fail("While creating ACK region", ex);
}
}
});
@@ -746,7 +748,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
createRegion(name,factory.create());
}
catch (CacheException ex) {
- fail("While creating ACK region", ex);
+ Assert.fail("While creating ACK region", ex);
}
}
});
@@ -828,7 +830,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
}
catch (CacheException ex) {
- fail("While creating replicated region", ex);
+ Assert.fail("While creating replicated region", ex);
}
}
});
@@ -841,7 +843,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
createRegion(name,factory.create());
}
catch (CacheException ex) {
- fail("While creating empty region", ex);
+ Assert.fail("While creating empty region", ex);
}
}
});
@@ -910,7 +912,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
createRegion(name,factory.create());
}
catch (CacheException ex) {
- fail("While creating empty region", ex);
+ Assert.fail("While creating empty region", ex);
}
}
});
@@ -923,7 +925,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
createRegion(name,factory.create());
}
catch (CacheException ex) {
- fail("While creating empty region", ex);
+ Assert.fail("While creating empty region", ex);
}
}
});
@@ -964,7 +966,7 @@ public class SearchAndLoadDUnitTest extends CacheTestCase {
}
catch (CacheException ex) {
- fail("While creating replicated region", ex);
+ Assert.fail("While creating replicated region", ex);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java
index 2c065a1..bea9f33 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java
@@ -79,7 +79,9 @@ import com.gemstone.gemfire.internal.cache.TXStateProxyImpl;
import com.gemstone.gemfire.internal.cache.locks.TXLockBatch;
import com.gemstone.gemfire.internal.cache.locks.TXLockService;
import com.gemstone.gemfire.internal.cache.locks.TXLockServiceImpl;
+import com.gemstone.gemfire.test.dunit.Assert;
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.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
@@ -107,7 +109,7 @@ public class TXDistributedDUnitTest extends CacheTestCase {
* Test a remote grantor
*/
public void testRemoteGrantor() throws Exception {
- addExpectedException("killing members ds");
+ IgnoredException.addExpectedException("killing members ds");
final CacheTransactionManager txMgr = this.getCache().getCacheTransactionManager();
final String rgnName = getUniqueName();
Region rgn = getCache().createRegion(rgnName, getRegionAttributes());
@@ -119,7 +121,7 @@ public class TXDistributedDUnitTest extends CacheTestCase {
Region rgn1 = getCache().createRegion(rgnName, getRegionAttributes());
rgn1.put("key", "val0");
} catch (CacheException e) {
- fail("While creating region", e);
+ Assert.fail("While creating region", e);
}
}
});
@@ -188,7 +190,7 @@ public class TXDistributedDUnitTest extends CacheTestCase {
assertTrue(!TXLockService.getDTLS().isLockGrantor());
}
} catch (CacheException e) {
- fail("While creating region", e);
+ Assert.fail("While creating region", e);
}
}
};
@@ -227,7 +229,7 @@ public class TXDistributedDUnitTest extends CacheTestCase {
rgn2.create("key", null);
rgn3.create("key", null);
} catch (CacheException e) {
- fail("While creating region", e);
+ Assert.fail("While creating region", e);
}
}
};
@@ -471,7 +473,7 @@ public class TXDistributedDUnitTest extends CacheTestCase {
factory2.setMirrorType(MirrorType.KEYS);
getCache().createRegion(rgnName, factory2.create());
} catch (CacheException e) {
- fail("While creating region", e);
+ Assert.fail("While creating region", e);
}
}
});
@@ -526,7 +528,7 @@ public class TXDistributedDUnitTest extends CacheTestCase {
}
public void testHighAvailabilityFeatures() throws Exception {
- addExpectedException("DistributedSystemDisconnectedException");
+ IgnoredException.addExpectedException("DistributedSystemDisconnectedException");
// final CacheTransactionManager txMgr = this.getCache().getCacheTransactionManager();
// final TXManagerImpl txMgrImpl = (TXManagerImpl) txMgr;
final String rgnName = getUniqueName();
@@ -543,7 +545,7 @@ public class TXDistributedDUnitTest extends CacheTestCase {
factory2.setDataPolicy(DataPolicy.REPLICATE);
getCache().createRegion(rgnName, factory2.create());
} catch (CacheException e) {
- fail("While creating region", e);
+ Assert.fail("While creating region", e);
}
}
});
@@ -615,7 +617,7 @@ public class TXDistributedDUnitTest extends CacheTestCase {
factory2.setDataPolicy(DataPolicy.REPLICATE);
rgn1 = getCache().createRegion(rgnName, factory2.create());
} catch (CacheException e) {
- fail("While creating region", e);
+ Assert.fail("While creating region", e);
}
}
Region.Entry re = rgn1.getEntry("key0");
@@ -727,7 +729,7 @@ public class TXDistributedDUnitTest extends CacheTestCase {
factory2.setDataPolicy(DataPolicy.REPLICATE);
rgn1 = getCache().createRegion(rgnName, factory2.create());
} catch (CacheException e) {
- fail("While creating region", e);
+ Assert.fail("While creating region", e);
}
}
long giveUp = System.currentTimeMillis() + 10000;
@@ -766,7 +768,7 @@ public class TXDistributedDUnitTest extends CacheTestCase {
rgn1.put("soloKey0", "soloVal0_0");
rgn1.put("soloKey1", "soloVal1_0");
} catch (CacheException e) {
- fail("While creating region", e);
+ Assert.fail("While creating region", e);
}
}
};
@@ -829,7 +831,7 @@ public class TXDistributedDUnitTest extends CacheTestCase {
factory2.setDataPolicy(DataPolicy.REPLICATE);
soloRgn = getCache().createRegion(soloRegionName, factory2.create());
} catch (CacheException e) {
- fail("While creating region ", e);
+ Assert.fail("While creating region ", e);
}
}
Region.Entry re = soloRgn.getEntry("soloKey0");
@@ -959,7 +961,7 @@ public class TXDistributedDUnitTest extends CacheTestCase {
factory2.setDataPolicy(DataPolicy.REPLICATE);
soloRgn = getCache().createRegion(soloRegionName, factory2.create());
} catch (CacheException e) {
- fail("While creating region ", e);
+ Assert.fail("While creating region ", e);
}
}
Region.Entry re = soloRgn.getEntry("soloKey0");
@@ -985,7 +987,7 @@ public class TXDistributedDUnitTest extends CacheTestCase {
factory2.setDataPolicy(DataPolicy.REPLICATE);
rgn1 = getCache().createRegion(rgnName, factory2.create());
} catch (CacheException e) {
- fail("While creating region", e);
+ Assert.fail("While creating region", e);
}
}
Region.Entry re = rgn1.getEntry("key0");
@@ -1110,7 +1112,7 @@ public class TXDistributedDUnitTest extends CacheTestCase {
Region rgn1 = getCache().createRegion(rgnName, getRegionAttributes());
rgn1.create("key", null);
} catch (CacheException e) {
- fail("While creating region", e);
+ Assert.fail("While creating region", e);
}
}
};
@@ -1217,7 +1219,7 @@ public class TXDistributedDUnitTest extends CacheTestCase {
factory.setDataPolicy(DataPolicy.REPLICATE);
getCache().createRegion(rgnName, factory.create());
} catch (CacheException e) {
- fail("While creating region", e);
+ Assert.fail("While creating region", e);
}
}
});
@@ -1409,9 +1411,9 @@ public class TXDistributedDUnitTest extends CacheTestCase {
}
}
};
- ExpectedException ee = null;
+ IgnoredException ee = null;
try {
- ee = addExpectedException(DiskAccessException.class.getName() + "|" +
+ ee = IgnoredException.addExpectedException(DiskAccessException.class.getName() + "|" +
CommitIncompleteException.class.getName() + "|" +
CommitReplyException.class.getName());
origin.invoke(doTransaction);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/TXRestrictionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/TXRestrictionsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/TXRestrictionsDUnitTest.java
index 14c0bca..6810675 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/TXRestrictionsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/TXRestrictionsDUnitTest.java
@@ -37,6 +37,7 @@ import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.internal.OSProcess;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
public class TXRestrictionsDUnitTest extends CacheTestCase {
@@ -78,7 +79,7 @@ public class TXRestrictionsDUnitTest extends CacheTestCase {
getCache().createRegion(misConfigRegionName, getDiskRegionAttributes());
// rgn1.put("misConfigKey", "oldmisConfigVal");
} catch (CacheException e) {
- fail("While creating region", e);
+ Assert.fail("While creating region", e);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
index 263ccf9..3dc6d75 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
@@ -31,6 +31,7 @@ import com.gemstone.gemfire.distributed.internal.DM;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
+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;
@@ -407,7 +408,7 @@ public class DistributedMemberDUnitTest extends DistributedTestCase {
assertTrue("Expected" + expected + " got " + members, members.containsAll(expected));
assertEquals(4, members.size());
} catch (UnknownHostException e) {
- fail("Unable to get IpAddress", e);
+ Assert.fail("Unable to get IpAddress", e);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
index de60132..85ac58e 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
@@ -53,6 +53,7 @@ import com.gemstone.gemfire.internal.tcp.Connection;
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;
@@ -87,7 +88,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
super.setUp();
port1 = -1;
port2 = -1;
- addExpectedException("Removing shunned member");
+ IgnoredException.addExpectedException("Removing shunned member");
}
@Override
@@ -475,7 +476,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
* (which is now the sole remaining member) shuts itself down.
*/
public void testLeadAndCoordFailure() throws Exception {
- addExpectedException("Possible loss of quorum due");
+ IgnoredException.addExpectedException("Possible loss of quorum due");
disconnectAllFromDS();
Host host = Host.getHost(0);
VM vm1 = host.getVM(1);
@@ -515,7 +516,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
Locator.startLocatorAndDS(port2, lf, properties);
}
catch (IOException ios) {
- fail("Unable to start locator2", ios);
+ com.gemstone.gemfire.test.dunit.Assert.fail("Unable to start locator2", ios);
}
}
});
@@ -649,7 +650,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
MembershipManagerHelper.inhibitForcedDisconnectLogging(true);
}
catch (IOException ios) {
- fail("Unable to start locator2", ios);
+ com.gemstone.gemfire.test.dunit.Assert.fail("Unable to start locator2", ios);
}
}
});
@@ -796,7 +797,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
Locator.startLocatorAndDS(port2, lf, properties);
}
catch (IOException ios) {
- fail("Unable to start locator2", ios);
+ com.gemstone.gemfire.test.dunit.Assert.fail("Unable to start locator2", ios);
}
}
});
@@ -945,7 +946,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
Locator.startLocatorAndDS(port2, lf, properties);
}
catch (IOException ios) {
- fail("Unable to start locator1", ios);
+ com.gemstone.gemfire.test.dunit.Assert.fail("Unable to start locator1", ios);
}
}
});
@@ -1061,7 +1062,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
} catch (Exception ex) {
// if you see this fail, determine if unexpected exception is expected
// if expected then add in a catch block for it above this catch
- fail("Failed with unexpected exception", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("Failed with unexpected exception", ex);
}
finally {
if (oldValue == null) {
@@ -1106,7 +1107,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
Locator.startLocatorAndDS(port, logFile, locProps);
} catch (IOException ex) {
- fail("While starting locator on port " + port, ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While starting locator on port " + port, ex);
}
}
});
@@ -1355,7 +1356,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
try {
Locator.startLocatorAndDS(port1, logFile, dsProps);
} catch (IOException ex) {
- fail("While starting locator on port " + port1, ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While starting locator on port " + port1, ex);
}
}
});
@@ -1370,7 +1371,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
Locator.startLocatorAndDS(port2, logFile, dsProps);
} catch (IOException ex) {
- fail("While starting locator on port " + port2, ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While starting locator on port " + port2, ex);
}
}
});
@@ -1441,7 +1442,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
*/
public void testMultipleMcastLocators() throws Exception {
disconnectAllFromDS();
- addExpectedException("Could not stop Distribution Locator"); // shutdown timing issue in InternalLocator
+ IgnoredException.addExpectedException("Could not stop Distribution Locator"); // shutdown timing issue in InternalLocator
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
@@ -1476,7 +1477,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
Locator.startLocatorAndDS(port1, logFile, null, props);
}
catch (IOException ex) {
- fail("While starting locator on port " + port1, ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While starting locator on port " + port1, ex);
}
}
});
@@ -1494,7 +1495,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
Locator.startLocatorAndDS(port2, logFile, null, props);
}
catch (IOException ex) {
- fail("While starting locator on port " + port2, ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While starting locator on port " + port2, ex);
}
}
});
@@ -1529,7 +1530,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
return system.getDM().getViewMembers().size() == 5;
}
catch (Exception e) {
- fail("unexpected exception", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("unexpected exception", e);
}
return false; // NOTREACHED
}
@@ -1831,7 +1832,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
locProps.put("log-level", getDUnitLogLevel());
Locator.startLocatorAndDS(port, logFile, locProps);
} catch (IOException ex) {
- fail("While starting locator on port " + port, ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("While starting locator on port " + port, ex);
}
finally {
System.getProperties().remove(InternalLocator.LOCATORS_PREFERRED_AS_COORDINATORS);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
index bdc08b6..7125457 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
@@ -44,6 +44,7 @@ import com.gemstone.gemfire.internal.admin.StatResource;
import com.gemstone.gemfire.internal.admin.remote.RemoteTransportConfig;
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;
@@ -70,7 +71,7 @@ public class ConsoleDistributionManagerDUnitTest
public void setUp() throws Exception {
boolean finishedSetup = false;
- addExpectedException("Error occurred while reading system log");
+ IgnoredException.addExpectedException("Error occurred while reading system log");
try {
if (firstTime) {
disconnectFromDS(); //make sure there's no ldm lying around
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java
index 3da075f..8b4bf9f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java
@@ -48,6 +48,7 @@ import com.gemstone.gemfire.distributed.internal.membership.gms.mgr.GMSMembershi
import com.gemstone.gemfire.internal.logging.LogService;
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;
@@ -283,7 +284,7 @@ public class DistributionManagerDUnitTest extends DistributedTestCase {
public void run() {
props.setProperty(DistributionConfig.NAME_NAME, "sleeper");
getSystem(props);
- addExpectedException("elapsed while waiting for replies");
+ IgnoredException.addExpectedException("elapsed while waiting for replies");
RegionFactory rf = new RegionFactory();
Region r = rf.setScope(Scope.DISTRIBUTED_ACK)
.setDataPolicy(DataPolicy.REPLICATE)
@@ -397,7 +398,7 @@ public class DistributionManagerDUnitTest extends DistributedTestCase {
*/
public void testKickOutSickMember() throws Exception {
disconnectAllFromDS();
- addExpectedException("10 seconds have elapsed while waiting");
+ IgnoredException.addExpectedException("10 seconds have elapsed while waiting");
Host host = Host.getHost(0);
// VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java
index d6f45d1..3a3eedd 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java
@@ -28,6 +28,7 @@ import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.distributed.Locator;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.CacheServerImpl;
+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.SerializableRunnable;
@@ -75,7 +76,7 @@ public class ProductUseLogDUnitTest extends DistributedTestCase {
try {
server.start();
} catch (IOException e) {
- fail("failed to start server", e);
+ Assert.fail("failed to start server", e);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java
index efdcb0c..f611705 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java
@@ -33,6 +33,7 @@ import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.distributed.DistributedLockService;
import com.gemstone.gemfire.distributed.LockServiceDestroyedException;
import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
+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;
@@ -65,7 +66,7 @@ public class GemFireDeadlockDetectorDUnitTest extends CacheTestCase {
thread.join(30000);
assertTrue(!thread.isAlive());
} catch (InterruptedException e) {
- fail("interrupted", e);
+ Assert.fail("interrupted", e);
}
}
}
@@ -131,7 +132,7 @@ public class GemFireDeadlockDetectorDUnitTest extends CacheTestCase {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
- fail("interrupted", e);
+ Assert.fail("interrupted", e);
}
ResultCollector collector = FunctionService.onMember(member).execute(new TestFunction());
//wait the function to lock the lock on member.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
index a6cc444..7deedcd 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
@@ -128,7 +128,7 @@ public class TcpServerBackwardCompatDUnitTest extends DistributedTestCase {
Locator.startLocatorAndDS(port0, logFile0, props);
} catch (IOException e) {
- fail("Locator1 start failed with Gossip Version: " + TcpServer.GOSSIPVERSION + "!", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("Locator1 start failed with Gossip Version: " + TcpServer.GOSSIPVERSION + "!", e);
}
}
});
@@ -194,7 +194,7 @@ public class TcpServerBackwardCompatDUnitTest extends DistributedTestCase {
// Assert.assertTrue(members.contains(new IpAddress(InetAddress.getLocalHost(), port1)));
} catch (IOException e) {
- fail("Locator1 start failed with Gossip Version: " + TcpServer.GOSSIPVERSION + "!", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("Locator1 start failed with Gossip Version: " + TcpServer.GOSSIPVERSION + "!", e);
}
}
});
@@ -247,7 +247,7 @@ public class TcpServerBackwardCompatDUnitTest extends DistributedTestCase {
// }
} catch (IOException e) {
- fail("Locator0 start failed with Gossip Version: " + TcpServer.GOSSIPVERSION + "!", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("Locator0 start failed with Gossip Version: " + TcpServer.GOSSIPVERSION + "!", e);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
index 61c31d4..58fabb0 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
@@ -57,6 +57,7 @@ import com.gemstone.gemfire.internal.cache.execute.data.CustId;
import com.gemstone.gemfire.internal.cache.execute.data.Customer;
import com.gemstone.gemfire.internal.cache.execute.data.Order;
import com.gemstone.gemfire.internal.cache.execute.data.OrderId;
+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;
@@ -1984,7 +1985,7 @@ public class DistributedTransactionDUnitTest extends CacheTestCase {
assertTrue("This test should fail with CommitConflictException",
txThread.gotConflict);
if (txThread.gotOtherException) {
- fail("Received unexpected exception ", txThread.ex);
+ Assert.fail("Received unexpected exception ", txThread.ex);
}
}
}
@@ -2114,7 +2115,7 @@ public class DistributedTransactionDUnitTest extends CacheTestCase {
e.printStackTrace();
}
if (txThread.gotException) {
- fail("Received exception ", txThread.ex);
+ Assert.fail("Received exception ", txThread.ex);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/ClassNotFoundExceptionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/ClassNotFoundExceptionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/ClassNotFoundExceptionDUnitTest.java
index 185ae2d..836dc13 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/ClassNotFoundExceptionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/ClassNotFoundExceptionDUnitTest.java
@@ -39,6 +39,7 @@ import com.gemstone.gemfire.pdx.PdxReader;
import com.gemstone.gemfire.pdx.PdxSerializable;
import com.gemstone.gemfire.pdx.PdxWriter;
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;
@@ -65,7 +66,7 @@ public class ClassNotFoundExceptionDUnitTest extends CacheTestCase {
}
public void doTest(final ObjectFactory objectFactory) throws InterruptedException {
- addExpectedException("SerializationException");
+ IgnoredException.addExpectedException("SerializationException");
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
index 99a3053..f58faef 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
@@ -45,6 +45,7 @@ import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -194,9 +195,9 @@ public class JarDeployerDUnitTest extends CacheTestCase {
fail("Should not have been able to obtain exclusive lock on file:" + jarFile1.getAbsolutePath());
}
} catch (FileNotFoundException fnfex) {
- fail("JAR file not found where expected", fnfex);
+ Assert.fail("JAR file not found where expected", fnfex);
} catch (IOException ioex) {
- fail("IOException when trying to obtain exclusive lock", ioex);
+ Assert.fail("IOException when trying to obtain exclusive lock", ioex);
} finally {
if (outStream != null) {
try {
@@ -628,7 +629,7 @@ public class JarDeployerDUnitTest extends CacheTestCase {
randomAccessFile.write("GARBAGE".getBytes(), 0, 7);
randomAccessFile.close();
} catch (IOException ioex) {
- fail("Error trying to create garbage file for test", ioex);
+ Assert.fail("Error trying to create garbage file for test", ioex);
}
getSystem();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupDUnitTest.java
index 6b0493e..0f8c1e9 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupDUnitTest.java
@@ -50,6 +50,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionMessageObserver;
import com.gemstone.gemfire.distributed.internal.ReplyMessage;
import com.gemstone.gemfire.internal.FileUtil;
import com.gemstone.gemfire.internal.cache.partitioned.PersistentPartitionedRegionTestBase;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
import com.gemstone.gemfire.test.dunit.DUnitEnv;
import com.gemstone.gemfire.test.dunit.Host;
@@ -402,7 +403,7 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase {
results = op.getResults();
assertEquals(1, results.getTotalBucketTransfersCompleted());
} catch (Exception e) {
- fail("interupted", e);
+ Assert.fail("interupted", e);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java
index cc07a3a..27386cf 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java
@@ -43,6 +43,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.persistence.UninterruptibleFileChannel;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -370,7 +371,7 @@ public class Bug39079DUnitTest extends CacheTestCase {
}catch(DiskAccessException dae) {
//OK expected
}catch (IOException e) {
- fail("test failed due to ", e);
+ Assert.fail("test failed due to ", e);
}
((LocalRegion) region).getDiskStore().waitForClose();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug40299DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug40299DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug40299DUnitTest.java
index e2d7eb7..eb0a83c 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug40299DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug40299DUnitTest.java
@@ -41,6 +41,7 @@ import com.gemstone.gemfire.internal.cache.SearchLoadAndWriteProcessor;
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;
@@ -290,7 +291,7 @@ public class Bug40299DUnitTest extends CacheTestCase
public void testQueryGetWithClear()
{
- addExpectedException("Entry has been cleared and is not present on disk");
+ IgnoredException.addExpectedException("Entry has been cleared and is not present on disk");
// create region in VM0
vm0.invoke(createCacheForVM0());
// Do puts to region.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java
index e023ed4..3d109e3 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java
@@ -34,6 +34,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionMessage;
import com.gemstone.gemfire.distributed.internal.DistributionMessageObserver;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.InitialImageOperation.RequestImageMessage;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -160,11 +161,11 @@ public class Bug41091DUnitTest extends CacheTestCase {
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);
} 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/internal/cache/Bug41957DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
index 1cdf92e..90fc2e1 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
@@ -34,6 +34,7 @@ import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.VM;
@@ -112,7 +113,7 @@ import com.gemstone.gemfire.test.dunit.VM;
try {
startBridgeServer(serverPort);
} catch (Exception e) {
- fail("While starting CacheServer", e);
+ Assert.fail("While starting CacheServer", e);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
index b34b115..57ea18b 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
@@ -40,8 +40,10 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.offheap.SimpleMemoryAllocatorImpl;
+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.IgnoredException;
import com.gemstone.gemfire.test.dunit.VM;
/**
@@ -575,7 +577,7 @@ import com.gemstone.gemfire.test.dunit.VM;
});
// client may see "server unreachable" exceptions after this
- addExpectedException("Server unreachable", client);
+ IgnoredException.addExpectedException("Server unreachable", client);
stopBridgeServer(server);
}
@@ -701,7 +703,7 @@ import com.gemstone.gemfire.test.dunit.VM;
bridge.setMaxThreads(offheap ? 16 : getMaxThreads());
bridge.start();
} catch (Exception e) {
- fail("While starting CacheServer", e);
+ Assert.fail("While starting CacheServer", e);
}
}
});
@@ -750,7 +752,7 @@ import com.gemstone.gemfire.test.dunit.VM;
startBridgeServer(serverPort);
System.out.println("Started bridger server ");
} catch (Exception e) {
- fail("While starting CacheServer", e);
+ Assert.fail("While starting CacheServer", e);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
index a733753..c6d406f 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
@@ -39,6 +39,7 @@ import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.tier.InterestType;
+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.SerializableCallableIF;
@@ -141,7 +142,7 @@ public class ClientServerInvalidAndDestroyedEntryDUnitTest extends CacheTestCase
server.start();
}
catch (IOException e) {
- fail("Failed to start server ", e);
+ Assert.fail("Failed to start server ", e);
}
}
if (usePR) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionCCEDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionCCEDUnitTest.java
index 0ac6f67..4d8088c 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionCCEDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionCCEDUnitTest.java
@@ -24,6 +24,7 @@ import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.partition.PartitionRegionHelper;
import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
import com.gemstone.gemfire.internal.cache.versions.VersionTag;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -37,10 +38,10 @@ public class ClientServerTransactionCCEDUnitTest extends
public void setUp() throws Exception {
super.setUp();
- addExpectedException("Connection reset");
- addExpectedException("SocketTimeoutException");
- addExpectedException("ServerConnectivityException");
- addExpectedException("Socket Closed");
+ IgnoredException.addExpectedException("Connection reset");
+ IgnoredException.addExpectedException("SocketTimeoutException");
+ IgnoredException.addExpectedException("ServerConnectivityException");
+ IgnoredException.addExpectedException("Socket Closed");
}
/**
[28/50] [abbrv] incubator-geode git commit: GEODE-859: Modularize
build script
Posted by kl...@apache.org.
GEODE-859: Modularize build script
The root build.gradle script was getting unwieldy. This change
breaks the script into the following sections:
- code-analysis.gradle
- ide.gradle
- java.gradle
- publish.gradle
- rat.gradle
- test.gradle
Each section should be relatively independent. For example, the
test script contains all the test dependencies.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/4903d907
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/4903d907
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/4903d907
Branch: refs/heads/feature/GEODE-773-2
Commit: 4903d907d702143836a8df0335f98f88a9f47c9f
Parents: 80bd7d8
Author: Anthony Baker <ab...@apache.org>
Authored: Tue Jan 26 09:00:12 2016 -0800
Committer: Anthony Baker <ab...@apache.org>
Committed: Sat Jan 30 09:02:43 2016 -0800
----------------------------------------------------------------------
build.gradle | 527 +------------------------------------
gemfire-assembly/build.gradle | 8 +-
gradle/code-analysis.gradle | 113 ++++++++
gradle/ide.gradle | 53 ++++
gradle/java.gradle | 106 ++++++++
gradle/publish.gradle | 83 ++++++
gradle/rat.gradle | 4 +
gradle/test.gradle | 243 +++++++++++++++++
8 files changed, 619 insertions(+), 518 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4903d907/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 28519dd..059cf31 100755
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,6 @@ buildscript {
}
}
-apply from: 'gradle/rat.gradle'
apply plugin: 'wrapper'
// Load all properties in dependency-version.properties as project properties, so all projects can read them
@@ -56,538 +55,32 @@ allprojects {
group = "org.apache.geode"
- apply plugin: 'idea'
- apply plugin: 'eclipse'
-
buildRoot = buildRoot.trim()
if (!buildRoot.isEmpty()) {
buildDir = buildRoot + project.path.replace(":", "/") + "/build"
}
-
- gradle.taskGraph.whenReady( { graph ->
- tasks.withType(Tar).each { tar ->
- tar.compression = Compression.GZIP
- tar.extension = 'tar.gz'
- }
- })
}
-task clean (type: Delete) {
+task clean(type: Delete) {
delete rootProject.buildDir
if (!buildRoot.isEmpty()) {
delete buildRoot
}
}
-def testResultsDir(def parent, def name) {
- new File(parent, name)
-}
-
-def writeTestProperties(def parent, def name) {
- def availablePortFinder = AvailablePortFinder.createPrivate()
-
- def props = new Properties()
- props.setProperty('mcast-port', Integer.toString(availablePortFinder.nextAvailable))
- props.setProperty('log-level', 'config')
- def propsFile = new File(testResultsDir(parent, name), 'gemfire.properties')
- def writer = propsFile.newWriter()
- props.store(writer, 'Autogenerated Gemfire properties')
-
+// allow external projects to override include location
+if (name == 'gemfire') {
+ ext.scriptDir = 'gradle'
}
-task combineReports(type: TestReport) {
- description 'Combines the test reports.'
- destinationDir = file "${rootProject.buildDir}/reports/combined"
-
- doLast {
- println "All test reports at ${rootProject.buildDir}/reports/combined"
- }
-}
-
-gradle.taskGraph.whenReady({ graph ->
- tasks.getByName('combineReports').reportOn rootProject.subprojects.collect{ it.tasks.withType(Test) }.flatten()
-})
+apply from: "${scriptDir}/java.gradle"
+apply from: "${scriptDir}/test.gradle"
+apply from: "${scriptDir}/publish.gradle"
+apply from: "${scriptDir}/code-analysis.gradle"
+apply from: "${scriptDir}/ide.gradle"
+apply from: "${scriptDir}/rat.gradle"
subprojects {
- apply plugin: 'java'
-
- // apply compiler options
- gradle.taskGraph.whenReady( { graph ->
- tasks.withType(JavaCompile).each { javac ->
- javac.configure {
- sourceCompatibility '1.8'
- targetCompatibility '1.8'
- options.encoding = 'UTF-8'
- }
- }
- })
-
- // apply default manifest
- gradle.taskGraph.whenReady( { graph ->
- tasks.withType(Jar).each { jar ->
- jar.doFirst {
- manifest {
- attributes(
- "Manifest-Version" : "1.0",
- "Created-By" : System.getProperty("user.name"),
- "Title" : rootProject.name,
- "Version" : version,
- "Organization" : "Apache Software Foundation (ASF)"
- )
- }
- }
- }
- })
-
- configurations {
- provided {
- description 'a dependency that is provided externally at runtime'
- visible true
- }
-
- testOutput {
- extendsFrom testCompile
- description 'a dependency that exposes test artifacts'
- }
- }
-
- // Here we want to disable all transitive dependencies on external artifacts. This
- // allows us to lock down library versions. However, we want project dependencies to
- // be transitive such that the libraries of a dependent project are automatically included.
- configurations.all {
- dependencies.all { dep ->
- if (dep instanceof ModuleDependency && !(dep instanceof ProjectDependency)) {
- dep.transitive = false
- }
- }
- }
-
- // Configuration for Checkstyle, FindBugs
- if (project.hasProperty("staticAnalysis")) {
- apply plugin: 'checkstyle'
-
- //Checkstyle configuration
- configurations.checkstyle {
- dependencies.all { dep ->
- dep.transitive = true
- }
- }
-
- //Findbugs configuration
- apply plugin: 'findbugs'
-
- configurations.findbugs {
- dependencies.all { dep ->
- dep.transitive = true
- }
- }
-
- // Switch default Findbugs report to HTML for developers
- def findbugsXmlEnabled = false
- def findbugsHtmlEnabled = true
-
- // Provide ability to change report type to XML for ingesting into other ap
- if ( project.hasProperty("findbugsXmlReport") ) {
- findbugsXmlEnabled = true
- findbugsHtmlEnabled = false
- }
-
- configurations.findbugs {
- dependencies.all { dep ->
- dep.transitive = true
- }
- findbugs.effort = 'max'
- findbugs.reportLevel = 'low'
- }
-
- tasks.withType(FindBugs) {
- reports {
- xml.enabled = findbugsXmlEnabled
- html.enabled = findbugsHtmlEnabled
- }
- }
- }
-
- // JaCoCo configuration
- if (project.hasProperty("codeCoverage")) {
- apply plugin: 'jacoco'
-
- configurations.jacocoAnt {
- dependencies.all { dep ->
- dep.transitive = true
- }
- }
-
- task mergeIntegrationTestCoverage (type: JacocoMerge) {
- description 'Merges Distributed and Integration test coverage results'
-
- destinationFile = file("${buildDir}/jacoco/mergedIntegrationTestCoverage.exec")
- executionData = fileTree(dir: 'build/jacoco', include: ['**/distributedTest.exec','**/integrationTest.exec'])
-
- }
-
- jacocoTestReport {
- reports {
- csv.enabled false
- sourceSets project.sourceSets.main
- html.destination "${buildDir}/jacocoTestHtml"
- }
- }
-
- task jacocoIntegrationTestReport (type: JacocoReport) {
- reports {
- csv.enabled false
- sourceSets project.sourceSets.main
- html.destination "${buildDir}/jacocoIntegrationTestHtml"
- executionData = fileTree(dir: 'build/jacoco', include: '**/integrationTest.exec')
- }
- }
-
- task jacocoDistributedTestReport (type: JacocoReport) {
- reports {
- csv.enabled false
- sourceSets project.sourceSets.main
- html.destination "${buildDir}/jacocoDistributedTestHtml"
- executionData = fileTree(dir: 'build/jacoco', include: '**/distributedTest.exec')
- }
- }
-
- task jacocoOverallTestReport (type: JacocoReport) {
- reports {
- csv.enabled false
- sourceSets project.sourceSets.main
- html.destination "${buildDir}/jacocoOverallTestHtml"
- executionData = fileTree(dir: 'build/jacoco', include: '**/*.exec')
- }
- }
- }
-
- eclipse {
- classpath {
- defaultOutputDir = file('build-eclipse')
- downloadSources = true
- plusConfigurations += [ configurations.provided ]
- }
- // Several files have UTF-8 encoding and Eclipse running on Windows
- // will have trouble unless we tell it to use UTF-8 encoding.
- // This setting needs to go into the core.resources.prefs file,
- // which the JDT script isn't set up to configure
- eclipseJdt << {
- File f = file('.settings/org.eclipse.core.resources.prefs')
- f.write('eclipse.preferences.version=1\n')
- f.append('encoding/<project>=utf-8')
- }
- }
-
- cleanEclipse << {
- delete '.settings/org.eclipse.core.resources.prefs'
- }
-
- tasks.eclipse.dependsOn(cleanEclipse)
-
- idea {
- module {
- downloadSources = true
- scopes.PROVIDED.plus += [ configurations.provided ]
- }
- }
-
- task jarTest (type: Jar, dependsOn: testClasses) {
- description 'Assembles a jar archive of test classes.'
- from sourceSets.test.output
- classifier 'test'
- }
-
- artifacts {
- testOutput jarTest
- }
-
- sourceSets {
- main.compileClasspath += configurations.provided
- main.runtimeClasspath -= configurations.provided
- test.compileClasspath += configurations.provided
- test.runtimeClasspath += configurations.provided
- }
-
- javadoc.classpath += configurations.provided
-
- javadoc {
- options.addStringOption('Xdoclint:none', '-quiet')
- options.encoding='UTF-8'
- }
-
- dependencies {
- compile 'org.springframework:spring-aop:' + project.'springframework.version'
- compile 'org.springframework:spring-beans:' + project.'springframework.version'
- compile 'org.springframework:spring-context:' + project.'springframework.version'
- compile 'org.springframework:spring-context-support:' + project.'springframework.version'
- compile 'org.springframework:spring-core:' + project.'springframework.version'
- compile 'org.springframework:spring-expression:' + project.'springframework.version'
- compile 'org.springframework:spring-web:' + project.'springframework.version'
- compile 'org.springframework:spring-webmvc:' + project.'springframework.version'
- compile 'com.github.stephenc.findbugs:findbugs-annotations:' + project.'stephenc-findbugs.version'
-
- testCompile 'com.github.stefanbirkner:system-rules:' + project.'system-rules.version'
- testCompile 'com.google.code.tempus-fugit:tempus-fugit:' + project.'tempus-fugit.version'
- testCompile 'com.jayway.awaitility:awaitility:' + project.'awaitility.version'
- testCompile 'edu.umd.cs.mtc:multithreadedtc:' + project.'multithreadedtc.version'
- testCompile 'eu.codearte.catch-exception:catch-exception:' + project.'catch-exception.version'
- testCompile 'eu.codearte.catch-exception:catch-throwable:' + project.'catch-throwable.version'
- testCompile 'junit:junit:' + project.'junit.version'
- testCompile 'org.assertj:assertj-core:' + project.'assertj-core.version'
- testCompile 'org.mockito:mockito-core:' + project.'mockito-core.version'
- testCompile 'org.hamcrest:hamcrest-all:' + project.'hamcrest-all.version'
- testCompile 'org.jmock:jmock:' + project.'jmock.version'
- testCompile 'org.jmock:jmock-junit4:' + project.'jmock.version'
- testCompile 'org.jmock:jmock-legacy:' + project.'jmock.version'
- testCompile 'pl.pragmatists:JUnitParams:' + project.'JUnitParams.version'
-
- testRuntime 'cglib:cglib:' + project.'cglib.version'
- testRuntime 'org.objenesis:objenesis:' + project.'objenesis.version'
- testRuntime 'org.ow2.asm:asm:' + project.'asm.version'
- }
-
- //This target does not run any tests. Rather, it validates that there are no
- //tests that are missing a category annotation
- task checkMissedTests(type: Test) {
- include '**/*Test.class'
- useJUnit {
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.UnitTest'
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.IntegrationTest'
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.DistributedTest'
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.PerformanceTest'
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.HydraTest'
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.ContainerTest'
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.UITest'
- }
-
- beforeTest { descriptor ->
- throw new GradleException("The test " + descriptor.getClassName() + "." + descriptor.getName() + " does not include a junit category.");
- }
- }
-
-
- test {
- include '**/*Test.class'
- useJUnit {
- includeCategories 'com.gemstone.gemfire.test.junit.categories.UnitTest'
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.IntegrationTest'
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.DistributedTest'
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.PerformanceTest'
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.HydraTest'
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.ContainerTest'
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.UITest'
- }
-
- // run each test in its own vm to avoid interference issues if a test doesn't clean up
- // state
- //forkEvery 1
-
- doFirst {
- writeTestProperties(buildDir, name)
- }
- }
-
- task integrationTest(type:Test) {
- include '**/*Test.class'
- exclude '**/*DUnitTest.class'
- useJUnit {
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.UnitTest'
- includeCategories 'com.gemstone.gemfire.test.junit.categories.IntegrationTest'
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.DistributedTest'
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.PerformanceTest'
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.HydraTest'
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.ContainerTest'
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.UITest'
- }
-
- forkEvery 1
-
- doFirst {
- writeTestProperties(buildDir, name)
- }
- }
-
- task uiTest(type:Test) {
- include '**/*Test.class'
- useJUnit {
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.UnitTest'
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.IntegrationTest'
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.DistributedTest'
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.PerformanceTest'
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.HydraTest'
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.ContainerTest'
- includeCategories 'com.gemstone.gemfire.test.junit.categories.UITest'
- }
-
- doFirst {
- writeTestProperties(buildDir, name)
- }
- }
-
- task distributedTest(type:Test) {
- include '**/*Test.class'
-
- // maxParallelForks = 2
- // maxParallelForks = Runtime.runtime.availableProcessors()
-
- useJUnit {
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.UnitTest'
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.IntegrationTest'
- includeCategories 'com.gemstone.gemfire.test.junit.categories.DistributedTest'
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.PerformanceTest'
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.HydraTest'
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.ContainerTest'
- excludeCategories 'com.gemstone.gemfire.test.junit.categories.UITest'
- }
-
- //I'm hoping this might deal with SOME OOMEs I've seen
- forkEvery 30
-
- }
-
- // By proving a file with an arbitrary list of test classes, we can select only those
- // tests to run. Activated using -Dcustom.tests=<file> customTest
- def customTestList = []
- def customTestFile = System.getProperty('custom.tests')
- if (customTestFile != null) {
- new File(customTestFile).eachLine { customTestList << it }
- }
-
- task customTest(type:Test) {
- include { x ->
- (x.isDirectory() || customTestList.any { y -> x.getName().contains(y) } ) ? true : false
- }
-
- forkEvery 30
- }
-
- // apply common test configuration
- gradle.taskGraph.whenReady( { graph ->
- tasks.withType(Test).each { test ->
- check.dependsOn test
- test.configure {
- onlyIf { ! Boolean.getBoolean('skip.tests') }
-
- //force tests to be run every time by
- //saying the results are never up to date
- outputs.upToDateWhen { false }
-
- def resultsDir = testResultsDir(buildDir, test.name)
- workingDir resultsDir.absolutePath
-
- reports.html.destination = file "$buildDir/reports/$name"
- testLogging {
- exceptionFormat = 'full'
- }
-
- maxHeapSize '768m'
- jvmArgs = ['-XX:+HeapDumpOnOutOfMemoryError', '-ea']
-
- systemProperty 'gemfire.DEFAULT_MAX_OPLOG_SIZE', '10'
- systemProperty 'gemfire.disallowMcastDefaults', 'true'
- systemProperty 'jline.terminal', 'jline.UnsupportedTerminal'
-
- def eol = System.getProperty('line.separator')
- def progress = new File(resultsDir, "$test.name-progress.txt")
- beforeTest { desc ->
- def now = new Date().format('yyyy-MM-dd HH:mm:ss.SSS Z')
- progress << "$now Starting test $desc.className $desc.name$eol"
- }
- afterTest { desc, result ->
- def now = new Date().format('yyyy-MM-dd HH:mm:ss.SSS Z')
- progress << "$now Completed test $desc.className $desc.name with result: ${result.resultType}$eol"
- }
-
- doFirst {
- resultsDir.deleteDir()
- resultsDir.mkdirs()
- }
- }
- }
- })
-
- // publishing configuration
- apply plugin: 'com.bmuschko.nexus'
-
- extraArchive {
- sources = true
- javadoc = true
- tests = false
- }
-
- nexus {
- sign = true
- repositoryUrl = 'https://repository.apache.org/service/local/staging/deploy/maven2'
- snapshotRepositoryUrl = 'https://repository.apache.org/content/repositories/snapshots'
- }
-
- modifyPom {
- project {
- name 'Apache Geode (incubating)'
- description 'Apache Geode (incubating) provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing'
- url 'http://geode.incubator.apache.org'
-
- scm {
- url 'https://git-wip-us.apache.org/repos/asf?p=incubator-geode.git;a=tree'
- connection 'scm:https://git-wip-us.apache.org/repos/asf/incubator-geode.git'
- developerConnection 'scm:https://git-wip-us.apache.org/repos/asf/incubator-geode.git'
- }
-
- licenses {
- license {
- name 'The Apache Software License, Version 2.0'
- url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
- }
- }
-
- repositories {
- repository {
- id 'libs-release'
- name 'Spring Maven libs-release Repository'
- url 'http://repo.spring.io/libs-release'
- }
- }
- }
- }
-
- // The nexus plugin reads authentication from ~/.gradle/gradle.properties but the
- // jenkins server stores publishing credentials in ~/.m2/settings.xml (maven).
- // We match on the expected snapshot repository id.
- afterEvaluate {
- if (!isReleaseVersion && System.env.USER == 'jenkins') {
- def settingsXml = new File(System.getProperty('user.home'), '.m2/settings.xml')
- if (settingsXml.exists()) {
- def snapshotCreds = new XmlSlurper().parse(settingsXml).servers.server.find { server ->
- server.id.text() == 'apache.snapshots.https'
- }
-
- if (snapshotCreds != null) {
- tasks.uploadArchives.doFirst {
- repositories().withType(MavenDeployer).each { repo ->
- repo.snapshotRepository.authentication.userName = snapshotCreds.username.text()
- repo.snapshotRepository.authentication.password = snapshotCreds.password.text()
- }
- }
- }
- }
- }
- }
-
- // Make precheckin task run all validation tests for checking in code.
- task precheckin (dependsOn: [ build, integrationTest, distributedTest ]) {
- description 'Run this task before checking in code to validate changes. This task combines the following tasks: build, integrationTest, and distributedTest'
- }
-
- check.dependsOn checkMissedTests, rat
- combineReports.mustRunAfter check, test, integrationTest, distributedTest, checkMissedTests
- build.finalizedBy combineReports
- check.finalizedBy combineReports
- test.finalizedBy combineReports
- integrationTest.finalizedBy combineReports
- distributedTest.finalizedBy combineReports
- checkMissedTests.finalizedBy combineReports
-
// Make sure clean task for rootProject runs last
clean.finalizedBy rootProject.clean
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4903d907/gemfire-assembly/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-assembly/build.gradle b/gemfire-assembly/build.gradle
index 834413e..3b2594c 100755
--- a/gemfire-assembly/build.gradle
+++ b/gemfire-assembly/build.gradle
@@ -16,9 +16,9 @@
*/
import org.gradle.api.internal.artifacts.publish.ArchivePublishArtifact;
-
apply plugin: 'distribution'
+// disable artifact generation for this project
jar.enabled = false
extraArchive {
sources = false
@@ -41,6 +41,12 @@ configurations.all {
artifacts.removeAll artifacts.findAll { it instanceof ArchivePublishArtifact && !it.archiveTask.enabled }
}
+gradle.taskGraph.whenReady( { graph ->
+ tasks.withType(Tar).each { tar ->
+ tar.compression = Compression.GZIP
+ tar.extension = 'tar.gz'
+ }
+})
dependencies {
provided project(':gemfire-core')
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4903d907/gradle/code-analysis.gradle
----------------------------------------------------------------------
diff --git a/gradle/code-analysis.gradle b/gradle/code-analysis.gradle
new file mode 100644
index 0000000..7ce31e8
--- /dev/null
+++ b/gradle/code-analysis.gradle
@@ -0,0 +1,113 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+subprojects {
+ if (project.hasProperty("staticAnalysis")) {
+ apply plugin: 'checkstyle'
+
+ //Checkstyle configuration
+ configurations.checkstyle {
+ dependencies.all { dep ->
+ dep.transitive = true
+ }
+ }
+
+ //Findbugs configuration
+ apply plugin: 'findbugs'
+
+ // Switch default Findbugs report to HTML for developers
+ def findbugsXmlEnabled = false
+ def findbugsHtmlEnabled = true
+
+ // Provide ability to change report type to XML for ingesting into other ap
+ if ( project.hasProperty("findbugsXmlReport") ) {
+ findbugsXmlEnabled = true
+ findbugsHtmlEnabled = false
+ }
+
+ configurations.findbugs {
+ dependencies.all { dep ->
+ dep.transitive = true
+ }
+ findbugs.effort = 'max'
+ findbugs.reportLevel = 'low'
+ }
+
+ tasks.withType(FindBugs) {
+ reports {
+ xml.enabled = findbugsXmlEnabled
+ html.enabled = findbugsHtmlEnabled
+ }
+ }
+ }
+
+ // JaCoCo configuration
+ if (project.hasProperty("codeCoverage")) {
+ apply plugin: 'jacoco'
+
+ configurations.jacocoAnt {
+ dependencies.all { dep ->
+ dep.transitive = true
+ }
+ }
+
+ task mergeIntegrationTestCoverage (type: JacocoMerge) {
+ description 'Merges Distributed and Integration test coverage results'
+
+ destinationFile = file("${buildDir}/jacoco/mergedIntegrationTestCoverage.exec")
+ executionData = fileTree(dir: 'build/jacoco', include: [
+ '**/distributedTest.exec',
+ '**/integrationTest.exec'
+ ])
+
+ }
+
+ jacocoTestReport {
+ reports {
+ csv.enabled false
+ sourceSets project.sourceSets.main
+ html.destination "${buildDir}/jacocoTestHtml"
+ }
+ }
+
+ task jacocoIntegrationTestReport (type: JacocoReport) {
+ reports {
+ csv.enabled false
+ sourceSets project.sourceSets.main
+ html.destination "${buildDir}/jacocoIntegrationTestHtml"
+ executionData = fileTree(dir: 'build/jacoco', include: '**/integrationTest.exec')
+ }
+ }
+
+ task jacocoDistributedTestReport (type: JacocoReport) {
+ reports {
+ csv.enabled false
+ sourceSets project.sourceSets.main
+ html.destination "${buildDir}/jacocoDistributedTestHtml"
+ executionData = fileTree(dir: 'build/jacoco', include: '**/distributedTest.exec')
+ }
+ }
+
+ task jacocoOverallTestReport (type: JacocoReport) {
+ reports {
+ csv.enabled false
+ sourceSets project.sourceSets.main
+ html.destination "${buildDir}/jacocoOverallTestHtml"
+ executionData = fileTree(dir: 'build/jacoco', include: '**/*.exec')
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4903d907/gradle/ide.gradle
----------------------------------------------------------------------
diff --git a/gradle/ide.gradle b/gradle/ide.gradle
new file mode 100644
index 0000000..e4c7df5
--- /dev/null
+++ b/gradle/ide.gradle
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+allprojects {
+ apply plugin: 'idea'
+ apply plugin: 'eclipse'
+}
+
+subprojects {
+ eclipse {
+ classpath {
+ defaultOutputDir = file('build-eclipse')
+ downloadSources = true
+ plusConfigurations += [ configurations.provided ]
+ }
+ // Several files have UTF-8 encoding and Eclipse running on Windows
+ // will have trouble unless we tell it to use UTF-8 encoding.
+ // This setting needs to go into the core.resources.prefs file,
+ // which the JDT script isn't set up to configure
+ eclipseJdt << {
+ File f = file('.settings/org.eclipse.core.resources.prefs')
+ f.write('eclipse.preferences.version=1\n')
+ f.append('encoding/<project>=utf-8')
+ }
+ }
+
+ cleanEclipse << {
+ delete '.settings/org.eclipse.core.resources.prefs'
+ }
+
+ tasks.eclipse.dependsOn(cleanEclipse)
+
+ idea {
+ module {
+ downloadSources = true
+ scopes.PROVIDED.plus += [ configurations.provided ]
+ }
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4903d907/gradle/java.gradle
----------------------------------------------------------------------
diff --git a/gradle/java.gradle b/gradle/java.gradle
new file mode 100644
index 0000000..3ec105d
--- /dev/null
+++ b/gradle/java.gradle
@@ -0,0 +1,106 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+subprojects {
+ apply plugin: 'java'
+
+ // apply compiler options
+ gradle.taskGraph.whenReady( { graph ->
+ tasks.withType(JavaCompile).each { javac ->
+ javac.configure {
+ sourceCompatibility '1.8'
+ targetCompatibility '1.8'
+ options.encoding = 'UTF-8'
+ }
+ }
+ })
+
+ // apply default manifest
+ gradle.taskGraph.whenReady( { graph ->
+ tasks.withType(Jar).each { jar ->
+ jar.doFirst {
+ manifest {
+ attributes(
+ "Manifest-Version" : "1.0",
+ "Created-By" : System.getProperty("user.name"),
+ "Title" : rootProject.name,
+ "Version" : version,
+ "Organization" : "Apache Software Foundation (ASF)"
+ )
+ }
+ }
+ }
+ })
+
+ configurations {
+ provided {
+ description 'a dependency that is provided externally at runtime'
+ visible true
+ }
+
+ testOutput {
+ extendsFrom testCompile
+ description 'a dependency that exposes test artifacts'
+ }
+ }
+
+ // Here we want to disable all transitive dependencies on external artifacts. This
+ // allows us to lock down library versions. However, we want project dependencies to
+ // be transitive such that the libraries of a dependent project are automatically included.
+ configurations.all {
+ dependencies.all { dep ->
+ if (dep instanceof ModuleDependency && !(dep instanceof ProjectDependency)) {
+ dep.transitive = false
+ }
+ }
+ }
+
+ task jarTest (type: Jar, dependsOn: testClasses) {
+ description 'Assembles a jar archive of test classes.'
+ from sourceSets.test.output
+ classifier 'test'
+ }
+
+ artifacts {
+ testOutput jarTest
+ }
+
+ sourceSets {
+ main.compileClasspath += configurations.provided
+ main.runtimeClasspath -= configurations.provided
+ test.compileClasspath += configurations.provided
+ test.runtimeClasspath += configurations.provided
+ }
+
+ javadoc.classpath += configurations.provided
+
+ javadoc {
+ options.addStringOption('Xdoclint:none', '-quiet')
+ options.encoding='UTF-8'
+ }
+
+ dependencies {
+ compile 'org.springframework:spring-aop:' + project.'springframework.version'
+ compile 'org.springframework:spring-beans:' + project.'springframework.version'
+ compile 'org.springframework:spring-context:' + project.'springframework.version'
+ compile 'org.springframework:spring-context-support:' + project.'springframework.version'
+ compile 'org.springframework:spring-core:' + project.'springframework.version'
+ compile 'org.springframework:spring-expression:' + project.'springframework.version'
+ compile 'org.springframework:spring-web:' + project.'springframework.version'
+ compile 'org.springframework:spring-webmvc:' + project.'springframework.version'
+ compile 'com.github.stephenc.findbugs:findbugs-annotations:' + project.'stephenc-findbugs.version'
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4903d907/gradle/publish.gradle
----------------------------------------------------------------------
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
new file mode 100644
index 0000000..4eb6a75
--- /dev/null
+++ b/gradle/publish.gradle
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+subprojects {
+ apply plugin: 'com.bmuschko.nexus'
+
+ extraArchive {
+ sources = true
+ javadoc = true
+ tests = false
+ }
+
+ nexus {
+ sign = true
+ repositoryUrl = 'https://repository.apache.org/service/local/staging/deploy/maven2'
+ snapshotRepositoryUrl = 'https://repository.apache.org/content/repositories/snapshots'
+ }
+
+ modifyPom {
+ project {
+ name 'Apache Geode (incubating)'
+ description 'Apache Geode (incubating) provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing'
+ url 'http://geode.incubator.apache.org'
+
+ scm {
+ url 'https://git-wip-us.apache.org/repos/asf?p=incubator-geode.git;a=tree'
+ connection 'scm:https://git-wip-us.apache.org/repos/asf/incubator-geode.git'
+ developerConnection 'scm:https://git-wip-us.apache.org/repos/asf/incubator-geode.git'
+ }
+
+ licenses {
+ license {
+ name 'The Apache Software License, Version 2.0'
+ url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+ }
+ }
+
+ repositories {
+ repository {
+ id 'libs-release'
+ name 'Spring Maven libs-release Repository'
+ url 'http://repo.spring.io/libs-release'
+ }
+ }
+ }
+ }
+
+ // The nexus plugin reads authentication from ~/.gradle/gradle.properties but the
+ // jenkins server stores publishing credentials in ~/.m2/settings.xml (maven).
+ // We match on the expected snapshot repository id.
+ afterEvaluate {
+ if (!isReleaseVersion && System.env.USER == 'jenkins') {
+ def settingsXml = new File(System.getProperty('user.home'), '.m2/settings.xml')
+ if (settingsXml.exists()) {
+ def snapshotCreds = new XmlSlurper().parse(settingsXml).servers.server.find { server ->
+ server.id.text() == 'apache.snapshots.https'
+ }
+
+ if (snapshotCreds != null) {
+ tasks.uploadArchives.doFirst {
+ repositories().withType(MavenDeployer).each { repo ->
+ repo.snapshotRepository.authentication.userName = snapshotCreds.username.text()
+ repo.snapshotRepository.authentication.password = snapshotCreds.password.text()
+ }
+ }
+ }
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4903d907/gradle/rat.gradle
----------------------------------------------------------------------
diff --git a/gradle/rat.gradle b/gradle/rat.gradle
index b81cffd..d66f9bb 100644
--- a/gradle/rat.gradle
+++ b/gradle/rat.gradle
@@ -198,3 +198,7 @@ rat {
'gemfire-pulse/src/main/webapp/scripts/multiselect/prettify.js'
]
}
+
+subprojects {
+ check.dependsOn rat
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4903d907/gradle/test.gradle
----------------------------------------------------------------------
diff --git a/gradle/test.gradle b/gradle/test.gradle
new file mode 100644
index 0000000..b076f26
--- /dev/null
+++ b/gradle/test.gradle
@@ -0,0 +1,243 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+def testResultsDir(def parent, def name) {
+ new File(parent, name)
+}
+
+def writeTestProperties(def parent, def name) {
+ def availablePortFinder = AvailablePortFinder.createPrivate()
+
+ def props = new Properties()
+ props.setProperty('mcast-port', Integer.toString(availablePortFinder.nextAvailable))
+ props.setProperty('log-level', 'config')
+ def propsFile = new File(testResultsDir(parent, name), 'gemfire.properties')
+ def writer = propsFile.newWriter()
+ props.store(writer, 'Autogenerated Gemfire properties')
+
+}
+
+task combineReports(type: TestReport) {
+ description 'Combines the test reports.'
+ destinationDir = file "${rootProject.buildDir}/reports/combined"
+
+ doLast {
+ println "All test reports at ${rootProject.buildDir}/reports/combined"
+ }
+}
+
+gradle.taskGraph.whenReady({ graph ->
+ tasks.getByName('combineReports').reportOn rootProject.subprojects.collect{ it.tasks.withType(Test) }.flatten()
+})
+
+
+subprojects {
+ dependencies {
+ testCompile 'com.github.stefanbirkner:system-rules:' + project.'system-rules.version'
+ testCompile 'com.google.code.tempus-fugit:tempus-fugit:' + project.'tempus-fugit.version'
+ testCompile 'com.jayway.awaitility:awaitility:' + project.'awaitility.version'
+ testCompile 'edu.umd.cs.mtc:multithreadedtc:' + project.'multithreadedtc.version'
+ testCompile 'eu.codearte.catch-exception:catch-exception:' + project.'catch-exception.version'
+ testCompile 'eu.codearte.catch-exception:catch-throwable:' + project.'catch-throwable.version'
+ testCompile 'junit:junit:' + project.'junit.version'
+ testCompile 'org.assertj:assertj-core:' + project.'assertj-core.version'
+ testCompile 'org.mockito:mockito-core:' + project.'mockito-core.version'
+ testCompile 'org.hamcrest:hamcrest-all:' + project.'hamcrest-all.version'
+ testCompile 'org.jmock:jmock:' + project.'jmock.version'
+ testCompile 'org.jmock:jmock-junit4:' + project.'jmock.version'
+ testCompile 'org.jmock:jmock-legacy:' + project.'jmock.version'
+ testCompile 'pl.pragmatists:JUnitParams:' + project.'JUnitParams.version'
+
+ testRuntime 'cglib:cglib:' + project.'cglib.version'
+ testRuntime 'org.objenesis:objenesis:' + project.'objenesis.version'
+ testRuntime 'org.ow2.asm:asm:' + project.'asm.version'
+ }
+
+ //This target does not run any tests. Rather, it validates that there are no
+ //tests that are missing a category annotation
+ task checkMissedTests(type: Test) {
+ include '**/*Test.class'
+ useJUnit {
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.UnitTest'
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.IntegrationTest'
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.DistributedTest'
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.PerformanceTest'
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.HydraTest'
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.ContainerTest'
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.UITest'
+ }
+
+ beforeTest { descriptor ->
+ throw new GradleException("The test " + descriptor.getClassName() + "." + descriptor.getName() + " does not include a junit category.");
+ }
+ }
+
+
+ test {
+ include '**/*Test.class'
+ useJUnit {
+ includeCategories 'com.gemstone.gemfire.test.junit.categories.UnitTest'
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.IntegrationTest'
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.DistributedTest'
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.PerformanceTest'
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.HydraTest'
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.ContainerTest'
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.UITest'
+ }
+
+ // run each test in its own vm to avoid interference issues if a test doesn't clean up
+ // state
+ //forkEvery 1
+
+ doFirst {
+ writeTestProperties(buildDir, name)
+ }
+ }
+
+ task integrationTest(type:Test) {
+ include '**/*Test.class'
+ exclude '**/*DUnitTest.class'
+ useJUnit {
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.UnitTest'
+ includeCategories 'com.gemstone.gemfire.test.junit.categories.IntegrationTest'
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.DistributedTest'
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.PerformanceTest'
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.HydraTest'
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.ContainerTest'
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.UITest'
+ }
+
+ forkEvery 1
+
+ doFirst {
+ writeTestProperties(buildDir, name)
+ }
+ }
+
+ task uiTest(type:Test) {
+ include '**/*Test.class'
+ useJUnit {
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.UnitTest'
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.IntegrationTest'
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.DistributedTest'
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.PerformanceTest'
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.HydraTest'
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.ContainerTest'
+ includeCategories 'com.gemstone.gemfire.test.junit.categories.UITest'
+ }
+
+ doFirst {
+ writeTestProperties(buildDir, name)
+ }
+ }
+
+ task distributedTest(type:Test) {
+ include '**/*Test.class'
+
+ // maxParallelForks = 2
+ // maxParallelForks = Runtime.runtime.availableProcessors()
+
+ useJUnit {
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.UnitTest'
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.IntegrationTest'
+ includeCategories 'com.gemstone.gemfire.test.junit.categories.DistributedTest'
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.PerformanceTest'
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.HydraTest'
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.ContainerTest'
+ excludeCategories 'com.gemstone.gemfire.test.junit.categories.UITest'
+ }
+
+ //I'm hoping this might deal with SOME OOMEs I've seen
+ forkEvery 30
+
+ }
+
+ // By proving a file with an arbitrary list of test classes, we can select only those
+ // tests to run. Activated using -Dcustom.tests=<file> customTest
+ def customTestList = []
+ def customTestFile = System.getProperty('custom.tests')
+ if (customTestFile != null) {
+ new File(customTestFile).eachLine { customTestList << it }
+ }
+
+ task customTest(type:Test) {
+ include { x ->
+ (x.isDirectory() || customTestList.any { y -> x.getName().contains(y) } ) ? true : false
+ }
+
+ forkEvery 30
+ }
+
+ // apply common test configuration
+ gradle.taskGraph.whenReady( { graph ->
+ tasks.withType(Test).each { test ->
+ check.dependsOn test
+ test.configure {
+ onlyIf { ! Boolean.getBoolean('skip.tests') }
+
+ //force tests to be run every time by
+ //saying the results are never up to date
+ outputs.upToDateWhen { false }
+
+ def resultsDir = testResultsDir(buildDir, test.name)
+ workingDir resultsDir.absolutePath
+
+ reports.html.destination = file "$buildDir/reports/$name"
+ testLogging {
+ exceptionFormat = 'full'
+ }
+
+ maxHeapSize '768m'
+ jvmArgs = ['-XX:+HeapDumpOnOutOfMemoryError', '-ea']
+
+ systemProperty 'gemfire.DEFAULT_MAX_OPLOG_SIZE', '10'
+ systemProperty 'gemfire.disallowMcastDefaults', 'true'
+ systemProperty 'jline.terminal', 'jline.UnsupportedTerminal'
+
+ def eol = System.getProperty('line.separator')
+ def progress = new File(resultsDir, "$test.name-progress.txt")
+ beforeTest { desc ->
+ def now = new Date().format('yyyy-MM-dd HH:mm:ss.SSS Z')
+ progress << "$now Starting test $desc.className $desc.name$eol"
+ }
+ afterTest { desc, result ->
+ def now = new Date().format('yyyy-MM-dd HH:mm:ss.SSS Z')
+ progress << "$now Completed test $desc.className $desc.name with result: ${result.resultType}$eol"
+ }
+
+ doFirst {
+ resultsDir.deleteDir()
+ resultsDir.mkdirs()
+ }
+ }
+ }
+ })
+
+ // Make precheckin task run all validation tests for checking in code.
+ task precheckin (dependsOn: [ build, integrationTest, distributedTest ]) {
+ description 'Run this task before checking in code to validate changes. This task combines the following tasks: build, integrationTest, and distributedTest'
+ }
+
+ check.dependsOn checkMissedTests
+
+ combineReports.mustRunAfter check, test, integrationTest, distributedTest, checkMissedTests
+ build.finalizedBy combineReports
+ check.finalizedBy combineReports
+ test.finalizedBy combineReports
+ integrationTest.finalizedBy combineReports
+ distributedTest.finalizedBy combineReports
+ checkMissedTests.finalizedBy combineReports
+}
[40/50] [abbrv] incubator-geode git commit: Refactor dunit
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
index 30063d4..2d2e886 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningDUnitTest.java
@@ -23,9 +23,10 @@ import com.gemstone.gemfire.cache.DuplicatePrimaryPartitionException;
import com.gemstone.gemfire.cache.EntryNotFoundException;
import com.gemstone.gemfire.cache.FixedPartitionAttributes;
import com.gemstone.gemfire.cache.partition.PartitionNotAvailableException;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.Host;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase.ExpectedException;
/**
* This Dunit test class have multiple tests to tests different validations of
@@ -77,7 +78,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
if (!((illegal.getCause() instanceof IllegalStateException) && (illegal
.getCause().getMessage()
.contains("Fixed partition name cannot be null")))) {
- fail("Expected IllegalStateException ", illegal);
+ Assert.fail("Expected IllegalStateException ", illegal);
}
}
}
@@ -107,7 +108,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
if (!((illegal.getCause() instanceof IllegalStateException) && (illegal
.getCause().getMessage()
.contains("can be added only once in FixedPartitionAttributes")))) {
- fail("Expected IllegalStateException ", illegal);
+ Assert.fail("Expected IllegalStateException ", illegal);
}
}
}
@@ -134,7 +135,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
catch (Exception illegal) {
if (!((illegal.getCause() instanceof IllegalStateException) && (illegal
.getCause().getMessage().contains("can not be defined for accessor")))) {
- fail("Expected IllegalStateException ", illegal);
+ Assert.fail("Expected IllegalStateException ", illegal);
}
}
}
@@ -147,7 +148,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
*/
public void testSamePartitionName_Primary_OnTwoMembers() {
- ExpectedException ex = addExpectedException("DuplicatePrimaryPartitionException");
+ IgnoredException ex = IgnoredException.addExpectedException("DuplicatePrimaryPartitionException");
try {
member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember");
FixedPartitionAttributes fpa1 = FixedPartitionAttributes
@@ -179,7 +180,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
if (!((duplicate.getCause() instanceof DuplicatePrimaryPartitionException) && (duplicate
.getCause().getMessage()
.contains("can not be defined as primary on more than one node")))) {
- fail("Expected DuplicatePrimaryPartitionException ", duplicate);
+ Assert.fail("Expected DuplicatePrimaryPartitionException ", duplicate);
}
} finally {
ex.remove();
@@ -192,7 +193,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
*/
public void testSamePartitionName_DifferentNumBuckets() {
- ExpectedException ex = addExpectedException("IllegalStateException");
+ IgnoredException ex = IgnoredException.addExpectedException("IllegalStateException");
try {
member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember");
FixedPartitionAttributes fpa1 = FixedPartitionAttributes
@@ -220,7 +221,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
catch (Exception illegal) {
if (!((illegal.getCause() instanceof IllegalStateException) && (illegal
.getCause().getMessage().contains("num-buckets are not same")))) {
- fail("Expected IllegalStateException ", illegal);
+ Assert.fail("Expected IllegalStateException ", illegal);
}
} finally {
ex.remove();
@@ -235,7 +236,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
*/
public void testNumberOfPartitions() {
- ExpectedException expected = addExpectedException("IllegalStateException");
+ IgnoredException expected = IgnoredException.addExpectedException("IllegalStateException");
try {
member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember");
member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes",
@@ -282,7 +283,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
if (!((ex.getCause() instanceof IllegalStateException) && (ex.getCause()
.getMessage()
.contains("should never exceed number of redundant copies")))) {
- fail("Expected IllegalStateException ", ex);
+ Assert.fail("Expected IllegalStateException ", ex);
}
} finally {
expected.remove();
@@ -295,7 +296,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
*/
public void testNumBuckets_totalNumBuckets() {
- ExpectedException expected = addExpectedException("IllegalStateException");
+ IgnoredException expected = IgnoredException.addExpectedException("IllegalStateException");
try {
member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember");
member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes",
@@ -330,7 +331,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
if (!((ex.getCause() instanceof IllegalStateException) && (ex.getCause()
.getMessage()
.contains("for different primary partitions should not be greater than total-num-buckets ")))) {
- fail("Expected IllegalStateException ", ex);
+ Assert.fail("Expected IllegalStateException ", ex);
}
} finally {
expected.remove();
@@ -372,7 +373,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
}
catch (Exception ex) {
if (!((ex.getCause() instanceof PartitionNotAvailableException))) {
- fail("Expected PartitionNotAvailableException ", ex);
+ Assert.fail("Expected PartitionNotAvailableException ", ex);
}
}
}
@@ -384,7 +385,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
*/
public void test_DataStoreWithoutPartition_DataStoreWithPartition() {
- ExpectedException expected = addExpectedException("IllegalStateException");
+ IgnoredException expected = IgnoredException.addExpectedException("IllegalStateException");
try {
member1.invoke(FixedPartitioningTestBase.class, "createCacheOnMember");
member1.invoke(FixedPartitioningTestBase.class, "createRegionWithPartitionAttributes",
@@ -402,7 +403,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
}
catch (Exception ex) {
if (!((ex.getCause() instanceof IllegalStateException))) {
- fail("Expected IllegalStateException ", ex);
+ Assert.fail("Expected IllegalStateException ", ex);
}
} finally {
expected.remove();
@@ -416,7 +417,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
*/
public void test_DataStoreWithPartition_DataStoreWithoutPartition() {
- ExpectedException expected = addExpectedException("IllegalStateException");
+ IgnoredException expected = IgnoredException.addExpectedException("IllegalStateException");
try {
member2.invoke(FixedPartitioningTestBase.class, "createCacheOnMember");
FixedPartitionAttributes fpa1 = FixedPartitionAttributes
@@ -434,7 +435,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
}
catch (Exception ex) {
if (!((ex.getCause() instanceof IllegalStateException))) {
- fail("Expected IllegalStateException ", ex);
+ Assert.fail("Expected IllegalStateException ", ex);
}
} finally {
expected.remove();
@@ -668,7 +669,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
}
catch (Exception ex) {
if (!((ex.getCause() instanceof EntryNotFoundException))) {
- fail("Expected EntryNotFoundException ", ex);
+ Assert.fail("Expected EntryNotFoundException ", ex);
}
}
@@ -727,7 +728,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
}
catch (Exception ex) {
if (!((ex.getCause() instanceof IllegalStateException))) {
- fail("Expected IllegalStateException ", ex);
+ Assert.fail("Expected IllegalStateException ", ex);
}
}
}
@@ -876,7 +877,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
}
catch (Exception ex) {
if (!((ex.getCause() instanceof IllegalStateException))) {
- fail("Expected IllegalStateException ", ex);
+ Assert.fail("Expected IllegalStateException ", ex);
}
}
}
@@ -931,7 +932,7 @@ public class FixedPartitioningDUnitTest extends FixedPartitioningTestBase {
}
catch (Exception ex) {
if (!((ex.getCause() instanceof IllegalStateException))) {
- fail("Expected IllegalStateException ", ex);
+ Assert.fail("Expected IllegalStateException ", ex);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
index f48ab61..0fba3c8 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
@@ -154,7 +154,7 @@ public class FixedPartitioningTestBase extends DistributedTestCase {
assertNotNull(cache);
}
catch (Exception e) {
- fail("Failed while creating the cache", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("Failed while creating the cache", e);
}
}
@@ -195,7 +195,7 @@ public class FixedPartitioningTestBase extends DistributedTestCase {
try {
RebalanceResults result = operation.getResults();
} catch (InterruptedException e) {
- fail("Not expecting exception", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("Not expecting exception", e);
}
}
@@ -342,7 +342,7 @@ public class FixedPartitioningTestBase extends DistributedTestCase {
assertEquals(customer, region_Cust.get(custid));
}
catch (Exception e) {
- fail(
+ com.gemstone.gemfire.test.dunit.Assert.fail(
"getForColocation : failed while doing get operation in CustomerPartitionedRegion ",
e);
}
@@ -457,7 +457,7 @@ public class FixedPartitioningTestBase extends DistributedTestCase {
partitionedregion.put(custid, customer);
}
catch (Exception e) {
- fail(
+ com.gemstone.gemfire.test.dunit.Assert.fail(
"putCustomerPartitionedRegion : failed while doing put operation in CustomerPartitionedRegion ",
e);
}
@@ -481,7 +481,7 @@ public class FixedPartitioningTestBase extends DistributedTestCase {
partitionedregion.put(orderId, order);
}
catch (Exception e) {
- fail(
+ com.gemstone.gemfire.test.dunit.Assert.fail(
"putOrderPartitionedRegion : failed while doing put operation in OrderPartitionedRegion ",
e);
}
@@ -508,7 +508,7 @@ public class FixedPartitioningTestBase extends DistributedTestCase {
partitionedregion.put(shipmentId, shipment);
}
catch (Exception e) {
- fail(
+ com.gemstone.gemfire.test.dunit.Assert.fail(
"putShipmentPartitionedRegion : failed while doing put operation in ShipmentPartitionedRegion ",
e);
}
@@ -532,7 +532,7 @@ public class FixedPartitioningTestBase extends DistributedTestCase {
partitionedregion.put(custid, customer);
}
catch (Exception e) {
- fail(
+ com.gemstone.gemfire.test.dunit.Assert.fail(
"putCustomerPartitionedRegion : failed while doing put operation in CustomerPartitionedRegion ",
e);
}
@@ -556,7 +556,7 @@ public class FixedPartitioningTestBase extends DistributedTestCase {
partitionedregion.put(orderId, order);
}
catch (Exception e) {
- fail(
+ com.gemstone.gemfire.test.dunit.Assert.fail(
"putOrderPartitionedRegion : failed while doing put operation in OrderPartitionedRegion ",
e);
}
@@ -583,7 +583,7 @@ public class FixedPartitioningTestBase extends DistributedTestCase {
partitionedregion.put(shipmentId, shipment);
}
catch (Exception e) {
- fail(
+ com.gemstone.gemfire.test.dunit.Assert.fail(
"putShipmentPartitionedRegion : failed while doing put operation in ShipmentPartitionedRegion ",
e);
}
@@ -608,7 +608,7 @@ public class FixedPartitioningTestBase extends DistributedTestCase {
partitionedregion.put(custid, customer);
}
catch (Exception e) {
- fail(
+ com.gemstone.gemfire.test.dunit.Assert.fail(
"putCustomerPartitionedRegion : failed while doing put operation in CustomerPartitionedRegion ",
e);
}
@@ -635,7 +635,7 @@ public class FixedPartitioningTestBase extends DistributedTestCase {
partitionedregion.put(orderId, order);
}
catch (Exception e) {
- fail(
+ com.gemstone.gemfire.test.dunit.Assert.fail(
"putOrderPartitionedRegion : failed while doing put operation in OrderPartitionedRegion ",
e);
}
@@ -664,7 +664,7 @@ public class FixedPartitioningTestBase extends DistributedTestCase {
partitionedregion.put(shipmentId, shipment);
}
catch (Exception e) {
- fail(
+ com.gemstone.gemfire.test.dunit.Assert.fail(
"putShipmentPartitionedRegion : failed while doing put operation in ShipmentPartitionedRegion ",
e);
}
@@ -690,7 +690,7 @@ public class FixedPartitioningTestBase extends DistributedTestCase {
partitionedregion.put(custid, customer);
}
catch (Exception e) {
- fail(
+ com.gemstone.gemfire.test.dunit.Assert.fail(
"putCustomerPartitionedRegion : failed while doing put operation in CustomerPartitionedRegion ",
e);
}
@@ -717,7 +717,7 @@ public class FixedPartitioningTestBase extends DistributedTestCase {
partitionedregion.put(orderId, order);
}
catch (Exception e) {
- fail(
+ com.gemstone.gemfire.test.dunit.Assert.fail(
"putOrderPartitionedRegion : failed while doing put operation in OrderPartitionedRegion ",
e);
}
@@ -746,7 +746,7 @@ public class FixedPartitioningTestBase extends DistributedTestCase {
partitionedregion.put(shipmentId, shipment);
}
catch (Exception e) {
- fail(
+ com.gemstone.gemfire.test.dunit.Assert.fail(
"putShipmentPartitionedRegion : failed while doing put operation in ShipmentPartitionedRegion ",
e);
}
@@ -800,7 +800,7 @@ public class FixedPartitioningTestBase extends DistributedTestCase {
}
}
catch (ParseException e) {
- FixedPartitioningTestBase.fail("Exception Occured while parseing date", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("Exception Occured while parseing date", e);
}
return null;
}
@@ -822,7 +822,7 @@ public class FixedPartitioningTestBase extends DistributedTestCase {
.getRegion(Region.SEPARATOR + shipmentPartitionedRegionName);
}
catch (Exception e) {
- fail(
+ com.gemstone.gemfire.test.dunit.Assert.fail(
"validateAfterPutPartitionedRegion : failed while getting the region",
e);
}
@@ -1131,7 +1131,7 @@ public class FixedPartitioningTestBase extends DistributedTestCase {
.getRegion(Region.SEPARATOR + customerPartitionedRegionName);
}
catch (Exception e) {
- fail(
+ com.gemstone.gemfire.test.dunit.Assert.fail(
"validateAfterPutPartitionedRegion : failed while getting the region",
e);
}
@@ -1159,7 +1159,7 @@ public class FixedPartitioningTestBase extends DistributedTestCase {
.getRegion(Region.SEPARATOR + shipmentPartitionedRegionName);
}
catch (Exception e) {
- fail(
+ com.gemstone.gemfire.test.dunit.Assert.fail(
"validateAfterPutPartitionedRegion : failed while getting the region",
e);
}
@@ -1210,7 +1210,7 @@ public class FixedPartitioningTestBase extends DistributedTestCase {
.getRegion(Region.SEPARATOR + shipmentPartitionedRegionName);
}
catch (Exception e) {
- fail(
+ com.gemstone.gemfire.test.dunit.Assert.fail(
"validateAfterPutPartitionedRegion : failed while getting the region",
e);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java
index 8f2dceb..46e54b6 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningWithColocationAndPersistenceDUnitTest.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import com.gemstone.gemfire.cache.FixedPartitionAttributes;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
import com.gemstone.gemfire.test.dunit.Host;
@@ -75,7 +76,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
if (!((illegal.getCause() instanceof IllegalStateException) && (illegal
.getCause().getMessage()
.contains("not be specified in PartitionAttributesFactory if colocated-with is specified")))) {
- fail("Expected IllegalStateException ", illegal);
+ Assert.fail("Expected IllegalStateException ", illegal);
}
}
}
@@ -232,7 +233,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
}
catch (Exception e) {
- fail("Unexpected Exception ", e);
+ Assert.fail("Unexpected Exception ", e);
}
}
@@ -373,7 +374,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
}
catch (Exception e) {
- fail("Unexpected Exception ", e);
+ Assert.fail("Unexpected Exception ", e);
}
}
@@ -573,7 +574,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
}
catch (Exception e) {
- fail("Unexpected Exception ", e);
+ Assert.fail("Unexpected Exception ", e);
}
}
@@ -768,7 +769,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
}
catch (Exception e) {
- fail("Unexpected Exception ", e);
+ Assert.fail("Unexpected Exception ", e);
}
}
@@ -1080,7 +1081,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
}
catch (Exception e) {
- fail("Unexpected Exception ", e);
+ Assert.fail("Unexpected Exception ", e);
}
}
@@ -1184,7 +1185,7 @@ public class FixedPartitioningWithColocationAndPersistenceDUnitTest extends
}
catch (Exception e) {
- fail("Unexpected Exception ", e);
+ Assert.fail("Unexpected Exception ", e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
index ed0b6dc..f3c72d6 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRVVRecoveryDUnitTest.java
@@ -66,6 +66,7 @@ import com.gemstone.gemfire.internal.cache.TombstoneService;
import com.gemstone.gemfire.internal.cache.versions.RegionVersionVector;
import com.gemstone.gemfire.internal.cache.versions.VersionTag;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
@@ -215,7 +216,7 @@ public class PersistentRVVRecoveryDUnitTest extends PersistentReplicatedTestBase
}
});
- ExpectedException ex = addExpectedException("DiskAccessException");
+ IgnoredException ex = IgnoredException.addExpectedException("DiskAccessException");
try {
//Force expiration, with our test hook that should close the cache
tombstoneService = cache.getTombstoneService();
@@ -751,7 +752,7 @@ public class PersistentRVVRecoveryDUnitTest extends PersistentReplicatedTestBase
//and then do the wait in the flusher thread.
//Setup the callbacks to wait for krf creation and throw an exception
- ExpectedException ex = addExpectedException("DiskAccessException");
+ IgnoredException ex = IgnoredException.addExpectedException("DiskAccessException");
LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER=true;
try {
final CountDownLatch krfCreated = new CountDownLatch(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
index cd6118a..16f7c6d 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
@@ -70,7 +70,9 @@ import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.cache.TXManagerImpl;
import com.gemstone.gemfire.internal.cache.versions.RegionVersionHolder;
import com.gemstone.gemfire.internal.cache.versions.RegionVersionVector;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
@@ -248,7 +250,7 @@ public class PersistentRecoveryOrderDUnitTest extends PersistentReplicatedTestBa
//Now, we should not be able to create a region
//in vm1, because the this member was revoked
getLogWriter().info("Creating region in VM1");
- ExpectedException e = addExpectedException(RevokedPersistentDataException.class.getSimpleName(), vm1);
+ IgnoredException e = IgnoredException.addExpectedException(RevokedPersistentDataException.class.getSimpleName(), vm1);
try {
createPersistentRegion(vm1);
fail("We should have received a split distributed system exception");
@@ -332,7 +334,7 @@ public class PersistentRecoveryOrderDUnitTest extends PersistentReplicatedTestBa
adminDS.connect();
adminDS.revokePersistentMember(InetAddress.getLocalHost(), dirToRevoke.getCanonicalPath());
} catch(Exception e) {
- fail("Unexpected exception", e);
+ Assert.fail("Unexpected exception", e);
} finally {
if(adminDS != null) {
adminDS.disconnect();
@@ -362,7 +364,7 @@ public class PersistentRecoveryOrderDUnitTest extends PersistentReplicatedTestBa
//Now, we should not be able to create a region
//in vm1, because the this member was revoked
getLogWriter().info("Creating region in VM1");
- ExpectedException e = addExpectedException(RevokedPersistentDataException.class.getSimpleName(), vm1);
+ IgnoredException e = IgnoredException.addExpectedException(RevokedPersistentDataException.class.getSimpleName(), vm1);
try {
createPersistentRegion(vm1);
fail("We should have received a split distributed system exception");
@@ -1045,7 +1047,7 @@ public class PersistentRecoveryOrderDUnitTest extends PersistentReplicatedTestBa
//so it will start up.
createPersistentRegion(vm0);
- ExpectedException e = addExpectedException(ConflictingPersistentDataException.class.getSimpleName(), vm1);
+ IgnoredException e = IgnoredException.addExpectedException(ConflictingPersistentDataException.class.getSimpleName(), vm1);
try {
//VM1 should not start up, because we should detect that vm1
//was never in the same distributed system as vm0
@@ -1341,7 +1343,7 @@ public class PersistentRecoveryOrderDUnitTest extends PersistentReplicatedTestBa
createNonPersistentRegion(vm0);
- ExpectedException e = addExpectedException(IllegalStateException.class.getSimpleName(), vm1);
+ IgnoredException e = IgnoredException.addExpectedException(IllegalStateException.class.getSimpleName(), vm1);
try {
createPersistentRegion(vm1);
fail("Should have received an IllegalState exception");
@@ -1679,7 +1681,7 @@ public class PersistentRecoveryOrderDUnitTest extends PersistentReplicatedTestBa
putAnEntry(vm1);
getLogWriter().info("Creating region in VM0");
- ExpectedException ex = addExpectedException("ConflictingPersistentDataException", vm0);
+ IgnoredException ex = IgnoredException.addExpectedException("ConflictingPersistentDataException", vm0);
try {
//this should cause a conflict
createPersistentRegion(vm0);
@@ -1700,7 +1702,7 @@ public class PersistentRecoveryOrderDUnitTest extends PersistentReplicatedTestBa
updateTheEntry(vm0);
- ex = addExpectedException("ConflictingPersistentDataException", vm1);
+ ex = IgnoredException.addExpectedException("ConflictingPersistentDataException", vm1);
//Now make sure vm1 gets a conflict
getLogWriter().info("Creating region in VM1");
try {
@@ -1827,9 +1829,9 @@ public class PersistentRecoveryOrderDUnitTest extends PersistentReplicatedTestBa
try {
((GemFireCacheImpl)cache).createVMRegion(REGION_NAME, rf.create(), internalArgs);
} catch (ClassNotFoundException e) {
- fail("error", e);
+ Assert.fail("error", e);
} catch (IOException e) {
- fail("error", e);
+ Assert.fail("error", e);
}
}
};
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
index 27240e5..96ba65c 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
@@ -30,6 +30,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.tier.ConnectionProxy;
+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;
@@ -250,7 +251,7 @@ public class BackwardCompatibilityHigherVersionClientDUnitTest extends
r.destroyRegion();
}
catch (Exception ex) {
- fail("failed while destroy region ", ex);
+ Assert.fail("failed while destroy region ", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java
index 6198ad2..a2caaea 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java
@@ -34,6 +34,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.ServerLocation;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.EventID;
+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;
@@ -124,7 +125,7 @@ public class Bug36269DUnitTest extends DistributedTestCase
srp.destroyRegionOnForTestsOnly(desCon, new EventID(new byte[] {1}, 1, 1), null);
}
catch (Exception ex) {
- fail("while setting acquireConnections", ex);
+ Assert.fail("while setting acquireConnections", ex);
}
}
@@ -184,7 +185,7 @@ public class Bug36269DUnitTest extends DistributedTestCase
assertNotNull(r);
}
catch (Exception ex) {
- fail("failed while verifyNoRegionDestroyOnOriginator()", ex);
+ Assert.fail("failed while verifyNoRegionDestroyOnOriginator()", ex);
}
}
@@ -202,7 +203,7 @@ public class Bug36269DUnitTest extends DistributedTestCase
DistributedTestCase.waitForCriterion(ev, 40 * 1000, 200, true);
}
catch (Exception ex) {
- fail("failed while verifyRegionDestroy", ex);
+ Assert.fail("failed while verifyRegionDestroy", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java
index 0124e92..5b35720 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java
@@ -37,6 +37,7 @@ import com.gemstone.gemfire.distributed.internal.ServerLocation;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
+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;
@@ -207,7 +208,7 @@ public class Bug36457DUnitTest extends DistributedTestCase
r.destroyRegion();
}
catch (Exception ex) {
- fail("failed while destroy region ", ex);
+ Assert.fail("failed while destroy region ", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java
index 74139bb..34ccfe1 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java
@@ -27,6 +27,7 @@ import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.cache.RegionDestroyedException;
import com.gemstone.gemfire.cache.client.*;
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.VM;
@@ -117,7 +118,7 @@ public class Bug36829DUnitTest extends DistributedTestCase {
}
}
catch (Exception ex) {
- fail("failed while registering interest in registerKey function", ex);
+ Assert.fail("failed while registering interest in registerKey function", ex);
}
}
@@ -141,7 +142,7 @@ public class Bug36829DUnitTest extends DistributedTestCase {
}
catch (Exception ex) {
- fail("failed while registering interest in registerKey function", ex);
+ Assert.fail("failed while registering interest in registerKey function", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java
index 3eb924e..0f0520e 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java
@@ -29,6 +29,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
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.VM;
import com.gemstone.gemfire.cache.client.*;
import com.gemstone.gemfire.cache.client.internal.PoolImpl;
@@ -176,7 +177,7 @@ public class Bug36995DUnitTest extends DistributedTestCase
public void testBug36995_UserSpecified()
{
//work around GEODE-507
- addExpectedException("Connection reset");
+ IgnoredException.addExpectedException("Connection reset");
Integer port1 = ((Integer)server1.invoke(Bug36995DUnitTest.class,
"createServerCache"));
Integer port2 = ((Integer)server2.invoke(Bug36995DUnitTest.class,
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java
index 3a9ab10..3221e4b 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java
@@ -35,6 +35,7 @@ import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import com.gemstone.gemfire.internal.cache.ha.HARegionQueue;
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.VM;
import com.gemstone.gemfire.cache.client.*;
@@ -83,7 +84,7 @@ public class Bug37210DUnitTest extends DistributedTestCase
{
super.setUp();
- addExpectedException("java.io.IOException");
+ IgnoredException.addExpectedException("java.io.IOException");
final Host host = Host.getHost(0);
server = host.getVM(0);
@@ -145,8 +146,8 @@ public class Bug37210DUnitTest extends DistributedTestCase
public void testHAStatsCleanup() throws Exception
{
getLogWriter().info("testHAStatsCleanup : BEGIN");
- addExpectedException("java.net.SocketException");
- addExpectedException("Unexpected IOException");
+ IgnoredException.addExpectedException("java.net.SocketException");
+ IgnoredException.addExpectedException("Unexpected IOException");
client.invoke(Bug37210DUnitTest.class, "createClientCache",
new Object[] { getServerHostName(Host.getHost(0)), new Integer(PORT) });
server.invoke(Bug37210DUnitTest.class, "doEntryOperations");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java
index 1f47d72..3800e87 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java
@@ -50,7 +50,9 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.PoolFactoryImpl;
import com.gemstone.gemfire.internal.cache.PoolFactoryImpl.PoolAttributes;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
/**
*
* @author Yogesh Mahajan
@@ -59,7 +61,7 @@ import com.gemstone.gemfire.test.dunit.DistributedTestCase;
public class CacheServerTestUtil extends DistributedTestCase
{
private static Cache cache = null;
- private static ExpectedException expected;
+ private static IgnoredException expected;
private static PoolImpl pool = null;
@@ -156,7 +158,7 @@ public class CacheServerTestUtil extends DistributedTestCase
public static void createCacheClient(Pool poolAttr, String regionName,
Properties dsProperties, Boolean addControlListener, Properties javaSystemProperties) throws Exception {
new CacheServerTestUtil("temp").createCache(dsProperties);
- addExpectedException("java.net.ConnectException||java.net.SocketException");
+ IgnoredException.addExpectedException("java.net.ConnectException||java.net.SocketException");
if (javaSystemProperties != null && javaSystemProperties.size() > 0) {
Enumeration e = javaSystemProperties.propertyNames();
@@ -224,7 +226,7 @@ public class CacheServerTestUtil extends DistributedTestCase
ccf.set("log-file", "abs_client_system.log");
ccf.set("log-level", getDUnitLogLevel());
cache = (Cache)ccf.create();
- expected = addExpectedException("java.net.ConnectionException||java.net.SocketException");
+ expected = IgnoredException.addExpectedException("java.net.ConnectionException||java.net.SocketException");
pool = (PoolImpl)PoolManager.find(poolName);
}
@@ -243,7 +245,7 @@ public class CacheServerTestUtil extends DistributedTestCase
ccf.set(DistributionConfig.DURABLE_CLIENT_ID_NAME, durableClientId);
ccf.set(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, String.valueOf(timeout));
cache = (Cache)ccf.create();
- expected = addExpectedException("java.net.ConnectionException||java.net.SocketException");
+ expected = IgnoredException.addExpectedException("java.net.ConnectionException||java.net.SocketException");
pool = (PoolImpl)PoolManager.find(poolName);
}
@@ -429,7 +431,7 @@ public class CacheServerTestUtil extends DistributedTestCase
setSystem(props, cc.getDistributedSystem());
cache = (Cache)cc;
assertNotNull(cache);
- expected = addExpectedException("java.net.ConnectionException||java.net.SocketException");
+ expected = IgnoredException.addExpectedException("java.net.ConnectionException||java.net.SocketException");
}
public static void closeCache()
@@ -493,7 +495,7 @@ public class CacheServerTestUtil extends DistributedTestCase
try {
server.start();
} catch(Exception e) {
- fail("Unexpected exception", e);
+ Assert.fail("Unexpected exception", e);
}
assertTrue(server.isRunning());
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
index fa38741..b11f510 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
@@ -36,6 +36,7 @@ import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.AvailablePort;
+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;
@@ -810,7 +811,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
assertEquals(r.getEntry(k3).getValue(), k3);
}
catch (Exception ex) {
- fail("failed while createEntries()", ex);
+ Assert.fail("failed while createEntries()", ex);
}
}
@@ -826,7 +827,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
r.registerInterest(keys);
}
catch (Exception ex) {
- fail("failed while registering keys(" + keys + ")", ex);
+ Assert.fail("failed while registering keys(" + keys + ")", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
index 79dd760..28d3d17 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
@@ -36,6 +36,7 @@ import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.CacheObserverAdapter;
import com.gemstone.gemfire.internal.cache.CacheObserverHolder;
import com.gemstone.gemfire.internal.cache.EventID;
+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;
@@ -348,7 +349,7 @@ public class ClearPropagationDUnitTest extends DistributedTestCase
assertEquals(r1.getEntry("key2").getValue(), "key-2");
}
catch (Exception ex) {
- fail("failed while createEntriesK1andK2()", ex);
+ Assert.fail("failed while createEntriesK1andK2()", ex);
}
}
@@ -435,7 +436,7 @@ public class ClearPropagationDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
- fail("failed while registering interest", ex);
+ Assert.fail("failed while registering interest", ex);
}
}
@@ -449,7 +450,7 @@ public class ClearPropagationDUnitTest extends DistributedTestCase
assertEquals("key-2", r.getEntry("key2").getValue());
}
catch (Exception ex) {
- fail("failed while verifyNoUpdates()", ex);
+ Assert.fail("failed while verifyNoUpdates()", ex);
}
}
@@ -465,7 +466,7 @@ public class ClearPropagationDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
- fail("failed while region", ex);
+ Assert.fail("failed while region", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
index 3673228..994ff5f 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
@@ -39,6 +39,7 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
+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;
@@ -105,7 +106,7 @@ public class ClientConflationDUnitTest extends DistributedTestCase
performSteps(DistributionConfig.CLIENT_CONFLATION_PROP_VALUE_DEFAULT);
}
catch( Exception e ) {
- fail("testConflationDefault failed due to exception", e);
+ Assert.fail("testConflationDefault failed due to exception", e);
}
}
@@ -114,7 +115,7 @@ public class ClientConflationDUnitTest extends DistributedTestCase
performSteps(DistributionConfig.CLIENT_CONFLATION_PROP_VALUE_ON);
}
catch( Exception e ) {
- fail("testConflationOn failed due to exception", e);
+ Assert.fail("testConflationOn failed due to exception", e);
}
}
@@ -123,7 +124,7 @@ public class ClientConflationDUnitTest extends DistributedTestCase
performSteps(DistributionConfig.CLIENT_CONFLATION_PROP_VALUE_OFF);
}
catch( Exception e ) {
- fail("testConflationOff failed due to exception", e);
+ Assert.fail("testConflationOff failed due to exception", e);
}
}
@@ -516,7 +517,7 @@ public class ClientConflationDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
ex.printStackTrace();
- fail("failed while region.put()", ex);
+ Assert.fail("failed while region.put()", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
index 2153746..d49be28 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
@@ -39,6 +39,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.CacheServerImpl;
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;
@@ -170,7 +171,7 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
performSteps();
}
catch( Exception e ) {
- fail("testInterestNotify failed due to exception", e);
+ Assert.fail("testInterestNotify failed due to exception", e);
}
}
@@ -587,7 +588,7 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
ex.printStackTrace();
- fail("failed while region doing ops", ex);
+ Assert.fail("failed while region doing ops", ex);
}
}
@@ -608,7 +609,7 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
ex.printStackTrace();
- fail("failed while region doing ops", ex);
+ Assert.fail("failed while region doing ops", ex);
}
}
@@ -625,7 +626,7 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
ex.printStackTrace();
- fail("failed while region doing ops", ex);
+ Assert.fail("failed while region doing ops", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
index 8d3b9ab..87d21e8 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
@@ -41,8 +41,10 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.CacheServerImpl;
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.IgnoredException;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -707,7 +709,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
public void testBug35380() throws Exception
{
//work around GEODE-477
- addExpectedException("Connection reset");
+ IgnoredException.addExpectedException("Connection reset");
Properties props = new Properties();
props.setProperty("mcast-port", "0");
props.setProperty("locators", "");
@@ -900,7 +902,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
}
catch (CacheWriterException e) {
e.printStackTrace();
- fail("Test failed due to CacheWriterException during registerInterest", e);
+ Assert.fail("Test failed due to CacheWriterException during registerInterest", e);
}
}
@@ -917,7 +919,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
}
catch (CacheWriterException e) {
e.printStackTrace();
- fail(
+ Assert.fail(
"Test failed due to CacheWriterException during registerInterestnBothRegions",
e);
}
@@ -936,7 +938,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
}
catch (CacheWriterException e) {
e.printStackTrace();
- fail(
+ Assert.fail(
"Test failed due to CacheWriterException during registerInterestnBothRegions",
e);
}
@@ -952,7 +954,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
}
catch (Exception e) {
e.printStackTrace();
- fail("Test failed due to Exception during closeRegion1", e);
+ Assert.fail("Test failed due to Exception during closeRegion1", e);
}
}
@@ -972,7 +974,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
}
catch (Exception e) {
e.printStackTrace();
- fail("Test failed due to Exception during closeBothRegions", e);
+ Assert.fail("Test failed due to Exception during closeBothRegions", e);
}
}
@@ -986,7 +988,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
}
catch (Exception e) {
e.printStackTrace();
- fail("Test failed due to Exception during closeBothRegions", e);
+ Assert.fail("Test failed due to Exception during closeBothRegions", e);
}
}
@@ -1000,7 +1002,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
}
catch (Exception e) {
e.printStackTrace();
- fail("Test failed due to Exception during closeBothRegions", e);
+ Assert.fail("Test failed due to Exception during closeBothRegions", e);
}
}
@@ -1012,7 +1014,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
r2.destroyRegion();
} catch (Exception e) {
// e.printStackTrace();
- fail("Test failed due to Exception during closeBothRegions", e);
+ Assert.fail("Test failed due to Exception during closeBothRegions", e);
}
}
@@ -1145,7 +1147,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
assertEquals(r2.getEntry(k2).getValue(), k2);
}
catch (Exception ex) {
- fail("failed while createEntries()", ex);
+ Assert.fail("failed while createEntries()", ex);
}
}
@@ -1170,7 +1172,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
assertEquals(r2.getEntry(k2).getValue(), server_k2);
}
catch (Exception ex) {
- fail("failed while put()", ex);
+ Assert.fail("failed while put()", ex);
}
}
@@ -1237,7 +1239,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
// assertEquals(server_k2, r2.getEntry(k2).getValue());
}
catch (Exception ex) {
- fail("failed while verifyUpdates()", ex);
+ Assert.fail("failed while verifyUpdates()", ex);
}
}
@@ -1316,7 +1318,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
DistributedTestCase.waitForCriterion(wc, 90 * 1000, 1000, true);
}
catch (Exception ex) {
- fail("failed while verifyInvalidatesOnBothRegions()", ex);
+ Assert.fail("failed while verifyInvalidatesOnBothRegions()", ex);
}
}
@@ -1354,7 +1356,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
// assertEquals(server_k2, r2.getEntry(k2).getValue());
}
catch (Exception ex) {
- fail("failed while verifyUpdatesOnRegion2()", ex);
+ Assert.fail("failed while verifyUpdatesOnRegion2()", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
index fe5d03f..6256d2a 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
@@ -40,6 +40,7 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.HARegion;
import com.gemstone.gemfire.internal.cache.ha.HAHelper;
import com.gemstone.gemfire.internal.cache.ha.HARegionQueue;
+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;
@@ -155,7 +156,7 @@ public class ConflationDUnitTest extends DistributedTestCase
vm2.invoke(ConflationDUnitTest.class, "assertCounterSizes");
}
catch( Exception e ) {
- fail("Test failed due to exception", e);
+ Assert.fail("Test failed due to exception", e);
}
}
@@ -186,7 +187,7 @@ public class ConflationDUnitTest extends DistributedTestCase
vm2.invoke(ConflationDUnitTest.class, "assertCounterSizes");
}
catch( Exception e ) {
- fail("Test failed due to exception", e);
+ Assert.fail("Test failed due to exception", e);
}
}
@@ -221,7 +222,7 @@ public class ConflationDUnitTest extends DistributedTestCase
vm0.invoke(ConflationDUnitTest.class, "assertConflationStatus");
}
catch (Exception e) {
- fail("Test failed due to exception", e);
+ Assert.fail("Test failed due to exception", e);
}
}
/**
@@ -729,7 +730,7 @@ public class ConflationDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
ex.printStackTrace();
- fail("failed while region.create()", ex);
+ Assert.fail("failed while region.create()", ex);
}
}
@@ -751,7 +752,7 @@ public class ConflationDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
ex.printStackTrace();
- fail("failed while region.put()", ex);
+ Assert.fail("failed while region.put()", ex);
}
}
@@ -765,7 +766,7 @@ public class ConflationDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
ex.printStackTrace();
- fail("failed while region.create() marker", ex);
+ Assert.fail("failed while region.create() marker", ex);
}
}
@@ -788,7 +789,7 @@ public class ConflationDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
ex.printStackTrace();
- fail("failed while region.put()", ex);
+ Assert.fail("failed while region.put()", ex);
}
}
@@ -835,7 +836,7 @@ public class ConflationDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
ex.printStackTrace();
- fail("failed while region.get()", ex);
+ Assert.fail("failed while region.get()", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
index 85bed81..9804184 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
@@ -47,7 +47,9 @@ import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import com.gemstone.gemfire.internal.cache.EventID;
+import com.gemstone.gemfire.test.dunit.Assert;
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;
@@ -217,7 +219,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
InternalDataSerializer.register(DSObject1.class, true);
}
catch (Exception e) {
- fail("Test failed due to exception in DSObject1", e);
+ Assert.fail("Test failed due to exception in DSObject1", e);
}
}
@@ -227,7 +229,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
InternalDataSerializer.register(DSObject2.class, true);
}
catch (Exception e) {
- fail("Test failed due to exception in DSObject2", e);
+ Assert.fail("Test failed due to exception in DSObject2", e);
}
}
@@ -237,7 +239,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
InternalDataSerializer.register(DSObject3.class, true);
}
catch (Exception e) {
- fail("Test failed due to exception in DSObject2", e);
+ Assert.fail("Test failed due to exception in DSObject2", e);
}
}
@@ -247,7 +249,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
InternalDataSerializer.register(DSObject4.class, true);
}
catch (Exception e) {
- fail("Test failed due to exception in DSObject4", e);
+ Assert.fail("Test failed due to exception in DSObject4", e);
}
}
@@ -257,7 +259,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
InternalDataSerializer.register(DSObject5.class, true);
}
catch (Exception e) {
- fail("Test failed due to exception in DSObject5", e);
+ Assert.fail("Test failed due to exception in DSObject5", e);
}
}
@@ -267,7 +269,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
InternalDataSerializer.register(DSObject6.class, true);
}
catch (Exception e) {
- fail("Test failed due to exception in DSObject6", e);
+ Assert.fail("Test failed due to exception in DSObject6", e);
}
}
@@ -277,7 +279,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
InternalDataSerializer.register(DSObject7.class, true);
}
catch (Exception e) {
- fail("Test failed due to exception in DSObject7", e);
+ Assert.fail("Test failed due to exception in DSObject7", e);
}
}
@@ -287,7 +289,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
InternalDataSerializer.register(DSObject8.class, true);
}
catch (Exception e) {
- fail("Test failed due to exception in DSObject8", e);
+ Assert.fail("Test failed due to exception in DSObject8", e);
}
}
@@ -297,7 +299,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
InternalDataSerializer.register(DSObject9.class, true);
}
catch (Exception e) {
- fail("Test failed due to exception in DSObject9", e);
+ Assert.fail("Test failed due to exception in DSObject9", e);
}
}
@@ -307,7 +309,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
InternalDataSerializer.register(DSObject10.class, true);
}
catch (Exception e) {
- fail("Test failed due to exception in DSObject10", e);
+ Assert.fail("Test failed due to exception in DSObject10", e);
}
}
@@ -317,7 +319,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
InternalDataSerializer.register(DSObject11.class, true);
}
catch (Exception e) {
- fail("Test failed due to exception in DSObject11", e);
+ Assert.fail("Test failed due to exception in DSObject11", e);
}
}
@@ -327,7 +329,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
InternalDataSerializer.register(DSObject12.class, true);
}
catch (Exception e) {
- fail("Test failed due to exception in DSObject12", e);
+ Assert.fail("Test failed due to exception in DSObject12", e);
}
}
@@ -337,7 +339,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
InternalDataSerializer.register(DSObject13.class, true);
}
catch (Exception e) {
- fail("Test failed due to exception in DSObject13", e);
+ Assert.fail("Test failed due to exception in DSObject13", e);
}
}
@@ -347,7 +349,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
InternalDataSerializer._register(new DSObjectLocalOnly(79), true);
}
catch (Exception e) {
- fail("Test failed due to exception in DSObjectLocalOnly", e);
+ Assert.fail("Test failed due to exception in DSObjectLocalOnly", e);
}
}
@@ -355,7 +357,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
try {
InternalDataSerializer.register(TestDataSerializer.class, true);
} catch (Exception e) {
- fail("Test failed due to exception in TestDataSerializer", e);
+ Assert.fail("Test failed due to exception in TestDataSerializer", e);
}
}
@@ -553,7 +555,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
"verifyDataSerializers", new Object[] { Integer.valueOf(1) });
// can get server connectivity exception
- final ExpectedException expectedEx = addExpectedException(
+ final IgnoredException expectedEx = IgnoredException.addExpectedException(
"Server unreachable", client1);
// stop the cache server
@@ -644,7 +646,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
instanceCountWithOnePut) });
// can get server connectivity exception
- final ExpectedException expectedEx = addExpectedException(
+ final IgnoredException expectedEx = IgnoredException.addExpectedException(
"Server unreachable", client1);
server1.invoke(DataSerializerPropogationDUnitTest.class, "stopServer");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
index 55bd889..33ef549 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
@@ -38,6 +38,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.EntryEventImpl;
import com.gemstone.gemfire.internal.cache.EventID;
+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;
@@ -342,7 +343,7 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase
assertEquals(r1.getEntry("key2").getValue(), "key-2");
}
catch (Exception ex) {
- fail("failed while createEntries()", ex);
+ Assert.fail("failed while createEntries()", ex);
}
}
@@ -359,7 +360,7 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase
r.destroy("key2");
}
catch (Exception ex) {
- fail("failed while destroyEntry()", ex);
+ Assert.fail("failed while destroyEntry()", ex);
}
}
@@ -372,7 +373,7 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase
assertNotNull(r.getEntry("key2"));
}
catch (Exception ex) {
- fail("failed while verifyDestroyEntry in C1", ex);
+ Assert.fail("failed while verifyDestroyEntry in C1", ex);
}
}
@@ -386,7 +387,7 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase
assertNull(r.getEntry("key2"));
}
catch (Exception ex) {
- fail("failed while verifyDestroyEntry in C1", ex);
+ Assert.fail("failed while verifyDestroyEntry in C1", ex);
}
}
@@ -400,7 +401,7 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase
assertNotNull(r.getEntry("key2"));
}
catch (Exception ex) {
- fail("failed while verifyDestroyEntry for key1", ex);
+ Assert.fail("failed while verifyDestroyEntry for key1", ex);
}
}
@@ -487,7 +488,7 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
- fail("failed while registering interest", ex);
+ Assert.fail("failed while registering interest", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java
index d40563b..3e62a4e 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java
@@ -30,6 +30,7 @@ import com.gemstone.gemfire.cache.client.internal.PoolImpl;
import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.internal.AvailablePortHelper;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -84,7 +85,7 @@ public class DurableClientBug39997DUnitTest extends CacheTestCase {
try {
server.start();
} catch (IOException e) {
- fail("couldn't start server", e);
+ Assert.fail("couldn't start server", e);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
index 3e23ab5..778e1bb 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
@@ -36,6 +36,7 @@ import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
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.VM;
/**
@@ -85,8 +86,8 @@ public class DurableClientQueueSizeDUnitTest extends DistributedTestCase {
"createCacheServer", new Object[] { });
port1 = (Integer) vm1.invoke(DurableClientQueueSizeDUnitTest.class,
"createCacheServer", new Object[] { });
- addExpectedException("java.net.SocketException");
- addExpectedException("Unexpected IOException");
+ IgnoredException.addExpectedException("java.net.SocketException");
+ IgnoredException.addExpectedException("Unexpected IOException");
}
public void tearDown2() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
index 309f44a..a433cdc 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
@@ -43,7 +43,9 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.ServerLocation;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.CacheServerImpl;
+import com.gemstone.gemfire.test.dunit.Assert;
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;
@@ -333,7 +335,7 @@ public class DurableClientReconnectDUnitTest extends DistributedTestCase
String rServer2 = (String)serverArray[1];
// can see sporadic socket closed exceptions
- final ExpectedException expectedEx = addExpectedException(
+ final IgnoredException expectedEx = IgnoredException.addExpectedException(
SocketException.class.getName());
instance.closeServer(rServer1);
@@ -450,7 +452,7 @@ public class DurableClientReconnectDUnitTest extends DistributedTestCase
assertTrue(redundantServersAfterReconnect.contains(endpointName));
}
}catch (Exception e){
- fail("test failed due to" , e);
+ Assert.fail("test failed due to" , e);
}
}
@@ -458,7 +460,7 @@ public class DurableClientReconnectDUnitTest extends DistributedTestCase
try{
checkNumberOfClientProxies(0);
}catch (Exception e){
- fail("test failed due to" , e);
+ Assert.fail("test failed due to" , e);
}
}
@@ -536,7 +538,7 @@ public class DurableClientReconnectDUnitTest extends DistributedTestCase
assertEquals("DurableClientReconnectDUnitTest_client", proxy.getDurableId());
// assertEquals(60, proxy.getDurableTimeout());
}catch (Exception e){
- fail("test failed due to" , e);
+ Assert.fail("test failed due to" , e);
}
}
@@ -585,7 +587,7 @@ public class DurableClientReconnectDUnitTest extends DistributedTestCase
cache = CacheFactory.create(ds);
assertNotNull(cache);
} catch(Exception e){
- fail("test failed due to " , e );
+ Assert.fail("test failed due to " , e );
}
}
@@ -641,7 +643,7 @@ public class DurableClientReconnectDUnitTest extends DistributedTestCase
cache.readyForEvents();
}catch(Exception e){
- fail("test failed due to " , e );
+ Assert.fail("test failed due to " , e );
}
}
@@ -676,7 +678,7 @@ public class DurableClientReconnectDUnitTest extends DistributedTestCase
cache.readyForEvents();
}catch(Exception e){
- fail("test failed due to " , e );
+ Assert.fail("test failed due to " , e );
}
}
@@ -711,7 +713,7 @@ public class DurableClientReconnectDUnitTest extends DistributedTestCase
cache.readyForEvents();
}catch(Exception e){
- fail("test failed due to " , e );
+ Assert.fail("test failed due to " , e );
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
index 08eaa9d..b97a058 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
@@ -30,6 +30,7 @@ import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import com.gemstone.gemfire.cache.client.*;
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.VM;
@@ -336,7 +337,7 @@ public class DurableClientStatsDUnitTest extends DistributedTestCase {
region.registerInterest(key, InterestResultPolicy.NONE, isDurable);
}
catch (Exception ex) {
- fail("failed while registering interest in registerKey function", ex);
+ Assert.fail("failed while registering interest in registerKey function", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
index f2ef6d1..3b40ed7 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
@@ -39,6 +39,7 @@ import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.cache.client.*;
import com.gemstone.gemfire.cache.query.data.Portfolio;
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.VM;
@@ -703,7 +704,7 @@ public class DurableRegistrationDUnitTest extends DistributedTestCase {
}
catch (Exception ex) {
- fail("failed while registering interest in registerKey function", ex);
+ Assert.fail("failed while registering interest in registerKey function", ex);
}
}
@@ -736,7 +737,7 @@ public class DurableRegistrationDUnitTest extends DistributedTestCase {
region.registerInterest(key, InterestResultPolicy.NONE, isDurable);
}
catch (Exception ex) {
- fail("failed while registering interest in registerKey function", ex);
+ Assert.fail("failed while registering interest in registerKey function", ex);
}
}
@@ -752,7 +753,7 @@ public class DurableRegistrationDUnitTest extends DistributedTestCase {
region.unregisterInterest(key);
}
catch (Exception ex) {
- fail("failed while registering interest in registerKey function", ex);
+ Assert.fail("failed while registering interest in registerKey function", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
index bbbdf80..1084793 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
@@ -24,8 +24,10 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
+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.VM;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.cache.client.*;
@@ -68,7 +70,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
"createServerCache"));
createCacheClient(getServerHostName(server1.getHost()));
//Disconnecting the client can cause this
- addExpectedException("Connection reset||Unexpected IOException");
+ IgnoredException.addExpectedException("Connection reset||Unexpected IOException");
}
public void testRegisterInterestResponse_NonExistent_Invalid()
@@ -369,7 +371,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
r.put(key, value);
}
catch (Exception e) {
- fail("test failed due to ", e);
+ Assert.fail("test failed due to ", e);
}
}
@@ -381,7 +383,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
r.destroy(key);
}
catch (Exception e) {
- fail("test failed due to ", e);
+ Assert.fail("test failed due to ", e);
}
}
@@ -393,7 +395,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
r.invalidate(key);
}
catch (Exception e) {
- fail("test failed due to ", e);
+ Assert.fail("test failed due to ", e);
}
}
@@ -406,7 +408,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
r.invalidate(key);
}
catch (Exception e) {
- fail("test failed due to ", e);
+ Assert.fail("test failed due to ", e);
}
}
@@ -419,7 +421,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
r.localInvalidate(key);
}
catch (Exception e) {
- fail("test failed due to ", e);
+ Assert.fail("test failed due to ", e);
}
}
@@ -434,7 +436,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
assertNotNull(cache);
}
catch (Exception e) {
- fail("test failed due to ", e);
+ Assert.fail("test failed due to ", e);
}
}
@@ -467,7 +469,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
}
catch (Exception e) {
- fail("test failed due to ", e);
+ Assert.fail("test failed due to ", e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
index 6cb897e..ba1658c 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
@@ -42,6 +42,7 @@ import com.gemstone.gemfire.internal.cache.CacheObserverHolder;
import com.gemstone.gemfire.internal.cache.EntryEventImpl;
import com.gemstone.gemfire.internal.cache.EventID;
import com.gemstone.gemfire.internal.cache.RegionEventImpl;
+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;
@@ -388,7 +389,7 @@ public class EventIDVerificationDUnitTest extends DistributedTestCase
assertEquals(r.getEntry("key-1").getValue(), "key-1");
}
catch (Exception ex) {
- fail("failed while createEntries()", ex);
+ Assert.fail("failed while createEntries()", ex);
}
}
@@ -404,7 +405,7 @@ public class EventIDVerificationDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
- fail("failed while r.put()", ex);
+ Assert.fail("failed while r.put()", ex);
}
}
@@ -416,7 +417,7 @@ public class EventIDVerificationDUnitTest extends DistributedTestCase
r.destroy("key-1");
}
catch (Exception ex) {
- fail("test failed due to exception in destroy ", ex);
+ Assert.fail("test failed due to exception in destroy ", ex);
}
}
@@ -429,7 +430,7 @@ public class EventIDVerificationDUnitTest extends DistributedTestCase
r.remove("key-1");
}
catch (Exception ex) {
- fail("test failed due to exception in remove ", ex);
+ Assert.fail("test failed due to exception in remove ", ex);
}
}
@@ -442,7 +443,7 @@ public class EventIDVerificationDUnitTest extends DistributedTestCase
r.destroyRegion();
}
catch (Exception ex) {
- fail("test failed due to exception in destroyRegion ", ex);
+ Assert.fail("test failed due to exception in destroyRegion ", ex);
}
}
@@ -454,7 +455,7 @@ public class EventIDVerificationDUnitTest extends DistributedTestCase
r.clear();
}
catch (Exception ex) {
- fail("test failed due to exception in clearRegion ", ex);
+ Assert.fail("test failed due to exception in clearRegion ", ex);
}
}
[29/50] [abbrv] incubator-geode git commit: Fix footer GitHub link
Posted by kl...@apache.org.
Fix footer GitHub link
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/41e55534
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/41e55534
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/41e55534
Branch: refs/heads/feature/GEODE-773-2
Commit: 41e55534d135d6c6030e29351cdcfac91836f758
Parents: 4903d90
Author: John C Bledsoe <jc...@users.noreply.github.com>
Authored: Sun Jan 31 03:49:49 2016 -0600
Committer: John C Bledsoe <jc...@users.noreply.github.com>
Committed: Sun Jan 31 03:49:49 2016 -0600
----------------------------------------------------------------------
gemfire-site/website/layouts/footer.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/41e55534/gemfire-site/website/layouts/footer.html
----------------------------------------------------------------------
diff --git a/gemfire-site/website/layouts/footer.html b/gemfire-site/website/layouts/footer.html
index c024af6..d757cc1 100644
--- a/gemfire-site/website/layouts/footer.html
+++ b/gemfire-site/website/layouts/footer.html
@@ -23,7 +23,7 @@
<div class="col-md-2">
<ul class="nav nav-list">
<li class="nav-header">Resources</li>
- <li><a href="http://github.com/apache/geode-incubator" target="_blank">GitHub Code</a></li>
+ <li><a href="http://github.com/apache/incubator-geode" target="_blank">GitHub Code</a></li>
<li><a href="http://geode.docs.pivotal.io" target="_blank">Docs</a></li>
<li><a href="https://issues.apache.org/jira/browse/GEODE" target="_blank">JIRA Bug Tracker</a></li>
<li><a href="http://stackoverflow.com/search?q=Apache%20Geode" target="_blank">StackOverflow</a></li>
[09/50] [abbrv] incubator-geode git commit: GEODE-867: Undoing
changes to pauseSender to wait for the pause
Posted by kl...@apache.org.
GEODE-867: Undoing changes to pauseSender to wait for the pause
GEODE-864 changed WANTestBase.pauseSender to wait for the sender to
pause. But apparently in
ConcurrentSerialGatewaySenderOperationsDUnitTest the sender never
actually pauses, causing a hang in precheckin.
Temporarily undoing the changes for GEODE-864 and just changing the one
test to use pauseSenderAndWaitForDispatcher instead. That will leave
GEODE-864 fixed but also fix the hang until we can figure out why the
sender is not paused in this case.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/09bd5307
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/09bd5307
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/09bd5307
Branch: refs/heads/feature/GEODE-773-2
Commit: 09bd5307994bd970bdf3bf4f1d5f302021e8b8e6
Parents: a724951
Author: Dan Smith <up...@apache.org>
Authored: Wed Jan 27 11:16:40 2016 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Wed Jan 27 11:16:40 2016 -0800
----------------------------------------------------------------------
.../gemfire/internal/cache/wan/WANTestBase.java | 23 ++++++++++++++++++--
...arallelGatewaySenderOperationsDUnitTest.java | 8 +++----
.../ParallelWANConflationDUnitTest.java | 8 +++----
3 files changed, 29 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/09bd5307/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
index 5539eb1..0c32d1f 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
@@ -2162,14 +2162,33 @@ public class WANTestBase extends DistributedTestCase{
}
}
sender.pause();
- ((AbstractGatewaySender) sender).getEventProcessor().waitForDispatcherToPause();
-
}
finally {
exp.remove();
exln.remove();
}
}
+
+ public static void pauseSenderAndWaitForDispatcherToPause(String senderId) {
+ final ExpectedException exln = addExpectedException("Could not connect");
+ ExpectedException exp = addExpectedException(ForceReattemptException.class
+ .getName());
+ try {
+ Set<GatewaySender> senders = cache.getGatewaySenders();
+ GatewaySender sender = null;
+ for (GatewaySender s : senders) {
+ if (s.getId().equals(senderId)) {
+ sender = s;
+ break;
+ }
+ }
+ sender.pause();
+ ((AbstractGatewaySender)sender).getEventProcessor().waitForDispatcherToPause();
+ } finally {
+ exp.remove();
+ exln.remove();
+ }
+ }
public static void resumeSender(String senderId) {
final ExpectedException exln = addExpectedException("Could not connect");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/09bd5307/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
index 3d0eb5b..19f6c4b 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
@@ -210,10 +210,10 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 100 });
//now, pause all of the senders
- vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+ vm4.invoke(WANTestBase.class, "pauseSenderAndWaitForDispatcherToPause", new Object[] { "ln" });
+ vm5.invoke(WANTestBase.class, "pauseSenderAndWaitForDispatcherToPause", new Object[] { "ln" });
+ vm6.invoke(WANTestBase.class, "pauseSenderAndWaitForDispatcherToPause", new Object[] { "ln" });
+ vm7.invoke(WANTestBase.class, "pauseSenderAndWaitForDispatcherToPause", new Object[] { "ln" });
//SECOND RUN: keep one thread doing puts to the region
vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/09bd5307/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
index 763b9c4..bce63f5 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
@@ -430,10 +430,10 @@ public class ParallelWANConflationDUnitTest extends WANTestBase {
}
protected void pauseSenders() {
- vm4.invoke(() ->pauseSender( "ln" ));
- vm5.invoke(() ->pauseSender( "ln" ));
- vm6.invoke(() ->pauseSender( "ln" ));
- vm7.invoke(() ->pauseSender( "ln" ));
+ vm4.invoke(() ->pauseSenderAndWaitForDispatcherToPause( "ln" ));
+ vm5.invoke(() ->pauseSenderAndWaitForDispatcherToPause( "ln" ));
+ vm6.invoke(() ->pauseSenderAndWaitForDispatcherToPause( "ln" ));
+ vm7.invoke(() ->pauseSenderAndWaitForDispatcherToPause( "ln" ));
}
protected void startSenders() {
[50/50] [abbrv] incubator-geode git commit: Refactor dunit
Posted by kl...@apache.org.
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/18401aa6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/18401aa6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/18401aa6
Branch: refs/heads/feature/GEODE-773-2
Commit: 18401aa6673da8a6ee8a035febe98e4e1311a3f9
Parents: 3b5d2a0
Author: Kirk Lund <kl...@pivotal.io>
Authored: Mon Feb 1 12:54:04 2016 -0800
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Mon Feb 1 12:54:04 2016 -0800
----------------------------------------------------------------------
.../gemfire/internal/cache/UpdateVersionDUnitTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/18401aa6/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
index 70ecac5..7cb5c0b 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
@@ -656,17 +656,17 @@ public class UpdateVersionDUnitTest extends DistributedTestCase {
InternalDistributedSystem ds = test.getSystem(props);
cache = CacheFactory.create(ds);
ExpectedException ex = new ExpectedException("could not get remote locator information for remote site");
- cache.getLogger().info(ex.getAddString());
+ cache.getLogger().info(ex.getAddMessage());
expectedExceptions.add(ex);
ex = new ExpectedException("Pool ln1 is not available");
- cache.getLogger().info(ex.getAddString());
+ cache.getLogger().info(ex.getAddMessage());
expectedExceptions.add(ex);
}
private static void closeCache() {
if (cache != null && !cache.isClosed()) {
for (ExpectedException expectedException: expectedExceptions) {
- cache.getLogger().info(expectedException.getRemoveString());
+ cache.getLogger().info(expectedException.getRemoveMessage());
}
expectedExceptions.clear();
cache.getDistributedSystem().disconnect();
[04/50] [abbrv] incubator-geode git commit: GEODE-858: Remove 1
second sleep from InternalLocator.startTcpServer
Posted by kl...@apache.org.
GEODE-858: Remove 1 second sleep from InternalLocator.startTcpServer
There is no reason for this sleep, it is causing tests to take longer.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/1ccf2266
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/1ccf2266
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/1ccf2266
Branch: refs/heads/feature/GEODE-773-2
Commit: 1ccf22662d61db9dafc2a21260c3fe9a856ad172
Parents: 30d2d64
Author: Dan Smith <up...@apache.org>
Authored: Mon Jan 25 16:50:36 2016 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Tue Jan 26 17:01:37 2016 -0800
----------------------------------------------------------------------
.../gemfire/distributed/internal/InternalLocator.java | 9 ---------
1 file changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1ccf2266/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
index 50a0fa9..c346a45 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
@@ -621,15 +621,6 @@ public class InternalLocator extends Locator implements ConnectListener {
private void startTcpServer() throws IOException {
logger.info(LocalizedMessage.create(LocalizedStrings.InternalLocator_STARTING_0, this));
server.start();
-
- try {
- Thread.sleep(1000);
- }
- catch (InterruptedException ie) {
- // always safe to exit this thread...
- Thread.currentThread().interrupt();
- logger.warn(LocalizedMessage.create(LocalizedStrings.ONE_ARG, "Interrupted"), ie);
- }
}
public SharedConfiguration getSharedConfiguration() {
[37/50] [abbrv] incubator-geode git commit: Refactor dunit
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DebuggerSupport.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DebuggerSupport.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DebuggerSupport.java
new file mode 100755
index 0000000..47cb89f
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DebuggerSupport.java
@@ -0,0 +1,5 @@
+package com.gemstone.gemfire.test.dunit;
+
+public class DebuggerSupport {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java
index 80f5a47..d753539 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java
@@ -17,9 +17,6 @@
package com.gemstone.gemfire.test.dunit;
import java.io.File;
-import java.io.PrintWriter;
-import java.io.Serializable;
-import java.io.StringWriter;
import java.net.UnknownHostException;
import java.text.DecimalFormat;
import java.util.HashMap;
@@ -28,9 +25,7 @@ import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Properties;
import java.util.Random;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.junit.experimental.categories.Category;
@@ -141,8 +136,6 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
private static Properties lastSystemProperties;
public static volatile String testName;
- private static ConcurrentLinkedQueue<ExpectedException> expectedExceptions = new ConcurrentLinkedQueue<ExpectedException>();
-
/** For formatting timing info */
private static final DecimalFormat format = new DecimalFormat("###.###");
@@ -780,10 +773,7 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
if (InternalDistributedSystem.systemAttemptingReconnect != null) {
InternalDistributedSystem.systemAttemptingReconnect.stopReconnecting();
}
- ExpectedException ex;
- while((ex = expectedExceptions.poll()) != null) {
- ex.remove();
- }
+ IgnoredException.removeAllExpectedExceptions();
}
private static void closeCache() {
@@ -957,14 +947,10 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
/**
* Helper method that causes this test to fail because of the given
* exception.
+ * @deprecated Use {@link Assert#fail(String,Throwable)} instead
*/
public static void fail(String message, Throwable ex) {
- StringWriter sw = new StringWriter();
- PrintWriter pw = new PrintWriter(sw, true);
- pw.print(message);
- pw.print(": ");
- ex.printStackTrace(pw);
- fail(sw.toString());
+ Assert.fail(message, ex);
}
// utility methods
@@ -998,7 +984,7 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
}
}
catch (InterruptedException e) {
- fail("interrupted", e);
+ Assert.fail("interrupted", e);
}
}
@@ -1044,7 +1030,7 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
}
}
catch (InterruptedException e) {
- fail("interrupted", e);
+ Assert.fail("interrupted", e);
}
}
@@ -1062,37 +1048,6 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
}
/**
- * If true, we randomize the amount of time we wait before polling a
- * {@link WaitCriterion}.
- */
- static private final boolean USE_JITTER = true;
- static private final Random jitter = new Random();
-
- /**
- * Return a jittered interval up to a maximum of <code>ms</code>
- * milliseconds, inclusive.
- *
- * The result is bounded by 50 ms as a minimum and 5000 ms as a maximum.
- *
- * @param ms total amount of time to wait
- * @return randomized interval we should wait
- */
- private static int jitterInterval(long ms) {
- final int minLegal = 50;
- final int maxLegal = 5000;
- if (ms <= minLegal) {
- return (int)ms; // Don't ever jitter anything below this.
- }
-
- int maxReturn = maxLegal;
- if (ms < maxLegal) {
- maxReturn = (int)ms;
- }
-
- return minLegal + jitter.nextInt(maxReturn - minLegal + 1);
- }
-
- /**
* Wait until given criterion is met
* @param ev criterion to wait on
* @param ms total time to wait, in milliseconds
@@ -1103,13 +1058,7 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
@Deprecated
static public void waitForCriterion(WaitCriterion ev, long ms,
long interval, boolean throwOnTimeout) {
- long waitThisTime;
- if (USE_JITTER) {
- waitThisTime = jitterInterval(interval);
- }
- else {
- waitThisTime = interval;
- }
+ long waitThisTime = Jitter.jitterInterval(interval);
final long tilt = System.currentTimeMillis() + ms;
for (;;) {
// getLogWriter().info("Testing to see if event has occurred: " + ev.description());
@@ -1162,13 +1111,7 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
static public void waitMutex(WaitCriterion ev, Object mutex, long ms,
long interval, boolean throwOnTimeout) {
final long tilt = System.currentTimeMillis() + ms;
- long waitThisTime;
- if (USE_JITTER) {
- waitThisTime = jitterInterval(interval);
- }
- else {
- waitThisTime = interval;
- }
+ long waitThisTime = Jitter.jitterInterval(interval);
synchronized (mutex) {
for (;;) {
if (ev.done()) {
@@ -1204,13 +1147,7 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
*/
static public void join(Thread t, long ms, LogWriter logger) {
final long tilt = System.currentTimeMillis() + ms;
- final long incrementalWait;
- if (USE_JITTER) {
- incrementalWait = jitterInterval(ms);
- }
- else {
- incrementalWait = ms; // wait entire time, no looping.
- }
+ final long incrementalWait = Jitter.jitterInterval(ms);
final long start = System.currentTimeMillis();
for (;;) {
// I really do *not* understand why this check is necessary
@@ -1272,74 +1209,40 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
}
/**
- * A class that represents an currently logged expected exception, which
- * should be removed
- *
- * @author Mitch Thomas
- * @since 5.7bugfix
+ * @deprecated Use {@link IgnoredException} instead.
*/
- public static class ExpectedException implements Serializable {
- private static final long serialVersionUID = 1L;
-
- final String ex;
-
- final transient VM v;
+ @Deprecated
+ public static class ExpectedException extends IgnoredException {
- public ExpectedException(String exception) {
- this.ex = exception;
- this.v = null;
+ private final IgnoredException wrappedInstance;
+
+ public ExpectedException(final IgnoredException wrappedInstance) {
+ super(wrappedInstance.errorString(), wrappedInstance.vm());
+ this.wrappedInstance = wrappedInstance;
}
-
- ExpectedException(String exception, VM vm) {
- this.ex = exception;
- this.v = vm;
+
+ public ExpectedException(final String exception) {
+ this(exception, null);
}
-
- public String getRemoveString() {
- return "<ExpectedException action=remove>" + ex + "</ExpectedException>";
+
+ private ExpectedException(final String exception, final VM vm) {
+ super(exception, vm);
+ this.wrappedInstance = new IgnoredException(exception);
}
-
- public String getAddString() {
- return "<ExpectedException action=add>" + ex + "</ExpectedException>";
+
+ public String getAddMessage() {
+ return this.wrappedInstance.getAddMessage();
}
-
+
+ public String getRemoveMessage() {
+ return this.wrappedInstance.getRemoveMessage();
+ }
+
public void remove() {
- SerializableRunnable removeRunnable = new SerializableRunnable(
- "removeExpectedExceptions") {
- public void run() {
- final String remove = getRemoveString();
- final InternalDistributedSystem sys = InternalDistributedSystem
- .getConnectedInstance();
- if (sys != null) {
- sys.getLogWriter().info(remove);
- }
- try {
- getLogWriter().info(remove);
- } catch (Exception noHydraLogger) {
- }
-
- logger.info(remove);
- }
- };
-
- if (this.v != null) {
- v.invoke(removeRunnable);
- }
- else {
- invokeInEveryVM(removeRunnable);
- }
- String s = getRemoveString();
- LogManager.getLogger(LogService.BASE_LOGGER_NAME).info(s);
- // log it locally
- final InternalDistributedSystem sys = InternalDistributedSystem
- .getConnectedInstance();
- if (sys != null) { // avoid creating a system
- sys.getLogWriter().info(s);
- }
- getLogWriter().info(s);
+ this.wrappedInstance.remove();
}
}
-
+
/**
* Log in all VMs, in both the test logger and the GemFire logger the
* expected exception string to prevent grep logs from complaining. The
@@ -1353,9 +1256,10 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
* @param exception
* the exception string to expect
* @return an ExpectedException instance for removal
+ * @deprecated Use {@link IgnoredException#addExpectedException(String)} instead
*/
public static ExpectedException addExpectedException(final String exception) {
- return addExpectedException(exception, null);
+ return new ExpectedException(IgnoredException.addExpectedException(exception));
}
/**
@@ -1370,51 +1274,10 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
* @param v
* the VM on which to log the expected exception or null for all VMs
* @return an ExpectedException instance for removal purposes
+ * @deprecated Use {@link IgnoredException#addExpectedException(String,VM)} instead
*/
- public static ExpectedException addExpectedException(final String exception,
- VM v) {
- final ExpectedException ret;
- if (v != null) {
- ret = new ExpectedException(exception, v);
- }
- else {
- ret = new ExpectedException(exception);
- }
- // define the add and remove expected exceptions
- final String add = ret.getAddString();
- SerializableRunnable addRunnable = new SerializableRunnable(
- "addExpectedExceptions") {
- public void run() {
- final InternalDistributedSystem sys = InternalDistributedSystem
- .getConnectedInstance();
- if (sys != null) {
- sys.getLogWriter().info(add);
- }
- try {
- getLogWriter().info(add);
- } catch (Exception noHydraLogger) {
- }
-
- logger.info(add);
- }
- };
- if (v != null) {
- v.invoke(addRunnable);
- }
- else {
- invokeInEveryVM(addRunnable);
- }
-
- LogManager.getLogger(LogService.BASE_LOGGER_NAME).info(add);
- // Log it locally too
- final InternalDistributedSystem sys = InternalDistributedSystem
- .getConnectedInstance();
- if (sys != null) { // avoid creating a cache
- sys.getLogWriter().info(add);
- }
- getLogWriter().info(add);
- expectedExceptions.add(ret);
- return ret;
+ public static IgnoredException addExpectedException(final String exception, final VM v) {
+ return new ExpectedException(IgnoredException.addExpectedException(exception, v));
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/IgnoredException.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/IgnoredException.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/IgnoredException.java
new file mode 100755
index 0000000..92f879c
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/IgnoredException.java
@@ -0,0 +1,174 @@
+package com.gemstone.gemfire.test.dunit;
+
+import java.io.Serializable;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.internal.logging.LogService;
+
+/**
+ * A class that represents an currently logged expected exception, which
+ * should be removed
+ *
+ * @author Mitch Thomas
+ * @since 5.7bugfix
+ */
+public class IgnoredException implements Serializable {
+ private static final Logger logger = LogService.getLogger();
+ private static final long serialVersionUID = 1L;
+
+ private final String errorString;
+
+ private final transient VM vm;
+
+ private static ConcurrentLinkedQueue<IgnoredException> ignoredExceptions = new ConcurrentLinkedQueue<IgnoredException>();
+
+ public IgnoredException(final String errorString) {
+ this.errorString = errorString;
+ this.vm = null;
+ }
+
+ IgnoredException(final String errorString, final VM vm) {
+ this.errorString = errorString;
+ this.vm = vm;
+ }
+
+ String errorString() {
+ return this.errorString;
+ }
+
+ VM vm() {
+ return this.vm;
+ }
+
+ public String getRemoveMessage() {
+ return "<ExpectedException action=remove>" + errorString + "</ExpectedException>";
+ }
+
+ public String getAddMessage() {
+ return "<ExpectedException action=add>" + errorString + "</ExpectedException>";
+ }
+
+ public void remove() {
+ SerializableRunnable removeRunnable = new SerializableRunnable(
+ "removeExpectedExceptions") {
+ public void run() {
+ final String remove = getRemoveMessage();
+ final InternalDistributedSystem sys = InternalDistributedSystem
+ .getConnectedInstance();
+ if (sys != null) {
+ sys.getLogWriter().info(remove);
+ }
+ try {
+ DistributedTestCase.getLogWriter().info(remove);
+ } catch (Exception noHydraLogger) {
+ }
+
+ logger.info(remove);
+ }
+ };
+
+ if (this.vm != null) {
+ vm.invoke(removeRunnable);
+ }
+ else {
+ DistributedTestCase.invokeInEveryVM(removeRunnable);
+ }
+ String s = getRemoveMessage();
+ LogManager.getLogger(LogService.BASE_LOGGER_NAME).info(s);
+ // log it locally
+ final InternalDistributedSystem sys = InternalDistributedSystem
+ .getConnectedInstance();
+ if (sys != null) { // avoid creating a system
+ sys.getLogWriter().info(s);
+ }
+ DistributedTestCase.getLogWriter().info(s);
+ }
+
+ public static void removeAllExpectedExceptions() {
+ IgnoredException ex;
+ while((ex = ignoredExceptions.poll()) != null) {
+ ex.remove();
+ }
+ }
+
+ /**
+ * Log in all VMs, in both the test logger and the GemFire logger the
+ * expected exception string to prevent grep logs from complaining. The
+ * expected string is used by the GrepLogs utility and so can contain
+ * regular expression characters.
+ *
+ * @since 5.7bugfix
+ * @param exception
+ * the exception string to expect
+ * @param v
+ * the VM on which to log the expected exception or null for all VMs
+ * @return an ExpectedException instance for removal purposes
+ */
+ public static IgnoredException addExpectedException(final String exception,
+ VM v) {
+ final IgnoredException ret;
+ if (v != null) {
+ ret = new IgnoredException(exception, v);
+ }
+ else {
+ ret = new IgnoredException(exception);
+ }
+ // define the add and remove expected exceptions
+ final String add = ret.getAddMessage();
+ SerializableRunnable addRunnable = new SerializableRunnable(
+ "addExpectedExceptions") {
+ public void run() {
+ final InternalDistributedSystem sys = InternalDistributedSystem
+ .getConnectedInstance();
+ if (sys != null) {
+ sys.getLogWriter().info(add);
+ }
+ try {
+ DistributedTestCase.getLogWriter().info(add);
+ } catch (Exception noHydraLogger) {
+ }
+
+ logger.info(add);
+ }
+ };
+ if (v != null) {
+ v.invoke(addRunnable);
+ }
+ else {
+ DistributedTestCase.invokeInEveryVM(addRunnable);
+ }
+
+ LogManager.getLogger(LogService.BASE_LOGGER_NAME).info(add);
+ // Log it locally too
+ final InternalDistributedSystem sys = InternalDistributedSystem
+ .getConnectedInstance();
+ if (sys != null) { // avoid creating a cache
+ sys.getLogWriter().info(add);
+ }
+ DistributedTestCase.getLogWriter().info(add);
+ IgnoredException.ignoredExceptions.add(ret);
+ return ret;
+ }
+
+ /**
+ * Log in all VMs, in both the test logger and the GemFire logger the
+ * expected exception string to prevent grep logs from complaining. The
+ * expected string is used by the GrepLogs utility and so can contain
+ * regular expression characters.
+ *
+ * If you do not remove the expected exception, it will be removed at the
+ * end of your test case automatically.
+ *
+ * @since 5.7bugfix
+ * @param exception
+ * the exception string to expect
+ * @return an ExpectedException instance for removal
+ */
+ public static IgnoredException addExpectedException(final String exception) {
+ return IgnoredException.addExpectedException(exception, null);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/Invoke.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/Invoke.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/Invoke.java
new file mode 100755
index 0000000..47109a8
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/Invoke.java
@@ -0,0 +1,22 @@
+package com.gemstone.gemfire.test.dunit;
+
+public class Invoke {
+
+ /**
+ * Invokes a <code>SerializableRunnable</code> in every VM that
+ * DUnit knows about.
+ *
+ * @see VM#invoke(Runnable)
+ */
+ public static void invokeInEveryVM(SerializableRunnable work) {
+ for (int h = 0; h < Host.getHostCount(); h++) {
+ Host host = Host.getHost(h);
+
+ for (int v = 0; v < host.getVMCount(); v++) {
+ VM vm = host.getVM(v);
+ vm.invoke(work);
+ }
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/Jitter.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/Jitter.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/Jitter.java
new file mode 100755
index 0000000..08fe71a
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/Jitter.java
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.test.dunit;
+
+import java.util.Random;
+
+/**
+ * Extracted from DistributedTestCase
+ */
+class Jitter {
+
+ /**
+ * If true, we randomize the amount of time we wait before polling a
+ * {@link WaitCriterion}.
+ */
+ private static final boolean USE_JITTER = true;
+
+ private static final Random jitter = new Random();
+
+ protected Jitter() {
+ }
+
+ /**
+ * Returns an adjusted interval from <code>minimum()</code to
+ * <code>intervalMillis</code> milliseconds. If jittering is disabled then
+ * the value returned will be equal to intervalMillis.
+ *
+ * @param intervalMillis
+ * @return adjust milliseconds to use as interval for WaitCriteria polling
+ */
+ static long jitterInterval(long intervalMillis) {
+ if (USE_JITTER) {
+ return adjustIntervalIfJitterIsEnabled(intervalMillis);
+ } else {
+ return intervalMillis;
+ }
+ }
+
+ static int minimum() {
+ return 10;
+ }
+
+ static int maximum() {
+ return 5000;
+ }
+
+ /**
+ * If jittering is enabled then returns a jittered interval up to a maximum
+ * of <code>intervalMillis</code> milliseconds, inclusive.
+ *
+ * If jittering is disabled then returns <code>intervalMillis</code>.
+ *
+ * The result is bounded by 50 ms as a minimum and 5000 ms as a maximum.
+ *
+ * @param ms total amount of time to wait
+ * @return randomized interval we should wait
+ */
+ private static int adjustIntervalIfJitterIsEnabled(final long intervalMillis) {
+ final int minLegal = minimum();
+ final int maxLegal = maximum();
+
+ if (intervalMillis <= minLegal) {
+ return (int)intervalMillis; // Don't ever jitter anything below this.
+ }
+
+ int maxValue = maxLegal;
+ if (intervalMillis < maxLegal) {
+ maxValue = (int)intervalMillis;
+ }
+
+ return minLegal + jitter.nextInt(maxValue - minLegal + 1);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/NetworkSupport.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/NetworkSupport.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/NetworkSupport.java
new file mode 100755
index 0000000..f86bef7
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/NetworkSupport.java
@@ -0,0 +1,5 @@
+package com.gemstone.gemfire.test.dunit;
+
+public class NetworkSupport {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/StoppableWaitCriterion.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/StoppableWaitCriterion.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/StoppableWaitCriterion.java
new file mode 100755
index 0000000..4587244
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/StoppableWaitCriterion.java
@@ -0,0 +1,9 @@
+package com.gemstone.gemfire.test.dunit;
+
+public interface StoppableWaitCriterion extends WaitCriterion {
+ /**
+ * If this method returns true then quit waiting even if we are not done.
+ * This allows a wait to fail early.
+ */
+ public boolean stopWaiting();
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/Threads.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/Threads.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/Threads.java
new file mode 100755
index 0000000..4bb4aa9
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/Threads.java
@@ -0,0 +1,10 @@
+package com.gemstone.gemfire.test.dunit;
+
+import org.apache.logging.log4j.Logger;
+
+import com.gemstone.gemfire.internal.logging.LogService;
+
+public class Threads {
+ private static final Logger logger = LogService.getLogger();
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/Wait.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/Wait.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/Wait.java
new file mode 100755
index 0000000..a26335e
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/Wait.java
@@ -0,0 +1,10 @@
+package com.gemstone.gemfire.test.dunit;
+
+import org.apache.logging.log4j.Logger;
+
+import com.gemstone.gemfire.internal.logging.LogService;
+import com.jayway.awaitility.Awaitility;
+
+public class Wait {
+ private static final Logger logger = LogService.getLogger();
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/WaitCriterion.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/WaitCriterion.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/WaitCriterion.java
new file mode 100755
index 0000000..40ba133
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/WaitCriterion.java
@@ -0,0 +1,6 @@
+package com.gemstone.gemfire.test.dunit;
+
+public interface WaitCriterion {
+ public boolean done();
+ public String description();
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/BasicDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/BasicDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/BasicDUnitTest.java
index 18e5f72..f9d033c 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/BasicDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/BasicDUnitTest.java
@@ -18,6 +18,7 @@ package com.gemstone.gemfire.test.dunit.tests;
import java.util.Properties;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
import com.gemstone.gemfire.test.dunit.DUnitEnv;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
@@ -117,14 +118,14 @@ public class BasicDUnitTest extends DistributedTestCase {
ai.join();
// TODO shouldn't we call fail() here?
if (ai.exceptionOccurred()) {
- fail("remoteBind failed", ai.getException());
+ Assert.fail("remoteBind failed", ai.getException());
}
ai = vm.invokeAsync(this.getClass(), "remoteValidateBind",
new Object[] {name, value });
ai.join();
if (ai.exceptionOccurred()) {
- fail("remoteValidateBind failed", ai.getException());
+ Assert.fail("remoteValidateBind failed", ai.getException());
}
}
[03/50] [abbrv] incubator-geode git commit: GEODE-864: Waiting for
conflation thread in conflation tests
Posted by kl...@apache.org.
GEODE-864: Waiting for conflation thread in conflation tests
For parallel queues, there is a actually a separate conflation thread
that removes entries from the queue on conflation. The tests need to
wait for this thread to finish it's work.
As part of this change, I refactored the ParallelWANConflationDUnitTest
to remove a bunch of duplicate code, replaced the VM.invoke(String)
calls with lambdas, and scaled the test down to create fewer buckets and
do fewer puts so that it runs in 1/4 of the time.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a7249514
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a7249514
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a7249514
Branch: refs/heads/feature/GEODE-773-2
Commit: a7249514eb2f09e5ca4920e7dc7aedfce4c2fe12
Parents: 27d965d
Author: Dan Smith <up...@apache.org>
Authored: Tue Jan 26 11:26:21 2016 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Tue Jan 26 16:50:11 2016 -0800
----------------------------------------------------------------------
.../gemfire/internal/cache/wan/WANTestBase.java | 149 ++-
...arallelGatewaySenderOperationsDUnitTest.java | 8 +-
.../ParallelWANConflationDUnitTest.java | 1017 ++++++------------
.../wan/serial/SerialWANStatsDUnitTest.java | 2 +-
4 files changed, 424 insertions(+), 752 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a7249514/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
index 230c8d8..5539eb1 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
@@ -39,6 +39,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import com.gemstone.gemfire.cache.AttributesFactory;
@@ -117,6 +118,7 @@ import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.util.test.TestUtil;
+import com.jayway.awaitility.Awaitility;
import junit.framework.Assert;
@@ -2160,6 +2162,8 @@ public class WANTestBase extends DistributedTestCase{
}
}
sender.pause();
+ ((AbstractGatewaySender) sender).getEventProcessor().waitForDispatcherToPause();
+
}
finally {
exp.remove();
@@ -2167,27 +2171,6 @@ public class WANTestBase extends DistributedTestCase{
}
}
- public static void pauseSenderAndWaitForDispatcherToPause(String senderId) {
- final ExpectedException exln = addExpectedException("Could not connect");
- ExpectedException exp = addExpectedException(ForceReattemptException.class
- .getName());
- try {
- Set<GatewaySender> senders = cache.getGatewaySenders();
- GatewaySender sender = null;
- for (GatewaySender s : senders) {
- if (s.getId().equals(senderId)) {
- sender = s;
- break;
- }
- }
- sender.pause();
- ((AbstractGatewaySender)sender).getEventProcessor().waitForDispatcherToPause();
- } finally {
- exp.remove();
- exln.remove();
- }
- }
-
public static void resumeSender(String senderId) {
final ExpectedException exln = addExpectedException("Could not connect");
ExpectedException exp = addExpectedException(ForceReattemptException.class
@@ -3189,35 +3172,23 @@ public class WANTestBase extends DistributedTestCase{
public static Map putCustomerPartitionedRegion(int numPuts) {
- assertNotNull(cache);
- assertNotNull(customerRegion);
- Map custKeyValues = new HashMap();
- for (int i = 1; i <= numPuts; i++) {
- CustId custid = new CustId(i);
- Customer customer = new Customer("name" + i, "Address" + i);
- try {
- customerRegion.put(custid, customer);
- custKeyValues.put(custid, customer);
- assertTrue(customerRegion.containsKey(custid));
- assertEquals(customer,customerRegion.get(custid));
- }
- catch (Exception e) {
- fail(
- "putCustomerPartitionedRegion : failed while doing put operation in CustomerPartitionedRegion ",
- e);
- }
- getLogWriter().info("Customer :- { " + custid + " : " + customer + " }");
- }
- return custKeyValues;
+ String valueSuffix = "";
+ return putCustomerPartitionedRegion(numPuts, valueSuffix);
}
public static Map updateCustomerPartitionedRegion(int numPuts) {
+ String valueSuffix = "_update";
+ return putCustomerPartitionedRegion(numPuts, valueSuffix);
+ }
+
+ protected static Map putCustomerPartitionedRegion(int numPuts,
+ String valueSuffix) {
assertNotNull(cache);
assertNotNull(customerRegion);
- Map custKeyValues = new HashMap();
+ Map custKeyValues = new HashMap();
for (int i = 1; i <= numPuts; i++) {
CustId custid = new CustId(i);
- Customer customer = new Customer("name" + i, "Address" + i + "_update");
+ Customer customer = new Customer("name" + i, "Address" + i + valueSuffix);
try {
customerRegion.put(custid, customer);
assertTrue(customerRegion.containsKey(custid));
@@ -3240,24 +3211,22 @@ public class WANTestBase extends DistributedTestCase{
Map orderKeyValues = new HashMap();
for (int i = 1; i <= numPuts; i++) {
CustId custid = new CustId(i);
- for (int j = 1; j <= 1; j++) {
- int oid = (i * 1) + j;
- OrderId orderId = new OrderId(oid, custid);
- Order order = new Order("OREDR" + oid);
- try {
- orderRegion.put(orderId, order);
- orderKeyValues.put(orderId, order);
- assertTrue(orderRegion.containsKey(orderId));
- assertEquals(order,orderRegion.get(orderId));
+ int oid = i + 1;
+ OrderId orderId = new OrderId(oid, custid);
+ Order order = new Order("OREDR" + oid);
+ try {
+ orderRegion.put(orderId, order);
+ orderKeyValues.put(orderId, order);
+ assertTrue(orderRegion.containsKey(orderId));
+ assertEquals(order,orderRegion.get(orderId));
- }
- catch (Exception e) {
- fail(
- "putOrderPartitionedRegion : failed while doing put operation in OrderPartitionedRegion ",
- e);
- }
- getLogWriter().info("Order :- { " + orderId + " : " + order + " }");
}
+ catch (Exception e) {
+ fail(
+ "putOrderPartitionedRegion : failed while doing put operation in OrderPartitionedRegion ",
+ e);
+ }
+ getLogWriter().info("Order :- { " + orderId + " : " + order + " }");
}
return orderKeyValues;
}
@@ -3412,36 +3381,7 @@ public class WANTestBase extends DistributedTestCase{
}
return shipmentKeyValue;
}
-
- public static void doPutsPDXSerializable(String regionName, int numPuts) {
- Region r = cache.getRegion(Region.SEPARATOR + regionName);
- assertNotNull(r);
- for (int i = 0; i < numPuts; i++) {
- r.put("Key_" + i, new SimpleClass(i, (byte)i));
- }
- }
- public static void doPutsPDXSerializable2(String regionName, int numPuts) {
- Region r = cache.getRegion(Region.SEPARATOR + regionName);
- assertNotNull(r);
- for (int i = 0; i < numPuts; i++) {
- r.put("Key_" + i, new SimpleClass1(false, (short) i, "" + i, i,"" +i ,""+ i,i, i));
- }
- }
-
-
- public static void doTxPuts(String regionName, int numPuts) {
- Region r = cache.getRegion(Region.SEPARATOR + regionName);
- assertNotNull(r);
- CacheTransactionManager mgr = cache.getCacheTransactionManager();
-
- mgr.begin();
- r.put(0, 0);
- r.put(100, 100);
- r.put(200, 200);
- mgr.commit();
- }
-
public static Map updateShipmentPartitionedRegion(int numPuts) {
assertNotNull(cache);
assertNotNull(shipmentRegion);
@@ -3495,7 +3435,36 @@ public class WANTestBase extends DistributedTestCase{
}
return shipmentKeyValue;
}
+
+ public static void doPutsPDXSerializable(String regionName, int numPuts) {
+ Region r = cache.getRegion(Region.SEPARATOR + regionName);
+ assertNotNull(r);
+ for (int i = 0; i < numPuts; i++) {
+ r.put("Key_" + i, new SimpleClass(i, (byte)i));
+ }
+ }
+
+ public static void doPutsPDXSerializable2(String regionName, int numPuts) {
+ Region r = cache.getRegion(Region.SEPARATOR + regionName);
+ assertNotNull(r);
+ for (int i = 0; i < numPuts; i++) {
+ r.put("Key_" + i, new SimpleClass1(false, (short) i, "" + i, i,"" +i ,""+ i,i, i));
+ }
+ }
+
+ public static void doTxPuts(String regionName, int numPuts) {
+ Region r = cache.getRegion(Region.SEPARATOR + regionName);
+ assertNotNull(r);
+ CacheTransactionManager mgr = cache.getCacheTransactionManager();
+
+ mgr.begin();
+ r.put(0, 0);
+ r.put(100, 100);
+ r.put(200, 200);
+ mgr.commit();
+ }
+
public static void doNextPuts(String regionName, int start, int numPuts) {
//waitForSitesToUpdate();
ExpectedException exp = addExpectedException(CacheClosedException.class
@@ -3512,6 +3481,10 @@ public class WANTestBase extends DistributedTestCase{
}
public static void checkQueueSize(String senderId, int numQueueEntries) {
+ Awaitility.await().atMost(10, TimeUnit.SECONDS).until(() -> testQueueSize(senderId, numQueueEntries));
+ }
+
+ public static void testQueueSize(String senderId, int numQueueEntries) {
GatewaySender sender = null;
for (GatewaySender s : cache.getGatewaySenders()) {
if (s.getId().equals(senderId)) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a7249514/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
index 19f6c4b..3d0eb5b 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
@@ -210,10 +210,10 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 100 });
//now, pause all of the senders
- vm4.invoke(WANTestBase.class, "pauseSenderAndWaitForDispatcherToPause", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "pauseSenderAndWaitForDispatcherToPause", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "pauseSenderAndWaitForDispatcherToPause", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "pauseSenderAndWaitForDispatcherToPause", new Object[] { "ln" });
+ vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+ vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+ vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+ vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
//SECOND RUN: keep one thread doing puts to the region
vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a7249514/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
index 4acaaf4..763b9c4 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
@@ -40,92 +40,31 @@ public class ParallelWANConflationDUnitTest extends WANTestBase {
}
public void testParallelPropagationConflationDisabled() throws Exception {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, "ln", 0, 100, isOffHeap() });
- vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, "ln", 0, 100, isOffHeap() });
- vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, "ln", 0, 100, isOffHeap() });
- vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, "ln", 0, 100, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- pause(3000);
-
- vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, null, 1, 100, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, null, 1, 100, isOffHeap() });
-
- pause(2000);
-
- final Map keyValues = new HashMap();
- final Map updateKeyValues = new HashMap();
- for(int i=0; i< 1000; i++) {
- keyValues.put(i, i);
- }
-
-
- vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, keyValues });
+ initialSetUp();
- vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() });
- for(int i=0;i<500;i++) {
- updateKeyValues.put(i, i+"_updated");
- }
+ createSendersNoConflation();
+
+ createSenderPRs();
+
+ startPausedSenders();
+
+ createReceiverPrs();
+
+ final Map keyValues = putKeyValues();
+
+ vm4.invoke(() ->checkQueueSize( "ln", keyValues.size() ));
- vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues });
+ final Map updateKeyValues = updateKeyValues();
- vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", (keyValues.size() + updateKeyValues.size()) });
+ vm4.invoke(() ->checkQueueSize( "ln", (keyValues.size() + updateKeyValues.size()) ));
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName, 0 });
+ vm2.invoke(() ->validateRegionSize(
+ testName, 0 ));
- vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+ resumeSenders();
keyValues.putAll(updateKeyValues);
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName, keyValues.size() });
- vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName, keyValues.size() });
-
- vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
- testName, keyValues });
- vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
- testName, keyValues });
+ validateReceiverRegionSize(keyValues);
}
@@ -137,661 +76,421 @@ public class ParallelWANConflationDUnitTest extends WANTestBase {
* @throws Exception
*/
public void testParallelPropagationBatchConflation() throws Exception {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 50, false, false, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 50, false, false, null, true });
- vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 50, false, false, null, true });
- vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 50, false, false, null, true });
+ initialSetUp();
+
+ vm4.invoke(() ->createSender( "ln", 2,
+ true, 100, 50, false, false, null, true ));
+ vm5.invoke(() ->createSender( "ln", 2,
+ true, 100, 50, false, false, null, true ));
+ vm6.invoke(() ->createSender( "ln", 2,
+ true, 100, 50, false, false, null, true ));
+ vm7.invoke(() ->createSender( "ln", 2,
+ true, 100, 50, false, false, null, true ));
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, "ln", 0, 100, isOffHeap() });
- vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, "ln", 0, 100, isOffHeap() });
- vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, "ln", 0, 100, isOffHeap() });
- vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, "ln", 0, 100, isOffHeap() });
+ createSenderPRs();
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+ startSenders();
- vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+ pauseSenders();
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, null, 1, 100, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, null, 1, 100, isOffHeap() });
+ createReceiverPrs();
final Map keyValues = new HashMap();
- for (int i = 1; i <= 100; i++) {
+ for (int i = 1; i <= 10; i++) {
for (int j = 1; j <= 10; j++) {
keyValues.put(j, i) ;
}
- vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] {
- testName, keyValues });
+ vm4.invoke(() ->putGivenKeyValue(
+ testName, keyValues ));
}
- vm4.invoke(WANTestBase.class, "enableConflation", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "enableConflation", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "enableConflation", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "enableConflation", new Object[] { "ln" });
+ vm4.invoke(() ->enableConflation( "ln" ));
+ vm5.invoke(() ->enableConflation( "ln" ));
+ vm6.invoke(() ->enableConflation( "ln" ));
+ vm7.invoke(() ->enableConflation( "ln" ));
- vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+ resumeSenders();
- pause(2000);
- ArrayList<Integer> v4List = (ArrayList<Integer>)vm4.invoke(
- WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
- ArrayList<Integer> v5List = (ArrayList<Integer>)vm5.invoke(
- WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
- ArrayList<Integer> v6List = (ArrayList<Integer>)vm6.invoke(
- WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
- ArrayList<Integer> v7List = (ArrayList<Integer>)vm7.invoke(
- WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
+ ArrayList<Integer> v4List = (ArrayList<Integer>)vm4.invoke(() ->
+ WANTestBase.getSenderStats( "ln", 0 ));
+ ArrayList<Integer> v5List = (ArrayList<Integer>)vm5.invoke(() ->
+ WANTestBase.getSenderStats( "ln", 0 ));
+ ArrayList<Integer> v6List = (ArrayList<Integer>)vm6.invoke(() ->
+ WANTestBase.getSenderStats( "ln", 0 ));
+ ArrayList<Integer> v7List = (ArrayList<Integer>)vm7.invoke(() ->
+ WANTestBase.getSenderStats( "ln", 0 ));
- getLogWriter().info("KBKBKB: batch conflated events : vm4 : " + v4List.get(8));
- getLogWriter().info("KBKBKB: batch conflated events : vm5 : " + v5List.get(8));
- getLogWriter().info("KBKBKB: batch conflated events : vm6 : " + v6List.get(8));
- getLogWriter().info("KBKBKB: batch conflated events : vm7 : " + v7List.get(8));
- getLogWriter().info("KBKBKB: batch conflated events : " + (v4List.get(8) + v5List.get(8) + v6List.get(8) + v7List.get(8)));
assertTrue("No events conflated in batch", (v4List.get(8) + v5List.get(8) + v6List.get(8) + v7List.get(8)) > 0);
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName, 10 });
+ vm2.invoke(() ->validateRegionSize(
+ testName, 10 ));
}
public void testParallelPropagationConflation() throws Exception {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, true, false, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, true, false, null, true });
- vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, true, false, null, true });
- vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, true, false, null, true });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, "ln", 0, 100, isOffHeap() });
- vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, "ln", 0, 100, isOffHeap() });
- vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, "ln", 0, 100, isOffHeap() });
- vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, "ln", 0, 100, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- pause(3000);
-
- vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, null, 1, 100, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, null, 1, 100, isOffHeap() });
-
- pause(2000);
-
- final Map keyValues = new HashMap();
- final Map updateKeyValues = new HashMap();
- for(int i=0; i< 1000; i++) {
- keyValues.put(i, i);
- }
-
-
- vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, keyValues });
+ doTestParallelPropagationConflation(0);
+ }
+
+ public void testParallelPropagationConflationRedundancy2() throws Exception {
+ doTestParallelPropagationConflation(2);
+ }
+
+ public void doTestParallelPropagationConflation(int redundancy) throws Exception {
+ initialSetUp();
- vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() });
- for(int i=0;i<500;i++) {
- updateKeyValues.put(i, i+"_updated");
- }
-
- vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues });
+ createSendersWithConflation();
- vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() + updateKeyValues.size() }); // creates aren't conflated
-
- vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues });
+ createSenderPRs(redundancy);
- vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() + updateKeyValues.size() }); // creates aren't conflated
+ startPausedSenders();
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName, 0 });
+ createReceiverPrs();
- vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+ final Map keyValues = putKeyValues();
- keyValues.putAll(updateKeyValues);
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName, keyValues.size() });
- vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName, keyValues.size() });
-
- vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
- testName, keyValues });
- vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
- testName, keyValues });
- }
-
-
- /**
- * Reproduce the bug #47213.
- * The test is same as above test, with the only difference that
- * redundancy is set to 1.
- * @throws Exception
- */
- public void testParallelPropagationConflation_Bug47213() throws Exception {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, true, false, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, true, false, null, true });
- vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, true, false, null, true });
- vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, true, false, null, true });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, "ln", 2, 100, isOffHeap() });
- vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, "ln", 2, 100, isOffHeap() });
- vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, "ln", 2, 100, isOffHeap() });
- vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, "ln", 2, 100, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- pause(3000);
-
- vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, null, 1, 100, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, null, 1, 100, isOffHeap() });
-
- pause(2000);//give some time for all the senders to pause
-
- final Map keyValues = new HashMap();
- final Map updateKeyValues = new HashMap();
- for(int i=0; i< 1000; i++) {
- keyValues.put(i, i);
- }
-
- vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, keyValues });
+ vm4.invoke(() ->checkQueueSize( "ln", keyValues.size() ));
+ final Map updateKeyValues = updateKeyValues();
- vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() });
- for(int i=0;i<500;i++) {
- updateKeyValues.put(i, i+"_updated");
- }
+ vm4.invoke(() ->checkQueueSize( "ln", keyValues.size() + updateKeyValues.size() )); // creates aren't conflated
- vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues });
+ vm4.invoke(() ->putGivenKeyValue( testName, updateKeyValues ));
- vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() + updateKeyValues.size() }); // creates aren't conflated
+ vm4.invoke(() ->checkQueueSize( "ln", keyValues.size() + updateKeyValues.size() )); // creates aren't conflated
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName, 0 });
+ vm2.invoke(() ->validateRegionSize(
+ testName, 0 ));
- vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+ resumeSenders();
keyValues.putAll(updateKeyValues);
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName, keyValues.size() });
- vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName, keyValues.size() });
-
- vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
- testName, keyValues });
- vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
- testName, keyValues });
+ validateReceiverRegionSize(keyValues);
}
public void testParallelPropagationConflationOfRandomKeys() throws Exception {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, true, false, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, true, false, null, true });
- vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, true, false, null, true });
- vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, true, false, null, true });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, "ln", 0, 100, isOffHeap() });
- vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, "ln", 0, 100, isOffHeap() });
- vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, "ln", 0, 100, isOffHeap() });
- vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, "ln", 0, 100, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- pause(3000);
-
- vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, null, 1, 100, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName, null, 1, 100, isOffHeap() });
-
- pause(2000);
+ initialSetUp();
- final Map keyValues = new HashMap();
- final Map updateKeyValues = new HashMap();
- for(int i=0; i< 1000; i++) {
- keyValues.put(i, i);
- }
- vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, keyValues });
+ createSendersWithConflation();
+
+ createSenderPRs();
+
+ startPausedSenders();
+
+ createReceiverPrs();
+
+ final Map keyValues = putKeyValues();
- vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() });
+ vm4.invoke(() ->checkQueueSize( "ln", keyValues.size() ));
- while(updateKeyValues.size()!=500) {
+ final Map updateKeyValues = new HashMap();
+ while(updateKeyValues.size()!=10) {
int key = (new Random()).nextInt(keyValues.size());
updateKeyValues.put(key, key+"_updated");
}
- vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues });
+ vm4.invoke(() ->putGivenKeyValue( testName, updateKeyValues ));
- vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() + updateKeyValues.size() });
+ vm4.invoke(() ->checkQueueSize( "ln", keyValues.size() + updateKeyValues.size() ));
- vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues });
+ vm4.invoke(() ->putGivenKeyValue( testName, updateKeyValues ));
- vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() + updateKeyValues.size() });
+ vm4.invoke(() ->checkQueueSize( "ln", keyValues.size() + updateKeyValues.size() ));
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName, 0 });
+ vm2.invoke(() ->validateRegionSize(
+ testName, 0 ));
- vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+ resumeSenders();
keyValues.putAll(updateKeyValues);
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName, keyValues.size() });
- vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName, keyValues.size() });
- vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
- testName, keyValues });
- vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
- testName, keyValues });
+ validateReceiverRegionSize(keyValues);
}
public void testParallelPropagationColocatedRegionConflation()
throws Exception {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, true, false, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, true, false, null, true });
- vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, true, false, null, true });
- vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, true, false, null, true });
-
- vm4.invoke(WANTestBase.class,
- "createCustomerOrderShipmentPartitionedRegion", new Object[] {
- testName, "ln", 0, 100, isOffHeap() });
- vm5.invoke(WANTestBase.class,
- "createCustomerOrderShipmentPartitionedRegion", new Object[] {
- testName, "ln", 0, 100, isOffHeap() });
- vm6.invoke(WANTestBase.class,
- "createCustomerOrderShipmentPartitionedRegion", new Object[] {
- testName, "ln", 0, 100, isOffHeap() });
- vm7.invoke(WANTestBase.class,
- "createCustomerOrderShipmentPartitionedRegion", new Object[] {
- testName, "ln", 0, 100, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- pause(3000);
-
- vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
- vm2.invoke(WANTestBase.class,
- "createCustomerOrderShipmentPartitionedRegion", new Object[] {
- testName, null, 1, 100, isOffHeap() });
- vm3.invoke(WANTestBase.class,
- "createCustomerOrderShipmentPartitionedRegion", new Object[] {
- testName, null, 1, 100, isOffHeap() });
-
- pause(2000);
-
- Map custKeyValues = (Map)vm4.invoke(WANTestBase.class, "putCustomerPartitionedRegion",
- new Object[] { 1000 });
- Map orderKeyValues = (Map)vm4.invoke(WANTestBase.class, "putOrderPartitionedRegion",
- new Object[] { 1000 });
- Map shipmentKeyValues = (Map)vm4.invoke(WANTestBase.class, "putShipmentPartitionedRegion",
- new Object[] { 1000 });
-
- vm4.invoke(
- WANTestBase.class,
- "checkQueueSize",
- new Object[] {
+ initialSetUp();
+
+ createSendersWithConflation();
+
+ createOrderShipmentOnSenders();
+
+ startPausedSenders();
+
+ createOrderShipmentOnReceivers();
+
+ Map custKeyValues = (Map)vm4.invoke(() ->putCustomerPartitionedRegion( 20 ));
+ Map orderKeyValues = (Map)vm4.invoke(() ->putOrderPartitionedRegion( 20 ));
+ Map shipmentKeyValues = (Map)vm4.invoke(() ->putShipmentPartitionedRegion( 20 ));
+
+ vm4.invoke(() ->
+ WANTestBase.checkQueueSize(
"ln",
(custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
- .size()) });
-
- Map updatedCustKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateCustomerPartitionedRegion",
- new Object[] { 500 });
- Map updatedOrderKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateOrderPartitionedRegion",
- new Object[] { 500 });
- Map updatedShipmentKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateShipmentPartitionedRegion",
- new Object[] { 500 });
-
- vm4.invoke(
- WANTestBase.class,
- "checkQueueSize",
- new Object[] {
+ .size()) ));
+
+ Map updatedCustKeyValues = (Map)vm4.invoke(() ->updateCustomerPartitionedRegion( 10 ));
+ Map updatedOrderKeyValues = (Map)vm4.invoke(() ->updateOrderPartitionedRegion( 10 ));
+ Map updatedShipmentKeyValues = (Map)vm4.invoke(() ->updateShipmentPartitionedRegion( 10 ));
+ int sum = (custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
+ .size())
+ + updatedCustKeyValues.size()
+ + updatedOrderKeyValues.size()
+ + updatedShipmentKeyValues.size();
+ vm4.invoke(() ->
+ WANTestBase.checkQueueSize(
"ln",
- (custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
- .size())
- + updatedCustKeyValues.size()
- + updatedOrderKeyValues.size()
- + updatedShipmentKeyValues.size() });
-
- updatedCustKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateCustomerPartitionedRegion",
- new Object[] { 500 });
- updatedOrderKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateOrderPartitionedRegion",
- new Object[] { 500 });
- updatedShipmentKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateShipmentPartitionedRegion",
- new Object[] { 500 });
-
- vm4.invoke(
- WANTestBase.class,
- "checkQueueSize",
- new Object[] {
+ sum));
+
+
+ updatedCustKeyValues = (Map)vm4.invoke(() ->updateCustomerPartitionedRegion( 10 ));
+ updatedOrderKeyValues = (Map)vm4.invoke(() ->updateOrderPartitionedRegion( 10 ));
+ updatedShipmentKeyValues = (Map)vm4.invoke(() ->updateShipmentPartitionedRegion( 10 ));
+ int sum2 = (custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
+ .size())
+ + updatedCustKeyValues.size()
+ + updatedOrderKeyValues.size()
+ + updatedShipmentKeyValues.size();
+ vm4.invoke(() ->
+ WANTestBase.checkQueueSize(
"ln",
- (custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
- .size())
- + updatedCustKeyValues.size()
- + updatedOrderKeyValues.size()
- + updatedShipmentKeyValues.size() });
-
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- WANTestBase.customerRegionName, 0 });
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- WANTestBase.orderRegionName, 0 });
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- WANTestBase.shipmentRegionName, 0 });
-
- vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+ sum2));
+
+ vm2.invoke(() ->validateRegionSize(
+ WANTestBase.customerRegionName, 0 ));
+ vm2.invoke(() ->validateRegionSize(
+ WANTestBase.orderRegionName, 0 ));
+ vm2.invoke(() ->validateRegionSize(
+ WANTestBase.shipmentRegionName, 0 ));
+
+ resumeSenders();
custKeyValues.putAll(updatedCustKeyValues);
orderKeyValues.putAll(updatedOrderKeyValues);
shipmentKeyValues.putAll(updatedShipmentKeyValues);
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- WANTestBase.customerRegionName, custKeyValues.size() });
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- WANTestBase.orderRegionName, orderKeyValues.size() });
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- WANTestBase.shipmentRegionName, shipmentKeyValues.size() });
-
- vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
- WANTestBase.customerRegionName, custKeyValues });
- vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
- WANTestBase.orderRegionName, orderKeyValues });
- vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
- WANTestBase.shipmentRegionName, shipmentKeyValues });
-
- vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- WANTestBase.customerRegionName, custKeyValues.size() });
- vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- WANTestBase.orderRegionName, orderKeyValues.size() });
- vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- WANTestBase.shipmentRegionName, shipmentKeyValues.size() });
-
- vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
- WANTestBase.customerRegionName, custKeyValues });
- vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
- WANTestBase.orderRegionName, orderKeyValues });
- vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
- WANTestBase.shipmentRegionName, shipmentKeyValues });
+ validateColocatedRegionContents(custKeyValues, orderKeyValues,
+ shipmentKeyValues);
}
+ //
+ //This is the same as the previous test, except for the UsingCustId methods
public void testParallelPropagationColoatedRegionConflationSameKey()
throws Exception {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, true, false, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, true, false, null, true });
- vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, true, false, null, true });
- vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, true, false, null, true });
-
- vm4.invoke(WANTestBase.class,
- "createCustomerOrderShipmentPartitionedRegion", new Object[] {
- testName, "ln", 0, 100, isOffHeap() });
- vm5.invoke(WANTestBase.class,
- "createCustomerOrderShipmentPartitionedRegion", new Object[] {
- testName, "ln", 0, 100, isOffHeap() });
- vm6.invoke(WANTestBase.class,
- "createCustomerOrderShipmentPartitionedRegion", new Object[] {
- testName, "ln", 0, 100, isOffHeap() });
- vm7.invoke(WANTestBase.class,
- "createCustomerOrderShipmentPartitionedRegion", new Object[] {
- testName, "ln", 0, 100, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- pause(3000);
-
- vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
- vm2.invoke(WANTestBase.class,
- "createCustomerOrderShipmentPartitionedRegion", new Object[] {
- testName, null, 1, 100, isOffHeap() });
- vm3.invoke(WANTestBase.class,
- "createCustomerOrderShipmentPartitionedRegion", new Object[] {
- testName, null, 1, 100, isOffHeap() });
-
- pause(2000);
-
- Map custKeyValues = (Map)vm4.invoke(WANTestBase.class, "putCustomerPartitionedRegion",
- new Object[] { 1000 });
- Map orderKeyValues = (Map)vm4.invoke(WANTestBase.class, "putOrderPartitionedRegionUsingCustId",
- new Object[] { 1000 });
- Map shipmentKeyValues = (Map)vm4.invoke(WANTestBase.class, "putShipmentPartitionedRegionUsingCustId",
- new Object[] { 1000 });
-
- vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", (custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
- .size()) });
-
- Map updatedCustKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateCustomerPartitionedRegion",
- new Object[] { 500 });
- Map updatedOrderKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateOrderPartitionedRegionUsingCustId",
- new Object[] { 500 });
- Map updatedShipmentKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateShipmentPartitionedRegionUsingCustId",
- new Object[] { 500 });
-
- vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", (custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
- .size()) + updatedCustKeyValues.size() + updatedOrderKeyValues.size() + updatedShipmentKeyValues.size() });
-
- updatedCustKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateCustomerPartitionedRegion",
- new Object[] { 500 });
- updatedOrderKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateOrderPartitionedRegionUsingCustId",
- new Object[] { 500 });
- updatedShipmentKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateShipmentPartitionedRegionUsingCustId",
- new Object[] { 500 });
-
- vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", (custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
- .size()) + updatedCustKeyValues.size() + updatedOrderKeyValues.size() + updatedShipmentKeyValues.size() });
-
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- WANTestBase.customerRegionName, 0 });
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- WANTestBase.orderRegionName, 0 });
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- WANTestBase.shipmentRegionName, 0 });
-
- vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+ initialSetUp();
+
+ createSendersWithConflation();
+
+ createOrderShipmentOnSenders();
+
+ startPausedSenders();
+
+ createOrderShipmentOnReceivers();
+
+ Map custKeyValues = (Map)vm4.invoke(() ->putCustomerPartitionedRegion( 20 ));
+ Map orderKeyValues = (Map)vm4.invoke(() ->putOrderPartitionedRegionUsingCustId( 20 ));
+ Map shipmentKeyValues = (Map)vm4.invoke(() ->putShipmentPartitionedRegionUsingCustId( 20 ));
+
+ vm4.invoke(() ->checkQueueSize( "ln", (custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
+ .size()) ));
+
+ Map updatedCustKeyValues = (Map)vm4.invoke(() ->updateCustomerPartitionedRegion( 10 ));
+ Map updatedOrderKeyValues = (Map)vm4.invoke(() ->updateOrderPartitionedRegionUsingCustId( 10 ));
+ Map updatedShipmentKeyValues = (Map)vm4.invoke(() ->updateShipmentPartitionedRegionUsingCustId( 10 ));
+ int sum = (custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
+ .size()) + updatedCustKeyValues.size() + updatedOrderKeyValues.size() + updatedShipmentKeyValues.size() ;
+
+ vm4.invoke(() ->checkQueueSize( "ln", sum));
+
+ updatedCustKeyValues = (Map)vm4.invoke(() ->updateCustomerPartitionedRegion( 10 ));
+ updatedOrderKeyValues = (Map)vm4.invoke(() ->updateOrderPartitionedRegionUsingCustId( 10 ));
+ updatedShipmentKeyValues = (Map)vm4.invoke(() ->updateShipmentPartitionedRegionUsingCustId( 10 ));
+
+ int sum2 = (custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
+ .size()) + updatedCustKeyValues.size() + updatedOrderKeyValues.size() + updatedShipmentKeyValues.size();
+ vm4.invoke(() ->checkQueueSize( "ln", sum2));
+
+ vm2.invoke(() ->validateRegionSize(
+ WANTestBase.customerRegionName, 0 ));
+ vm2.invoke(() ->validateRegionSize(
+ WANTestBase.orderRegionName, 0 ));
+ vm2.invoke(() ->validateRegionSize(
+ WANTestBase.shipmentRegionName, 0 ));
+
+ resumeSenders();
custKeyValues.putAll(updatedCustKeyValues);
orderKeyValues.putAll(updatedOrderKeyValues);
shipmentKeyValues.putAll(updatedShipmentKeyValues);
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- WANTestBase.customerRegionName, custKeyValues.size() });
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- WANTestBase.orderRegionName, orderKeyValues.size() });
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- WANTestBase.shipmentRegionName, shipmentKeyValues.size() });
-
- vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
- WANTestBase.customerRegionName, custKeyValues });
- vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
- WANTestBase.orderRegionName, orderKeyValues });
- vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
- WANTestBase.shipmentRegionName, shipmentKeyValues });
-
- vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- WANTestBase.customerRegionName, custKeyValues.size() });
- vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- WANTestBase.orderRegionName, orderKeyValues.size() });
- vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- WANTestBase.shipmentRegionName, shipmentKeyValues.size() });
-
- vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
- WANTestBase.customerRegionName, custKeyValues });
- vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
- WANTestBase.orderRegionName, orderKeyValues });
- vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
- WANTestBase.shipmentRegionName, shipmentKeyValues });
+ validateColocatedRegionContents(custKeyValues, orderKeyValues,
+ shipmentKeyValues);
+ }
+
+ protected void validateColocatedRegionContents(Map custKeyValues,
+ Map orderKeyValues, Map shipmentKeyValues) {
+ vm2.invoke(() ->validateRegionSize(
+ WANTestBase.customerRegionName, custKeyValues.size() ));
+ vm2.invoke(() ->validateRegionSize(
+ WANTestBase.orderRegionName, orderKeyValues.size() ));
+ vm2.invoke(() ->validateRegionSize(
+ WANTestBase.shipmentRegionName, shipmentKeyValues.size() ));
+
+ vm2.invoke(() ->validateRegionContents(
+ WANTestBase.customerRegionName, custKeyValues ));
+ vm2.invoke(() ->validateRegionContents(
+ WANTestBase.orderRegionName, orderKeyValues ));
+ vm2.invoke(() ->validateRegionContents(
+ WANTestBase.shipmentRegionName, shipmentKeyValues ));
+
+ vm3.invoke(() ->validateRegionSize(
+ WANTestBase.customerRegionName, custKeyValues.size() ));
+ vm3.invoke(() ->validateRegionSize(
+ WANTestBase.orderRegionName, orderKeyValues.size() ));
+ vm3.invoke(() ->validateRegionSize(
+ WANTestBase.shipmentRegionName, shipmentKeyValues.size() ));
+
+ vm3.invoke(() ->validateRegionContents(
+ WANTestBase.customerRegionName, custKeyValues ));
+ vm3.invoke(() ->validateRegionContents(
+ WANTestBase.orderRegionName, orderKeyValues ));
+ vm3.invoke(() ->validateRegionContents(
+ WANTestBase.shipmentRegionName, shipmentKeyValues ));
+ }
+
+ protected void createOrderShipmentOnReceivers() {
+ vm2.invoke(() ->createCustomerOrderShipmentPartitionedRegion(
+ testName, null, 1, 8, isOffHeap() ));
+ vm3.invoke(() ->createCustomerOrderShipmentPartitionedRegion(
+ testName, null, 1, 8, isOffHeap() ));
+ }
+
+ protected void createOrderShipmentOnSenders() {
+ vm4.invoke(() ->createCustomerOrderShipmentPartitionedRegion(
+ testName, "ln", 0, 8, isOffHeap() ));
+ vm5.invoke(() ->createCustomerOrderShipmentPartitionedRegion(
+ testName, "ln", 0, 8, isOffHeap() ));
+ vm6.invoke(() ->createCustomerOrderShipmentPartitionedRegion(
+ testName, "ln", 0, 8, isOffHeap() ));
+ vm7.invoke(() ->createCustomerOrderShipmentPartitionedRegion(
+ testName, "ln", 0, 8, isOffHeap() ));
+ }
+
+ protected Map updateKeyValues() {
+ final Map updateKeyValues = new HashMap();
+ for(int i=0;i<10;i++) {
+ updateKeyValues.put(i, i+"_updated");
+ }
+
+ vm4.invoke(() ->putGivenKeyValue( testName, updateKeyValues ));
+ return updateKeyValues;
+ }
+
+ protected Map putKeyValues() {
+ final Map keyValues = new HashMap();
+ for(int i=0; i< 20; i++) {
+ keyValues.put(i, i);
+ }
+
+
+ vm4.invoke(() ->putGivenKeyValue( testName, keyValues ));
+ return keyValues;
+ }
+
+ protected void validateReceiverRegionSize(final Map keyValues) {
+ vm2.invoke(() ->validateRegionSize(
+ testName, keyValues.size() ));
+ vm3.invoke(() ->validateRegionSize(
+ testName, keyValues.size() ));
+
+ vm2.invoke(() ->validateRegionContents(
+ testName, keyValues ));
+ vm3.invoke(() ->validateRegionContents(
+ testName, keyValues ));
+ }
+
+ protected void resumeSenders() {
+ vm4.invoke(() ->resumeSender( "ln" ));
+ vm5.invoke(() ->resumeSender( "ln" ));
+ vm6.invoke(() ->resumeSender( "ln" ));
+ vm7.invoke(() ->resumeSender( "ln" ));
+ }
+
+ protected void createReceiverPrs() {
+ vm2.invoke(() ->createPartitionedRegion(
+ testName, null, 1, 8, isOffHeap() ));
+ vm3.invoke(() ->createPartitionedRegion(
+ testName, null, 1, 8, isOffHeap() ));
+ }
+
+ protected void startPausedSenders() {
+ startSenders();
+
+ pauseSenders();
+ }
+
+ protected void pauseSenders() {
+ vm4.invoke(() ->pauseSender( "ln" ));
+ vm5.invoke(() ->pauseSender( "ln" ));
+ vm6.invoke(() ->pauseSender( "ln" ));
+ vm7.invoke(() ->pauseSender( "ln" ));
+ }
+
+ protected void startSenders() {
+ vm4.invoke(() ->startSender( "ln" ));
+ vm5.invoke(() ->startSender( "ln" ));
+ vm6.invoke(() ->startSender( "ln" ));
+ vm7.invoke(() ->startSender( "ln" ));
+ }
+
+ protected void createSenderPRs() {
+ createSenderPRs(0);
+ }
+
+ protected void createSenderPRs(int redundancy) {
+ vm4.invoke(() ->createPartitionedRegion(
+ testName, "ln", redundancy, 8, isOffHeap() ));
+ vm5.invoke(() ->createPartitionedRegion(
+ testName, "ln", redundancy, 8, isOffHeap() ));
+ vm6.invoke(() ->createPartitionedRegion(
+ testName, "ln", redundancy, 8, isOffHeap() ));
+ vm7.invoke(() ->createPartitionedRegion(
+ testName, "ln", redundancy, 8, isOffHeap() ));
+ }
+
+ protected void initialSetUp() {
+ Integer lnPort = (Integer)vm0.invoke(() ->createFirstLocatorWithDSId( 1 ));
+ Integer nyPort = (Integer)vm1.invoke(() ->createFirstRemoteLocator( 2, lnPort ));
+
+ vm2.invoke(() ->createReceiver( nyPort ));
+ vm3.invoke(() ->createReceiver( nyPort ));
+
+ vm4.invoke(() ->createCache(lnPort ));
+ vm5.invoke(() ->createCache(lnPort ));
+ vm6.invoke(() ->createCache(lnPort ));
+ vm7.invoke(() ->createCache(lnPort ));
+ }
+
+ protected void createSendersNoConflation() {
+ vm4.invoke(() ->createSender( "ln", 2,
+ true, 100, 10, false, false, null, true ));
+ vm5.invoke(() ->createSender( "ln", 2,
+ true, 100, 10, false, false, null, true ));
+ vm6.invoke(() ->createSender( "ln", 2,
+ true, 100, 10, false, false, null, true ));
+ vm7.invoke(() ->createSender( "ln", 2,
+ true, 100, 10, false, false, null, true ));
+ }
+
+ protected void createSendersWithConflation() {
+ vm4.invoke(() ->createSender( "ln", 2,
+ true, 100, 2, true, false, null, true ));
+ vm5.invoke(() ->createSender( "ln", 2,
+ true, 100, 2, true, false, null, true ));
+ vm6.invoke(() ->createSender( "ln", 2,
+ true, 100, 2, true, false, null, true ));
+ vm7.invoke(() ->createSender( "ln", 2,
+ true, 100, 2, true, false, null, true ));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a7249514/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
index 979439b..a142f82 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
@@ -537,7 +537,7 @@ public class SerialWANStatsDUnitTest extends WANTestBase {
vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm4.invoke(WANTestBase.class, "pauseSenderAndWaitForDispatcherToPause", new Object[] { "ln" });
+ vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
testName, null,1, 100, isOffHeap() });
[38/50] [abbrv] incubator-geode git commit: Refactor dunit
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
index 7e81aae..e28a752 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
@@ -35,6 +35,7 @@ import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.OSProcess;
import com.gemstone.gemfire.internal.jta.CacheUtils;
+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;
@@ -156,27 +157,27 @@ public class TxnTimeOutDUnitTest extends DistributedTestCase {
DistributedTestCase.join(asyncObj1, 5 * 60 * 1000, getLogWriter());
if(asyncObj1.exceptionOccurred()){
- fail("asyncObj1 failed", asyncObj1.getException());
+ Assert.fail("asyncObj1 failed", asyncObj1.getException());
}
DistributedTestCase.join(asyncObj2, 5 * 60 * 1000, getLogWriter());
if(asyncObj2.exceptionOccurred()){
- fail("asyncObj2 failed", asyncObj2.getException());
+ Assert.fail("asyncObj2 failed", asyncObj2.getException());
}
DistributedTestCase.join(asyncObj3, 5 * 60 * 1000, getLogWriter());
if(asyncObj3.exceptionOccurred()){
- fail("asyncObj3 failed", asyncObj3.getException());
+ Assert.fail("asyncObj3 failed", asyncObj3.getException());
}
DistributedTestCase.join(asyncObj4, 5 * 60 * 1000, getLogWriter());
if(asyncObj4.exceptionOccurred()){
- fail("asyncObj4 failed", asyncObj4.getException());
+ Assert.fail("asyncObj4 failed", asyncObj4.getException());
}
DistributedTestCase.join(asyncObj5, 5 * 60 * 1000, getLogWriter());
if(asyncObj5.exceptionOccurred()){
- fail("asyncObj5 failed", asyncObj5.getException());
+ Assert.fail("asyncObj5 failed", asyncObj5.getException());
}
@@ -195,12 +196,12 @@ public class TxnTimeOutDUnitTest extends DistributedTestCase {
DistributedTestCase.join(asyncObj1, 5 * 60 * 1000, getLogWriter());
if(asyncObj1.exceptionOccurred()){
- fail("asyncObj1 failed", asyncObj1.getException());
+ Assert.fail("asyncObj1 failed", asyncObj1.getException());
}
DistributedTestCase.join(asyncObj2, 5 * 60 * 1000, getLogWriter());
if(asyncObj2.exceptionOccurred()){
- fail("asyncObj2 failed", asyncObj2.getException());
+ Assert.fail("asyncObj2 failed", asyncObj2.getException());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
index 77814b0..ec37780 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
@@ -38,6 +38,7 @@ import com.gemstone.gemfire.internal.cache.OffHeapTestUtil;
import com.gemstone.gemfire.internal.logging.LogService;
import com.gemstone.gemfire.internal.util.StopWatch;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
/**
@@ -61,7 +62,7 @@ public class OutOfOffHeapMemoryDUnitTest extends CacheTestCase {
public void setUp() throws Exception {
disconnectAllFromDS();
super.setUp();
- addExpectedException(OutOfOffHeapMemoryException.class.getSimpleName());
+ IgnoredException.addExpectedException(OutOfOffHeapMemoryException.class.getSimpleName());
}
// public static void caseSetUp() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
index 40aa750..66ca181 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
@@ -60,6 +60,7 @@ import com.gemstone.gemfire.internal.StatArchiveReader.StatSpec;
import com.gemstone.gemfire.internal.StatSamplerStats;
import com.gemstone.gemfire.internal.StatisticsTypeFactoryImpl;
import com.gemstone.gemfire.internal.StatArchiveReader.StatValue;
+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;
@@ -338,7 +339,7 @@ public class StatisticsDUnitTest extends CacheTestCase {
for (int pubThread = 0; pubThread < publishers.length; pubThread++) {
publishers[pubThread].join();
if (publishers[pubThread].exceptionOccurred()) {
- fail("Test failed", publishers[pubThread].getException());
+ Assert.fail("Test failed", publishers[pubThread].getException());
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
index 7f7c4fd..06898a6 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
@@ -48,6 +48,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
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,7 +102,7 @@ public class ClientHealthStatsDUnitTest extends DistributedTestCase {
server = host.getVM(1);
client = host.getVM(2);
client2 = host.getVM(3);
- addExpectedException("Connection reset");
+ IgnoredException.addExpectedException("Connection reset");
}
public void tearDown2() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java
index 1a52f9b..1ed8dd0 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java
@@ -49,6 +49,7 @@ import com.gemstone.gemfire.management.internal.NotificationHub.NotificationHubL
import com.gemstone.gemfire.management.internal.SystemManagementService;
import com.gemstone.gemfire.management.internal.beans.MemberMBean;
import com.gemstone.gemfire.management.internal.beans.SequenceNumber;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
@@ -613,7 +614,7 @@ public class DistributedSystemDUnitTest extends ManagementTestBase {
vm1.invoke(new SerializableCallable("Warning level Alerts") {
public Object call() throws Exception {
- final ExpectedException warnEx = addExpectedException(WARNING_LEVEL_MESSAGE);
+ final IgnoredException warnEx = IgnoredException.addExpectedException(WARNING_LEVEL_MESSAGE);
logger.warn(WARNING_LEVEL_MESSAGE);
warnEx.remove();
return null;
@@ -647,7 +648,7 @@ public class DistributedSystemDUnitTest extends ManagementTestBase {
public Object call() throws Exception {
// add expected exception strings
- final ExpectedException severeEx = addExpectedException(SEVERE_LEVEL_MESSAGE);
+ final IgnoredException severeEx = IgnoredException.addExpectedException(SEVERE_LEVEL_MESSAGE);
logger.fatal(SEVERE_LEVEL_MESSAGE);
severeEx.remove();
return null;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
index 631c9d0..1cdff3f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
@@ -31,6 +31,7 @@ import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.management.internal.ManagementConstants;
+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;
@@ -170,7 +171,7 @@ public class LocatorManagementDUnitTest extends ManagementTestBase {
try {
bindAddr = InetAddress.getByName(getServerHostName(vm.getHost()));
} catch (UnknownHostException uhe) {
- fail("While resolving bind address ", uhe);
+ Assert.fail("While resolving bind address ", uhe);
}
try {
@@ -178,7 +179,7 @@ public class LocatorManagementDUnitTest extends ManagementTestBase {
Locator locator = Locator.startLocatorAndDS(port, logFile, bindAddr,
props, isPeer, true, null);
} catch (IOException ex) {
- fail("While starting locator on port " + port, ex);
+ Assert.fail("While starting locator on port " + port, ex);
}
assertTrue(InternalLocator.hasLocator());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
index ab2f1ce..ab29a7b 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
@@ -42,6 +42,7 @@ import com.gemstone.gemfire.management.internal.LocalManager;
import com.gemstone.gemfire.management.internal.MBeanJMXAdapter;
import com.gemstone.gemfire.management.internal.ManagementStrings;
import com.gemstone.gemfire.management.internal.SystemManagementService;
+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;
@@ -462,7 +463,7 @@ public class ManagementTestBase extends DistributedTestCase {
} catch (ManagementException e) {
- fail("failed with ManagementException", e);
+ Assert.fail("failed with ManagementException", e);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java
index c148029..691527a 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/RegionManagementDUnitTest.java
@@ -49,6 +49,7 @@ import com.gemstone.gemfire.internal.cache.lru.LRUStatistics;
import com.gemstone.gemfire.internal.cache.partitioned.fixed.SingleHopQuarterPartitionResolver;
import com.gemstone.gemfire.management.internal.MBeanJMXAdapter;
import com.gemstone.gemfire.management.internal.SystemManagementService;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -779,11 +780,11 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
mbeanServer.addNotificationListener(memberMBeanName, regionCreate,
null, null);
} catch (NullPointerException e) {
- fail("FAILED WITH EXCEPION", e);
+ Assert.fail("FAILED WITH EXCEPION", e);
} catch (InstanceNotFoundException e) {
- fail("FAILED WITH EXCEPION", e);
+ Assert.fail("FAILED WITH EXCEPION", e);
} catch (Exception e) {
- fail("FAILED WITH EXCEPION", e);
+ Assert.fail("FAILED WITH EXCEPION", e);
}
}
@@ -817,9 +818,9 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
null, null);
} catch (NullPointerException e) {
- fail("FAILED WITH EXCEPION", e);
+ Assert.fail("FAILED WITH EXCEPION", e);
} catch (InstanceNotFoundException e) {
- fail("FAILED WITH EXCEPION", e);
+ Assert.fail("FAILED WITH EXCEPION", e);
}
@@ -1068,12 +1069,12 @@ public class RegionManagementDUnitTest extends ManagementTestBase {
.addNotificationListener(memberMBeanName, test, null, null);
} catch (MalformedObjectNameException e) {
- fail("FAILED WITH EXCEPION", e);
+ Assert.fail("FAILED WITH EXCEPION", e);
} catch (NullPointerException e) {
- fail("FAILED WITH EXCEPION", e);
+ Assert.fail("FAILED WITH EXCEPION", e);
} catch (InstanceNotFoundException e) {
- fail("FAILED WITH EXCEPION", e);
+ Assert.fail("FAILED WITH EXCEPION", e);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
index 296d13d..3b5e43a 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
@@ -49,6 +49,7 @@ import com.gemstone.gemfire.management.membership.ClientMembershipListener;
import com.gemstone.gemfire.management.membership.MembershipEvent;
import com.gemstone.gemfire.management.membership.MembershipListener;
import com.gemstone.gemfire.management.membership.UniversalMembershipListenerAdapter;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -1649,7 +1650,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
new LocalLogWriter(InternalLogWriter.ALL_LEVEL, System.out);
bgexecLogger.info("<ExpectedException action=add>" +
"java.io.IOException" + "</ExpectedException>");
- final ExpectedException ex = addExpectedException(
+ final IgnoredException ex = IgnoredException.addExpectedException(
ServerConnectivityException.class.getName());
try {
vm0.invoke(new SerializableRunnable("Disconnect Peer server") {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsDUnitTest.java
index b7b3a70..972112e 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsDUnitTest.java
@@ -29,6 +29,7 @@ import com.gemstone.gemfire.management.MemberMXBean;
import com.gemstone.gemfire.management.internal.SystemManagementService;
import com.gemstone.gemfire.management.internal.beans.MemberMBean;
import com.gemstone.gemfire.management.internal.beans.MemberMBeanBridge;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -99,9 +100,9 @@ public class DistributedSystemStatsDUnitTest extends ManagementTestBase{
MemberMXBean memberBean = service.getMBeanProxy(memberMBeanName, MemberMXBean.class);
waitForRefresh(2, memberMBeanName);
} catch (NullPointerException e) {
- fail("FAILED WITH EXCEPION", e);
+ Assert.fail("FAILED WITH EXCEPION", e);
} catch (Exception e) {
- fail("FAILED WITH EXCEPION", e);
+ Assert.fail("FAILED WITH EXCEPION", e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
index 5c68915..70f28ea 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
@@ -37,6 +37,7 @@ import com.gemstone.gemfire.management.DistributedRegionMXBean;
import com.gemstone.gemfire.management.ManagementService;
import com.gemstone.gemfire.management.RegionMXBean;
import com.gemstone.gemfire.management.internal.cli.result.CommandResultException;
+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;
@@ -314,7 +315,7 @@ public class CliUtilDUnitTest extends CacheTestCase {
assertEquals(true,containsMember(set,MEMBER_2_GROUP2));
} catch (CommandResultException e) {
- fail("CliUtil failed with exception",e);
+ Assert.fail("CliUtil failed with exception",e);
}
}
@@ -355,7 +356,7 @@ public class CliUtilDUnitTest extends CacheTestCase {
assertEquals("executeOnGroup", region1.get(MEMBER_1_GROUP1));
assertEquals("executeOnGroup", region1.get(MEMBER_2_GROUP1));
} catch (CommandResultException e) {
- fail("Error during querying members",e);
+ Assert.fail("Error during querying members",e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
index 37f7520..d4ac3ca 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
@@ -35,6 +35,7 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
import com.gemstone.gemfire.management.internal.cli.remote.CommandProcessor;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
+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;
@@ -88,7 +89,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
try {
deleteTestFiles();
} catch (IOException e) {
- fail("error", e);
+ Assert.fail("error", e);
}
}
});
@@ -250,7 +251,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
FileReader reader = new FileReader(shellConfigFile);
reader.read(fileContents);
} catch (Exception ex) {
- fail("Unable to read file contents for comparison", ex);
+ Assert.fail("Unable to read file contents for comparison", ex);
}
assertEquals(configToMatch, new String(fileContents));
@@ -477,7 +478,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
gemfireProperties = sharedConfig.getConfiguration(groupName).getGemfireProperties();
assertEquals("fine", gemfireProperties.get(DistributionConfig.LOG_LEVEL_NAME));
} catch (Exception e) {
- fail("Error occurred in cluster configuration service", e);
+ Assert.fail("Error occurred in cluster configuration service", e);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
index 9c0fa21..c91a98f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
@@ -40,6 +40,7 @@ import com.gemstone.gemfire.management.internal.ManagementConstants;
import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
@@ -836,7 +837,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
try {
assertTrue(sharedConfig.getConfiguration(groupName).getCacheXmlContent().contains(regionName));
} catch (Exception e) {
- fail("Error in cluster configuration service", e);
+ Assert.fail("Error in cluster configuration service", e);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
index 2e2a2d5..3b70080 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
@@ -29,6 +29,7 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
import com.gemstone.gemfire.management.internal.cli.remote.CommandExecutionContext;
import com.gemstone.gemfire.management.internal.cli.remote.CommandProcessor;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
+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.SerializableRunnable;
@@ -412,7 +413,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase {
try {
assertTrue(sharedConfig.getConfiguration(groupName).getJarNames().contains("DeployCommandsDUnit1.jar"));
} catch (Exception e) {
- fail("Error occurred in cluster configuration service", e);
+ Assert.fail("Error occurred in cluster configuration service", e);
}
}
});
@@ -445,7 +446,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase {
try {
assertFalse(sharedConfig.getConfiguration(groupName).getJarNames().contains("DeployCommandsDUnit1.jar"));
} catch (Exception e) {
- fail("Error occurred in cluster configuration service", e);
+ Assert.fail("Error occurred in cluster configuration service", e);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
index b32a3a0..f2da967 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
@@ -46,6 +46,7 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.management.internal.cli.shell.Gfsh;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
+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;
@@ -522,7 +523,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
xmlFromConfig = sharedConfig.getConfiguration(groupName).getCacheXmlContent();
assertTrue(xmlFromConfig.contains(diskStoreName));
} catch (Exception e) {
- fail("Error occurred in cluster configuration service", e);
+ Assert.fail("Error occurred in cluster configuration service", e);
}
}
});
@@ -573,7 +574,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
xmlFromConfig = sharedConfig.getConfiguration(groupName).getCacheXmlContent();
assertFalse(xmlFromConfig.contains(diskStoreName));
} catch (Exception e) {
- fail("Error occurred in cluster configuration service", e);
+ Assert.fail("Error occurred in cluster configuration service", e);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
index 76f51de..302d79f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
@@ -55,7 +55,9 @@ import com.gemstone.gemfire.management.internal.cli.result.CompositeResultData.S
import com.gemstone.gemfire.management.internal.cli.result.ResultData;
import com.gemstone.gemfire.management.internal.cli.result.TabularResultData;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
+import com.gemstone.gemfire.test.dunit.Assert;
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.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
@@ -388,7 +390,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
assertEquals(-1, expectedMembers);//Regions do not exist at all
}
} catch (QueryInvalidException qe) {
- fail("Invalid Query", qe);
+ Assert.fail("Invalid Query", qe);
}
}
@@ -503,7 +505,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
CommandResult cmdResult = executeCommand(query);
printCommandOutput(cmdResult);
validateSelectResult(cmdResult, true, -1, null);
- ExpectedException ex = addExpectedException(QueryInvalidException.class.getSimpleName(), Host.getHost(0).getVM(0));
+ IgnoredException ex = IgnoredException.addExpectedException(QueryInvalidException.class.getSimpleName(), Host.getHost(0).getVM(0));
try {
query = "query --query=\"select ID , status , createTime , pk, floatMinValue from ${DATA_REGION2} where ID <= ${PORTFOLIO_ID2}" + " and status='${STATUS2}'" + "\" --interactive=false";
cmdResult = executeCommand(query);
@@ -766,7 +768,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
assertEquals(true, found);
}
} catch (GfJsonException e) {
- fail("Error accessing table data", e);
+ Assert.fail("Error accessing table data", e);
}
}
@@ -793,7 +795,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
}
} catch (GfJsonException e) {
- fail("Error accessing table data", e);
+ Assert.fail("Error accessing table data", e);
}
}
@@ -821,7 +823,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
assertEquals(true, found);
}
} catch (GfJsonException e) {
- fail("Error accessing table data", e);
+ Assert.fail("Error accessing table data", e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
index 99ba73d..8df678f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
@@ -35,6 +35,7 @@ import com.gemstone.gemfire.management.internal.cli.domain.Stock;
import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
@@ -664,7 +665,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
xmlFromConfig = sharedConfig.getConfiguration(groupName).getCacheXmlContent();
assertTrue(xmlFromConfig.contains(indexName));
} catch (Exception e) {
- fail("Error occurred in cluster configuration service", e);
+ Assert.fail("Error occurred in cluster configuration service", e);
}
}
});
@@ -709,7 +710,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
xmlFromConfig = sharedConfig.getConfiguration(groupName).getCacheXmlContent();
assertFalse(xmlFromConfig.contains(indexName));
} catch (Exception e) {
- fail("Error occurred in cluster configuration service", e);
+ Assert.fail("Error occurred in cluster configuration service", e);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
index c449a18..e1b1543 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
@@ -33,6 +33,7 @@ import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.management.internal.cli.result.CompositeResultData;
import com.gemstone.gemfire.management.internal.cli.result.CompositeResultData.SectionResultData;
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;
@@ -222,7 +223,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
public void testShutDownWithoutTimeout() {
- addExpectedException("EntryDestroyedException");
+ IgnoredException.addExpectedException("EntryDestroyedException");
setupForShutDown();
ThreadUtils.sleep(2500);
@@ -259,7 +260,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
setupForShutDown();
ThreadUtils.sleep(2500);
- addExpectedException("EntryDestroyedException");
+ IgnoredException.addExpectedException("EntryDestroyedException");
String command = "shutdown --time-out=15";
CommandResult cmdResult = executeCommand(command);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
index 78540ac..8665a97 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
@@ -29,6 +29,7 @@ import com.gemstone.gemfire.management.cli.Result;
import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
@@ -334,7 +335,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
xmlFromConfig = sharedConfig.getConfiguration(groupName).getCacheXmlContent();
assertTrue(xmlFromConfig.contains(queueName));
} catch (Exception e) {
- fail("Error occurred in cluster configuration service", e);
+ Assert.fail("Error occurred in cluster configuration service", e);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
index b937fa9..54a75df 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
@@ -34,6 +34,7 @@ import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
import com.gemstone.gemfire.management.internal.configuration.SharedConfigurationDUnitTest;
import com.gemstone.gemfire.management.internal.configuration.domain.Configuration;
+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;
@@ -318,7 +319,7 @@ public class SharedConfigurationCommandsDUnitTest extends CliCommandTestBase {
} catch (IOException ioex) {
fail("Unable to create a locator with a shared configuration");
} catch (Exception e) {
- fail("Error occurred in cluster configuration service", e);
+ Assert.fail("Error occurred in cluster configuration service", e);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
index 7a72865..61a515b 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
@@ -32,6 +32,7 @@ import com.gemstone.gemfire.management.internal.cli.CliUtil;
import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
import com.gemstone.gemfire.management.internal.cli.remote.CommandProcessor;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
+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;
@@ -183,7 +184,7 @@ public class ShowDeadlockDUnitTest extends CacheTestCase {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
- fail("interrupted", e);
+ Assert.fail("interrupted", e);
}
ResultCollector collector = FunctionService.onMember(system, member).execute(new TestFunction());
//wait the function to lock the lock on member.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
index b096bd8..ae314f2 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
@@ -37,6 +37,7 @@ import com.gemstone.gemfire.management.CacheServerMXBean;
import com.gemstone.gemfire.management.MBeanUtil;
import com.gemstone.gemfire.management.ManagementTestBase;
import com.gemstone.gemfire.management.internal.cli.CliUtil;
+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;
@@ -291,7 +292,7 @@ public class TestClientIdsDUnitTest 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/management/internal/pulse/TestSubscriptionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
index 56fcbb1..891b64a 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
@@ -37,6 +37,7 @@ import com.gemstone.gemfire.management.DistributedRegionMXBean;
import com.gemstone.gemfire.management.DistributedSystemMXBean;
import com.gemstone.gemfire.management.ManagementService;
import com.gemstone.gemfire.management.ManagementTestBase;
+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;
@@ -273,7 +274,7 @@ public class TestSubscriptionsDUnitTest extends DistributedTestCase {
r1.registerInterest(k1);
r1.registerInterest(k2);
} catch (Exception ex) {
- fail("TestSubscriptionsDUnitTest failed while register Interest", ex);
+ Assert.fail("TestSubscriptionsDUnitTest failed while register Interest", ex);
}
}
@@ -294,7 +295,7 @@ public class TestSubscriptionsDUnitTest extends DistributedTestCase {
r1.put(k2, client_k2);
assertEquals(r1.getEntry(k2).getValue(), client_k2);
} 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/pdx/ClientsWithVersioningRetryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java
index 0704121..836f054 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java
@@ -56,6 +56,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
import com.gemstone.gemfire.internal.cache.tier.sockets.command.Put70;
import com.gemstone.gemfire.internal.cache.versions.VMVersionTag;
import com.gemstone.gemfire.internal.cache.versions.VersionTag;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
@@ -67,7 +68,7 @@ import com.gemstone.gemfire.test.dunit.VM;
*/
public class ClientsWithVersioningRetryDUnitTest extends CacheTestCase {
// list of expected exceptions to remove in tearDown2()
- static List<ExpectedException> expectedExceptions = new LinkedList<ExpectedException>();
+ static List<IgnoredException> expectedExceptions = new LinkedList<IgnoredException>();
public ClientsWithVersioningRetryDUnitTest(String name) {
super(name);
@@ -97,7 +98,7 @@ public class ClientsWithVersioningRetryDUnitTest extends CacheTestCase {
}
});
- for (ExpectedException ex: expectedExceptions) {
+ for (IgnoredException ex: expectedExceptions) {
ex.remove();
}
}
@@ -298,7 +299,7 @@ public class ClientsWithVersioningRetryDUnitTest extends CacheTestCase {
getLogWriter().info("creating region in vm3");
createRegionInPeer(vm3, RegionShortcut.PARTITION_PROXY);
- expectedExceptions.add(addExpectedException("RuntimeException", vm2));
+ expectedExceptions.add(IgnoredException.addExpectedException("RuntimeException", vm2));
vm2.invoke(new SerializableRunnable("install message listener to ignore update") {
public void run() {
//Add a listener to close vm2 when we send a distributed put all operation
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java
index 5a355ea..2e1dbc6 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java
@@ -26,6 +26,7 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
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.VM;
@@ -69,7 +70,7 @@ public class DistributedSystemIdDUnitTest extends DistributedTestCase {
}
public void testMismatch() {
- addExpectedException("Rejected new system node");
+ IgnoredException.addExpectedException("Rejected new system node");
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxDeserializationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxDeserializationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxDeserializationDUnitTest.java
index 3310d95..ad5c133 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxDeserializationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxDeserializationDUnitTest.java
@@ -38,6 +38,7 @@ import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.pdx.PdxReader;
import com.gemstone.gemfire.pdx.PdxSerializable;
import com.gemstone.gemfire.pdx.PdxWriter;
+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;
@@ -310,7 +311,7 @@ public class PdxDeserializationDUnitTest extends CacheTestCase {
}
} catch (Exception e) {
- fail("got exception from query", e);
+ Assert.fail("got exception from query", e);
}
@@ -352,7 +353,7 @@ public class PdxDeserializationDUnitTest extends CacheTestCase {
try {
server.start();
} catch (IOException e) {
- fail("got exception", e);
+ Assert.fail("got exception", e);
}
return server;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java
index 28e2940..03aa8cf 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java
@@ -26,6 +26,7 @@ import com.gemstone.gemfire.internal.SocketCreator;
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.VM;
@@ -139,8 +140,8 @@ public class RedisDistDUnitTest extends DistributedTestCase {
}
public void testConcCreateDestroy() throws Throwable {
- addExpectedException("RegionDestroyedException");
- addExpectedException("IndexInvalidException");
+ IgnoredException.addExpectedException("RegionDestroyedException");
+ IgnoredException.addExpectedException("IndexInvalidException");
final int ops = 40;
final String hKey = TEST_KEY+"hash";
final String lKey = TEST_KEY+"list";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java
index ccdf782..6a0a7d7 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java
@@ -32,6 +32,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
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.VM;
import security.DummyCredentialGenerator;
@@ -81,7 +82,7 @@ public class ClientAuthenticationDUnitTest extends DistributedTestCase {
client1 = host.getVM(2);
client2 = host.getVM(3);
- addExpectedException("Connection refused: connect");
+ IgnoredException.addExpectedException("Connection refused: connect");
server1.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
new Object[] { serverExpectedExceptions });
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
index c434a2a..608170f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
@@ -34,6 +34,7 @@ import security.XmlAuthzCredentialGenerator;
import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.VM;
import templates.security.UserPasswordAuthInit;
@@ -679,7 +680,7 @@ public class ClientAuthorizationDUnitTest extends ClientAuthorizationTestBase {
public void testAllOpsWithFailover() {
- addExpectedException("Read timed out");
+ IgnoredException.addExpectedException("Read timed out");
OperationWithAction[] allOps = {
// Test CREATE and verify with a GET
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestBase.java
index 4796203..51e11b1 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestBase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestBase.java
@@ -59,6 +59,7 @@ import com.gemstone.gemfire.internal.AvailablePort.Keeper;
import com.gemstone.gemfire.internal.cache.AbstractRegionEntry;
import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.util.Callable;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.VM;
@@ -684,7 +685,7 @@ public class ClientAuthorizationTestBase extends DistributedTestCase {
continue;
}
else {
- fail("doOp: Got unexpected exception when doing operation. Policy = "
+ Assert.fail("doOp: Got unexpected exception when doing operation. Policy = "
+ policy + " flags = " + OpFlags.description(flags), ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java
index 42fe897..1630379 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java
@@ -32,6 +32,7 @@ import com.gemstone.gemfire.cache.client.NoAvailableServersException;
import com.gemstone.gemfire.cache.client.ServerConnectivityException;
import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode;
import com.gemstone.gemfire.internal.cache.PartitionedRegionLocalMaxMemoryDUnitTest.TestObject1;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
/**
@@ -199,7 +200,7 @@ public class DeltaClientAuthorizationDUnitTest extends
getLogWriter().info("Got expected exception when doing puts: " + ex);
}
else {
- fail("Got unexpected exception when doing puts", ex);
+ Assert.fail("Got unexpected exception when doing puts", ex);
}
}
for (int index = 0; index < num.intValue(); ++index) {
@@ -220,7 +221,7 @@ public class DeltaClientAuthorizationDUnitTest extends
continue;
}
else {
- fail("Got unexpected exception when doing puts", ex);
+ Assert.fail("Got unexpected exception when doing puts", ex);
}
}
catch (ServerConnectivityException ex) {
@@ -249,7 +250,7 @@ public class DeltaClientAuthorizationDUnitTest extends
getLogWriter().info("Got expected exception when doing puts: " + ex);
}
else {
- fail("Got unexpected exception when doing puts", ex);
+ Assert.fail("Got unexpected exception when doing puts", ex);
}
}
catch (Exception ex) {
@@ -257,7 +258,7 @@ public class DeltaClientAuthorizationDUnitTest extends
getLogWriter().info("Got expected exception when doing puts: " + ex);
}
else {
- fail("Got unexpected exception when doing puts", ex);
+ Assert.fail("Got unexpected exception when doing puts", ex);
}
}
}
@@ -277,7 +278,7 @@ public class DeltaClientAuthorizationDUnitTest extends
getLogWriter().info("Got expected exception when doing gets: " + ex);
}
else {
- fail("Got unexpected exception when doing gets", ex);
+ Assert.fail("Got unexpected exception when doing gets", ex);
}
}
for (int index = 0; index < num.intValue(); ++index) {
@@ -301,7 +302,7 @@ public class DeltaClientAuthorizationDUnitTest extends
continue;
}
else {
- fail("Got unexpected exception when doing puts", ex);
+ Assert.fail("Got unexpected exception when doing puts", ex);
}
}
catch (ServerConnectivityException ex) {
@@ -316,7 +317,7 @@ public class DeltaClientAuthorizationDUnitTest extends
getLogWriter().info("Got expected exception when doing gets: " + ex);
}
else {
- fail("Got unexpected exception when doing gets", ex);
+ Assert.fail("Got unexpected exception when doing gets", ex);
}
}
catch (Exception ex) {
@@ -324,7 +325,7 @@ public class DeltaClientAuthorizationDUnitTest extends
getLogWriter().info("Got expected exception when doing gets: " + ex);
}
else {
- fail("Got unexpected exception when doing gets", ex);
+ Assert.fail("Got unexpected exception when doing gets", ex);
}
}
assertNotNull(value);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java
index 94b603e..23a900b 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java
@@ -40,7 +40,9 @@ import com.gemstone.gemfire.cache.query.CqException;
import com.gemstone.gemfire.cache.query.QueryInvocationTargetException;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.util.Callable;
+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.VM;
/**
@@ -87,8 +89,8 @@ public class DeltaClientPostAuthorizationDUnitTest extends
}
public void testPutPostOpNotifications() throws Exception {
- addExpectedException("Unexpected IOException");
- addExpectedException("SocketException");
+ IgnoredException.addExpectedException("Unexpected IOException");
+ IgnoredException.addExpectedException("SocketException");
OperationWithAction[] allOps = {
// Test CREATE and verify with a GET
@@ -525,7 +527,7 @@ public class DeltaClientPostAuthorizationDUnitTest extends
continue;
}
else {
- fail("doOp: Got unexpected exception when doing operation. Policy = "
+ Assert.fail("doOp: Got unexpected exception when doing operation. Policy = "
+ policy + " flags = " + OpFlags.description(flags), ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
index 2ff0b2e..974ef17 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
@@ -40,6 +40,7 @@ import com.gemstone.gemfire.distributed.internal.membership.gms.MembershipManage
import com.gemstone.gemfire.internal.AvailablePort;
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.VM;
/**
@@ -306,7 +307,7 @@ public class P2PAuthenticationDUnitTest extends DistributedTestCase {
throws Exception {
disconnectAllFromDS();
- addExpectedException("Authentication failed");
+ IgnoredException.addExpectedException("Authentication failed");
CredentialGenerator gen = new DummyCredentialGenerator();
Properties props = gen.getSystemProperties();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtil.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtil.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtil.java
index 2ac470c..31aca2f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtil.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtil.java
@@ -78,6 +78,7 @@ import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.logging.InternalLogWriter;
import com.gemstone.gemfire.internal.logging.PureLogWriter;
import com.gemstone.gemfire.internal.util.Callable;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
/**
@@ -309,7 +310,7 @@ public class SecurityTestUtil extends DistributedTestCase {
return new Integer(0);
}
else {
- fail("Got unexpected exception when starting peer", ex);
+ Assert.fail("Got unexpected exception when starting peer", ex);
}
}
catch (AuthenticationFailedException ex) {
@@ -318,11 +319,11 @@ public class SecurityTestUtil extends DistributedTestCase {
return new Integer(0);
}
else {
- fail("Got unexpected exception when starting peer", ex);
+ Assert.fail("Got unexpected exception when starting peer", ex);
}
}
catch (Exception ex) {
- fail("Got unexpected exception when starting peer", ex);
+ Assert.fail("Got unexpected exception when starting peer", ex);
}
if (setupDynamicRegionFactory.booleanValue()) {
@@ -348,7 +349,7 @@ public class SecurityTestUtil extends DistributedTestCase {
server1.start();
}
catch (Exception ex) {
- fail("Got unexpected exception when starting CacheServer", ex);
+ Assert.fail("Got unexpected exception when starting CacheServer", ex);
}
return new Integer(server1.getPort());
}
@@ -441,7 +442,7 @@ public class SecurityTestUtil extends DistributedTestCase {
getLogWriter().info("Got expected UnsupportedOperationException in single-user mode");
}
else {
- fail("Got unexpected exception in multi-user mode ", uoe);
+ Assert.fail("Got unexpected exception in multi-user mode ", uoe);
}
}
@@ -466,7 +467,7 @@ public class SecurityTestUtil extends DistributedTestCase {
"Got expected exception when starting client: " + ex);
}
else {
- fail("Got unexpected exception when starting client", ex);
+ Assert.fail("Got unexpected exception when starting client", ex);
}
}
catch (AuthenticationFailedException ex) {
@@ -475,7 +476,7 @@ public class SecurityTestUtil extends DistributedTestCase {
"Got expected exception when starting client: " + ex);
}
else {
- fail("Got unexpected exception when starting client", ex);
+ Assert.fail("Got unexpected exception when starting client", ex);
}
}
catch (ServerRefusedConnectionException ex) {
@@ -484,11 +485,11 @@ public class SecurityTestUtil extends DistributedTestCase {
"Got expected exception when starting client: " + ex);
}
else {
- fail("Got unexpected exception when starting client", ex);
+ Assert.fail("Got unexpected exception when starting client", ex);
}
}
catch (Exception ex) {
- fail("Got unexpected exception when starting client", ex);
+ Assert.fail("Got unexpected exception when starting client", ex);
}
}
@@ -595,7 +596,7 @@ public class SecurityTestUtil extends DistributedTestCase {
"Got expected exception when starting client: " + ex);
}
else {
- fail("Got unexpected exception when starting client", ex);
+ Assert.fail("Got unexpected exception when starting client", ex);
}
}
catch (AuthenticationFailedException ex) {
@@ -604,7 +605,7 @@ public class SecurityTestUtil extends DistributedTestCase {
"Got expected exception when starting client: " + ex);
}
else {
- fail("Got unexpected exception when starting client", ex);
+ Assert.fail("Got unexpected exception when starting client", ex);
}
}
catch (ServerRefusedConnectionException ex) {
@@ -613,11 +614,11 @@ public class SecurityTestUtil extends DistributedTestCase {
"Got expected exception when starting client: " + ex);
}
else {
- fail("Got unexpected exception when starting client", ex);
+ Assert.fail("Got unexpected exception when starting client", ex);
}
}
catch (Exception ex) {
- fail("Got unexpected exception when starting client", ex);
+ Assert.fail("Got unexpected exception when starting client", ex);
}
}
@@ -647,7 +648,7 @@ public class SecurityTestUtil extends DistributedTestCase {
server.start();
}
catch (Exception ex) {
- fail("Unexpected exception when restarting cache servers", ex);
+ Assert.fail("Unexpected exception when restarting cache servers", ex);
}
assertTrue(server.isRunning());
}
@@ -678,7 +679,7 @@ public class SecurityTestUtil extends DistributedTestCase {
authProps);
}
catch (IOException ex) {
- fail("While starting locator on port " + port.intValue(), ex);
+ Assert.fail("While starting locator on port " + port.intValue(), ex);
}
}
@@ -690,7 +691,7 @@ public class SecurityTestUtil extends DistributedTestCase {
.getDistributedSystem().getLogWriter());
}
catch (Exception ex) {
- fail("While stopping locator on port " + port.intValue(), ex);
+ Assert.fail("While stopping locator on port " + port.intValue(), ex);
}
}
@@ -712,7 +713,7 @@ public class SecurityTestUtil extends DistributedTestCase {
return ((Boolean)cond.call()).booleanValue();
}
catch (Exception e) {
- fail("Unexpected exception", e);
+ Assert.fail("Unexpected exception", e);
}
return false; // NOTREACHED
}
@@ -760,7 +761,7 @@ public class SecurityTestUtil extends DistributedTestCase {
getLogWriter().info("Got expected exception when doing puts: " + ex);
}
else {
- fail("Got unexpected exception when doing puts", ex);
+ Assert.fail("Got unexpected exception when doing puts", ex);
}
}
for (int index = 0; index < num.intValue(); ++index) {
@@ -783,7 +784,7 @@ public class SecurityTestUtil extends DistributedTestCase {
continue;
}
else {
- fail("Got unexpected exception when doing puts", ex);
+ Assert.fail("Got unexpected exception when doing puts", ex);
}
}
catch (ServerConnectivityException ex) {
@@ -812,7 +813,7 @@ public class SecurityTestUtil extends DistributedTestCase {
getLogWriter().info("Got expected exception when doing puts: " + ex);
}
else {
- fail("Got unexpected exception when doing puts", ex);
+ Assert.fail("Got unexpected exception when doing puts", ex);
}
}
catch (Exception ex) {
@@ -820,7 +821,7 @@ public class SecurityTestUtil extends DistributedTestCase {
getLogWriter().info("Got expected exception when doing puts: " + ex);
}
else {
- fail("Got unexpected exception when doing puts", ex);
+ Assert.fail("Got unexpected exception when doing puts", ex);
}
}
}
@@ -843,7 +844,7 @@ public class SecurityTestUtil extends DistributedTestCase {
getLogWriter().info("Got expected exception when doing getAll: " + ex);
}
else {
- fail("Got unexpected exception when doing getAll", ex);
+ Assert.fail("Got unexpected exception when doing getAll", ex);
}
}
try {
@@ -873,7 +874,7 @@ public class SecurityTestUtil extends DistributedTestCase {
"Got expected NoAvailableServers when doing getAll: "
+ ex.getCause());
} else {
- fail("Got unexpected exception when doing getAll", ex);
+ Assert.fail("Got unexpected exception when doing getAll", ex);
}
} catch (ServerConnectivityException ex) {
if ((expectedResult.intValue() == NOTAUTHZ_EXCEPTION)
@@ -884,13 +885,13 @@ public class SecurityTestUtil extends DistributedTestCase {
} else if (expectedResult.intValue() == OTHER_EXCEPTION) {
getLogWriter().info("Got expected exception when doing getAll: " + ex);
} else {
- fail("Got unexpected exception when doing getAll", ex);
+ Assert.fail("Got unexpected exception when doing getAll", ex);
}
} catch (Exception ex) {
if (expectedResult.intValue() == OTHER_EXCEPTION) {
getLogWriter().info("Got expected exception when doing getAll: " + ex);
} else {
- fail("Got unexpected exception when doing getAll", ex);
+ Assert.fail("Got unexpected exception when doing getAll", ex);
}
}
}
@@ -919,7 +920,7 @@ public class SecurityTestUtil extends DistributedTestCase {
getLogWriter().info("Got expected exception when doing gets: " + ex);
}
else {
- fail("Got unexpected exception when doing gets", ex);
+ Assert.fail("Got unexpected exception when doing gets", ex);
}
}
for (int index = 0; index < num.intValue(); ++index) {
@@ -943,7 +944,7 @@ public class SecurityTestUtil extends DistributedTestCase {
continue;
}
else {
- fail("Got unexpected exception when doing gets", ex);
+ Assert.fail("Got unexpected exception when doing gets", ex);
}
}
catch (ServerConnectivityException ex) {
@@ -958,7 +959,7 @@ public class SecurityTestUtil extends DistributedTestCase {
getLogWriter().info("Got expected exception when doing gets: " + ex);
}
else {
- fail("Got unexpected exception when doing gets", ex);
+ Assert.fail("Got unexpected exception when doing gets", ex);
}
}
catch (Exception ex) {
@@ -966,7 +967,7 @@ public class SecurityTestUtil extends DistributedTestCase {
getLogWriter().info("Got expected exception when doing gets: " + ex);
}
else {
- fail("Got unexpected exception when doing gets", ex);
+ Assert.fail("Got unexpected exception when doing gets", ex);
}
}
assertNotNull(value);
@@ -1020,7 +1021,7 @@ public class SecurityTestUtil extends DistributedTestCase {
getLogWriter().info(
"Got expected exception when doing region destroy: " + ex);
} else {
- fail("Got unexpected exception when doing region destroy", ex);
+ Assert.fail("Got unexpected exception when doing region destroy", ex);
}
}
@@ -1041,7 +1042,7 @@ public class SecurityTestUtil extends DistributedTestCase {
"Got expected NoAvailableServers when doing region destroy: "
+ ex.getCause());
} else {
- fail("Got unexpected exception when doing region destroy", ex);
+ Assert.fail("Got unexpected exception when doing region destroy", ex);
}
} catch (ServerConnectivityException ex) {
if ((expectedResult.intValue() == NOTAUTHZ_EXCEPTION)
@@ -1053,14 +1054,14 @@ public class SecurityTestUtil extends DistributedTestCase {
getLogWriter().info(
"Got expected exception when doing region destroy: " + ex);
} else {
- fail("Got unexpected exception when doing region destroy", ex);
+ Assert.fail("Got unexpected exception when doing region destroy", ex);
}
} catch (Exception ex) {
if (expectedResult.intValue() == OTHER_EXCEPTION) {
getLogWriter().info(
"Got expected exception when doing region destroy: " + ex);
} else {
- fail("Got unexpected exception when doing region destroy", ex);
+ Assert.fail("Got unexpected exception when doing region destroy", ex);
}
}
}
@@ -1084,7 +1085,7 @@ public class SecurityTestUtil extends DistributedTestCase {
getLogWriter().info("Got expected exception when doing destroys: " + ex);
}
else {
- fail("Got unexpected exception when doing destroys", ex);
+ Assert.fail("Got unexpected exception when doing destroys", ex);
}
}
for (int index = 0; index < num.intValue(); ++index) {
@@ -1102,7 +1103,7 @@ public class SecurityTestUtil extends DistributedTestCase {
continue;
}
else {
- fail("Got unexpected exception when doing destroys", ex);
+ Assert.fail("Got unexpected exception when doing destroys", ex);
}
}
catch (ServerConnectivityException ex) {
@@ -1117,7 +1118,7 @@ public class SecurityTestUtil extends DistributedTestCase {
getLogWriter().info("Got expected exception when doing destroys: " + ex);
}
else {
- fail("Got unexpected exception when doing destroys", ex);
+ Assert.fail("Got unexpected exception when doing destroys", ex);
}
}
catch (Exception ex) {
@@ -1125,7 +1126,7 @@ public class SecurityTestUtil extends DistributedTestCase {
getLogWriter().info("Got expected exception when doing destroys: " + ex);
}
else {
- fail("Got unexpected exception when doing destroys", ex);
+ Assert.fail("Got unexpected exception when doing destroys", ex);
}
}
}
@@ -1150,7 +1151,7 @@ public class SecurityTestUtil extends DistributedTestCase {
getLogWriter().info("Got expected exception when doing invalidates: " + ex);
}
else {
- fail("Got unexpected exception when doing invalidates", ex);
+ Assert.fail("Got unexpected exception when doing invalidates", ex);
}
}
for (int index = 0; index < num.intValue(); ++index) {
@@ -1168,7 +1169,7 @@ public class SecurityTestUtil extends DistributedTestCase {
continue;
}
else {
- fail("Got unexpected exception when doing invalidates", ex);
+ Assert.fail("Got unexpected exception when doing invalidates", ex);
}
}
catch (ServerConnectivityException ex) {
@@ -1183,7 +1184,7 @@ public class SecurityTestUtil extends DistributedTestCase {
getLogWriter().info("Got expected exception when doing invalidates: " + ex);
}
else {
- fail("Got unexpected exception when doing invalidates", ex);
+ Assert.fail("Got unexpected exception when doing invalidates", ex);
}
}
catch (Exception ex) {
@@ -1191,7 +1192,7 @@ public class SecurityTestUtil extends DistributedTestCase {
getLogWriter().info("Got expected exception when doing invalidates: " + ex);
}
else {
- fail("Got unexpected exception when doing invalidates", ex);
+ Assert.fail("Got unexpected exception when doing invalidates", ex);
}
}
}
@@ -1216,7 +1217,7 @@ public class SecurityTestUtil extends DistributedTestCase {
getLogWriter().info("Got expected exception when doing containsKey: " + ex);
}
else {
- fail("Got unexpected exception when doing containsKey", ex);
+ Assert.fail("Got unexpected exception when doing containsKey", ex);
}
}
for (int index = 0; index < num.intValue(); ++index) {
@@ -1235,7 +1236,7 @@ public class SecurityTestUtil extends DistributedTestCase {
continue;
}
else {
- fail("Got unexpected exception when doing containsKey", ex);
+ Assert.fail("Got unexpected exception when doing containsKey", ex);
}
}
catch (ServerConnectivityException ex) {
@@ -1250,7 +1251,7 @@ public class SecurityTestUtil extends DistributedTestCase {
getLogWriter().info("Got expected exception when doing containsKey: " + ex);
}
else {
- fail("Got unexpected exception when doing containsKey", ex);
+ Assert.fail("Got unexpected exception when doing containsKey", ex);
}
}
catch (Exception ex) {
@@ -1258,7 +1259,7 @@ public class SecurityTestUtil extends DistributedTestCase {
getLogWriter().info("Got expected exception when doing containsKey: " + ex);
}
else {
- fail("Got unexpected exception when doing containsKey", ex);
+ Assert.fail("Got unexpected exception when doing containsKey", ex);
}
}
assertEquals(expectedValue, result);
@@ -1279,7 +1280,7 @@ public class SecurityTestUtil extends DistributedTestCase {
if (expectedResult.intValue() == OTHER_EXCEPTION) {
getLogWriter().info("Got expected exception when doing queries: " + ex);
} else {
- fail("Got unexpected exception when doing queries", ex);
+ Assert.fail("Got unexpected exception when doing queries", ex);
}
}
String queryStr = "SELECT DISTINCT * FROM " + region.getFullPath();
@@ -1296,7 +1297,7 @@ public class SecurityTestUtil extends DistributedTestCase {
"Got expected NoAvailableServers when doing queries: "
+ ex.getCause());
} else {
- fail("Got unexpected exception when doing queries", ex);
+ Assert.fail("Got unexpected exception when doing queries", ex);
}
} catch (ServerConnectivityException ex) {
if ((expectedResult.intValue() == NOTAUTHZ_EXCEPTION)
@@ -1307,7 +1308,7 @@ public class SecurityTestUtil extends DistributedTestCase {
} else if (expectedResult.intValue() == OTHER_EXCEPTION) {
getLogWriter().info("Got expected exception when doing queries: " + ex);
} else {
- fail("Got unexpected exception when doing queries", ex);
+ Assert.fail("Got unexpected exception when doing queries", ex);
}
} catch (QueryInvocationTargetException qite) {
if ((expectedResult.intValue() == NOTAUTHZ_EXCEPTION)
@@ -1318,13 +1319,13 @@ public class SecurityTestUtil extends DistributedTestCase {
} else if (expectedResult.intValue() == OTHER_EXCEPTION) {
getLogWriter().info("Got expected exception when doing queries: " + qite);
} else {
- fail("Got unexpected exception when doing queries", qite);
+ Assert.fail("Got unexpected exception when doing queries", qite);
}
} catch (Exception ex) {
if (expectedResult.intValue() == OTHER_EXCEPTION) {
getLogWriter().info("Got expected exception when doing queries: " + ex);
} else {
- fail("Got unexpected exception when doing queries", ex);
+ Assert.fail("Got unexpected exception when doing queries", ex);
}
}
}
@@ -1345,7 +1346,7 @@ public class SecurityTestUtil extends DistributedTestCase {
getLogWriter().info(
"Got expected exception when executing function: " + ex);
} else {
- fail("Got unexpected exception when executing function", ex);
+ Assert.fail("Got unexpected exception when executing function", ex);
}
}
try {
@@ -1376,7 +1377,7 @@ public class SecurityTestUtil extends DistributedTestCase {
"Got expected NoAvailableServers when executing function: "
+ ex.getCause());
} else {
- fail("Got unexpected exception when executing function", ex);
+ Assert.fail("Got unexpected exception when executing function", ex);
}
} catch (ServerConnectivityException ex) {
if ((expectedResult.intValue() == NOTAUTHZ_EXCEPTION)
@@ -1388,7 +1389,7 @@ public class SecurityTestUtil extends DistributedTestCase {
getLogWriter().info(
"Got expected exception when executing function: " + ex);
} else {
- fail("Got unexpected exception when executing function", ex);
+ Assert.fail("Got unexpected exception when executing function", ex);
}
} catch (FunctionException ex) {
if ((expectedResult.intValue() == NOTAUTHZ_EXCEPTION)
@@ -1402,14 +1403,14 @@ public class SecurityTestUtil extends DistributedTestCase {
getLogWriter().info(
"Got expected exception when executing function: " + ex);
} else {
- fail("Got unexpected exception when executing function", ex);
+ Assert.fail("Got unexpected exception when executing function", ex);
}
} catch (Exception ex) {
if (expectedResult.intValue() == OTHER_EXCEPTION) {
getLogWriter().info(
"Got expected exception when executing function: " + ex);
} else {
- fail("Got unexpected exception when executing function", ex);
+ Assert.fail("Got unexpected exception when executing function", ex);
}
}
}
@@ -1429,7 +1430,7 @@ public class SecurityTestUtil extends DistributedTestCase {
getLogWriter().info(
"Got expected exception when executing query: " + ex);
} else {
- fail("Got unexpected exception when executing query", ex);
+ Assert.fail("Got unexpected exception when executing query", ex);
}
}
try {
@@ -1452,7 +1453,7 @@ public class SecurityTestUtil extends DistributedTestCase {
"Got expected NoAvailableServers when executing query: "
+ ex.getCause());
} else {
- fail("Got unexpected exception when executing query", ex);
+ Assert.fail("Got unexpected exception when executing query", ex);
}
} catch (ServerConnectivityException ex) {
if ((expectedResult.intValue() == NOTAUTHZ_EXCEPTION)
@@ -1464,14 +1465,14 @@ public class SecurityTestUtil extends DistributedTestCase {
getLogWriter().info(
"Got expected exception when executing query: " + ex);
} else {
- fail("Got unexpected exception when executing query", ex);
+ Assert.fail("Got unexpected exception when executing query", ex);
}
} catch (Exception ex) {
if (expectedResult.intValue() == OTHER_EXCEPTION) {
getLogWriter().info(
"Got expected exception when executing query: " + ex);
} else {
- fail("Got unexpected exception when executing query", ex);
+ Assert.fail("Got unexpected exception when executing query", ex);
}
}
}
@@ -1699,7 +1700,7 @@ public class SecurityTestUtil extends DistributedTestCase {
}
} catch (Exception e) {
if (!e.getClass().getSimpleName().endsWith(expectedResult)) {
- fail("Expected " + expectedResult + " but found "
+ Assert.fail("Expected " + expectedResult + " but found "
+ e.getClass().getSimpleName() + " in doSimplePut()", e);
} else {
getLogWriter().fine(
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/Assert.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/Assert.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/Assert.java
new file mode 100755
index 0000000..7c4a9ef
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/Assert.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.test.dunit;
+
+/**
+ * Extracted from DistributedTestCase
+ */
+public class Assert extends org.junit.Assert {
+
+ protected Assert() {
+ }
+
+ public static void fail(final String message, final Throwable cause) {
+ if (message == null && cause == null) {
+ throw new AssertionError();
+ }
+ if (message == null) {
+ throw new AssertionError(cause);
+ }
+ if (cause == null) {
+ throw new AssertionError(message);
+ }
+ throw new AssertionError(message, cause);
+ }
+}
[43/50] [abbrv] incubator-geode git commit: Refactor dunit
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java
index c19b7b6..ffb06af 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java
@@ -67,6 +67,7 @@ import com.gemstone.gemfire.internal.cache.execute.util.RollbackFunction;
import com.gemstone.gemfire.internal.cache.tx.ClientTXStateStub;
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;
@@ -88,7 +89,7 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest
public void setUp() throws Exception {
super.setUp();
- addExpectedException("java.net.SocketException");
+ IgnoredException.addExpectedException("java.net.SocketException");
}
private Integer createRegionsAndStartServer(VM vm, boolean accessor) {
@@ -1405,7 +1406,7 @@ public void testClientCommitAndDataStoreGetsEvent() throws Exception {
VM server2 = host.getVM(1);
VM client = host.getVM(2);
- addExpectedException("java.net.SocketException");
+ IgnoredException.addExpectedException("java.net.SocketException");
final int port1 = createRegionsAndStartServer(server1, true);
final int port2 = createRegionsAndStartServer(server2, false);
@@ -2665,7 +2666,7 @@ public void testClientCommitAndDataStoreGetsEvent() throws Exception {
final int port2 = createRegionsAndStartServer(server2, false);
final int port = createRegionsAndStartServer(server1, true);
- addExpectedException("ClassCastException");
+ IgnoredException.addExpectedException("ClassCastException");
SerializableRunnable suspectStrings = new SerializableRunnable("suspect string") {
public void run() {
InternalDistributedSystem.getLoggerI18n().convertToLogWriter().info(
@@ -2762,8 +2763,8 @@ public void testClientCommitAndDataStoreGetsEvent() throws Exception {
doFunctionWithFailureWork(false);
}
private void doFunctionWithFailureWork(final boolean commit) {
- addExpectedException("TransactionDataNodeHasDepartedException");
- addExpectedException("ClassCastException");
+ IgnoredException.addExpectedException("TransactionDataNodeHasDepartedException");
+ IgnoredException.addExpectedException("ClassCastException");
Host host = Host.getHost(0);
VM server1 = host.getVM(0);
VM server2 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentDestroySubRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentDestroySubRegionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentDestroySubRegionDUnitTest.java
index 0611f63..2a7c0b5 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentDestroySubRegionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentDestroySubRegionDUnitTest.java
@@ -23,6 +23,7 @@ import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionDestroyedException;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache30.CacheTestCase;
+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.SerializableRunnable;
@@ -101,7 +102,7 @@ public class ConcurrentDestroySubRegionDUnitTest extends CacheTestCase {
vm1.invoke(createChild);
} catch(Exception e) {
if(!(e.getCause() instanceof RegionDestroyedException)) {
- fail("Wrong exception", e);
+ Assert.fail("Wrong exception", e);
}
RegionDestroyedException rde = (RegionDestroyedException) e.getCause();
assertEquals("Error on loop " + i, "/region", rde.getRegionFullPath());
@@ -160,7 +161,7 @@ public class ConcurrentDestroySubRegionDUnitTest extends CacheTestCase {
vm1.invoke(createChild);
} catch(Exception e) {
if(!(e.getCause() instanceof RegionDestroyedException)) {
- fail("Wrong exception", e);
+ Assert.fail("Wrong exception", e);
}
RegionDestroyedException rde = (RegionDestroyedException) e.getCause();
assertEquals("Error on loop " + i, "/region", rde.getRegionFullPath());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java
index df0ea7f..5a08dac 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java
@@ -50,6 +50,7 @@ import com.gemstone.gemfire.distributed.internal.membership.MembershipManager;
import com.gemstone.gemfire.distributed.internal.membership.gms.MembershipManagerHelper;
import com.gemstone.gemfire.internal.AvailablePort;
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.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
@@ -1046,7 +1047,7 @@ public class ConcurrentMapOpsDUnitTest extends CacheTestCase {
final int port2 = createRegionsAndStartServer(server2, true);
final String regionName = usePR? PR_REG_NAME : REP_REG_NAME;
- addExpectedException("java.net.SocketException");
+ IgnoredException.addExpectedException("java.net.SocketException");
createClientRegion(client, port1, false, port2);
@@ -1059,11 +1060,11 @@ public class ConcurrentMapOpsDUnitTest extends CacheTestCase {
final DistributedMember server1ID = (DistributedMember)server1.invoke(getID);
final DistributedMember server2ID = (DistributedMember)server2.invoke(getID);
- Set<ExpectedException> exceptions = new HashSet<ExpectedException>();
- exceptions.add(addExpectedException("Membership: requesting removal", server1));
- exceptions.add(addExpectedException("Membership: requesting removal", server2));
- exceptions.add(addExpectedException("ForcedDisconnect", server1));
- exceptions.add(addExpectedException("ForcedDisconnect", server2));
+ Set<IgnoredException> exceptions = new HashSet<IgnoredException>();
+ exceptions.add(IgnoredException.addExpectedException("Membership: requesting removal", server1));
+ exceptions.add(IgnoredException.addExpectedException("Membership: requesting removal", server2));
+ exceptions.add(IgnoredException.addExpectedException("ForcedDisconnect", server1));
+ exceptions.add(IgnoredException.addExpectedException("ForcedDisconnect", server2));
try {
@@ -1164,7 +1165,7 @@ public class ConcurrentMapOpsDUnitTest extends CacheTestCase {
});
} finally {
disconnectAllFromDS();
- for (ExpectedException ex: exceptions) {
+ for (IgnoredException ex: exceptions) {
ex.remove();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java
index f101acb..b17fdb0 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java
@@ -43,6 +43,7 @@ import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
/** A test of 46438 - missing response to an update attributes message */
public class ConnectDisconnectDUnitTest extends CacheTestCase {
@@ -52,7 +53,7 @@ public class ConnectDisconnectDUnitTest extends CacheTestCase {
}
- private ExpectedException ex;
+ private IgnoredException ex;
public ConnectDisconnectDUnitTest(String name) {
super(name);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
index 43ed3da..13b65b3 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
@@ -835,7 +835,7 @@ public class DeltaPropagationDUnitTest extends DistributedTestCase {
}
}
catch (Exception e) {
- fail("failed in doLocalOp()", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("failed in doLocalOp()", e);
}
}
@@ -878,7 +878,7 @@ public class DeltaPropagationDUnitTest extends DistributedTestCase {
+ expected, expected.equals(value));
}
catch (Exception e) {
- fail("failed in assertValue()", e);
+ com.gemstone.gemfire.test.dunit.Assert.fail("failed in assertValue()", e);
}
}
@@ -1015,7 +1015,7 @@ public class DeltaPropagationDUnitTest extends DistributedTestCase {
r.put(LAST_KEY, "");
}
catch (Exception ex) {
- fail("failed in createDelta()", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("failed in createDelta()", ex);
}
}
@@ -1032,7 +1032,7 @@ public class DeltaPropagationDUnitTest extends DistributedTestCase {
r.create(DELTA_KEY, deltaPut[0]);
}
catch (Exception ex) {
- fail("failed in createDelta()", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("failed in createDelta()", ex);
}
}
@@ -1054,7 +1054,7 @@ public class DeltaPropagationDUnitTest extends DistributedTestCase {
r.put(LAST_KEY, "");
}
catch (Exception ex) {
- fail("failed in updateDelta()", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("failed in updateDelta()", ex);
}
}
@@ -1069,7 +1069,7 @@ public class DeltaPropagationDUnitTest extends DistributedTestCase {
r.create(LAST_KEY, "");
}
catch (Exception ex) {
- fail("failed in createDeltas()", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("failed in createDeltas()", ex);
}
}
@@ -1081,7 +1081,7 @@ public class DeltaPropagationDUnitTest extends DistributedTestCase {
r.create("KEY-A", "I push the delta out to disk :)");
}
catch (Exception ex) {
- fail("failed in createAnEntry()", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("failed in createAnEntry()", ex);
}
}
@@ -1093,7 +1093,7 @@ public class DeltaPropagationDUnitTest extends DistributedTestCase {
r.invalidate(DELTA_KEY);
}
catch (Exception ex) {
- fail("failed in invalidateDelta()", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("failed in invalidateDelta()", ex);
}
}
@@ -1476,7 +1476,7 @@ public class DeltaPropagationDUnitTest extends DistributedTestCase {
r.registerInterest("ALL_KEYS");
}
catch (Exception ex) {
- fail("failed in registerInterestListAll", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("failed in registerInterestListAll", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java
index 1c2f921..8d86669 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java
@@ -28,6 +28,7 @@ import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
public class DistrbutedRegionProfileOffHeapDUnitTest extends CacheTestCase {
@@ -96,7 +97,7 @@ public class DistrbutedRegionProfileOffHeapDUnitTest extends CacheTestCase {
Region region = null;
try {
- addExpectedException("IllegalStateException");
+ IgnoredException.addExpectedException("IllegalStateException");
region = regionFactory.create(regionName);
fail("Expected exception upon creation with invalid off-heap state");
} catch (IllegalStateException expected) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java
index 19f72ab..0ad338e 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java
@@ -40,6 +40,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionMessage;
import com.gemstone.gemfire.distributed.internal.DistributionMessageObserver;
import com.gemstone.gemfire.internal.cache.EventTracker.BulkOpHolder;
import com.gemstone.gemfire.internal.cache.ha.ThreadIdentifier;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -146,7 +147,7 @@ public class EventTrackerDUnitTest extends CacheTestCase {
try {
startCacheServer();
} catch (Exception ex) {
- fail("While starting CacheServer", ex);
+ Assert.fail("While starting CacheServer", ex);
}
}
});
@@ -219,7 +220,7 @@ public class EventTrackerDUnitTest extends CacheTestCase {
try {
startCacheServer();
} catch (Exception ex) {
- fail("While starting CacheServer", ex);
+ Assert.fail("While starting CacheServer", ex);
}
}
});
@@ -303,7 +304,7 @@ public class EventTrackerDUnitTest extends CacheTestCase {
try {
startCacheServer();
} catch (Exception ex) {
- fail("While starting CacheServer", ex);
+ Assert.fail("While starting CacheServer", ex);
}
}
};
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionObjectSizerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionObjectSizerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionObjectSizerDUnitTest.java
index dbc1f3f..c2a5e90 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionObjectSizerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionObjectSizerDUnitTest.java
@@ -37,6 +37,7 @@ import com.gemstone.gemfire.internal.SharedLibrary;
import com.gemstone.gemfire.internal.cache.lru.HeapLRUCapacityController;
import com.gemstone.gemfire.internal.cache.lru.Sizeable;
import com.gemstone.gemfire.internal.size.ReflectionSingleObjectSizer;
+import com.gemstone.gemfire.test.dunit.Assert;
public class EvictionObjectSizerDUnitTest extends CacheTestCase {
@@ -215,7 +216,7 @@ public class EvictionObjectSizerDUnitTest extends CacheTestCase {
cache.getResourceManager().setEvictionHeapPercentage(50);
}
catch (Exception e) {
- fail("Failed while creating the cache", e);
+ Assert.fail("Failed while creating the cache", e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionStatsDUnitTest.java
index 189d0d2..445d479 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionStatsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionStatsDUnitTest.java
@@ -40,6 +40,7 @@ import com.gemstone.gemfire.internal.cache.control.InternalResourceManager;
import com.gemstone.gemfire.internal.cache.control.InternalResourceManager.ResourceType;
import com.gemstone.gemfire.internal.cache.lru.HeapEvictor;
import com.gemstone.gemfire.internal.cache.lru.HeapLRUCapacityController;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -415,7 +416,7 @@ public class EvictionStatsDUnitTest extends CacheTestCase {
cache.getResourceManager().setEvictionHeapPercentage(20);
}
catch (Exception e) {
- fail("Failed while creating the cache", e);
+ Assert.fail("Failed while creating the cache", e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionTestBase.java
index cbd2f65..aefa88b 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionTestBase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionTestBase.java
@@ -44,6 +44,7 @@ import com.gemstone.gemfire.internal.cache.control.InternalResourceManager.Resou
import com.gemstone.gemfire.internal.cache.control.MemoryEvent;
import com.gemstone.gemfire.internal.cache.control.MemoryThresholds.MemoryState;
import com.gemstone.gemfire.internal.cache.lru.HeapEvictor;
+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;
@@ -297,7 +298,7 @@ public class EvictionTestBase extends CacheTestCase {
getLogWriter().info("critical= "+cache.getResourceManager().getCriticalHeapPercentage());
}
catch (Exception e) {
- fail("Failed while creating the cache", e);
+ Assert.fail("Failed while creating the cache", e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java
index 6a96948..8578c64 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java
@@ -40,6 +40,7 @@ import com.gemstone.gemfire.internal.cache.partitioned.fixed.QuarterPartitionRes
import com.gemstone.gemfire.internal.cache.partitioned.fixed.SingleHopQuarterPartitionResolver;
import com.gemstone.gemfire.internal.cache.partitioned.fixed.FixedPartitioningTestBase.Q1_Months;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
+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;
@@ -367,7 +368,7 @@ public class FixedPRSinglehopDUnitTest extends CacheTestCase {
server.start();
}
catch (IOException e) {
- fail("Failed to start server ", e);
+ Assert.fail("Failed to start server ", e);
}
if (!fpaList.isEmpty() || isAccessor) {
@@ -412,7 +413,7 @@ public class FixedPRSinglehopDUnitTest extends CacheTestCase {
server.start();
}
catch (IOException e) {
- fail("Failed to start server ", e);
+ Assert.fail("Failed to start server ", e);
}
if (!fpaList.isEmpty() || isAccessor) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIDeltaDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIDeltaDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIDeltaDUnitTest.java
index 9f318fb..f3cfa2f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIDeltaDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIDeltaDUnitTest.java
@@ -55,8 +55,10 @@ import com.gemstone.gemfire.internal.cache.persistence.DiskStoreID;
import com.gemstone.gemfire.internal.cache.versions.RegionVersionVector;
import com.gemstone.gemfire.internal.cache.versions.VersionTag;
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.IgnoredException;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
@@ -83,7 +85,7 @@ public class GIIDeltaDUnitTest extends CacheTestCase {
// protected static String REGION_NAME = GIIDeltaDUnitTest.class.getSimpleName()+"_Region";
protected static String REGION_NAME = "_Region";
final String expectedExceptions = GemFireIOException.class.getName();
- protected ExpectedException expectedEx;
+ protected IgnoredException expectedEx;
static Object giiSyncObject = new Object();
/**
@@ -152,7 +154,7 @@ public class GIIDeltaDUnitTest extends CacheTestCase {
createDistributedRegion(vm1);
assignVMsToPandR(vm0, vm1);
// from now on, use P and R as vmhttps://wiki.gemstone.com/display/gfepersistence/DeltaGII+Spec+for+8.0
- expectedEx = addExpectedException(expectedExceptions);
+ expectedEx = IgnoredException.addExpectedException(expectedExceptions);
}
// these steps are shared by all test cases
@@ -2003,7 +2005,7 @@ public class GIIDeltaDUnitTest extends CacheTestCase {
try {
future.join(MAX_WAIT);
} catch (InterruptedException e) {
- fail("Create region is interrupted", e);
+ Assert.fail("Create region is interrupted", e);
}
if(future.isAlive()) {
fail("Region not created within" + MAX_WAIT);
@@ -2025,7 +2027,7 @@ public class GIIDeltaDUnitTest extends CacheTestCase {
getLogWriter().info("In createDistributedRegion, using hydra.getLogWriter()");
getLogWriter().fine("Unfinished Op limit="+InitialImageOperation.MAXIMUM_UNFINISHED_OPERATIONS);
} catch (CacheException ex) {
- fail("While creating region", ex);
+ Assert.fail("While creating region", ex);
}
}
};
@@ -2367,9 +2369,9 @@ public class GIIDeltaDUnitTest extends CacheTestCase {
try {
remote_rvv = DataSerializer.readObject(new DataInputStream(bais));
} catch (IOException e) {
- fail("Unexpected exception", e);
+ Assert.fail("Unexpected exception", e);
} catch (ClassNotFoundException e) {
- fail("Unexpected exception", e);
+ Assert.fail("Unexpected exception", e);
}
RequestImageMessage rim = new RequestImageMessage();
rim.setSender(R_ID);
@@ -2521,10 +2523,10 @@ public class GIIDeltaDUnitTest extends CacheTestCase {
try {
async.join(30000);
if (async.exceptionOccurred()) {
- fail("Test failed", async.getException());
+ Assert.fail("Test failed", async.getException());
}
} catch (InterruptedException e1) {
- fail("Test failed", e1);
+ Assert.fail("Test failed", e1);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIFlowControlDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIFlowControlDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIFlowControlDUnitTest.java
index d478b8b..44df27d 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIFlowControlDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/GIIFlowControlDUnitTest.java
@@ -30,7 +30,9 @@ import com.gemstone.gemfire.distributed.internal.DistributionManager;
import com.gemstone.gemfire.distributed.internal.DistributionMessage;
import com.gemstone.gemfire.distributed.internal.DistributionMessageObserver;
import com.gemstone.gemfire.internal.cache.InitialImageOperation.ImageReplyMessage;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -134,7 +136,7 @@ public class GIIFlowControlDUnitTest extends CacheTestCase {
try {
Thread.sleep(500);
} catch (InterruptedException e) {
- fail("interrupted", e);
+ Assert.fail("interrupted", e);
}
assertEquals(2, observer.messageCount.get());
observer.allowMessages.countDown();
@@ -201,7 +203,7 @@ public class GIIFlowControlDUnitTest extends CacheTestCase {
try {
Thread.sleep(500);
} catch (InterruptedException e) {
- fail("interrupted", e);
+ Assert.fail("interrupted", e);
}
assertEquals(2, observer.messageCount.get());
}
@@ -257,7 +259,7 @@ public class GIIFlowControlDUnitTest extends CacheTestCase {
}
});
- ExpectedException expectedEx = null;
+ IgnoredException expectedEx = null;
try {
createRegion(vm0);
@@ -284,7 +286,7 @@ public class GIIFlowControlDUnitTest extends CacheTestCase {
try {
Thread.sleep(500);
} catch (InterruptedException e) {
- fail("interrupted", e);
+ Assert.fail("interrupted", e);
}
assertEquals(2, observer.messageCount.get());
}
@@ -306,7 +308,7 @@ public class GIIFlowControlDUnitTest extends CacheTestCase {
throw e;
}
- expectedEx = addExpectedException(InterruptedException.class.getName(),
+ expectedEx = IgnoredException.addExpectedException(InterruptedException.class.getName(),
vm1);
if(disconnect) {
disconnect(vm1);
@@ -437,7 +439,7 @@ public class GIIFlowControlDUnitTest extends CacheTestCase {
try {
allowMessages.await();
} catch (InterruptedException e) {
- fail("Interrupted", e);
+ Assert.fail("Interrupted", e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
index 9a6b3e4..3c77110 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
@@ -33,6 +33,7 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.distributed.internal.InternalLocator;
import com.gemstone.gemfire.internal.AvailablePort.Keeper;
import com.gemstone.gemfire.internal.AvailablePortHelper;
+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.SerializableRunnable;
@@ -96,7 +97,7 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
try {
Locator.startLocatorAndDS(port1, logFile, null, dsProps, true, true, null);
} catch (IOException ex) {
- fail("While starting locator on port " + port1, ex);
+ Assert.fail("While starting locator on port " + port1, ex);
}
}
});
@@ -112,7 +113,7 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
Locator.startLocatorAndDS(port2, logFile, null, dsProps, true, true, "locator2HNFC");
} catch (IOException ex) {
- fail("While starting locator on port " + port2, ex);
+ Assert.fail("While starting locator on port " + port2, ex);
}
}
});
@@ -605,7 +606,7 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
try {
Locator.startLocatorAndDS(port1, logFile, null, dsProps, true, true, null);
} catch (IOException ex) {
- fail("While starting locator on port " + port1, ex);
+ Assert.fail("While starting locator on port " + port1, ex);
}
}
});
@@ -621,7 +622,7 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
Locator.startLocatorAndDS(port2, logFile, null, dsProps, true, true, "locator2HNFC");
} catch (IOException ex) {
- fail("While starting locator on port " + port2, ex);
+ Assert.fail("While starting locator on port " + port2, ex);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java
index 54da4b6..3ec0411 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java
@@ -38,6 +38,7 @@ import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.AvailablePort;
+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 HABug36773DUnitTest extends DistributedTestCase
Thread.sleep(700);
}
catch (InterruptedException ie) {
- fail("Interrupted while waiting ", ie);
+ Assert.fail("Interrupted while waiting ", ie);
}
}
}
@@ -260,7 +261,7 @@ public class HABug36773DUnitTest extends DistributedTestCase
assertEquals(r1.getEntry(KEY2).getValue(), "key-2");
}
catch (Exception ex) {
- fail("failed while createEntriesK1andK2()", ex);
+ Assert.fail("failed while createEntriesK1andK2()", ex);
}
}
@@ -320,7 +321,7 @@ public class HABug36773DUnitTest extends DistributedTestCase
}
catch (Exception ex) {
- fail("failed while registering interest", ex);
+ Assert.fail("failed while registering interest", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptClientServerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptClientServerDUnitTest.java
index 03d9edd..91b4796 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptClientServerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptClientServerDUnitTest.java
@@ -34,6 +34,7 @@ import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.UpdateOperation.UpdateMessage;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
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.VM;
@@ -83,7 +84,7 @@ public class InterruptClientServerDUnitTest extends CacheTestCase {
* @throws Throwable
*/
public void testClientPutWithInterrupt() throws Throwable {
- addExpectedException("InterruptedException");
+ IgnoredException.addExpectedException("InterruptedException");
Host host = Host.getHost(0);
final VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/MapClearGIIDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/MapClearGIIDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/MapClearGIIDUnitTest.java
index 3910c3c..93f4f0c 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/MapClearGIIDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/MapClearGIIDUnitTest.java
@@ -32,6 +32,7 @@ import com.gemstone.gemfire.cache.RegionEvent;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.cache30.CacheTestCase;
+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;
@@ -239,19 +240,19 @@ public class MapClearGIIDUnitTest extends CacheTestCase {
DistributedTestCase.join(asyncGII, 30 * 1000, getLogWriter());
if (asyncGII.exceptionOccurred()) {
Throwable t = asyncGII.getException();
- fail("createRegionInVM0 failed", t);
+ Assert.fail("createRegionInVM0 failed", t);
}
assertTrue(vm0
.invokeBoolean(MapClearGIIDUnitTest.class, "checkImageStateFlag"));
if (asyncGII.exceptionOccurred()) {
- fail("asyncGII failed", asyncGII.getException());
+ Assert.fail("asyncGII failed", asyncGII.getException());
}
}
catch (Exception e) {
- fail("Test failed", e);
+ Assert.fail("Test failed", e);
}
finally {
vm0.invoke(new SerializableRunnable("Set fast image processing") {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java
index 4482533..5879929 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java
@@ -25,6 +25,7 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.control.InternalResourceManager.ResourceType;
import com.gemstone.gemfire.internal.cache.lru.HeapEvictor;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -82,7 +83,7 @@ public class OffHeapEvictionDUnitTest extends EvictionDUnitTest {
getLogWriter().info("critical= "+cache.getResourceManager().getCriticalOffHeapPercentage());
}
catch (Exception e) {
- fail("Failed while creating the cache", e);
+ Assert.fail("Failed while creating the cache", e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java
index a2d0555..82f47d5 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java
@@ -21,6 +21,7 @@ import java.util.Properties;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
/**
@@ -78,7 +79,7 @@ public class OffHeapEvictionStatsDUnitTest extends EvictionStatsDUnitTest {
getLogWriter().info("critical= "+cache.getResourceManager().getCriticalOffHeapPercentage());
}
catch (Exception e) {
- fail("Failed while creating the cache", e);
+ Assert.fail("Failed while creating the cache", e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PRBadToDataDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PRBadToDataDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PRBadToDataDUnitTest.java
index f1e7988..8249d2b 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PRBadToDataDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PRBadToDataDUnitTest.java
@@ -24,6 +24,7 @@ import com.gemstone.gemfire.cache.CacheException;
import com.gemstone.gemfire.cache.PartitionAttributesFactory;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.cache30.CacheTestCase;
+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;
@@ -76,7 +77,7 @@ public class PRBadToDataDUnitTest extends CacheTestCase {
assertNotNull(pr);
}
catch (final CacheException ex) {
- fail("While creating Partitioned region", ex);
+ Assert.fail("While creating Partitioned region", ex);
}
}
};
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
index d5e7f9c..a11987a 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
@@ -35,6 +35,7 @@ import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDataStore.BucketVisitor;
+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;
@@ -517,7 +518,7 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest extends
for (int count = 0; count < AsyncInvocationArrSize; count++) {
if (async[count].exceptionOccurred()) {
- fail("Exception during " + count, async[count].getException());
+ Assert.fail("Exception during " + count, async[count].getException());
}
}
}
@@ -558,7 +559,7 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest extends
}
for (int count = 0; count < AsyncInvocationArrSize; count++) {
if (async[count].exceptionOccurred()) {
- fail("Exception during " + count, async[count].getException());
+ Assert.fail("Exception during " + count, async[count].getException());
}
}
}
@@ -592,7 +593,7 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest extends
for (int count = 0; count < AsyncInvocationArrSize; count++) {
if (async[count].exceptionOccurred()) {
- fail("exception during" + count, async[count].getException());
+ Assert.fail("exception during" + count, async[count].getException());
}
}
}
@@ -630,7 +631,7 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest extends
for (int count = 0; count < AsyncInvocationArrSize; count++) {
if (async[count].exceptionOccurred()) {
- fail("exception during " + count, async[count].getException());
+ Assert.fail("exception during " + count, async[count].getException());
}
}
}
@@ -702,7 +703,7 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest extends
for (int count = 0; count < AsyncInvocationArrSize; count++) {
if (async[count].exceptionOccurred()) {
- fail("exception during " + count, async[count].getException());
+ Assert.fail("exception during " + count, async[count].getException());
}
}
}
@@ -747,7 +748,7 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest extends
for (int count = 0; count < AsyncInvocationArrSize; count++) {
if (async[count].exceptionOccurred()) {
- fail("exception during " + count, async[count].getException());
+ Assert.fail("exception during " + count, async[count].getException());
}
}
}
@@ -826,7 +827,7 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest extends
for (int count = 0; count < 4; count++) {
if (async[count].exceptionOccurred()) {
- fail("got exception on " + count, async[count].getException());
+ Assert.fail("got exception on " + count, async[count].getException());
}
}
@@ -888,7 +889,7 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest extends
for (int count = 0; count < AsyncInvocationArrSize; count++) {
if (async[count].exceptionOccurred()) {
- fail("Validation of bucket distribution failed on " + count,
+ Assert.fail("Validation of bucket distribution failed on " + count,
async[count].getException());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheCloseDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheCloseDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheCloseDUnitTest.java
index d458947..b7cb178 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheCloseDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheCloseDUnitTest.java
@@ -27,6 +27,7 @@ import com.gemstone.gemfire.cache.PartitionAttributesFactory;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+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;
@@ -129,7 +130,7 @@ public class PartitionedRegionCacheCloseDUnitTest extends
DistributedTestCase.join(async1, 30 * 1000, getLogWriter());
if(async0.exceptionOccurred()) {
- fail("Exception during async0", async0.getException());
+ Assert.fail("Exception during async0", async0.getException());
}
// Here we would close cache on one of the vms.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCreationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCreationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCreationDUnitTest.java
index 367782a..1701a73 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCreationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCreationDUnitTest.java
@@ -34,9 +34,11 @@ import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
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.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -126,7 +128,7 @@ public class PartitionedRegionCreationDUnitTest extends
for (int count = 0; count < AsyncInvocationArrSize; count++) {
if (async[count].exceptionOccurred()) {
- fail("exception during " + count, async[count].getException());
+ Assert.fail("exception during " + count, async[count].getException());
}
}
@@ -257,7 +259,7 @@ public class PartitionedRegionCreationDUnitTest extends
for (int count = 0; count < AsyncInvocationArrSize; count++) {
if (async[count].exceptionOccurred()) {
- fail("exception during " + count, async[count].getException());
+ Assert.fail("exception during " + count, async[count].getException());
}
}
@@ -443,7 +445,7 @@ public class PartitionedRegionCreationDUnitTest extends
for (int count = 0; count < 4; count++) {
if (async[count].exceptionOccurred()) {
- fail("exception during " + count, async[count].getException());
+ Assert.fail("exception during " + count, async[count].getException());
}
}
@@ -459,7 +461,7 @@ public class PartitionedRegionCreationDUnitTest extends
for (int count = 4; count < AsyncInvocationArrSize; count++) {
if (async[count].exceptionOccurred()) {
- fail("exception during " + count, async[count].getException());
+ Assert.fail("exception during " + count, async[count].getException());
}
}
getLogWriter().info("*****INITIALIZATION TEST ENDED*****");
@@ -499,7 +501,7 @@ public class PartitionedRegionCreationDUnitTest extends
for (int count = 0; count < 4; count++) {
if (async[count].exceptionOccurred()) {
- fail("exception during " + count, async[count].getException());
+ Assert.fail("exception during " + count, async[count].getException());
}
}
@@ -519,7 +521,7 @@ public class PartitionedRegionCreationDUnitTest extends
for (int count = 4; count < AsyncInvocationArrSize; count++) {
if (async[count].exceptionOccurred()) {
- fail("exception during " + count, async[count].getException());
+ Assert.fail("exception during " + count, async[count].getException());
}
}
getLogWriter().info("*****REGISTRATION TEST ENDED*****");
@@ -532,7 +534,7 @@ public class PartitionedRegionCreationDUnitTest extends
*/
public void testPartitionRegionPersistenceConflicts() throws Throwable
{
- addExpectedException("IllegalStateException");
+ IgnoredException.addExpectedException("IllegalStateException");
final String name = getUniqueName();
// Cache cache = getCache();
Host host = Host.getHost(0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
index 1d89967..acd6bc9 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
@@ -26,6 +26,7 @@ import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.internal.cache.control.InternalResourceManager;
import com.gemstone.gemfire.internal.cache.control.InternalResourceManager.ResourceObserverAdapter;
+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;
@@ -156,7 +157,7 @@ public class PartitionedRegionDelayedRecoveryDUnitTest extends CacheTestCase {
fail("Redundancy recovery did not happen within 60 seconds");
}
} catch (InterruptedException e) {
- fail("interrupted", e);
+ Assert.fail("interrupted", e);
} finally {
InternalResourceManager.setResourceObserver(null);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDestroyDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDestroyDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDestroyDUnitTest.java
index 4733fff..6f4e20d 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDestroyDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDestroyDUnitTest.java
@@ -28,6 +28,7 @@ import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.RegionDestroyedException;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+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;
@@ -166,7 +167,7 @@ public class PartitionedRegionDestroyDUnitTest extends
DistributedTestCase.join(async1, 30 * 1000, getLogWriter());
if(async1.exceptionOccurred()) {
- fail("async1 failed", async1.getException());
+ Assert.fail("async1 failed", async1.getException());
}
final String expectedExceptions = "com.gemstone.gemfire.distributed.internal.ReplyException";
addExceptionTag(expectedExceptions);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionEntryCountDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionEntryCountDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionEntryCountDUnitTest.java
index dbaa433..985656d 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionEntryCountDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionEntryCountDUnitTest.java
@@ -23,6 +23,7 @@ import com.gemstone.gemfire.cache.EvictionAttributes;
import com.gemstone.gemfire.cache.PartitionAttributesFactory;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.cache30.CacheTestCase;
+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;
@@ -85,7 +86,7 @@ public class PartitionedRegionEntryCountDUnitTest extends CacheTestCase {
assertNotNull(pr);
}
catch (final CacheException ex) {
- fail("While creating Partitioned region", ex);
+ Assert.fail("While creating Partitioned region", ex);
}
}
};
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionEvictionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionEvictionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionEvictionDUnitTest.java
index 5fe0b45..48972c6 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionEvictionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionEvictionDUnitTest.java
@@ -46,6 +46,7 @@ import com.gemstone.gemfire.internal.cache.control.HeapMemoryMonitor;
import com.gemstone.gemfire.internal.cache.control.InternalResourceManager.ResourceType;
import com.gemstone.gemfire.internal.cache.lru.HeapEvictor;
import com.gemstone.gemfire.internal.cache.lru.HeapLRUCapacityController;
+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;
@@ -362,7 +363,7 @@ public class PartitionedRegionEvictionDUnitTest extends CacheTestCase {
assertNotNull(pr);
}
catch (final CacheException ex) {
- fail("While creating Partitioned region", ex);
+ Assert.fail("While creating Partitioned region", ex);
}
}
};
@@ -543,7 +544,7 @@ public class PartitionedRegionEvictionDUnitTest extends CacheTestCase {
assertNotNull(pr);
}
catch (final CacheException ex) {
- fail("While creating Partitioned region", ex);
+ Assert.fail("While creating Partitioned region", ex);
}
}
};
@@ -661,7 +662,7 @@ public class PartitionedRegionEvictionDUnitTest extends CacheTestCase {
assertNotNull(pr);
}
catch (final CacheException ex) {
- fail("While creating Partitioned region", ex);
+ Assert.fail("While creating Partitioned region", ex);
}
}
};
@@ -1723,7 +1724,7 @@ public class PartitionedRegionEvictionDUnitTest extends CacheTestCase {
assertNotNull(pr);
}
catch (final CacheException ex) {
- fail("While creating Partitioned region", ex);
+ Assert.fail("While creating Partitioned region", ex);
}
}
};
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHADUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHADUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHADUnitTest.java
index 9ce79e1..50ec5b9 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHADUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHADUnitTest.java
@@ -36,6 +36,7 @@ import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.internal.cache.control.InternalResourceManager;
import com.gemstone.gemfire.internal.cache.control.InternalResourceManager.ResourceObserver;
import com.gemstone.gemfire.internal.cache.control.InternalResourceManager.ResourceObserverAdapter;
+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;
@@ -102,7 +103,7 @@ public class PartitionedRegionHADUnitTest extends PartitionedRegionDUnitTestCase
}
assertNotNull(partitionedregion);
} catch (InterruptedException e) {
- fail("interrupted",e);
+ Assert.fail("interrupted",e);
} finally {
InternalResourceManager.setResourceObserver(null);
}
@@ -219,7 +220,7 @@ public class PartitionedRegionHADUnitTest extends PartitionedRegionDUnitTestCase
fail("recovery didn't happen in 60 seconds");
}
} catch (InterruptedException e) {
- fail("recovery wait interrupted", e);
+ Assert.fail("recovery wait interrupted", e);
} finally {
InternalResourceManager.setResourceObserver(null);
}
@@ -321,7 +322,7 @@ public class PartitionedRegionHADUnitTest extends PartitionedRegionDUnitTestCase
// async1.join();
if (async0.exceptionOccurred()) {
- fail("async0 failed", async0.getException());
+ Assert.fail("async0 failed", async0.getException());
}
// assertFalse(async1.exceptionOccurred());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHAFailureAndRecoveryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHAFailureAndRecoveryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHAFailureAndRecoveryDUnitTest.java
index 726423d..ca37e1c 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHAFailureAndRecoveryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHAFailureAndRecoveryDUnitTest.java
@@ -32,6 +32,7 @@ import com.gemstone.gemfire.cache30.CertifiableTestCacheListener;
import com.gemstone.gemfire.distributed.DistributedMember;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.NanoTimer;
+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;
@@ -401,7 +402,7 @@ public class PartitionedRegionHAFailureAndRecoveryDUnitTest extends
for (int count2 = 0; count2 < async.length; count2++) {
if (async[count2].exceptionOccurred()) {
- fail("exception during " + count2, async[count2].getException());
+ Assert.fail("exception during " + count2, async[count2].getException());
}
}
}
@@ -491,7 +492,7 @@ public class PartitionedRegionHAFailureAndRecoveryDUnitTest extends
TimeUnit.MILLISECONDS.sleep(250);
}
catch (InterruptedException e) {
- fail("Interrupted, ah!", e);
+ Assert.fail("Interrupted, ah!", e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionMultipleDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionMultipleDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionMultipleDUnitTest.java
index 6ace0a5..74b7d42 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionMultipleDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionMultipleDUnitTest.java
@@ -20,6 +20,7 @@ import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheException;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+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;
@@ -243,7 +244,7 @@ public class PartitionedRegionMultipleDUnitTest extends
for (int count = 0; count < AsyncInvocationArrSize; count++) {
if (async[count].exceptionOccurred()) {
- fail("exception during " + count, async[count].getException());
+ Assert.fail("exception during " + count, async[count].getException());
}
}
@@ -303,7 +304,7 @@ public class PartitionedRegionMultipleDUnitTest extends
for (int count = 0; count < AsyncInvocationArrSize; count++) {
if (async[count].exceptionOccurred()) {
- fail("exception during " + count, async[count].getException());
+ Assert.fail("exception during " + count, async[count].getException());
}
}
}
@@ -339,7 +340,7 @@ public class PartitionedRegionMultipleDUnitTest extends
for (int count = 0; count < AsyncInvocationArrSize; count++) {
if (async[count].exceptionOccurred()) {
- fail("exception during " + count, async[count].getException());
+ Assert.fail("exception during " + count, async[count].getException());
}
}
}
@@ -372,7 +373,7 @@ public class PartitionedRegionMultipleDUnitTest extends
for (int count = 0; count < AsyncInvocationArrSize; count++) {
if (async[count].exceptionOccurred()) {
- fail("Failed due to exception: "+ async[count].getException(),
+ Assert.fail("Failed due to exception: "+ async[count].getException(),
async[count].getException());
}
}
@@ -411,7 +412,7 @@ public class PartitionedRegionMultipleDUnitTest extends
for (int count = 0; count < AsyncInvocationArrSize; count++) {
if (async[count].exceptionOccurred()) {
- fail("exception during " + count, async[count].getException());
+ Assert.fail("exception during " + count, async[count].getException());
}
}
}
@@ -545,7 +546,7 @@ public class PartitionedRegionMultipleDUnitTest extends
for (int count = 0; count < AsyncInvocationArrSize; count++) {
DistributedTestCase.join(async[count], 30 * 1000, getLogWriter());
if (async[count].exceptionOccurred()) {
- fail("exception during " + count, async[count].getException());
+ Assert.fail("exception during " + count, async[count].getException());
}
}
@@ -591,7 +592,7 @@ public class PartitionedRegionMultipleDUnitTest extends
for (int count = 0; count < AsyncInvocationArrSize; count++) {
if (async[count].exceptionOccurred()) {
- fail("exception during " + count, async[count].getException());
+ Assert.fail("exception during " + count, async[count].getException());
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionPRIDDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionPRIDDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionPRIDDUnitTest.java
index 496026d..dc88914 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionPRIDDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionPRIDDUnitTest.java
@@ -23,6 +23,7 @@ import java.util.*;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache30.*;
+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;
@@ -121,7 +122,7 @@ public class PartitionedRegionPRIDDUnitTest extends
for (int count = 0; count < AsyncInvocationArrSize; count++) {
if (async[count].exceptionOccurred()) {
- fail("VM " + count
+ Assert.fail("VM " + count
+ " encountered this exception during async invocation",
async[count].getException());
}
@@ -238,7 +239,7 @@ public class PartitionedRegionPRIDDUnitTest extends
for (int i = 0; i < numNodes; i++) {
if (async[i].exceptionOccurred()) {
- fail("VM " + i
+ Assert.fail("VM " + i
+ " encountered this exception during async invocation",
async[i].getException());
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionQueryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionQueryDUnitTest.java
index b4af7d1..171a889 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionQueryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionQueryDUnitTest.java
@@ -58,6 +58,7 @@ import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.partitioned.QueryMessage;
import com.gemstone.gemfire.pdx.JSONFormatter;
+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;
@@ -295,7 +296,7 @@ public class PartitionedRegionQueryDUnitTest extends CacheTestCase {
9 })), results.asSet());
} catch (Exception e) {
- fail("Bad query", e);
+ Assert.fail("Bad query", e);
}
}
});
@@ -367,7 +368,7 @@ public class PartitionedRegionQueryDUnitTest extends CacheTestCase {
9 })), results.asSet());
} catch (Exception e) {
- fail("Bad query", e);
+ Assert.fail("Bad query", e);
}
}
});
@@ -438,7 +439,7 @@ public class PartitionedRegionQueryDUnitTest extends CacheTestCase {
9 })), results.asSet());
} catch (Exception e) {
- fail("Bad query", e);
+ Assert.fail("Bad query", e);
}
}
});
@@ -510,7 +511,7 @@ public class PartitionedRegionQueryDUnitTest extends CacheTestCase {
9 })), results.asSet());
} catch (Exception e) {
- fail("Bad query", e);
+ Assert.fail("Bad query", e);
}
}
});
@@ -582,7 +583,7 @@ public class PartitionedRegionQueryDUnitTest extends CacheTestCase {
9 })), results.asSet());
} catch (Exception e) {
- fail("Bad query", e);
+ Assert.fail("Bad query", e);
}
}
});
@@ -655,7 +656,7 @@ public class PartitionedRegionQueryDUnitTest extends CacheTestCase {
9 })), results.asSet());
} catch (Exception e) {
- fail("Bad query", e);
+ Assert.fail("Bad query", e);
}
}
});
@@ -727,7 +728,7 @@ public class PartitionedRegionQueryDUnitTest extends CacheTestCase {
9 })), results.asSet());
} catch (Exception e) {
- fail("Bad query", e);
+ Assert.fail("Bad query", e);
}
}
});
@@ -798,7 +799,7 @@ public class PartitionedRegionQueryDUnitTest extends CacheTestCase {
9 })), results.asSet());
} catch (Exception e) {
- fail("Bad query", e);
+ Assert.fail("Bad query", e);
}
}
});
@@ -953,7 +954,7 @@ public class PartitionedRegionQueryDUnitTest extends CacheTestCase {
try {
qs = getCache().getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
for (int i = 0; i < queries.length; i++) {
@@ -962,7 +963,7 @@ public class PartitionedRegionQueryDUnitTest extends CacheTestCase {
assertTrue("Size of resultset should be greater than 0 for query: "
+ queries[i], sr.size() > 0);
} catch (Exception e) {
- fail("Failed executing query ", e);
+ Assert.fail("Failed executing query ", e);
}
}
return null;
@@ -1004,7 +1005,7 @@ public class PartitionedRegionQueryDUnitTest extends CacheTestCase {
SelectResults results = (SelectResults) query.execute();
assertEquals(new HashSet(Arrays.asList(new Integer[] { 1, 2, 3 ,4, 5, 6, 7, 8, 9 })), results.asSet());
} catch (Exception e) {
- fail("Bad query", e);
+ Assert.fail("Bad query", e);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java
index e5e238e..1d57733 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java
@@ -65,9 +65,11 @@ import com.gemstone.gemfire.internal.cache.execute.data.CustId;
import com.gemstone.gemfire.internal.cache.execute.data.OrderId;
import com.gemstone.gemfire.internal.cache.execute.data.ShipmentId;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
+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.VM;
public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
@@ -104,7 +106,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
public void setUp() throws Exception {
super.setUp();
- addExpectedException("Connection refused");
+ IgnoredException.addExpectedException("Connection refused");
Host host = Host.getHost(0);
member0 = host.getVM(0);
member1 = host.getVM(1);
@@ -186,7 +188,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
server.start();
}
catch (IOException e) {
- fail("Failed to start server ", e);
+ Assert.fail("Failed to start server ", e);
}
PartitionAttributesFactory paf = new PartitionAttributesFactory();
@@ -805,7 +807,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
public void testMetadataFetchOnlyThroughFunctions() {
//Workaround for 52004
- addExpectedException("InternalFunctionInvocationTargetException");
+ IgnoredException.addExpectedException("InternalFunctionInvocationTargetException");
Integer port0 = (Integer)member0.invoke(
PartitionedRegionSingleHopDUnitTest.class, "createServer",
new Object[] { 3, 4 });
@@ -1404,7 +1406,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
server.start();
}
catch (IOException e) {
- fail("Failed to start server ", e);
+ Assert.fail("Failed to start server ", e);
}
PartitionAttributesFactory paf = new PartitionAttributesFactory();
@@ -1474,7 +1476,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
server.start();
}
catch (IOException e) {
- fail("Failed to start server ", e);
+ Assert.fail("Failed to start server ", e);
}
PartitionAttributesFactory paf = new PartitionAttributesFactory();
@@ -1616,7 +1618,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
server.start();
}
catch (IOException e) {
- fail("Failed to start server ", e);
+ Assert.fail("Failed to start server ", e);
}
return port;
}
@@ -1699,7 +1701,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
server.start();
}
catch (IOException e) {
- fail("Failed to start server ", e);
+ Assert.fail("Failed to start server ", e);
}
return port;
}
@@ -1714,7 +1716,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
server.start();
}
catch (IOException e) {
- fail("Failed to start server ", e);
+ Assert.fail("Failed to start server ", e);
}
PartitionAttributesFactory paf = new PartitionAttributesFactory();
@@ -1786,7 +1788,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
server.start();
}
catch (IOException e) {
- fail("Failed to start server ", e);
+ Assert.fail("Failed to start server ", e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
index ee256a9..711909d 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
@@ -41,8 +41,10 @@ import com.gemstone.gemfire.internal.cache.execute.data.CustId;
import com.gemstone.gemfire.internal.cache.execute.data.OrderId;
import com.gemstone.gemfire.internal.cache.execute.data.ShipmentId;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
+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.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -115,7 +117,7 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends CacheTes
member1 = host.getVM(1);
member2 = host.getVM(2);
member3 = host.getVM(3);
- addExpectedException("java.net.SocketException");
+ IgnoredException.addExpectedException("java.net.SocketException");
}
public void tearDown2() throws Exception {
@@ -809,7 +811,7 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends CacheTes
server.start();
}
catch (IOException e) {
- fail("Failed to start server ", e);
+ Assert.fail("Failed to start server ", e);
}
PartitionAttributesFactory paf = new PartitionAttributesFactory();
@@ -895,7 +897,7 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends CacheTes
server.start();
}
catch (IOException e) {
- fail("Failed to start server ", e);
+ Assert.fail("Failed to start server ", e);
}
PartitionAttributesFactory paf = new PartitionAttributesFactory();
@@ -981,7 +983,7 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends CacheTes
server.start();
}
catch (IOException e) {
- fail("Failed to start server ", e);
+ Assert.fail("Failed to start server ", e);
}
PartitionAttributesFactory paf = new PartitionAttributesFactory();
@@ -1350,7 +1352,7 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends CacheTes
server.start();
}
catch (IOException e) {
- fail("Failed to start server ", e);
+ Assert.fail("Failed to start server ", e);
}
PartitionAttributesFactory paf = new PartitionAttributesFactory();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSizeDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSizeDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSizeDUnitTest.java
index c4c9796..735acfd 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSizeDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSizeDUnitTest.java
@@ -31,6 +31,7 @@ import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.OSProcess;
import com.gemstone.gemfire.internal.logging.InternalLogWriter;
+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;
@@ -237,7 +238,7 @@ public class PartitionedRegionSizeDUnitTest extends
DistributedTestCase.join(async0, 30 * 1000, getLogWriter());
if (async0.exceptionOccurred()) {
- fail("Exception during async0", async0.getException());
+ Assert.fail("Exception during async0", async0.getException());
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionStatsDUnitTest.java
index fe2a104..79b0ec8 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionStatsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionStatsDUnitTest.java
@@ -30,6 +30,7 @@ import com.gemstone.gemfire.cache.control.RebalanceOperation;
import com.gemstone.gemfire.cache.control.RebalanceResults;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.distributed.DistributedSystem;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -358,7 +359,7 @@ public class PartitionedRegionStatsDUnitTest extends
try {
RebalanceResults results = op.getResults();
} catch (Exception e) {
- fail("ex", e);
+ Assert.fail("ex", e);
}
}
};
@@ -406,7 +407,7 @@ public class PartitionedRegionStatsDUnitTest extends
RebalanceResults results = op.getResults();
}
catch (Exception e) {
- fail("ex", e);
+ Assert.fail("ex", e);
}
}
};
@@ -541,7 +542,7 @@ public class PartitionedRegionStatsDUnitTest extends
try {
tombstoneService.forceBatchExpirationForTests(1);
} catch (InterruptedException e) {
- fail("interrupted", e);
+ Assert.fail("interrupted", e);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
index 7840a2b..0b73af0 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
@@ -36,6 +36,7 @@ import com.gemstone.gemfire.cache.PartitionAttributesFactory;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.distributed.DistributedMember;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.VM;
@@ -97,9 +98,9 @@ public class PartitionedRegionTestUtilsDUnitTest extends
assertNotNull(s);
assertTrue(s.isEmpty());
} catch (ClassNotFoundException cnfe) {
- fail("GetSomeKeys failed with ClassNotFoundException", cnfe);
+ Assert.fail("GetSomeKeys failed with ClassNotFoundException", cnfe);
} catch (IOException ioe) {
- fail("GetSomeKeys failed with IOException", ioe);
+ Assert.fail("GetSomeKeys failed with IOException", ioe);
}
}
@@ -127,9 +128,9 @@ public class PartitionedRegionTestUtilsDUnitTest extends
assertTrue(val.intValue() < MAXKEYS);
}
} catch (ClassNotFoundException cnfe) {
- fail("GetSomeKeys failed with ClassNotFoundException", cnfe);
+ Assert.fail("GetSomeKeys failed with ClassNotFoundException", cnfe);
} catch (IOException ioe) {
- fail("GetSomeKeys failed with IOException", ioe);
+ Assert.fail("GetSomeKeys failed with IOException", ioe);
}
}
}
@@ -513,7 +514,7 @@ public class PartitionedRegionTestUtilsDUnitTest extends
assertEquals(0, p.getBucketOwnersForValidation(i).size());
}
} catch (ForceReattemptException noGood) {
- fail("Unexpected force retry", noGood);
+ Assert.fail("Unexpected force retry", noGood);
}
}
}
@@ -562,7 +563,7 @@ public class PartitionedRegionTestUtilsDUnitTest extends
assertEquals(1, primCount);
}
} catch (ForceReattemptException noGood) {
- fail("Unexpected force retry", noGood);
+ Assert.fail("Unexpected force retry", noGood);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionWithSameNameDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionWithSameNameDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionWithSameNameDUnitTest.java
index 55d9a82..b6ad72d 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionWithSameNameDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionWithSameNameDUnitTest.java
@@ -37,6 +37,7 @@ import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.RegionExistsException;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -754,7 +755,7 @@ public class PartitionedRegionWithSameNameDUnitTest extends
cache.createRegion(innerPrPrefix + i, ra);
}
catch (RegionExistsException ex) {
- fail(
+ Assert.fail(
"Got incorrect exception because the partition region being created prior to local region",
ex);
}
[21/50] [abbrv] incubator-geode git commit: adding a unit test to
ensure that WAN servers aren't reported as cache-servers to clients
Posted by kl...@apache.org.
adding a unit test to ensure that WAN servers aren't reported as cache-servers to clients
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f13bf0c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f13bf0c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f13bf0c1
Branch: refs/heads/feature/GEODE-773-2
Commit: f13bf0c1d707955567b47d40eb64bddbfcc82da5
Parents: 4a6b0dd
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Thu Jan 28 14:27:18 2016 -0800
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Thu Jan 28 14:27:18 2016 -0800
----------------------------------------------------------------------
.../distributed/internal/ServerLocator.java | 2 +-
.../SerialGatewaySenderOperationsDUnitTest.java | 52 ++++++++++++++++++++
2 files changed, 53 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f13bf0c1/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/ServerLocator.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/ServerLocator.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/ServerLocator.java
index f7fea72..644bf63 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/ServerLocator.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/ServerLocator.java
@@ -164,7 +164,7 @@ public class ServerLocator implements TcpHandler, DistributionAdvisee {
return this.ds != null;
}
- public Object processRequest(Object request) throws IOException {
+ public Object processRequest(Object request) {
if (!readyToProcessRequests()) {
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f13bf0c1/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
index 7f4535e..fe113a2 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
@@ -16,17 +16,26 @@
*/
package com.gemstone.gemfire.internal.cache.wan.serial;
+import java.util.HashSet;
import java.util.Set;
import org.junit.Ignore;
import com.gemstone.gemfire.cache.RegionDestroyedException;
+import com.gemstone.gemfire.cache.client.internal.locator.QueueConnectionRequest;
+import com.gemstone.gemfire.cache.client.internal.locator.QueueConnectionResponse;
import com.gemstone.gemfire.cache.wan.GatewaySender;
+import com.gemstone.gemfire.distributed.Locator;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.distributed.internal.InternalLocator;
+import com.gemstone.gemfire.distributed.internal.ServerLocator;
+import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
import com.gemstone.gemfire.internal.cache.wan.GatewaySenderException;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
import com.gemstone.gemfire.test.dunit.RMIException;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
/**
@@ -545,6 +554,49 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
vm2.invoke(() -> WANTestBase.validateRegionSize(
testName + "_RR", 10 ));
}
+
+
+ public void testGatewaySenderNotRegisteredAsCacheServer() {
+ Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+ "createFirstLocatorWithDSId", new Object[] { 1 });
+ Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+ "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+ vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+ vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+ vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+ vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+ vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+ false, 100, 10, false, true, null, true });
+ vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+ false, 100, 10, false, true, null, true });
+
+ vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+ vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+ SerializableRunnable check = new SerializableRunnable("assert no cache servers") {
+ public void run() {
+ InternalLocator inl = (InternalLocator)Locator.getLocator();
+ ServerLocator servel = inl.getServerLocatorAdvisee();
+ getLogWriter().info("Server load map is " + servel.getLoadMap());
+ assertTrue("expected an empty map but found " + servel.getLoadMap(),
+ servel.getLoadMap().isEmpty());
+ QueueConnectionRequest request = new QueueConnectionRequest(
+ ClientProxyMembershipID.getNewProxyMembership(InternalDistributedSystem.getConnectedInstance()),
+ 1, new HashSet<>(), "", false);
+ QueueConnectionResponse response = (QueueConnectionResponse)servel.processRequest(request);
+ assertTrue("expected no servers but found " + response.getServers(),
+ response.getServers().isEmpty());
+ }
+ };
+ vm0.invoke(check);
+ vm1.invoke(check);
+
+ }
+
+
public static void verifySenderPausedState(String senderId) {
Set<GatewaySender> senders = cache.getGatewaySenders();
[11/50] [abbrv] incubator-geode git commit: GEODE-865: CI Failure:
ConcurrentParallelGatewaySenderOperation_2_DUnitTest.testParallelGatewaySenders_SingleNode_UserPR_localDestroy_RecreateRegion
Posted by kl...@apache.org.
GEODE-865: CI Failure: ConcurrentParallelGatewaySenderOperation_2_DUnitTest.testParallelGatewaySenders_SingleNode_UserPR_localDestroy_RecreateRegion
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/68a85fed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/68a85fed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/68a85fed
Branch: refs/heads/feature/GEODE-773-2
Commit: 68a85fed991d7ebd9519c0f77b5b5b564b965a56
Parents: 09bd530
Author: Barry Oglesby <bo...@pivotal.io>
Authored: Tue Jan 26 13:43:21 2016 -0800
Committer: Barry Oglesby <bo...@pivotal.io>
Committed: Wed Jan 27 18:02:19 2016 -0800
----------------------------------------------------------------------
.../gemfire/internal/cache/wan/WANTestBase.java | 14 +-
...allelGatewaySenderOperation_2_DUnitTest.java | 841 +++++--------------
2 files changed, 234 insertions(+), 621 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/68a85fed/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
index 0c32d1f..3dd4742 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
@@ -2395,7 +2395,7 @@ public class WANTestBase extends DistributedTestCase{
public static void createConcurrentSender(String dsName, int remoteDsId,
boolean isParallel, Integer maxMemory, Integer batchSize,
boolean isConflation, boolean isPersistent, GatewayEventFilter filter,
- boolean isManulaStart, int concurrencyLevel, OrderPolicy policy) {
+ boolean isManualStart, int concurrencyLevel, OrderPolicy policy) {
File persistentDirectory = new File(dsName + "_disk_"
+ System.currentTimeMillis() + "_" + VM.getCurrentVMNum());
@@ -2408,7 +2408,7 @@ public class WANTestBase extends DistributedTestCase{
gateway.setParallel(true);
gateway.setMaximumQueueMemory(maxMemory);
gateway.setBatchSize(batchSize);
- gateway.setManualStart(isManulaStart);
+ gateway.setManualStart(isManualStart);
((InternalGatewaySenderFactory) gateway)
.setLocatorDiscoveryCallback(new MyLocatorCallback());
if (filter != null) {
@@ -2430,7 +2430,7 @@ public class WANTestBase extends DistributedTestCase{
GatewaySenderFactory gateway = cache.createGatewaySenderFactory();
gateway.setMaximumQueueMemory(maxMemory);
gateway.setBatchSize(batchSize);
- gateway.setManualStart(isManulaStart);
+ gateway.setManualStart(isManualStart);
((InternalGatewaySenderFactory) gateway)
.setLocatorDiscoveryCallback(new MyLocatorCallback());
if (filter != null) {
@@ -4825,7 +4825,13 @@ public class WANTestBase extends DistributedTestCase{
}
}
}
-
+
+ protected Integer[] createLNAndNYLocators() {
+ Integer lnPort = (Integer) vm0.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer nyPort = (Integer) vm1.invoke(() -> createFirstRemoteLocator(2, lnPort));
+ return new Integer[] { lnPort, nyPort };
+ }
+
public static class MyLocatorCallback extends
LocatorDiscoveryCallbackAdapter {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/68a85fed/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
index f770062..694fc1f 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
@@ -23,6 +23,8 @@ import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.VM;
+
/**
* @author skumar
*
@@ -46,239 +48,75 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
// to test that when userPR is locally destroyed, shadow Pr is also locally
// destroyed and on recreation usrePr , shadow Pr is also recreated.
public void testParallelGatewaySender_SingleNode_UserPR_localDestroy_RecreateRegion() throws Exception {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
+ Integer[] locatorPorts = createLNAndNYLocators();
+ Integer lnPort = locatorPorts[0];
+ Integer nyPort = locatorPorts[1];
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
try {
- vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
- "ln", 2, true, 100, 10, false, false, null, false, 5, OrderPolicy.KEY });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
-
- getLogWriter().info("Created PRs on local site");
-
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 10, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
- 10 });
-
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
+ createAndStartSender(vm4, lnPort, 5, false, true);
- // since sender is paused, no dispatching
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 0 });
+ createReceiverAndDoPutsInPausedSender(nyPort);
- vm4.invoke(WANTestBase.class, "localDestroyRegion",
- new Object[] { testName + "_PR" });
+ vm4.invoke(() -> localDestroyRegion(testName + "_PR"));
- // since shodowPR is locally destroyed, so no data to dispatch
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 0 });
-
- vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
- testName + "_PR", 10, 20 });
-
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
-
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
+ recreatePRDoPutsAndValidateRegionSizes(0, true);
} finally {
- vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+ vm4.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
}
}
public void testParallelGatewaySender_SingleNode_UserPR_Destroy_RecreateRegion() throws Exception {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
+ Integer[] locatorPorts = createLNAndNYLocators();
+ Integer lnPort = locatorPorts[0];
+ Integer nyPort = locatorPorts[1];
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
try {
- vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
+ createAndStartSender(vm4, lnPort, 4, false, true);
- vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
- "ln", 2, true, 100, 10, false, false, null, false, 4, OrderPolicy.KEY });
+ createReceiverAndDoPutsInPausedSender(nyPort);
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+ vm4.invoke(() -> resumeSender("ln"));
- vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+ vm4.invoke(() -> validateParallelSenderQueueAllBucketsDrained("ln"));
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
-
- getLogWriter().info("Created PRs on local site");
+ vm4.invoke(() -> localDestroyRegion(testName + "_PR"));
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 10, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
- 10 });
-
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
-
- // since resume is paused, no dispatching
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 0 });
-
- vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+ recreatePRDoPutsAndValidateRegionSizes(10, false);
+ } finally {
+ vm4.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
+ }
+ }
- vm4.invoke(WANTestBase.class, "destroyRegion", new Object[] { testName
- + "_PR" });
+ public void testParallelGatewaySender_SingleNode_UserPR_Close_RecreateRegion() throws Exception {
+ Integer[] locatorPorts = createLNAndNYLocators();
+ Integer lnPort = locatorPorts[0];
+ Integer nyPort = locatorPorts[1];
- // before destoy, there is wait for queue to drain, so data will be
- // dispatched
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
+ createAndStartSender(vm4, lnPort, 7, false, true);
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
+ createReceiverAndDoPutsInPausedSender(nyPort);
- vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
- testName + "_PR", 10, 20 });
+ vm4.invoke(() -> closeRegion(testName + "_PR"));
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
+ vm4.invoke(() -> resumeSender("ln"));
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 20 });
- } finally {
- vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
- }
- }
-
-
- public void testParallelGatewaySender_SingleNode_UserPR_Close_RecreateRegion() throws Exception {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
+ pause(500); //paused if there is any element which is received on remote site
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+ recreatePRDoPutsAndValidateRegionSizes(0, false);
- vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class, "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME", new Object[] { lnPort });
-
- getLogWriter().info("Created cache on local site");
-
- getLogWriter().info("Created senders on local site");
-
- vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, false, 7, OrderPolicy.KEY });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap()});
-
- getLogWriter().info("Created PRs on local site");
-
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 10, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 10 });
-
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
-
- //since resume is paused, no dispatching
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 0 });
-
- vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class, "closeRegion", new Object[] { testName + "_PR" });
-
- vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-
- pause(500); //paused if there is any element which is received on remote site
-
- //before close, there is wait for queue to drain, so data will be dispatched
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 0 });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] { testName + "_PR", 10, 20 });
-
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
-
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
-
- vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+ vm4.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
}
//to test that while localDestroy is in progress, put operation does not successed
public void testParallelGatewaySender_SingleNode_UserPR_localDestroy_SimultenuousPut_RecreateRegion() throws Exception {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+ Integer[] locatorPorts = createLNAndNYLocators();
+ Integer lnPort = locatorPorts[0];
+ Integer nyPort = locatorPorts[1];
try {
- vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
-
- getLogWriter().info("Created cache on local site");
+ createAndStartSender(vm4, lnPort, 5, false, true);
- getLogWriter().info("Created senders on local site");
-
- vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
- "ln", 2, true, 100, 10, false, false, null, false, 5, OrderPolicy.KEY });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
-
- getLogWriter().info("Created PRs on local site");
-
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 10, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
- 10 });
-
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
-
- // since resume is paused, no dispatching
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 0 });
+ createReceiverAndDoPutsInPausedSender(nyPort);
AsyncInvocation putAsync = vm4.invokeAsync(WANTestBase.class,
"doPutsFrom", new Object[] { testName + "_PR", 100, 2000 });
@@ -302,73 +140,30 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
putAsync.getException());
}
- vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+ vm4.invoke(() -> resumeSender("ln"));
pause(500); // paused if there is any element which is received on remote
// site
- // since shodowPR is locally destroyed, so no data to dispatch
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 0 });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
- testName + "_PR", 10, 20 });
-
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
-
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
+ recreatePRDoPutsAndValidateRegionSizes(0, false);
} finally {
- vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+ vm4.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
}
}
public void testParallelGatewaySender_SingleNode_UserPR_Destroy_SimultenuousPut_RecreateRegion() throws Exception {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+ Integer[] locatorPorts = createLNAndNYLocators();
+ Integer lnPort = locatorPorts[0];
+ Integer nyPort = locatorPorts[1];
try {
- vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
- "ln", 2, true, 100, 10, false, false, null, false, 6, OrderPolicy.KEY });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
- vm4.invoke(WANTestBase.class, "addCacheListenerAndDestroyRegion", new Object[] {
- testName + "_PR"});
-
- getLogWriter().info("Created PRs on local site");
-
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 10, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
- 10 });
+ createAndStartSender(vm4, lnPort, 6, false, true);
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
+ vm4.invoke(() -> addCacheListenerAndDestroyRegion(testName + "_PR"));
- // since resume is paused, no dispatching
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 0 });
+ createReceiverAndDoPutsInPausedSender(nyPort);
- vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+ vm4.invoke(() -> resumeSender("ln"));
AsyncInvocation putAsync = vm4.invokeAsync(WANTestBase.class,
"doPutsFrom", new Object[] { testName + "_PR", 10, 101 });
@@ -387,27 +182,18 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
// before destroy, there is wait for queue to drain, so data will be
// dispatched
- vm2.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "validateRegionSizeWithinRange", new Object[] { testName + "_PR", 10,
- 101 }); // possible size is more than 10
+ vm2.invoke(() -> validateRegionSizeWithinRange(testName + "_PR", 10, 101)); // possible size is more than 10
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
+ vm4.invoke(() -> createPartitionedRegion(testName + "_PR", "ln", 1, 10, isOffHeap()));
- vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
- testName + "_PR", 10, 20 });
+ vm4.invoke(() -> doPutsFrom(testName + "_PR", 10, 20));
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
+ vm4.invoke(() -> validateRegionSize(testName + "_PR", 10));
- vm2.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "validateRegionSizeWithinRange", new Object[] { testName + "_PR", 20,
- 101 });// possible size is more than 20
+ vm2.invoke(() -> validateRegionSizeWithinRange(testName + "_PR", 20, 101)); // possible size is more than 20
} finally {
- vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+ vm4.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
}
-
}
public void testParallelGatewaySender_SingleNode_UserPR_Destroy_NodeDown()
@@ -415,60 +201,16 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
addExpectedException("Broken pipe");
addExpectedException("Connection reset");
addExpectedException("Unexpected IOException");
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+ Integer[] locatorPorts = createLNAndNYLocators();
+ Integer lnPort = locatorPorts[0];
+ Integer nyPort = locatorPorts[1];
try {
- vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
- vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
- vm6.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
- "ln", 2, true, 100, 10, false, false, null, false, 5, OrderPolicy.KEY });
- vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
- "ln", 2, true, 100, 10, false, false, null, false, 5, OrderPolicy.KEY });
- vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
- "ln", 2, true, 100, 10, false, false, null, false, 5, OrderPolicy.KEY });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
- vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
- vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
-
- getLogWriter().info("Created PRs on local site");
-
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 10, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
- 10000 });
+ createAndStartSender(vm4, lnPort, 5, false, true);
+ createAndStartSender(vm5, lnPort, 5, false, true);
+ createAndStartSender(vm6, lnPort, 5, false, true);
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10000 });
-
- // since resume is paused, no dispatching
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 0 });
+ createReceiverAndDoPutsInPausedSender(nyPort);
vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
@@ -488,60 +230,24 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
fail("Interrupted the async invocation.");
}
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10000 });// possible size is more than 20
+ vm2.invoke(() -> validateRegionSize(testName + "_PR", 10));
} finally {
- vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
- vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
- vm6.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+ vm4.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
+ vm5.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
+ vm6.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
}
}
public void testParallelGatewaySender_SingleNode_UserPR_Close_SimultenuousPut_RecreateRegion() throws Exception {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+ Integer[] locatorPorts = createLNAndNYLocators();
+ Integer lnPort = locatorPorts[0];
+ Integer nyPort = locatorPorts[1];
try {
- vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
-
- getLogWriter().info("Created cache on local site");
-
- getLogWriter().info("Created senders on local site");
+ createAndStartSender(vm4, lnPort, 5, false, true);
- vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
- "ln", 2, true, 100, 10, false, false, null, false, 5, OrderPolicy.KEY });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
-
- getLogWriter().info("Created PRs on local site");
-
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 10, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
- 10 });
-
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
-
- // since resume is paused, no dispatching
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 0 });
+ createReceiverAndDoPutsInPausedSender(nyPort);
AsyncInvocation putAsync = vm4.invokeAsync(WANTestBase.class,
"doPutsFrom", new Object[] { testName + "_PR", 10, 2000 });
@@ -556,140 +262,108 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
fail("Interrupted the async invocation.");
}
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 0 });
-
- vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
- testName + "_PR", 10, 20 });
+ recreatePRDoPutsAndValidateRegionSizes(0, true);
+ } finally {
+ vm4.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
+ }
+ }
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
+ private void createReceiverAndDoPutsInPausedSender(int port) {
+ // Note: This is a test-specific method used by several tests to do puts from vm4 to vm2.
+ String regionName = testName + "_PR";
+ vm2.invoke(() -> createReceiver(port));
+ vm2.invoke(() -> createPartitionedRegion(regionName, null, 1, 10, isOffHeap()));
+ vm4.invoke(() -> doPuts(regionName, 10));
+ vm4.invoke(() -> validateRegionSize(regionName, 10));
+ // since sender is paused, no dispatching
+ vm2.invoke(() -> validateRegionSize(regionName, 0));
+ }
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
- } finally {
- vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+ private void recreatePRDoPutsAndValidateRegionSizes(int expectedRegionSize, boolean resumeSender) {
+ // Note: This is a test-specific method used by several test to recreate a partitioned region,
+ // do puts and validate region sizes in vm2 and vm4.
+ // since shadowPR is locally destroyed, so no data to dispatch
+ String regionName = testName + "_PR";
+ vm2.invoke(() -> validateRegionSize(regionName, expectedRegionSize));
+ if (resumeSender) {
+ vm4.invoke(() -> resumeSender("ln"));
}
+ vm4.invoke(() -> createPartitionedRegion(regionName, "ln", 1, 10, isOffHeap()));
+ vm4.invoke(() -> doPutsFrom(regionName, 10, 20));
+ validateRegionSizes(regionName, 10, vm4, vm2);
}
-
+
public void testParallelGatewaySenders_SingleNode_UserPR_localDestroy_RecreateRegion() throws Exception {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
- Integer tkPort = (Integer)vm2.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 3, lnPort });
- Integer pnPort = (Integer)vm3.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 4, lnPort });
-
- vm4.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm5.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
- vm6.invoke(WANTestBase.class, "createReceiver", new Object[] { pnPort });
+ Integer[] locatorPorts = createLNAndNYLocators();
+ Integer lnPort = locatorPorts[0];
+ Integer nyPort = locatorPorts[1];
+ Integer tkPort = (Integer)vm2.invoke(() -> createFirstRemoteLocator(3, lnPort));
+ Integer pnPort = (Integer)vm3.invoke(() -> createFirstRemoteLocator(4, lnPort));
+
+ vm4.invoke(() -> createReceiver(nyPort));
+ vm5.invoke(() -> createReceiver(tkPort));
+ vm6.invoke(() -> createReceiver(pnPort));
try {
- vm7.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
+ vm7.invoke(() -> createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME(lnPort));
getLogWriter().info("Created cache on local site");
- vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
- "ln1", 2, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+ vm7.invoke(() -> createConcurrentSender("ln1", 2, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY));
+ vm7.invoke(() -> createConcurrentSender("ln2", 3, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY));
+ vm7.invoke(() -> createConcurrentSender("ln3", 4, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY));
- vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
- "ln2", 3, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+ vm7.invoke(() -> startSender("ln1"));
+ vm7.invoke(() -> startSender("ln2"));
+ vm7.invoke(() -> startSender("ln3"));
- vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
- "ln3", 4, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+ String regionName = testName + "_PR";
+ vm7.invoke(() -> createPartitionedRegion(regionName, "ln1,ln2,ln3", 1, 10, isOffHeap()));
- vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
- vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln2" });
- vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln3" });
+ getLogWriter().info("Created PRs on local site");
- vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln1,ln2,ln3", 1, 10, isOffHeap() });
+ vm4.invoke(() -> createPartitionedRegion(regionName, null, 1, 10, isOffHeap()));
+ vm5.invoke(() -> createPartitionedRegion(regionName, null, 1, 10, isOffHeap()));
+ vm6.invoke(() -> createPartitionedRegion(regionName, null, 1, 10, isOffHeap()));
- getLogWriter().info("Created PRs on local site");
+ vm7.invoke(() -> doPuts(regionName, 10));
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 10, isOffHeap() });
- vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 10, isOffHeap() });
- vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 10, isOffHeap() });
+ vm7.invoke(() -> validateParallelSenderQueueAllBucketsDrained("ln1"));
+ vm7.invoke(() -> validateParallelSenderQueueAllBucketsDrained("ln2"));
+ vm7.invoke(() -> validateParallelSenderQueueAllBucketsDrained("ln3"));
- vm7.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
- 10 });
- pause(1000);
- vm7.invoke(WANTestBase.class, "localDestroyRegion",
- new Object[] { testName + "_PR" });
+ vm7.invoke(() -> localDestroyRegion(regionName));
- vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln1,ln2,ln3", 1, 10, isOffHeap() });
+ vm7.invoke(() -> createPartitionedRegion(regionName, "ln1,ln2,ln3", 1, 10, isOffHeap()));
- vm7.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
- testName + "_PR", 10, 20 });
+ vm7.invoke(() -> doPutsFrom(regionName, 10, 20));
- vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
+ vm7.invoke(() -> validateRegionSize(regionName, 10));
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 20 });
- vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 20 });
- vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 20 });
+ validateRegionSizes(regionName, 20, vm4, vm5, vm6);
} finally {
- vm7.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+ vm7.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
}
}
public void testParallelGatewaySender_MultipleNode_UserPR_localDestroy_Recreate() throws Exception {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
+ Integer[] locatorPorts = createLNAndNYLocators();
+ Integer lnPort = locatorPorts[0];
+ Integer nyPort = locatorPorts[1];
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+ vm2.invoke(() -> createReceiver(nyPort));
try {
- vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
- vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
- "ln", 2, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
- vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
- "ln", 2, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- getLogWriter().info("Created PRs on local site");
+ createAndStartSender(vm4, lnPort, 5, true, false);
+ createAndStartSender(vm5, lnPort, 5, true, false);
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
+ String regionName = testName + "_PR";
+ vm2.invoke(() -> createPartitionedRegion(regionName, null, 1, 10, isOffHeap()));
AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
- new Object[] { testName + "_PR", 1000 });
+ new Object[] { regionName, 10 });
pause(1000);
- vm5.invoke(WANTestBase.class, "localDestroyRegion",
- new Object[] { testName + "_PR" });
+ vm5.invoke(() -> localDestroyRegion(regionName));
try {
inv1.join();
@@ -698,79 +372,45 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
fail("Interrupted the async invocation.");
}
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 1000 });
-
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 1000 });
- vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
+ validateRegionSizes(regionName, 10, vm4, vm2);
- vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
- testName + "_PR", 1000, 2000 });
+ vm5.invoke(() -> createPartitionedRegion(regionName, "ln", 1, 10, isOffHeap()));
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 2000 });
+ vm4.invoke(() -> doPutsFrom(regionName, 10, 20));
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 2000 });
+ validateRegionSizes(regionName, 20, vm4, vm2);
} finally {
- vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
- vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+ vm4.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
+ vm5.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
}
}
public void testParallelGatewaySenders_MultiplNode_UserPR_localDestroy_Recreate() throws Exception {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
- Integer tkPort = (Integer)vm2.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 3, lnPort });
-
- vm6.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm7.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
-
+ Integer[] locatorPorts = createLNAndNYLocators();
+ Integer lnPort = locatorPorts[0];
+ Integer nyPort = locatorPorts[1];
+ Integer tkPort = (Integer)vm2.invoke(() -> createFirstRemoteLocator(3, lnPort));
+
+ vm6.invoke(() -> createReceiver(nyPort));
+ vm7.invoke(() -> createReceiver(tkPort));
+
try {
- vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
- vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln1,ln2", 1, 100, isOffHeap() });
- vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln1,ln2", 1, 100, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
- "ln1", 2, true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
- vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
- "ln2", 3, true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
- vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
- "ln1", 2, true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
- vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
- "ln2", 3, true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln2" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln2" });
+ createAndStartTwoSenders(vm4, lnPort);
+ createAndStartTwoSenders(vm5, lnPort);
+ String regionName = testName + "_PR";
vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
+ regionName, null, 1, 100, isOffHeap() });
vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
+ regionName, null, 1, 100, isOffHeap() });
AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
- new Object[] { testName + "_PR", 1000 });
+ new Object[] { regionName, 10 });
+
pause(1000);
vm5.invoke(WANTestBase.class, "localDestroyRegion",
- new Object[] { testName + "_PR" });
+ new Object[] { regionName });
try {
inv1.join();
@@ -779,79 +419,52 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
fail("Interrupted the async invocation.");
}
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 1000 });
-
- vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 1000 });
- vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 1000 });
+ validateRegionSizes(regionName, 10, vm4, vm6, vm7);
vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln1,ln2", 1, 100, isOffHeap() });
+ regionName, "ln1,ln2", 1, 100, isOffHeap() });
vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
- testName + "_PR", 1000, 2000 });
+ regionName, 10, 20 });
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 2000 });
-
- vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 2000 });
- vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 2000 });
+ validateRegionSizes(regionName, 20, vm4, vm6, vm7);
} finally {
- vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
- vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+ vm4.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
+ vm5.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
}
}
-
- public void testParallelGatewaySender_ColocatedPartitionedRegions_localDestroy() throws Exception {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+ private void createAndStartTwoSenders(VM vm, int port) {
+ // Note: This is a test-specific method used to create and start 2 senders.
+ vm.invoke(() -> createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME(port));
+ vm.invoke(() -> createPartitionedRegion(testName + "_PR", "ln1,ln2", 1, 100, isOffHeap()));
+ vm.invoke(() -> createConcurrentSender("ln1", 2, true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY));
+ vm.invoke(() -> createConcurrentSender("ln2", 3, true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY));
+ vm.invoke(() -> startSender("ln1"));
+ vm.invoke(() -> startSender("ln2"));
+ }
- try {
- vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
- vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class,
- "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
- "ln", 1, 100, isOffHeap() });
- vm5.invoke(WANTestBase.class,
- "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
- "ln", 1, 100, isOffHeap() });
+ public void testParallelGatewaySender_ColocatedPartitionedRegions_localDestroy() throws Exception {
+ Integer[] locatorPorts = createLNAndNYLocators();
+ Integer lnPort = locatorPorts[0];
+ Integer nyPort = locatorPorts[1];
- vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
- "ln", 2, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
- vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
- "ln", 2, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+ vm2.invoke(() -> createReceiver(nyPort));
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+ try {
+ createAndStartSenderWithCustomerOrderShipmentRegion(vm4, lnPort, 5, true);
+ createAndStartSenderWithCustomerOrderShipmentRegion(vm5, lnPort, 5, true);
getLogWriter().info("Created PRs on local site");
- vm2.invoke(WANTestBase.class,
- "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
- null, 1, 100, isOffHeap() });
+ vm2.invoke(() -> createCustomerOrderShipmentPartitionedRegion(null, null, 1, 100, isOffHeap()));
AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class,
- "putcolocatedPartitionedRegion", new Object[] { 2000 });
+ "putcolocatedPartitionedRegion", new Object[] { 10 });
pause(1000);
try {
- vm5.invoke(WANTestBase.class, "localDestroyRegion",
- new Object[] { customerRegionName });
+ vm5.invoke(() -> localDestroyRegion(customerRegionName));
} catch (Exception ex) {
assertTrue(ex.getCause() instanceof UnsupportedOperationException);
}
@@ -862,51 +475,29 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
fail("Unexpected exception", e);
}
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- customerRegionName, 2000 });
- vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- customerRegionName, 2000 });
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- customerRegionName, 2000 });
+ validateRegionSizes(customerRegionName, 10, vm4, vm5, vm2);
} finally {
- vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
- vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+ vm4.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
+ vm5.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
}
-
}
-
+
+ private void validateRegionSizes(String regionName, int expectedRegionSize, VM... vms) {
+ for (VM vm : vms) {
+ vm.invoke(() -> validateRegionSize(regionName, expectedRegionSize));
+ }
+ }
+
public void testParallelGatewaySender_ColocatedPartitionedRegions_destroy() throws Exception {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
+ Integer[] locatorPorts = createLNAndNYLocators();
+ Integer lnPort = locatorPorts[0];
+ Integer nyPort = locatorPorts[1];
vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
try {
- vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
- vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class,
- "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
- "ln", 1, 100, isOffHeap() });
- vm5.invoke(WANTestBase.class,
- "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
- "ln", 1, 100, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
- "ln", 2, true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY });
- vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
- "ln", 2, true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+ createAndStartSenderWithCustomerOrderShipmentRegion(vm4, lnPort, 6, true);
+ createAndStartSenderWithCustomerOrderShipmentRegion(vm5, lnPort, 6, true);
getLogWriter().info("Created PRs on local site");
@@ -927,13 +518,29 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
}
fail("Excpeted UnsupportedOperationException");
} finally {
- vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
- vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+ vm4.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
+ vm5.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
}
}
-
+
+ private void createAndStartSenderWithCustomerOrderShipmentRegion(VM vm, int port, int concurrencyLevel, boolean manualStart) {
+ vm.invoke(() -> createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME(port));
+ vm.invoke(() -> createCustomerOrderShipmentPartitionedRegion(null, "ln", 1, 100, isOffHeap()));
+ vm.invoke(() -> createConcurrentSender("ln", 2, true, 100, 10, false, false, null, manualStart, concurrencyLevel, OrderPolicy.KEY));
+ vm.invoke(() -> startSender("ln"));
+ }
+
+ private void createAndStartSender(VM vm, int port, int concurrencyLevel, boolean manualStart, boolean pause) {
+ vm.invoke(() -> createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME(port));
+ vm.invoke(() -> createConcurrentSender("ln", 2, true, 100, 10, false, false, null, manualStart, concurrencyLevel, OrderPolicy.KEY));
+ vm.invoke(() -> startSender("ln"));
+ if (pause) {
+ vm.invoke(() -> pauseSender("ln"));
+ }
+ vm.invoke(() -> createPartitionedRegion(testName + "_PR", "ln", 1, 10, isOffHeap()));
+ getLogWriter().info("Created PRs on local site");
+ }
+
public static void createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME(
Integer locPort) {
createCache(false, locPort);
[16/50] [abbrv] incubator-geode git commit: Merge remote-tracking
branch 'origin/wan_cq_donation' into develop
Posted by kl...@apache.org.
Merge remote-tracking branch 'origin/wan_cq_donation' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/46ae4ef5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/46ae4ef5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/46ae4ef5
Branch: refs/heads/feature/GEODE-773-2
Commit: 46ae4ef56d3548de033d3e20ff1e786520528b28
Parents: c01506b 441c29c
Author: Dan Smith <up...@apache.org>
Authored: Thu Jan 28 09:56:14 2016 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Thu Jan 28 09:56:14 2016 -0800
----------------------------------------------------------------------
gemfire-assembly/build.gradle | 10 +
gemfire-cq/build.gradle | 22 +
.../cache/client/internal/CloseCQOp.java | 72 +
.../cache/client/internal/CreateCQOp.java | 163 +
.../cache/client/internal/CreateCQWithIROp.java | 92 +
.../cache/client/internal/GetDurableCQsOp.java | 135 +
.../client/internal/ServerCQProxyImpl.java | 111 +
.../gemfire/cache/client/internal/StopCQOp.java | 72 +
.../cache/query/internal/cq/ClientCQImpl.java | 615 +++
.../internal/cq/CqAttributesMutatorImpl.java | 68 +
.../cache/query/internal/cq/CqConflatable.java | 223 +
.../cache/query/internal/cq/CqEventImpl.java | 162 +
.../cache/query/internal/cq/CqListenerImpl.java | 56 +
.../cache/query/internal/cq/CqQueryImpl.java | 383 ++
.../query/internal/cq/CqServiceFactoryImpl.java | 69 +
.../cache/query/internal/cq/CqServiceImpl.java | 2087 +++++++
.../internal/cq/CqServiceStatisticsImpl.java | 100 +
.../query/internal/cq/CqServiceVsdStats.java | 411 ++
.../query/internal/cq/CqStatisticsImpl.java | 75 +
.../cache/query/internal/cq/ServerCQImpl.java | 655 +++
.../tier/sockets/command/BaseCQCommand.java | 59 +
.../cache/tier/sockets/command/CloseCQ.java | 131 +
.../cache/tier/sockets/command/ExecuteCQ.java | 168 +
.../cache/tier/sockets/command/ExecuteCQ61.java | 220 +
.../cache/tier/sockets/command/GetCQStats.java | 100 +
.../tier/sockets/command/GetDurableCQs.java | 143 +
.../cache/tier/sockets/command/MonitorCQ.java | 100 +
.../cache/tier/sockets/command/StopCQ.java | 135 +
...cache.query.internal.cq.spi.CqServiceFactory | 15 +
.../gemfire/cache/query/cq/CQJUnitTest.java | 150 +
.../cache/query/cq/dunit/CqDataDUnitTest.java | 1162 ++++
.../dunit/CqDataOptimizedExecuteDUnitTest.java | 54 +
.../cq/dunit/CqDataUsingPoolDUnitTest.java | 1567 ++++++
...qDataUsingPoolOptimizedExecuteDUnitTest.java | 53 +
.../cache/query/cq/dunit/CqPerfDUnitTest.java | 1044 ++++
.../cq/dunit/CqPerfUsingPoolDUnitTest.java | 1004 ++++
.../cache/query/cq/dunit/CqQueryDUnitTest.java | 4004 ++++++++++++++
.../dunit/CqQueryOptimizedExecuteDUnitTest.java | 311 ++
.../cq/dunit/CqQueryUsingPoolDUnitTest.java | 3322 +++++++++++
...QueryUsingPoolOptimizedExecuteDUnitTest.java | 50 +
.../cq/dunit/CqResultSetUsingPoolDUnitTest.java | 1139 ++++
...ltSetUsingPoolOptimizedExecuteDUnitTest.java | 231 +
.../cache/query/cq/dunit/CqStateDUnitTest.java | 134 +
.../cache/query/cq/dunit/CqStatsDUnitTest.java | 441 ++
.../dunit/CqStatsOptimizedExecuteDUnitTest.java | 51 +
.../cq/dunit/CqStatsUsingPoolDUnitTest.java | 452 ++
...StatsUsingPoolOptimizedExecuteDUnitTest.java | 51 +
.../query/cq/dunit/CqTimeTestListener.java | 266 +
.../PartitionedRegionCqQueryDUnitTest.java | 1788 ++++++
...dRegionCqQueryOptimizedExecuteDUnitTest.java | 246 +
.../query/cq/dunit/PrCqUsingPoolDUnitTest.java | 2029 +++++++
.../PrCqUsingPoolOptimizedExecuteDUnitTest.java | 50 +
.../cache/query/dunit/PdxQueryCQDUnitTest.java | 702 +++
.../cache/query/dunit/PdxQueryCQTestBase.java | 494 ++
.../dunit/QueryIndexUpdateRIDUnitTest.java | 819 +++
.../query/dunit/QueryMonitorDUnitTest.java | 1296 +++++
.../cache/snapshot/ClientSnapshotDUnitTest.java | 284 +
.../AnalyzeCQSerializablesJUnitTest.java | 79 +
.../cache/PRDeltaPropagationDUnitTest.java | 1212 ++++
.../internal/cache/PutAllCSDUnitTest.java | 4419 +++++++++++++++
.../cache/RemoteCQTransactionDUnitTest.java | 1121 ++++
.../internal/cache/ha/CQListGIIDUnitTest.java | 820 +++
.../cache/ha/HADispatcherDUnitTest.java | 695 +++
.../sockets/ClientToServerDeltaDUnitTest.java | 1037 ++++
.../DeltaPropagationWithCQDUnitTest.java | 341 ++
...ToRegionRelationCQRegistrationDUnitTest.java | 786 +++
.../sockets/DurableClientCrashDUnitTest.java | 99 +
.../sockets/DurableClientNetDownDUnitTest.java | 80 +
.../sockets/DurableClientSimpleDUnitTest.java | 3404 ++++++++++++
.../tier/sockets/DurableClientTestCase.java | 2089 +++++++
.../CacheServerManagementDUnitTest.java | 571 ++
.../cli/commands/ClientCommandsDUnitTest.java | 1443 +++++
.../DurableClientCommandsDUnitTest.java | 433 ++
.../internal/pulse/TestCQDUnitTest.java | 147 +
.../internal/pulse/TestClientsDUnitTest.java | 108 +
.../internal/pulse/TestServerDUnitTest.java | 99 +
.../ClientAuthorizationTwoDUnitTest.java | 245 +
.../security/ClientAuthzObjectModDUnitTest.java | 416 ++
.../ClientCQPostAuthorizationDUnitTest.java | 522 ++
.../ClientPostAuthorizationDUnitTest.java | 398 ++
.../gemfire/security/MultiuserAPIDUnitTest.java | 391 ++
.../MultiuserDurableCQAuthzDUnitTest.java | 489 ++
.../gemfire/codeAnalysis/excludedClasses.txt | 2 +
.../gemstone/gemfire/codeAnalysis/openBugs.txt | 21 +
.../sanctionedDataSerializables.txt | 4 +
.../codeAnalysis/sanctionedSerializables.txt | 1 +
.../tier/sockets/durablecq-client-cache.xml | 37 +
.../tier/sockets/durablecq-server-cache.xml | 32 +
gemfire-wan/build.gradle | 22 +
.../client/internal/GatewaySenderBatchOp.java | 313 ++
.../cache/client/internal/SenderProxy.java | 43 +
.../internal/locator/wan/LocatorDiscovery.java | 227 +
.../internal/locator/wan/LocatorHelper.java | 143 +
.../locator/wan/LocatorJoinMessage.java | 105 +
.../wan/LocatorMembershipListenerImpl.java | 230 +
.../locator/wan/RemoteLocatorJoinRequest.java | 87 +
.../locator/wan/RemoteLocatorJoinResponse.java | 89 +
.../locator/wan/RemoteLocatorPingRequest.java | 56 +
.../locator/wan/RemoteLocatorPingResponse.java | 55 +
.../locator/wan/RemoteLocatorRequest.java | 66 +
.../locator/wan/RemoteLocatorResponse.java | 74 +
.../internal/locator/wan/WANFactoryImpl.java | 74 +
.../locator/wan/WanLocatorDiscovererImpl.java | 138 +
.../cache/wan/AbstractRemoteGatewaySender.java | 169 +
.../cache/wan/GatewayReceiverFactoryImpl.java | 147 +
.../internal/cache/wan/GatewayReceiverImpl.java | 253 +
.../wan/GatewaySenderEventRemoteDispatcher.java | 767 +++
.../cache/wan/GatewaySenderFactoryImpl.java | 389 ++
.../wan/parallel/ParallelGatewaySenderImpl.java | 267 +
...rentParallelGatewaySenderEventProcessor.java | 67 +
...moteParallelGatewaySenderEventProcessor.java | 122 +
...urrentSerialGatewaySenderEventProcessor.java | 45 +
...RemoteSerialGatewaySenderEventProcessor.java | 50 +
.../wan/serial/SerialGatewaySenderImpl.java | 260 +
...ternal.locator.wan.LocatorMembershipListener | 15 +
...ne.gemfire.internal.cache.wan.spi.WANFactory | 15 +
.../cache/CacheXml70GatewayDUnitTest.java | 243 +
.../cache/CacheXml80GatewayDUnitTest.java | 77 +
.../AnalyzeWANSerializablesJUnitTest.java | 91 +
.../internal/cache/UpdateVersionDUnitTest.java | 960 ++++
.../gemfire/internal/cache/wan/WANTestBase.java | 5178 ++++++++++++++++++
...oncurrentParallelGatewaySenderDUnitTest.java | 860 +++
...ntParallelGatewaySenderOffHeapDUnitTest.java | 32 +
...allelGatewaySenderOperation_1_DUnitTest.java | 848 +++
...allelGatewaySenderOperation_2_DUnitTest.java | 579 ++
...tSerialGatewaySenderOperationsDUnitTest.java | 111 +
...GatewaySenderOperationsOffHeapDUnitTest.java | 32 +
.../ConcurrentWANPropogation_1_DUnitTest.java | 608 ++
.../ConcurrentWANPropogation_2_DUnitTest.java | 485 ++
.../cache/wan/disttx/DistTXWANDUnitTest.java | 209 +
.../CommonParallelGatewaySenderDUnitTest.java | 481 ++
...onParallelGatewaySenderOffHeapDUnitTest.java | 32 +
...wWANConcurrencyCheckForDestroyDUnitTest.java | 526 ++
.../cache/wan/misc/PDXNewWanDUnitTest.java | 787 +++
...dRegion_ParallelWANPersistenceDUnitTest.java | 752 +++
...dRegion_ParallelWANPropogationDUnitTest.java | 1132 ++++
.../SenderWithTransportFilterDUnitTest.java | 274 +
...downAllPersistentGatewaySenderDUnitTest.java | 205 +
.../wan/misc/WANConfigurationJUnitTest.java | 617 +++
.../wan/misc/WANLocatorServerDUnitTest.java | 193 +
.../cache/wan/misc/WANSSLDUnitTest.java | 151 +
.../wan/misc/WanAutoDiscoveryDUnitTest.java | 557 ++
.../cache/wan/misc/WanValidationsDUnitTest.java | 1678 ++++++
...GatewaySenderOperationsOffHeapDUnitTest.java | 34 +
...ewaySenderQueueOverflowOffHeapDUnitTest.java | 34 +
.../ParallelWANConflationOffHeapDUnitTest.java | 34 +
...nceEnabledGatewaySenderOffHeapDUnitTest.java | 34 +
...ropogationConcurrentOpsOffHeapDUnitTest.java | 34 +
.../ParallelWANPropogationOffHeapDUnitTest.java | 34 +
...erialGatewaySenderQueueOffHeapDUnitTest.java | 34 +
...nceEnabledGatewaySenderOffHeapDUnitTest.java | 34 +
.../SerialWANPropogationOffHeapDUnitTest.java | 34 +
...ation_PartitionedRegionOffHeapDUnitTest.java | 34 +
...arallelGatewaySenderOperationsDUnitTest.java | 1984 +++++++
...llelGatewaySenderQueueOverflowDUnitTest.java | 531 ++
.../ParallelWANConflationDUnitTest.java | 496 ++
...ersistenceEnabledGatewaySenderDUnitTest.java | 1823 ++++++
...llelWANPropagationClientServerDUnitTest.java | 114 +
...lelWANPropagationConcurrentOpsDUnitTest.java | 290 +
.../ParallelWANPropagationDUnitTest.java | 1448 +++++
...ParallelWANPropagationLoopBackDUnitTest.java | 425 ++
.../wan/parallel/ParallelWANStatsDUnitTest.java | 632 +++
...tewaySenderDistributedDeadlockDUnitTest.java | 407 ++
...rialGatewaySenderEventListenerDUnitTest.java | 390 ++
.../SerialGatewaySenderOperationsDUnitTest.java | 602 ++
.../SerialGatewaySenderQueueDUnitTest.java | 337 ++
...ersistenceEnabledGatewaySenderDUnitTest.java | 602 ++
.../SerialWANPropagationLoopBackDUnitTest.java | 538 ++
.../serial/SerialWANPropogationDUnitTest.java | 1602 ++++++
...NPropogation_PartitionedRegionDUnitTest.java | 439 ++
.../SerialWANPropogationsFeatureDUnitTest.java | 373 ++
.../wan/serial/SerialWANStatsDUnitTest.java | 596 ++
.../wan/wancommand/WANCommandTestBase.java | 513 ++
...anCommandCreateGatewayReceiverDUnitTest.java | 699 +++
.../WanCommandCreateGatewaySenderDUnitTest.java | 763 +++
...WanCommandGatewayReceiverStartDUnitTest.java | 327 ++
.../WanCommandGatewayReceiverStopDUnitTest.java | 332 ++
.../WanCommandGatewaySenderStartDUnitTest.java | 416 ++
.../WanCommandGatewaySenderStopDUnitTest.java | 367 ++
.../wan/wancommand/WanCommandListDUnitTest.java | 403 ++
.../WanCommandPauseResumeDUnitTest.java | 716 +++
.../wancommand/WanCommandStatusDUnitTest.java | 582 ++
.../management/WANManagementDUnitTest.java | 525 ++
.../ClusterConfigurationDUnitTest.java | 1055 ++++
.../pulse/TestRemoteClusterDUnitTest.java | 274 +
.../gemfire/codeAnalysis/excludedClasses.txt | 2 +
.../gemstone/gemfire/codeAnalysis/openBugs.txt | 21 +
.../sanctionedDataSerializables.txt | 28 +
.../codeAnalysis/sanctionedSerializables.txt | 0
settings.gradle | 2 +
190 files changed, 94367 insertions(+)
----------------------------------------------------------------------
[06/50] [abbrv] incubator-geode git commit: GEODE-863: Gfsh-started
locator exits after a successful auto-reconnect
Posted by kl...@apache.org.
GEODE-863: Gfsh-started locator exits after a successful auto-reconnect
Modified InternalLocator.waitToStop() to work with auto-reconnect.
Modified InternalDistributedSystem to keep log appenders open during
auto-reconnect.
Added test of waitToStop to ReconnectDUnitTest.
Modified LocatorLauncher to show error details.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/4e211e2c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/4e211e2c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/4e211e2c
Branch: refs/heads/feature/GEODE-773-2
Commit: 4e211e2c2f771a4c399ce2be8dd0eb85f9b63740
Parents: 1ccf226
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Wed Jan 27 08:24:42 2016 -0800
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Wed Jan 27 08:28:11 2016 -0800
----------------------------------------------------------------------
.../gemfire/distributed/LocatorLauncher.java | 13 +++++++
.../internal/InternalDistributedSystem.java | 26 +++++++------
.../distributed/internal/InternalLocator.java | 14 ++++---
.../gemfire/cache30/ReconnectDUnitTest.java | 39 ++++++++++++++++++++
4 files changed, 76 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4e211e2c/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
index 6846905..d13dae5 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
@@ -35,6 +35,8 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.logging.Level;
+
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
@@ -667,6 +669,13 @@ public final class LocatorLauncher extends AbstractLauncher<String> {
* @param cause the Throwable thrown during the startup or wait operation on the Locator.
*/
private void failOnStart(final Throwable cause) {
+
+ if (cause != null) {
+ logger.log(Level.INFO, "locator is exiting due to an exception", cause);
+ } else {
+ logger.log(Level.INFO, "locator is exiting normally");
+ }
+
if (this.locator != null) {
this.locator.stop();
this.locator = null;
@@ -712,6 +721,10 @@ public final class LocatorLauncher extends AbstractLauncher<String> {
t = e;
throw e;
}
+ catch (Throwable e) {
+ t = e;
+ throw e;
+ }
finally {
failOnStart(t);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4e211e2c/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
index 087407a..b3c636a 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
@@ -1326,12 +1326,14 @@ public class InternalDistributedSystem
shutdownListeners = doDisconnects(attemptingToReconnect, reason);
}
- if (this.logWriterAppender != null) {
- LogWriterAppenders.stop(LogWriterAppenders.Identifier.MAIN);
- }
- if (this.securityLogWriterAppender != null) {
- // LOG:SECURITY: old code did NOT invoke this
- LogWriterAppenders.stop(LogWriterAppenders.Identifier.SECURITY);
+ if (!this.attemptingToReconnect) {
+ if (this.logWriterAppender != null) {
+ LogWriterAppenders.stop(LogWriterAppenders.Identifier.MAIN);
+ }
+ if (this.securityLogWriterAppender != null) {
+ // LOG:SECURITY: old code did NOT invoke this
+ LogWriterAppenders.stop(LogWriterAppenders.Identifier.SECURITY);
+ }
}
AlertAppender.getInstance().shuttingDown();
@@ -1376,11 +1378,13 @@ public class InternalDistributedSystem
this.sampler = null;
}
- if (this.logWriterAppender != null) {
- LogWriterAppenders.destroy(LogWriterAppenders.Identifier.MAIN);
- }
- if (this.securityLogWriterAppender != null) {
- LogWriterAppenders.destroy(LogWriterAppenders.Identifier.SECURITY);
+ if (!this.attemptingToReconnect) {
+ if (this.logWriterAppender != null) {
+ LogWriterAppenders.destroy(LogWriterAppenders.Identifier.MAIN);
+ }
+ if (this.securityLogWriterAppender != null) {
+ LogWriterAppenders.destroy(LogWriterAppenders.Identifier.SECURITY);
+ }
}
// NOTE: no logging after this point :-)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4e211e2c/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
index c346a45..0f27d36 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
@@ -923,6 +923,10 @@ public class InternalLocator extends Locator implements ConnectListener {
*/
public void stop(boolean forcedDisconnect, boolean stopForReconnect, boolean waitForDisconnect) {
final boolean isDebugEnabled = logger.isDebugEnabled();
+
+ this.stoppedForReconnect = stopForReconnect;
+ this.forcedDisconnect = forcedDisconnect;
+
if (this.server.isShuttingDown()) {
// fix for bug 46156
// If we are already shutting down don't do all of this again.
@@ -949,9 +953,7 @@ public class InternalLocator extends Locator implements ConnectListener {
}
return;
}
- this.stoppedForReconnect = stopForReconnect;
- this.forcedDisconnect = forcedDisconnect;
-
+
if (this.server.isAlive()) {
logger.info(LocalizedMessage.create(LocalizedStrings.InternalLocator_STOPPING__0, this));
try {
@@ -1041,15 +1043,16 @@ public class InternalLocator extends Locator implements ConnectListener {
public void waitToStop() throws InterruptedException {
boolean restarted;
do {
+ DistributedSystem ds = this.myDs;
restarted = false;
this.server.join();
if (this.stoppedForReconnect) {
logger.info("waiting for distributed system to disconnect...");
- while (this.myDs.isConnected()) {
+ while (ds.isConnected()) {
Thread.sleep(5000);
}
logger.info("waiting for distributed system to reconnect...");
- restarted = this.myDs.waitUntilReconnected(-1, TimeUnit.SECONDS);
+ restarted = ds.waitUntilReconnected(-1, TimeUnit.SECONDS);
if (restarted) {
logger.info("system restarted");
} else {
@@ -1060,6 +1063,7 @@ public class InternalLocator extends Locator implements ConnectListener {
logger.info("waiting for services to restart...");
rs.join();
this.restartThread = null;
+ logger.info("done waiting for services to restart");
}
}
} while (restarted);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4e211e2c/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
index b4a73bc..cdc3283 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
@@ -61,12 +61,14 @@ import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
+@SuppressWarnings("serial")
public class ReconnectDUnitTest extends CacheTestCase
{
static int locatorPort;
static Locator locator;
static DistributedSystem savedSystem;
static int locatorVMNumber = 3;
+ static Thread gfshThread;
Properties dsProperties;
@@ -506,8 +508,10 @@ public class ReconnectDUnitTest extends CacheTestCase
try {
dm = getDMID(vm0);
+ createGfshWaitingThread(vm0);
forceDisconnect(vm0);
newdm = waitForReconnect(vm0);
+ assertGfshWaitingThreadAlive(vm0);
boolean running = (Boolean)vm0.invoke(new SerializableCallable("check for running locator") {
public Object call() {
@@ -551,6 +555,10 @@ public class ReconnectDUnitTest extends CacheTestCase
if (loc != null) {
loc.stop();
}
+ if (gfshThread != null && gfshThread.isAlive()) {
+ gfshThread.interrupt();
+ }
+ gfshThread = null;
}
});
deleteLocatorStateFile(locPort);
@@ -558,6 +566,37 @@ public class ReconnectDUnitTest extends CacheTestCase
}
}
+ @SuppressWarnings("serial")
+ private void createGfshWaitingThread(VM vm) {
+ vm.invoke(new SerializableRunnable("create Gfsh-like waiting thread") {
+ public void run() {
+ final Locator loc = Locator.getLocator();
+ assertNotNull(loc);
+ gfshThread = new Thread("ReconnectDUnitTest_Gfsh_thread") {
+ public void run() {
+ try {
+ ((InternalLocator)loc).waitToStop();
+ } catch (InterruptedException e) {
+ System.out.println(Thread.currentThread().getName() + " interrupted - exiting");
+ }
+ }
+ };
+ gfshThread.setDaemon(true);
+ gfshThread.start();
+ System.out.println("created gfsh thread: " + gfshThread);
+ }
+ });
+ }
+
+ @SuppressWarnings("serial")
+ private void assertGfshWaitingThreadAlive(VM vm) {
+ vm.invoke(new SerializableRunnable("assert gfshThread is still waiting") {
+ public void run() {
+ assertTrue(gfshThread.isAlive());
+ }
+ });
+ }
+
/**
* Test the reconnect behavior when the required roles are missing.
* Reconnect is triggered as a Reliability policy. The test is to
[27/50] [abbrv] incubator-geode git commit: GEODE-882: Add apache
license header
Posted by kl...@apache.org.
GEODE-882: Add apache license header
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/80bd7d82
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/80bd7d82
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/80bd7d82
Branch: refs/heads/feature/GEODE-773-2
Commit: 80bd7d8297534d748c19faee5e263007a02d3f6c
Parents: c6e0d2d
Author: Kirk Lund <kl...@pivotal.io>
Authored: Fri Jan 29 16:04:55 2016 -0800
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Fri Jan 29 16:32:07 2016 -0800
----------------------------------------------------------------------
...elGatewaySenderOperation_2_OffHeapDUnitTest.java | 16 ++++++++++++++++
...elGatewaySenderOperation_2_OffHeapDUnitTest.java | 16 ++++++++++++++++
.../ParallelGatewaySenderOperation_2_DUnitTest.java | 16 ++++++++++++++++
3 files changed, 48 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/80bd7d82/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
index 3be8284..c429183 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ConcurrentParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.gemstone.gemfire.internal.cache.wan.offheap;
import com.gemstone.gemfire.internal.cache.wan.concurrent.ConcurrentParallelGatewaySenderOperation_2_DUnitTest;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/80bd7d82/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
index 8657d3b..eab9e05 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperation_2_OffHeapDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.gemstone.gemfire.internal.cache.wan.offheap;
import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelGatewaySenderOperation_2_DUnitTest;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/80bd7d82/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperation_2_DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperation_2_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperation_2_DUnitTest.java
index 0d9c32e..091738c 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperation_2_DUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperation_2_DUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.gemstone.gemfire.internal.cache.wan.parallel;
import com.gemstone.gemfire.internal.cache.wan.concurrent.ConcurrentParallelGatewaySenderOperation_2_DUnitTest;
[24/50] [abbrv] incubator-geode git commit: GEODE-634 CI failure:
DistributedMemberDUnitTest.testRolesInAllVMs
Posted by kl...@apache.org.
GEODE-634 CI failure: DistributedMemberDUnitTest.testRolesInAllVMs
Overriding another JGroups method that sometimes logs errors during
disconnect, causing tests to fail with suspect-strings.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f30e497b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f30e497b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f30e497b
Branch: refs/heads/feature/GEODE-773-2
Commit: f30e497be28946b23e771b58bfb635a339689724
Parents: 0994a45
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Fri Jan 29 09:47:01 2016 -0800
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Fri Jan 29 09:47:01 2016 -0800
----------------------------------------------------------------------
.../membership/gms/messenger/Transport.java | 27 +++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f30e497b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/Transport.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/Transport.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/Transport.java
index dfc2d6d..167193f 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/Transport.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/Transport.java
@@ -24,6 +24,7 @@ import java.net.SocketException;
import org.jgroups.Address;
import org.jgroups.Message;
import org.jgroups.protocols.UDP;
+import org.jgroups.util.AsciiString;
import org.jgroups.util.DefaultThreadFactory;
import org.jgroups.util.LazyThreadFactory;
import org.jgroups.util.Util;
@@ -75,7 +76,31 @@ public class Transport extends UDP {
// Util.getMessage("SendFailure"),
// local_addr, (dest == null? "cluster" : dest), msg.size(), e.toString(), msg.printHeaders());
}
-}
+ }
+
+ /*
+ * (non-Javadoc)
+ * copied from JGroups to perform Geode-specific error handling when there
+ * is a network partition
+ */
+ @Override
+ protected void doSend(AsciiString cluster_name, byte[] buf, int offset, int length, Address dest) throws Exception {
+ try {
+ super.doSend(cluster_name, buf, offset, length, dest);
+ } catch(SocketException sock_ex) {
+ if (!this.sock.isClosed() && !stack.getChannel().isClosed()) {
+ log.error("Exception caught while sending message", sock_ex);
+ }
+ } catch (IOException e) {
+ if (messenger != null
+ /*&& e.getMessage().contains("Operation not permitted")*/) { // this is the english Oracle JDK exception condition we really want to catch
+ messenger.handleJGroupsIOException(e, dest);
+ }
+ } catch(Throwable e) {
+ log.error("Exception caught while sending message", e);
+ }
+ }
+
/*
* (non-Javadoc)
[22/50] [abbrv] incubator-geode git commit: GEODE-851: Cleanup tests
in management.internal.security package
Posted by kl...@apache.org.
GEODE-851: Cleanup tests in management.internal.security package
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/de7afae6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/de7afae6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/de7afae6
Branch: refs/heads/feature/GEODE-773-2
Commit: de7afae6b4e173493efe66a01b747b147b7ea5d1
Parents: f13bf0c
Author: Kirk Lund <kl...@pivotal.io>
Authored: Mon Jan 25 10:49:59 2016 -0800
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Thu Jan 28 15:55:52 2016 -0800
----------------------------------------------------------------------
...rDistributedSystemMXBeanIntegrationTest.java | 50 +++
...horizeOperationForMBeansIntegrationTest.java | 323 +++++++++++++++
...erationForRegionCommandsIntegrationTest.java | 136 +++++++
.../internal/security/JSONAuthCodeTest.java | 143 -------
...JSONAuthorizationDetailsIntegrationTest.java | 163 ++++++++
.../security/JSONAuthorizationTest.java | 168 --------
...tionCodesForDataCommandsIntegrationTest.java | 101 +++++
...tionCodesForDistributedSystemMXBeanTest.java | 76 ++++
.../security/ResourceOperationJUnit.java | 394 -------------------
9 files changed, 849 insertions(+), 705 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de7afae6/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/AuthorizeOperationForDistributedSystemMXBeanIntegrationTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/AuthorizeOperationForDistributedSystemMXBeanIntegrationTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/AuthorizeOperationForDistributedSystemMXBeanIntegrationTest.java
new file mode 100755
index 0000000..4ae0107
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/AuthorizeOperationForDistributedSystemMXBeanIntegrationTest.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.management.internal.security;
+
+import static org.junit.Assert.*;
+
+import javax.management.remote.JMXPrincipal;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.management.internal.MBeanJMXAdapter;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+import com.gemstone.gemfire.util.test.TestUtil;
+
+/**
+ * Tests <code>JSONAuthorization.authorizeOperation(...)</code> for <code>DistributedSystemMXBean</code> operations.
+ */
+@Category(IntegrationTest.class)
+public class AuthorizeOperationForDistributedSystemMXBeanIntegrationTest {
+
+ @Test
+ public void returnsFalseForUnauthorizedUser() throws Exception {
+ System.setProperty("resource.secDescriptor", TestUtil.getResourcePath(getClass(), "auth1.json"));
+ JSONAuthorization authorization = JSONAuthorization.create();
+ authorization.init(new JMXPrincipal("tushark"), null, null);
+
+ JMXOperationContext context = new JMXOperationContext(MBeanJMXAdapter.getDistributedSystemName(), "queryData");
+ boolean result = authorization.authorizeOperation(null, context);
+ //assertTrue(result); TODO: why is this commented out? looks like this should be true but it isn't
+
+ context = new JMXOperationContext(MBeanJMXAdapter.getDistributedSystemName(), "changeAlertLevel");
+ result = authorization.authorizeOperation(null,context);
+ assertFalse(result);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de7afae6/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/AuthorizeOperationForMBeansIntegrationTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/AuthorizeOperationForMBeansIntegrationTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/AuthorizeOperationForMBeansIntegrationTest.java
new file mode 100644
index 0000000..d63947b
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/AuthorizeOperationForMBeansIntegrationTest.java
@@ -0,0 +1,323 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.management.internal.security;
+
+import static org.junit.Assert.*;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.Serializable;
+import java.security.Principal;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.management.JMX;
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.management.remote.JMXConnector;
+import javax.management.remote.JMXConnectorFactory;
+import javax.management.remote.JMXServiceURL;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.contrib.java.lang.system.RestoreSystemProperties;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TestName;
+
+import com.gemstone.gemfire.LogWriter;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.operations.OperationContext;
+import com.gemstone.gemfire.distributed.DistributedMember;
+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.management.DistributedSystemMXBean;
+import com.gemstone.gemfire.management.MemberMXBean;
+import com.gemstone.gemfire.management.internal.MBeanJMXAdapter;
+import com.gemstone.gemfire.management.internal.security.ResourceOperationContext.ResourceOperationCode;
+import com.gemstone.gemfire.security.AccessControl;
+import com.gemstone.gemfire.security.AuthenticationFailedException;
+import com.gemstone.gemfire.security.Authenticator;
+import com.gemstone.gemfire.security.NotAuthorizedException;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+
+/**
+ * Tests <code>JSONAuthorization.authorizeOperation(...)</code> with GemFire MBeans.
+ */
+@Category(IntegrationTest.class)
+@SuppressWarnings("deprecation")
+public class AuthorizeOperationForMBeansIntegrationTest {
+
+ private GemFireCacheImpl cache;
+ private DistributedSystem ds;
+ private int jmxManagerPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+ private JMXConnector jmxConnector;
+ private MBeanServerConnection mbeanServer;
+
+ @Rule
+ public TestName testName = new TestName();
+
+ @Rule
+ public RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
+
+ @Before
+ public void setUp() throws Exception {
+ System.setProperty("resource-auth-accessor", TestAccessControl.class.getName());
+ System.setProperty("resource-authenticator", TestAuthenticator.class.getName());
+
+ Properties properties = new Properties();
+ properties.put("name", this.testName.getMethodName());
+ properties.put(DistributionConfig.LOCATORS_NAME, "");
+ properties.put(DistributionConfig.MCAST_PORT_NAME, "0");
+ properties.put(DistributionConfig.JMX_MANAGER_NAME, "true");
+ properties.put(DistributionConfig.JMX_MANAGER_START_NAME, "true");
+ properties.put(DistributionConfig.JMX_MANAGER_PORT_NAME, String.valueOf(this.jmxManagerPort));
+ properties.put(DistributionConfig.HTTP_SERVICE_PORT_NAME, "0");
+
+ this.ds = DistributedSystem.connect(properties);
+ this.cache = (GemFireCacheImpl) CacheFactory.create(ds);
+
+ this.jmxConnector = getGemfireMBeanServer(this.jmxManagerPort, "tushark", "tushark");
+ this.mbeanServer = this.jmxConnector.getMBeanServerConnection();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ if (this.jmxConnector != null) {
+ this.jmxConnector.close();
+ this.jmxConnector = null;
+ }
+ if (this.cache != null) {
+ this.cache.close();
+ this.cache = null;
+ }
+ if (this.ds != null) {
+ this.ds.disconnect();
+ this.ds = null;
+ }
+ }
+
+ /**
+ * This is testing a sampling of operations for DistributedSystemMXBean and AccessControlMXBean
+ */
+ @Test
+ public void operationsShouldBeCoveredByAuthorization() throws Exception {
+ ObjectName objectName = MBeanJMXAdapter.getDistributedSystemName();
+
+ checkListCacheServerObjectNames(objectName);
+ checkAlertLevel(objectName);
+ checkAccessControlMXBean();
+ checkBackUpMembers(objectName);
+ checkShutDownAllMembers(objectName);
+ checkCLIContext(this.mbeanServer);
+ }
+
+ private void checkListCacheServerObjectNames(final ObjectName objectName) throws Exception {
+ Object cacheServerObjectNames = this.mbeanServer.invoke(objectName, "listCacheServerObjectNames", null, null);
+ assertThat(cacheServerObjectNames).isNotNull().isInstanceOf(ObjectName[].class);
+ assertThat((ObjectName[])cacheServerObjectNames).hasSize(0); // this isn't really testing much since there are no CacheServers
+ }
+
+ private void checkAlertLevel(final ObjectName objectName) throws Exception {
+ // attribute AlertLevel
+ String oldLevel = (String) this.mbeanServer.getAttribute(objectName, "AlertLevel");
+ assertThat(oldLevel).isEqualTo("severe");
+
+ // operation changeAlertLevel
+ this.mbeanServer.invoke(
+ objectName,
+ "changeAlertLevel",
+ new Object[] { "warning" },
+ new String[] { String.class.getName() }
+ );
+ String newLevel = (String) this.mbeanServer.getAttribute(objectName, "AlertLevel");
+ assertThat(newLevel).isEqualTo("warning");
+ }
+
+ private void checkAccessControlMXBean() throws Exception {
+ final ResourceOperationCode resourceOperationCodes[] = {
+ ResourceOperationCode.LIST_DS,
+ ResourceOperationCode.READ_DS,
+ ResourceOperationCode.CHANGE_ALERT_LEVEL_DS,
+ ResourceOperationCode.LOCATE_ENTRY_REGION
+ };
+
+ ObjectName objectName = new ObjectName(ManagementInterceptor.OBJECT_NAME_ACCESSCONTROL);
+ for (ResourceOperationCode resourceOperationCode : resourceOperationCodes) {
+ boolean isAuthorizedForOperation = (Boolean) this.mbeanServer.invoke(
+ objectName,
+ "authorize",
+ new Object[] { resourceOperationCode.toString() },
+ new String[] { String.class.getName() }
+ );
+ assertThat(isAuthorizedForOperation).isTrue();
+ }
+
+ boolean isAuthorizedForAllOperations = (Boolean) mbeanServer.invoke(
+ objectName,
+ "authorize",
+ new Object[] { ResourceOperationCode.ADMIN_DS.toString() },
+ new String[] { String.class.getName() }
+ );
+ assertThat(isAuthorizedForAllOperations).isFalse();
+ }
+
+ private void checkBackUpMembers(final ObjectName objectName) throws Exception {
+ try {
+ this.mbeanServer.invoke(
+ objectName,
+ "backupAllMembers",
+ new Object[] { "targetPath", "baseLinePath" },
+ new String[] { String.class.getCanonicalName(), String.class.getCanonicalName() });
+ fail("Should not be authorized for backupAllMembers");
+ } catch (SecurityException expected) {
+ // expected
+ }
+ }
+
+ private void checkShutDownAllMembers(final ObjectName objectName) throws Exception {
+ try {
+ this.mbeanServer.invoke(
+ objectName,
+ "shutDownAllMembers",
+ null,
+ null
+ );
+ fail("Should not be authorized for shutDownAllMembers");
+ } catch (SecurityException expected) {
+ // expected
+ }
+ }
+
+ private void checkCLIContext(MBeanServerConnection mbeanServer) {
+ ObjectName objectName = MBeanJMXAdapter.getDistributedSystemName();
+ DistributedSystemMXBean proxy = JMX.newMXBeanProxy(mbeanServer, objectName, DistributedSystemMXBean.class);
+ ObjectName managerMemberObjectName = proxy.getMemberObjectName();
+ MemberMXBean memberMXBeanProxy = JMX.newMXBeanProxy(mbeanServer, managerMemberObjectName, MemberMXBean.class);
+
+ Map<String, String> map = new HashMap<String, String>();
+ map.put("APP", "GFSH");
+ String result = memberMXBeanProxy.processCommand("locate entry --key=k1 --region=/region1", map);
+
+ assertThat(result).isNotNull().doesNotContain(SecurityException.class.getSimpleName());
+ }
+
+ private JMXConnector getGemfireMBeanServer(final int port, final String user, final String pwd) throws Exception {
+ JMXServiceURL url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://:" + port + "/jmxrmi");
+ if (user != null) { // TODO: why isn't this deterministic? need to create 2nd test without a user?
+ Map<String, String[]> env = new HashMap<String, String[]>();
+ String[] creds = { user, pwd };
+ env.put(JMXConnector.CREDENTIALS, creds);
+ JMXConnector jmxc = JMXConnectorFactory.connect(url, env);
+ return jmxc;
+ } else {
+ JMXConnector jmxc = JMXConnectorFactory.connect(url, null);
+ return jmxc;
+ }
+ }
+
+ /**
+ * Fake Principal for testing.
+ */
+ @SuppressWarnings("serial")
+ public static class TestUsernamePrincipal implements Principal, Serializable {
+
+ private final String userName;
+
+ public TestUsernamePrincipal(final String userName) {
+ this.userName = userName;
+ }
+
+ @Override
+ public String getName() {
+ return this.userName;
+ }
+
+ @Override
+ public String toString() {
+ return this.userName;
+ }
+ }
+
+ /**
+ * Fake Authenticator for testing.
+ */
+ public static class TestAuthenticator implements Authenticator {
+
+ @Override
+ public void close() {
+ }
+
+ @Override
+ public void init(final Properties securityProps, final LogWriter systemLogger, final LogWriter securityLogger) throws AuthenticationFailedException {
+ }
+
+ @Override
+ public Principal authenticate(final Properties props, final DistributedMember member) throws AuthenticationFailedException {
+ String user = props.getProperty(ManagementInterceptor.USER_NAME);
+ String pwd = props.getProperty(ManagementInterceptor.PASSWORD);
+ if (user != null && !user.equals(pwd) && !"".equals(user)) {
+ throw new AuthenticationFailedException("Wrong username/password");
+ }
+ return new TestUsernamePrincipal(user);
+ }
+ }
+
+ /**
+ * Fake AccessControl for testing.
+ */
+ public static class TestAccessControl implements AccessControl {
+
+ private Principal principal;
+
+ @Override
+ public void close() {
+ }
+
+ @Override
+ public void init(final Principal principal, final DistributedMember remoteMember, final Cache cache) throws NotAuthorizedException {
+ this.principal = principal;
+ }
+
+ @Override
+ public boolean authorizeOperation(String regionName, OperationContext context) {
+ if (principal.getName().equals("tushark")) {
+ ResourceOperationCode authorizedOps[] = {
+ ResourceOperationCode.LIST_DS,
+ ResourceOperationCode.READ_DS,
+ ResourceOperationCode.CHANGE_ALERT_LEVEL_DS,
+ ResourceOperationCode.LOCATE_ENTRY_REGION
+ };
+
+ ResourceOperationContext ctx = (ResourceOperationContext) context;
+ boolean found = false;
+ for (ResourceOperationCode code : authorizedOps) {
+ if (ctx.getResourceOperationCode().equals(code)) {
+ found = true;
+ break;
+ }
+ }
+ return found;
+ }
+ return false;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de7afae6/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/AuthorizeOperationForRegionCommandsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/AuthorizeOperationForRegionCommandsIntegrationTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/AuthorizeOperationForRegionCommandsIntegrationTest.java
new file mode 100644
index 0000000..ecc4c72
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/AuthorizeOperationForRegionCommandsIntegrationTest.java
@@ -0,0 +1,136 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.management.internal.security;
+
+import static org.junit.Assert.*;
+
+import java.lang.management.ManagementFactory;
+import java.util.Properties;
+import java.util.Set;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import javax.management.remote.JMXPrincipal;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.contrib.java.lang.system.RestoreSystemProperties;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TestName;
+
+import com.gemstone.gemfire.cache.CacheFactory;
+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.util.test.TestUtil;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+
+/**
+ * Tests <code>JSONAuthorization.authorizeOperation(...)</code> for Region commands.
+ */
+@Category(IntegrationTest.class)
+@SuppressWarnings("deprecation")
+public class AuthorizeOperationForRegionCommandsIntegrationTest {
+
+ private GemFireCacheImpl cache;
+ private DistributedSystem ds;
+ private int jmxManagerPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+
+ @Rule
+ public TestName testName = new TestName();
+
+ @Rule
+ public RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
+
+ @Before
+ public void setUp() {
+ System.setProperty("resource.secDescriptor", TestUtil.getResourcePath(getClass(), "auth3.json"));
+ System.setProperty("resource-auth-accessor", JSONAuthorization.class.getCanonicalName());
+ System.setProperty("resource-authenticator", JSONAuthorization.class.getCanonicalName());
+
+ Properties properties = new Properties();
+ properties.put("name", testName.getMethodName());
+ properties.put(DistributionConfig.LOCATORS_NAME, "");
+ properties.put(DistributionConfig.MCAST_PORT_NAME, "0");
+ properties.put(DistributionConfig.JMX_MANAGER_NAME, "true");
+ properties.put(DistributionConfig.JMX_MANAGER_START_NAME, "true");
+ properties.put(DistributionConfig.JMX_MANAGER_PORT_NAME, String.valueOf(this.jmxManagerPort));
+ properties.put(DistributionConfig.HTTP_SERVICE_PORT_NAME, "0");
+
+ this.ds = DistributedSystem.connect(properties);
+ this.cache = (GemFireCacheImpl) CacheFactory.create(ds);
+ }
+
+ @After
+ public void tearDown() {
+ if (cache != null) {
+ cache.close();
+ cache = null;
+ }
+ if (ds != null) {
+ ds.disconnect();
+ ds = null;
+ }
+ }
+
+ @Ignore("Test was never implemented")
+ @Test
+ public void testInheritRole() {
+ }
+
+ @Ignore("Test was dead-coded")
+ @Test
+ public void testUserMultipleRole() throws Exception {
+ }
+
+ @Test
+ public void testAuthorizeOperationWithRegionOperations() throws Exception {
+ JSONAuthorization authorization = JSONAuthorization.create();
+ authorization.init(new JMXPrincipal("tushark"), null, null);
+
+ checkAccessControlMBean();
+
+ CLIOperationContext cliContext = new CLIOperationContext("locate entry --key=k1 --region=region1");
+ boolean result = authorization.authorizeOperation(null, cliContext);
+ assertTrue(result);
+
+ cliContext = new CLIOperationContext("locate entry --key=k1 --region=secureRegion");
+ result = authorization.authorizeOperation(null, cliContext);
+ //assertFalse(result); //this is failing due to logic issue TODO: why is this commented out?
+
+ authorization.init(new JMXPrincipal("avinash"), null, null);
+ result = authorization.authorizeOperation(null, cliContext);
+ assertTrue(result);
+
+ cliContext = new CLIOperationContext("locate entry --key=k1 --region=region1");
+ result = authorization.authorizeOperation(null, cliContext);
+ assertTrue(result);
+ }
+
+ private void checkAccessControlMBean() throws Exception {
+ ObjectName name = new ObjectName(ManagementInterceptor.OBJECT_NAME_ACCESSCONTROL);
+ MBeanServer platformMBeanServer = ManagementFactory.getPlatformMBeanServer();
+ Set<ObjectName> names = platformMBeanServer.queryNames(name, null);
+ assertFalse(names.isEmpty());
+ assertEquals(1, names.size());
+ assertEquals(name,names.iterator().next());
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de7afae6/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/JSONAuthCodeTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/JSONAuthCodeTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/JSONAuthCodeTest.java
deleted file mode 100644
index c408116..0000000
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/JSONAuthCodeTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gemstone.gemfire.management.internal.security;
-
-import static org.junit.Assert.*;
-
-import java.lang.management.ManagementFactory;
-import java.util.Properties;
-import java.util.Set;
-
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import javax.management.remote.JMXPrincipal;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
-
-import com.gemstone.gemfire.cache.CacheFactory;
-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.management.internal.MBeanJMXAdapter;
-import com.gemstone.gemfire.util.test.TestUtil;
-import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
-
-@Category(IntegrationTest.class)
-public class JSONAuthCodeTest {
-
- private GemFireCacheImpl cache;
- private DistributedSystem ds;
-
- @Rule
- public RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
-
- @Before
- public void setUp() {
- System.setProperty(DistributedSystem.PROPERTIES_FILE_PROPERTY, getClass().getSimpleName() + ".properties");
- }
-
- @After
- public void tearDown() {
- if (cache != null) {
- cache.close();
- cache = null;
- }
- if (ds != null) {
- ds.disconnect();
- ds = null;
- }
- }
-
- @Test
- public void testSimpleUserAndRole() throws Exception {
- System.setProperty("resource.secDescriptor", TestUtil.getResourcePath(getClass(), "auth1.json"));
- JSONAuthorization authorization = JSONAuthorization.create();
- authorization.init(new JMXPrincipal("tushark"), null, null);
-
- JMXOperationContext context = new JMXOperationContext(MBeanJMXAdapter.getDistributedSystemName(), "queryData");
- boolean result = authorization.authorizeOperation(null, context);
- //assertTrue(result);
-
- context = new JMXOperationContext(MBeanJMXAdapter.getDistributedSystemName(), "changeAlertLevel");
- result = authorization.authorizeOperation(null,context);
- assertFalse(result);
- }
-
- @Ignore("Test was never implemented")
- @Test
- public void testInheritRole() {
- }
-
- @Ignore("Test was dead-coded")
- @Test
- public void testUserMultipleRole() throws Exception {
- }
-
- @Test
- public void testCLIAuthForRegion() throws Exception {
- System.setProperty("resource.secDescriptor", TestUtil.getResourcePath(getClass(), "auth3.json"));
- JSONAuthorization authorization = JSONAuthorization.create();
- authorization.init(new JMXPrincipal("tushark"), null, null);
-
- System.setProperty("resource-auth-accessor", JSONAuthorization.class.getCanonicalName());
- System.setProperty("resource-authenticator", JSONAuthorization.class.getCanonicalName());
- Properties pr = new Properties();
- pr.put("name", "testJMXOperationContext");
- pr.put(DistributionConfig.JMX_MANAGER_NAME, "true");
- pr.put(DistributionConfig.JMX_MANAGER_START_NAME, "true");
- int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
- pr.put(DistributionConfig.JMX_MANAGER_PORT_NAME, String.valueOf(port));
- pr.put(DistributionConfig.HTTP_SERVICE_PORT_NAME, "0");
- ds = DistributedSystem.connect(pr);
- cache = (GemFireCacheImpl) CacheFactory.create(ds);
-
- checkAccessControlMBean();
- CLIOperationContext cliContext = new CLIOperationContext("locate entry --key=k1 --region=region1");
- boolean result = authorization.authorizeOperation(null, cliContext);
- assertTrue(result);
-
- cliContext = new CLIOperationContext("locate entry --key=k1 --region=secureRegion");
- result = authorization.authorizeOperation(null, cliContext);
- System.out.println("Result for secureRegion=" + result);
- //assertFalse(result); //this is failing due to logic issue
-
- authorization.init(new JMXPrincipal("avinash"), null, null);
- result = authorization.authorizeOperation(null, cliContext);
- assertTrue(result);
-
- cliContext = new CLIOperationContext("locate entry --key=k1 --region=region1");
- result = authorization.authorizeOperation(null, cliContext);
- assertTrue(result);
- }
-
- private void checkAccessControlMBean() throws Exception {
- ObjectName name = new ObjectName(ManagementInterceptor.OBJECT_NAME_ACCESSCONTROL);
- MBeanServer platformMBeanServer = ManagementFactory.getPlatformMBeanServer();
- Set<ObjectName> names = platformMBeanServer.queryNames(name, null);
- assertFalse(names.isEmpty());
- assertEquals(1, names.size());
- assertEquals(name,names.iterator().next());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de7afae6/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/JSONAuthorizationDetailsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/JSONAuthorizationDetailsIntegrationTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/JSONAuthorizationDetailsIntegrationTest.java
new file mode 100644
index 0000000..877f34e
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/JSONAuthorizationDetailsIntegrationTest.java
@@ -0,0 +1,163 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.management.internal.security;
+
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Map;
+
+import org.json.JSONException;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.management.internal.security.JSONAuthorization.User;
+import com.gemstone.gemfire.util.test.TestUtil;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+
+/**
+ * Tests JSONAuthorization with JSON loaded from files.
+ */
+@Category(IntegrationTest.class)
+public class JSONAuthorizationDetailsIntegrationTest {
+
+ @Test
+ public void testSimpleUserAndRole() throws Exception {
+ String json = readFile(TestUtil.getResourcePath(getClass(), "testSimpleUserAndRole.json"));
+ new JSONAuthorization(json); // static side effect
+ Map<String, User> acl = JSONAuthorization.getAcl();
+ assertNotNull(acl);
+ assertEquals(1, acl.size());
+ User user = acl.get("tushark");
+ assertNotNull(user);
+ assertNotNull(user.roles);
+ assertEquals(1, user.roles.length);
+ assertEquals("jmxReader", user.roles[0].name);
+ assertEquals(1, user.roles[0].permissions.length);
+ assertEquals("QUERY", user.roles[0].permissions[0]);
+ }
+
+ @Test
+ public void testUserAndRoleRegionServerGroup() throws Exception {
+ String json = readFile(TestUtil.getResourcePath(getClass(), "testUserAndRoleRegionServerGroup.json"));
+ new JSONAuthorization(json); // static side effect
+ Map<String, User> acl = JSONAuthorization.getAcl();
+
+ assertNotNull(acl);
+ assertEquals(1, acl.size());
+ User user = acl.get("tushark");
+ assertNotNull(user);
+ assertNotNull(user.roles);
+ assertEquals(1, user.roles.length);
+ assertEquals("jmxReader", user.roles[0].name);
+ assertEquals(1, user.roles[0].permissions.length);
+ assertEquals("QUERY", user.roles[0].permissions[0]);
+
+ assertEquals("secureRegion", user.roles[0].regionName);
+ assertEquals("SG2", user.roles[0].serverGroup);
+ }
+
+ @Test
+ public void testUserMultipleRole() throws Exception {
+ String json = readFile(TestUtil.getResourcePath(getClass(), "testUserMultipleRole.json"));
+ new JSONAuthorization(json); // static side effect
+ Map<String, User> acl = JSONAuthorization.getAcl();
+
+ assertNotNull(acl);
+ assertEquals(1, acl.size());
+ User user = acl.get("tushark");
+ assertNotNull(user);
+ assertNotNull(user.roles);
+ assertEquals(2, user.roles.length);
+
+ JSONAuthorization.Role role = user.roles[0];
+ assertEquals("jmxReader", role.name);
+
+ assertEquals(1, role.permissions.length);
+ assertEquals("QUERY", role.permissions[0]);
+
+ role = user.roles[1];
+ assertNotEquals("jmxReader", role.name);
+
+ assertEquals(7, role.permissions.length);
+ assertEquals("sysMonitors", role.name);
+ assertTrue(contains(role.permissions, "CMD_EXORT_LOGS"));
+ assertTrue(contains(role.permissions, "CMD_STACK_TRACES"));
+ assertTrue(contains(role.permissions, "CMD_GC"));
+ assertTrue(contains(role.permissions, "CMD_NETSTAT"));
+ assertTrue(contains(role.permissions, "CMD_SHOW_DEADLOCKS"));
+ assertTrue(contains(role.permissions, "CMD_SHOW_LOG"));
+ assertTrue(contains(role.permissions, "SHOW_METRICS"));
+ }
+
+ @Test
+ public void testInheritRole() throws Exception {
+ String json = readFile(TestUtil.getResourcePath(getClass(), "testInheritRole.json"));
+ new JSONAuthorization(json); // static side effect
+ Map<String, User> acl = JSONAuthorization.getAcl();
+
+ assertNotNull(acl);
+ assertEquals(3, acl.size());
+ User user = acl.get("tushark");
+ assertNotNull(user);
+ assertNotNull(user.roles);
+ assertEquals(1, user.roles.length);
+ assertEquals("jmxReader", user.roles[0].name);
+ assertEquals(1, user.roles[0].permissions.length);
+ assertEquals("QUERY", user.roles[0].permissions[0]);
+
+ User admin1 = acl.get("admin1");
+ assertNotNull(admin1);
+ assertNotNull(admin1.roles);
+ assertEquals(1, admin1.roles.length);
+ assertEquals("adminSG1", admin1.roles[0].name);
+ assertEquals("SG1", admin1.roles[0].serverGroup);
+ assertEquals(1, admin1.roles[0].permissions.length);
+ assertEquals("CMD_SHUTDOWN", admin1.roles[0].permissions[0]);
+
+ User admin2 = acl.get("admin2");
+ assertNotNull(admin2);
+ assertNotNull(admin2.roles);
+ assertEquals(1, admin2.roles.length);
+ assertEquals("adminSG2", admin2.roles[0].name);
+ assertEquals("SG2", admin2.roles[0].serverGroup);
+ assertEquals(2, admin2.roles[0].permissions.length);
+ assertTrue(contains(admin2.roles[0].permissions, "CHANGE_LOG_LEVEL"));
+ assertTrue(contains(admin2.roles[0].permissions, "CMD_SHUTDOWN"));
+ }
+
+ private String readFile(String name) throws IOException, JSONException {
+ File file = new File(name);
+ FileReader reader = new FileReader(file);
+ char[] buffer = new char[(int) file.length()];
+ reader.read(buffer);
+ String json = new String(buffer);
+ reader.close();
+ return json;
+ }
+
+ private boolean contains(String[] permissions, String string) {
+ for (String str : permissions) {
+ if (str.equals(string)) {
+ return true;
+ }
+ }
+ return false;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de7afae6/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/JSONAuthorizationTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/JSONAuthorizationTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/JSONAuthorizationTest.java
deleted file mode 100644
index bfd8152..0000000
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/JSONAuthorizationTest.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gemstone.gemfire.management.internal.security;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import org.json.JSONException;
-import org.junit.experimental.categories.Category;
-
-import com.gemstone.gemfire.management.internal.security.JSONAuthorization.User;
-import com.gemstone.gemfire.util.test.TestUtil;
-import com.gemstone.gemfire.test.junit.categories.UnitTest;
-
-@Category(UnitTest.class)
-public class JSONAuthorizationTest extends TestCase {
-
- public static String makePath(String[] strings) {
- StringBuilder sb = new StringBuilder();
- for(int i=0;i<strings.length;i++){
- sb.append(strings[i]);
- sb.append(File.separator);
- }
- return sb.toString();
- }
-
- public void testSimpleUserAndRole() throws IOException, JSONException {
- String json = readFile(TestUtil.getResourcePath(getClass(), "testSimpleUserAndRole.json"));
- JSONAuthorization authorization = new JSONAuthorization(json);
- Map<String, User> acl = authorization.getAcl();
- assertNotNull(acl);
- assertEquals(1, acl.size());
- User user = acl.get("tushark");
- assertNotNull(user);
- assertNotNull(user.roles);
- assertEquals(1,user.roles.length);
- assertEquals("jmxReader", user.roles[0].name);
- assertEquals(1, user.roles[0].permissions.length);
- assertEquals("QUERY", user.roles[0].permissions[0]);
- }
-
-
- public void testUserAndRoleRegionServerGroup() throws IOException, JSONException {
- String json = readFile(TestUtil.getResourcePath(getClass(), "testUserAndRoleRegionServerGroup.json"));
- JSONAuthorization authorization = new JSONAuthorization(json);
- Map<String, User> acl = authorization.getAcl();
- assertNotNull(acl);
- assertEquals(1, acl.size());
- User user = acl.get("tushark");
- assertNotNull(user);
- assertNotNull(user.roles);
- assertEquals(1,user.roles.length);
- assertEquals("jmxReader", user.roles[0].name);
- assertEquals(1, user.roles[0].permissions.length);
- assertEquals("QUERY", user.roles[0].permissions[0]);
-
- assertEquals("secureRegion", user.roles[0].regionName);
- assertEquals("SG2", user.roles[0].serverGroup);
- }
-
- public void testUserMultipleRole()throws IOException, JSONException {
- String json = readFile(TestUtil.getResourcePath(getClass(), "testUserMultipleRole.json"));
- JSONAuthorization authorization = new JSONAuthorization(json);
- Map<String, User> acl = authorization.getAcl();
- assertNotNull(acl);
- assertEquals(1, acl.size());
- User user = acl.get("tushark");
- assertNotNull(user);
- assertNotNull(user.roles);
- assertEquals(2,user.roles.length);
-
- JSONAuthorization.Role role = user.roles[0];
- if(role.name.equals("jmxReader")){
- assertEquals(1, role.permissions.length);
- assertEquals("QUERY", role.permissions[0]);
- } else {
- assertEquals(7, role.permissions.length);
- assertEquals("sysMonitors", role.name);
- }
-
- role = user.roles[1];
- if(role.name.equals("jmxReader")){
- assertEquals(1, role.permissions.length);
- assertEquals("QUERY", role.permissions[0]);
- } else {
- assertEquals(7, role.permissions.length);
- assertEquals("sysMonitors", role.name);
- assertTrue(contains(role.permissions, "CMD_EXORT_LOGS"));
- assertTrue(contains(role.permissions, "CMD_STACK_TRACES"));
- assertTrue(contains(role.permissions, "CMD_GC"));
- assertTrue(contains(role.permissions, "CMD_NETSTAT"));
- assertTrue(contains(role.permissions, "CMD_SHOW_DEADLOCKS"));
- assertTrue(contains(role.permissions, "CMD_SHOW_LOG"));
- assertTrue(contains(role.permissions, "SHOW_METRICS"));
- }
- }
-
- private boolean contains(String[] permissions, String string) {
- for(String str : permissions)
- if(str.equals(string))
- return true;
- return false;
- }
-
-
- public void testInheritRole() throws IOException, JSONException {
- String json = readFile(TestUtil.getResourcePath(getClass(), "testInheritRole.json"));
- JSONAuthorization authorization = new JSONAuthorization(json);
- Map<String, User> acl = authorization.getAcl();
- assertNotNull(acl);
- assertEquals(3, acl.size());
- User user = acl.get("tushark");
- assertNotNull(user);
- assertNotNull(user.roles);
- assertEquals(1,user.roles.length);
- assertEquals("jmxReader", user.roles[0].name);
- assertEquals(1, user.roles[0].permissions.length);
- assertEquals("QUERY", user.roles[0].permissions[0]);
-
- User admin1 = acl.get("admin1");
- assertNotNull(admin1);
- assertNotNull(admin1.roles);
- assertEquals(1,admin1.roles.length);
- assertEquals("adminSG1", admin1.roles[0].name);
- assertEquals("SG1", admin1.roles[0].serverGroup);
- assertEquals(1, admin1.roles[0].permissions.length);
- assertEquals("CMD_SHUTDOWN", admin1.roles[0].permissions[0]);
-
- User admin2 = acl.get("admin2");
- assertNotNull(admin2);
- assertNotNull(admin2.roles);
- assertEquals(1,admin2.roles.length);
- assertEquals("adminSG2", admin2.roles[0].name);
- assertEquals("SG2", admin2.roles[0].serverGroup);
- assertEquals(2, admin2.roles[0].permissions.length);
- assertTrue(contains(admin2.roles[0].permissions, "CHANGE_LOG_LEVEL"));
- assertTrue(contains(admin2.roles[0].permissions, "CMD_SHUTDOWN"));
- }
-
- private String readFile(String name) throws IOException, JSONException {
- File file = new File(name);
- FileReader reader = new FileReader(file);
- char[] buffer = new char[(int) file.length()];
- reader.read(buffer);
- String json = new String(buffer);
- reader.close();
- return json;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de7afae6/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/OperationCodesForDataCommandsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/OperationCodesForDataCommandsIntegrationTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/OperationCodesForDataCommandsIntegrationTest.java
new file mode 100755
index 0000000..b8c1c9d
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/OperationCodesForDataCommandsIntegrationTest.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.management.internal.security;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.contrib.java.lang.system.RestoreSystemProperties;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TestName;
+
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.distributed.DistributedSystem;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.management.internal.security.ResourceOperationContext.ResourceOperationCode;
+import com.gemstone.gemfire.management.internal.security.AuthorizeOperationForMBeansIntegrationTest.TestAccessControl;
+import com.gemstone.gemfire.management.internal.security.AuthorizeOperationForMBeansIntegrationTest.TestAuthenticator;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+
+/**
+ * Tests operation codes for data commands.
+ */
+@Category(IntegrationTest.class)
+@SuppressWarnings("deprecation")
+public class OperationCodesForDataCommandsIntegrationTest {
+
+ private GemFireCacheImpl cache;
+ private DistributedSystem ds;
+ private Map<String, ResourceOperationCode> commands = new HashMap<String, ResourceOperationCode>();
+
+ @Rule
+ public TestName testName = new TestName();
+
+ @Rule
+ public RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
+
+ @Before
+ public void setUp() {
+ System.setProperty("resource-auth-accessor", TestAccessControl.class.getName());
+ System.setProperty("resource-authenticator", TestAuthenticator.class.getName());
+
+ Properties properties = new Properties();
+ properties.put("name", testName.getMethodName());
+ properties.put(DistributionConfig.LOCATORS_NAME, "");
+ properties.put(DistributionConfig.MCAST_PORT_NAME, "0");
+ properties.put(DistributionConfig.HTTP_SERVICE_PORT_NAME, "0");
+
+ this.ds = DistributedSystem.connect(properties);
+ this.cache = (GemFireCacheImpl) CacheFactory.create(ds);
+
+ this.commands.put("put --key=k1 --value=v1 --region=/region1", ResourceOperationCode.PUT_REGION);
+ this.commands.put("locate entry --key=k1 --region=/region1", ResourceOperationCode.LOCATE_ENTRY_REGION);
+ this.commands.put("query --query=\"select * from /region1\"", ResourceOperationCode.QUERYDATA_DS);
+ this.commands.put("export data --region=value --file=value --member=value", ResourceOperationCode.EXPORT_DATA_REGION);
+ this.commands.put("import data --region=value --file=value --member=value", ResourceOperationCode.IMPORT_DATA_REGION);
+ this.commands.put("rebalance", ResourceOperationCode.REBALANCE_DS);
+ }
+
+ @After
+ public void tearDown() throws IOException {
+ if (this.cache != null) {
+ this.cache.close();
+ this.cache = null;
+ }
+ if (this.ds != null) {
+ this.ds.disconnect();
+ this.ds = null;
+ }
+ }
+
+ @Test
+ public void commandsShouldMapToCorrectResourceCodes() throws Exception {
+ for (String command : this.commands.keySet()) {
+ CLIOperationContext ctx = new CLIOperationContext(command);
+ assertThat(ctx.getResourceOperationCode()).isEqualTo(this.commands.get(command));
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de7afae6/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/OperationCodesForDistributedSystemMXBeanTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/OperationCodesForDistributedSystemMXBeanTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/OperationCodesForDistributedSystemMXBeanTest.java
new file mode 100755
index 0000000..8b7edbf
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/OperationCodesForDistributedSystemMXBeanTest.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.management.internal.security;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import javax.management.ObjectName;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode;
+import com.gemstone.gemfire.management.internal.MBeanJMXAdapter;
+import com.gemstone.gemfire.management.internal.security.ResourceOperationContext.ResourceOperationCode;
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
+
+/**
+ * Tests operation codes for DistributedSystemMXBean operations.
+ */
+@Category(UnitTest.class)
+public class OperationCodesForDistributedSystemMXBeanTest {
+
+ private final String[] distributedSystemMXBeanOperations = {
+ "listCacheServerObjectNames",
+ "viewRemoteClusterStatus",
+ "getTotalHeapSize",
+ "setQueryCollectionsDepth",
+ "getQueryCollectionsDepth",
+ "changeAlertLevel",
+ "backupAllMembers",
+ "revokeMissingDiskStores",
+ "shutDownAllMembers",
+ "queryData",
+ "queryDataForCompressedResult",
+ "setQueryResultSetLimit"
+ };
+
+ private final ResourceOperationCode[] distributedSystemResourceOperationCodes = {
+ ResourceOperationCode.LIST_DS,
+ ResourceOperationCode.LIST_DS,
+ ResourceOperationCode.READ_DS,
+ ResourceOperationCode.QUERYDATA_DS,
+ ResourceOperationCode.READ_DS,
+ ResourceOperationCode.CHANGE_ALERT_LEVEL_DS,
+ ResourceOperationCode.BACKUP_DS,
+ ResourceOperationCode.REMOVE_DISKSTORE_DS,
+ ResourceOperationCode.SHUTDOWN_DS,
+ ResourceOperationCode.QUERYDATA_DS,
+ ResourceOperationCode.QUERYDATA_DS,
+ ResourceOperationCode.QUERYDATA_DS
+ };
+
+ @Test
+ public void operationsShouldMapToCodes() {
+ ObjectName objectName = MBeanJMXAdapter.getDistributedSystemName();
+ for (int i = 0; i < distributedSystemMXBeanOperations.length; i++) {
+ JMXOperationContext context = new JMXOperationContext(objectName, distributedSystemMXBeanOperations[i]);
+ assertThat(context.getResourceOperationCode()).isEqualTo(distributedSystemResourceOperationCodes[i]);
+ assertThat(context.getOperationCode()).isEqualTo(OperationCode.RESOURCE);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de7afae6/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/ResourceOperationJUnit.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/ResourceOperationJUnit.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/ResourceOperationJUnit.java
deleted file mode 100644
index 0d680e6..0000000
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/security/ResourceOperationJUnit.java
+++ /dev/null
@@ -1,394 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gemstone.gemfire.management.internal.security;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.net.MalformedURLException;
-import java.security.Principal;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.management.AttributeNotFoundException;
-import javax.management.InstanceNotFoundException;
-import javax.management.JMX;
-import javax.management.MBeanException;
-import javax.management.MBeanServerConnection;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import javax.management.ReflectionException;
-import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXConnectorFactory;
-import javax.management.remote.JMXServiceURL;
-
-import org.junit.experimental.categories.Category;
-
-import junit.framework.TestCase;
-
-import com.gemstone.gemfire.LogWriter;
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.operations.OperationContext;
-import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode;
-import com.gemstone.gemfire.distributed.DistributedMember;
-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.management.DistributedSystemMXBean;
-import com.gemstone.gemfire.management.MemberMXBean;
-import com.gemstone.gemfire.management.internal.MBeanJMXAdapter;
-import com.gemstone.gemfire.management.internal.security.ResourceOperationContext.ResourceOperationCode;
-import com.gemstone.gemfire.security.AccessControl;
-import com.gemstone.gemfire.security.AuthenticationFailedException;
-import com.gemstone.gemfire.security.Authenticator;
-import com.gemstone.gemfire.security.NotAuthorizedException;
-import com.gemstone.gemfire.test.junit.categories.UnitTest;
-
-@Category(UnitTest.class)
-public class ResourceOperationJUnit extends TestCase {
-
- public static class TestUsernamePrincipal implements Principal,
- Serializable {
-
- private final String userName;
-
- public TestUsernamePrincipal(String userName) {
- this.userName = userName;
- }
-
- public String getName() {
- return this.userName;
- }
-
- @Override
- public String toString() {
- return this.userName;
- }
-
- }
-
- public static class TestAuthenticator implements Authenticator {
-
- @Override
- public void close() {
-
- }
-
- @Override
- public void init(Properties securityProps, LogWriter systemLogger,
- LogWriter securityLogger) throws AuthenticationFailedException {
-
- }
-
- @Override
- public Principal authenticate(Properties props, DistributedMember member)
- throws AuthenticationFailedException {
- String user = props.getProperty(ManagementInterceptor.USER_NAME);
- String pwd = props.getProperty(ManagementInterceptor.PASSWORD);
- if (user!=null && !user.equals(pwd) && !"".equals(user))
- throw new AuthenticationFailedException(
- "Wrong username/password");
- System.out.println("Authentication successful!! for " + user);
- return new TestUsernamePrincipal(user);
- }
-
- }
-
- public static class TestAccessControl implements AccessControl {
-
- private Principal principal=null;
- @Override
- public void close() {
-
- }
-
- @Override
- public void init(Principal principal, DistributedMember remoteMember,
- Cache cache) throws NotAuthorizedException {
- this.principal = principal;
- }
-
- @Override
- public boolean authorizeOperation(String regionName,
- OperationContext context) {
- if(principal.getName().equals("tushark")) {
- ResourceOperationCode authorizedOps[] = {
- ResourceOperationCode.LIST_DS,
- ResourceOperationCode.READ_DS,
- ResourceOperationCode.CHANGE_ALERT_LEVEL_DS,
- ResourceOperationCode.LOCATE_ENTRY_REGION
- };
-
- System.out.println("Context received " + context);
-
- //if(context instanceof JMXOperationContext) {
- ResourceOperationContext ctx = (ResourceOperationContext)context;
- System.out.println("Checking for code " + ctx.getResourceOperationCode());
- boolean found = false;
- for(ResourceOperationCode code : authorizedOps) {
- if(ctx.getResourceOperationCode().equals(code)){
- found =true;
- System.out.println("found code " + code.toString());
- break;
- }
- }
- if(found)
- return true;
- System.out.println("Did not find code " + ctx.getResourceOperationCode());
- return false;
- //}
- }
- return false;
- }
-
- }
-
- public void testJMXOperationContext() {
- System.setProperty("resource-auth-accessor", "com.gemstone.gemfire.management.internal.security.ResourceOperationJUnit$TestAccessControl");
- System.setProperty("resource-authenticator", "com.gemstone.gemfire.management.internal.security.ResourceOperationJUnit$TestAuthenticator");
- GemFireCacheImpl cache = null;
- DistributedSystem ds = null;
- Properties pr = new Properties();
- pr.put("name", "testJMXOperationContext");
- pr.put(DistributionConfig.JMX_MANAGER_NAME, "true");
- pr.put(DistributionConfig.JMX_MANAGER_START_NAME, "true");
- int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
- pr.put(DistributionConfig.JMX_MANAGER_PORT_NAME, String.valueOf(port));
- pr.put(DistributionConfig.HTTP_SERVICE_PORT_NAME, "0");
- ds = getSystem(pr);
- cache = (GemFireCacheImpl) CacheFactory.create(ds);
- ObjectName name = MBeanJMXAdapter.getDistributedSystemName();
-
- String[] methods = {
- "listCacheServerObjectNames",
- "viewRemoteClusterStatus",
- "getTotalHeapSize",
- "setQueryCollectionsDepth",
- "getQueryCollectionsDepth",
- "changeAlertLevel",
- "backupAllMembers",
- "revokeMissingDiskStores",
- "shutDownAllMembers",
- "queryData",
- "queryDataForCompressedResult",
- "setQueryResultSetLimit",
- };
-
- ResourceOperationCode expectedCodes[] = {
- ResourceOperationCode.LIST_DS,
- ResourceOperationCode.LIST_DS,
- ResourceOperationCode.READ_DS,
- ResourceOperationCode.QUERYDATA_DS,
- ResourceOperationCode.READ_DS,
- ResourceOperationCode.CHANGE_ALERT_LEVEL_DS,
- ResourceOperationCode.BACKUP_DS,
- ResourceOperationCode.REMOVE_DISKSTORE_DS,
- ResourceOperationCode.SHUTDOWN_DS,
- ResourceOperationCode.QUERYDATA_DS,
- ResourceOperationCode.QUERYDATA_DS,
- ResourceOperationCode.QUERYDATA_DS
- };
-
- for(int i=0;i<methods.length;i++) {
- String methodName = methods[i];
- JMXOperationContext context = new JMXOperationContext(name, methodName);
- assertEquals(expectedCodes[i],
- context.getResourceOperationCode());
- assertEquals(OperationCode.RESOURCE, context.getOperationCode());
- }
-
- JMXConnector cs = getGemfireMBeanServer(port, "tushark", "tushark");;
- MBeanServerConnection mbeanServer =null;
- try {
- mbeanServer = cs.getMBeanServerConnection();
- mbeanServer.invoke(MBeanJMXAdapter.getDistributedSystemName(), "listCacheServerObjectNames", null, null);
- String oldLevel = (String)mbeanServer.getAttribute(MBeanJMXAdapter.getDistributedSystemName(), "AlertLevel");
- System.out.println("Old Level = " + oldLevel);
- mbeanServer.invoke(MBeanJMXAdapter.getDistributedSystemName(), "changeAlertLevel", new Object[]{"WARNING"},new String[]{
- String.class.getCanonicalName()
- });
- String newLevel = (String)mbeanServer.getAttribute(MBeanJMXAdapter.getDistributedSystemName(), "AlertLevel");
- System.out.println("New Level = " + newLevel);
-
-
- //Checking accessControlMXBean
- System.out.println("Checking access via AccessControlMbean");
- ResourceOperationCode authorizedOps[] = {
- ResourceOperationCode.LIST_DS,
- ResourceOperationCode.READ_DS,
- ResourceOperationCode.CHANGE_ALERT_LEVEL_DS,
- ResourceOperationCode.LOCATE_ENTRY_REGION
- };
- ObjectName accControlON = new ObjectName(ManagementInterceptor.OBJECT_NAME_ACCESSCONTROL);
- for(ResourceOperationCode c : authorizedOps) {
- boolean result = (Boolean) mbeanServer.invoke(accControlON, "authorize"
- , new Object[]{ResourceOperationCode.CHANGE_ALERT_LEVEL_DS.toString()}
- , new String[]{String.class.getCanonicalName()});
- assertTrue(result);
- }
-
- boolean result = (Boolean) mbeanServer.invoke(accControlON, "authorize"
- , new Object[]{ResourceOperationCode.ADMIN_DS.toString()}
- , new String[]{String.class.getCanonicalName()});
- assertFalse(result);
-
- } catch (InstanceNotFoundException e1) {
- e1.printStackTrace();
- fail("Error while invoking JMXRMI " + e1.getMessage());
- } catch (MBeanException e1) {
- e1.printStackTrace();
- fail("Error while invoking JMXRMI " + e1.getMessage());
- } catch (ReflectionException e1) {
- fail("Error while invoking JMXRMI " + e1.getMessage());
- } catch (IOException e1) {
- fail("Error while invoking JMXRMI " + e1.getMessage());
- } catch (AttributeNotFoundException e) {
- fail("Error while invoking JMXRMI" + e.getMessage());
- } catch (MalformedObjectNameException e) {
- fail("Error while invoking JMXRMI" + e.getMessage());
- }
-
- try {
- mbeanServer.invoke(MBeanJMXAdapter.getDistributedSystemName(),
- "backupAllMembers",
- new Object[]{"targetPath","baseLinePath"},
- new String[]{String.class.getCanonicalName(), String.class.getCanonicalName()});
- fail("Should not be authorized for backupAllMembers");
- } catch (SecurityException e) {
- //expected
- } catch(Exception e){
- e.printStackTrace();
- fail("Unexpected exception : " + e.getMessage());
- }
-
- try {
- mbeanServer.invoke(MBeanJMXAdapter.getDistributedSystemName(),
- "shutDownAllMembers",null,null);
- fail("Should not be authorized for shutDownAllMembers");
- } catch (SecurityException e) {
- //expected
- } catch(Exception e){
- fail("Unexpected exception : " + e.getMessage());
- }
-
- checkCLIContext(mbeanServer);
-
- try {
- cs.close();
- } catch (IOException e) {
- fail("Unexpected exception : " + e.getMessage());
- }
-
-
-
-
- cache.close();
- ds.disconnect();
- }
-
- private void checkCLIContext(MBeanServerConnection mbeanServer) {
- DistributedSystemMXBean proxy = JMX.newMXBeanProxy(mbeanServer, MBeanJMXAdapter.getDistributedSystemName(),
- DistributedSystemMXBean.class);
- ObjectName managerMemberObjectName = proxy.getMemberObjectName();
- MemberMXBean memberMXBeanProxy = JMX.newMXBeanProxy(mbeanServer, managerMemberObjectName, MemberMXBean.class);
- try {
- Map<String,String> map = new HashMap<String,String>();
- map.put("APP","GFSH");
- String result = memberMXBeanProxy.processCommand("locate entry --key=k1 --region=/region1", map);
- System.out.println("Result = " + result);
- } catch (Exception e) {
- System.out.println("Excpetion e " + e.getMessage());
- e.printStackTrace();
- }
- }
-
- public void testCLIOperationContext() {
- System.setProperty("resource-auth-accessor", "com.gemstone.gemfire.management.internal.security.ResourceOperationJUnit$TestAccessControl");
- System.setProperty("resource-authenticator", "com.gemstone.gemfire.management.internal.security.ResourceOperationJUnit$TestAuthenticator");
- GemFireCacheImpl cache = null;
- DistributedSystem ds = null;
- Properties pr = new Properties();
- pr.put("name", "testJMXOperationContext");
- pr.put(DistributionConfig.JMX_MANAGER_NAME, "true");
- pr.put(DistributionConfig.JMX_MANAGER_START_NAME, "true");
- int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
- pr.put(DistributionConfig.JMX_MANAGER_PORT_NAME, String.valueOf(port));
- pr.put(DistributionConfig.HTTP_SERVICE_PORT_NAME, "0");
- ds = getSystem(pr);
- cache = (GemFireCacheImpl) CacheFactory.create(ds);
-
- String[] commands = {
- "put --key=k1 --value=v1 --region=/region1",
- "locate entry --key=k1 --region=/region1",
- "query --query=\"select * from /region1\"",
- "export data --region=value --file=value --member=value",
- "import data --region=value --file=value --member=value",
- "rebalance"
- };
-
- ResourceOperationCode expectedCodes[] = {
- ResourceOperationCode.PUT_REGION,
- ResourceOperationCode.LOCATE_ENTRY_REGION,
- ResourceOperationCode.QUERYDATA_DS,
- ResourceOperationCode.EXPORT_DATA_REGION,
- ResourceOperationCode.IMPORT_DATA_REGION,
- ResourceOperationCode.REBALANCE_DS
- };
-
- for(int i=0;i<commands.length;i++){
- CLIOperationContext ctx = new CLIOperationContext(commands[i]);
- System.out.println("Context " + ctx);
- assertEquals(expectedCodes[i],ctx.getResourceOperationCode());
- }
-
- cache.close();
- ds.disconnect();
- }
-
-
-
- private JMXConnector getGemfireMBeanServer(int port, String user, String pwd) {
- JMXServiceURL url;
- try {
- url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://:"+ port +"/jmxrmi");
- if(user!=null){
- Map env = new HashMap();
- String[] creds = {user, pwd};
- env.put(JMXConnector.CREDENTIALS, creds);
- JMXConnector jmxc = JMXConnectorFactory.connect(url,env);
- return jmxc;
- } else {
- JMXConnector jmxc = JMXConnectorFactory.connect(url, null);
- return jmxc;
- }
- } catch (MalformedURLException e) {
- fail("Error connecting to port=" + port + " " + e.getMessage());
- } catch (IOException e) {
- fail("Error connecting to port=" + port + " " + e.getMessage());
- }
- return null;
- }
-
-
-
- private static DistributedSystem getSystem(Properties properties) {
- return DistributedSystem.connect(properties);
- }
-
-}
[34/50] [abbrv] incubator-geode git commit: GEODE-805: Fix javadoc
warnings.
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml81DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml81DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml81DUnitTest.java
index ac2e2ba..c94505f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml81DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml81DUnitTest.java
@@ -58,7 +58,7 @@ public class CacheXml81DUnitTest extends CacheXml80DUnitTest {
/**
* Test extensions to
- * <code>cache<code> element. Exercises {@link CacheCreation#fillIn}
+ * <code>cache<code> element.
*
* @since 8.1
*/
@@ -87,8 +87,7 @@ public class CacheXml81DUnitTest extends CacheXml80DUnitTest {
}
/**
- * Test extensions to <code>region</code> element. Exercises
- * {@link CacheCreation#fillIn}
+ * Test extensions to <code>region</code> element.
*
* @since 8.1
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/MemLRUEvictionControllerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/MemLRUEvictionControllerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/MemLRUEvictionControllerDUnitTest.java
index 6d82855..e6ff7f1 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/MemLRUEvictionControllerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/MemLRUEvictionControllerDUnitTest.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.internal.size.ReflectionSingleObjectSizer;
import com.gemstone.gemfire.internal.size.WellKnownClassSizer;
/**
- * Tests the basic functionality of the memory lru eviction{@link controller
+ * Tests the basic functionality of the memory lru eviction controller
* and its statistics.
*
* @author David Whitlock
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/TXOrderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/TXOrderDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/TXOrderDUnitTest.java
index 584a929..6f42483 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/TXOrderDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/TXOrderDUnitTest.java
@@ -314,7 +314,6 @@ public class TXOrderDUnitTest extends CacheTestCase {
private final int TEST_DESTROY = 2;
/**
* verify that queries on indexes work with transaction
- * @see bug#40842
* @throws Exception
*/
public void testFarSideIndexOnPut() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/codeAnalysis/CompiledClassUtils.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/codeAnalysis/CompiledClassUtils.java b/gemfire-core/src/test/java/com/gemstone/gemfire/codeAnalysis/CompiledClassUtils.java
index d7b73f4..adf190f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/codeAnalysis/CompiledClassUtils.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/codeAnalysis/CompiledClassUtils.java
@@ -95,7 +95,6 @@ public class CompiledClassUtils {
/**
* Parse the files in the given jar file and return a map of name->CompiledClass.
* Any IO exceptions are consumed by this method and written to stderr.
- * @param jar the jar file holding classes
*/
public static Map<String, CompiledClass> parseClassFilesInDir(File buildDir) {
Map<String, CompiledClass> result = new HashMap<String, CompiledClass>();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherJUnitTest.java
index 7b8a6bb..6e19234 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherJUnitTest.java
@@ -37,7 +37,6 @@ import org.junit.experimental.categories.Category;
* @author John Blum
* @author Kirk Lund
* @see com.gemstone.gemfire.distributed.AbstractLauncher
- * @see com.gemstone.gemfire.distributed.CommonLauncherTestSuite
* @see org.junit.Assert
* @see org.junit.Test
* @since 7.0
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherJUnitTest.java
index c1b6ed0..aa7e028 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherJUnitTest.java
@@ -41,7 +41,6 @@ import org.junit.rules.TestName;
*
* @author John Blum
* @author Kirk Lund
- * @see com.gemstone.gemfire.distributed.CommonLauncherTestSuite
* @see com.gemstone.gemfire.distributed.LocatorLauncher
* @see com.gemstone.gemfire.distributed.LocatorLauncher.Builder
* @see com.gemstone.gemfire.distributed.LocatorLauncher.Command
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherJUnitTest.java
index 802df9f..7240daa 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherJUnitTest.java
@@ -58,7 +58,6 @@ import org.junit.rules.TestName;
*
* @author John Blum
* @author Kirk Lund
- * @see com.gemstone.gemfire.distributed.CommonLauncherTestSuite
* @see com.gemstone.gemfire.distributed.ServerLauncher
* @see com.gemstone.gemfire.distributed.ServerLauncher.Builder
* @see com.gemstone.gemfire.distributed.ServerLauncher.Command
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
index bdc08b6..6872f32 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
@@ -48,8 +48,8 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
/**
- * This class tests the functionality of the {@linkplain internal
- * admin com.gemstone.gemfire.internal.admin} API.
+ * This class tests the functionality of the {@linkplain com.gemstone.gemfire.internal.admin internal
+ * admin} API.
*/
public class ConsoleDistributionManagerDUnitTest
extends CacheTestCase implements AlertListener {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
index 2817b79..61bfd2f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
@@ -822,7 +822,7 @@ public class InternalDistributedSystemJUnitTest
/**
* Detect LinkLocal IPv6 address where the interface is missing, ie %[0-9].
- * @see {@link InetAddress#isLinkLocalAddress()}
+ * @see InetAddress#isLinkLocalAddress()
*/
private static boolean isIPv6LinkLocalAddress(Inet6Address addr) {
byte[] addrBytes = addr.getAddress();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/LDM.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/LDM.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/LDM.java
index f6e4bcd..1629628 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/LDM.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/LDM.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.logging.LogService;
/**
- * A little class for testing the {@link LocalDistributionManager}
+ * A little class for testing the local DistributionManager
*/
public class LDM {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/SharedConfigurationJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/SharedConfigurationJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/SharedConfigurationJUnitTest.java
index 72c4713..c0246d8 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/SharedConfigurationJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/SharedConfigurationJUnitTest.java
@@ -40,7 +40,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
public class SharedConfigurationJUnitTest {
/**
- * Test {@link SharedConfiguration#createAndUpgradeDocumentFromXml()}
+ * Test {@link SharedConfiguration#createAndUpgradeDocumentFromXml(String)}
*/
@Test
public void testCreateAndUpgradeDocumentFromXml() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/ClassBuilder.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/ClassBuilder.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/ClassBuilder.java
index 9fdc181..6854d3b 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/ClassBuilder.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/ClassBuilder.java
@@ -72,7 +72,6 @@ public class ClassBuilder implements Serializable {
* Content of the created class
* @param outputFile
* Where to write the JAR file
- * @return The definition of the class
* @throws IOException
* If there is a problem writing the JAR file.
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/DataSerializableJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/DataSerializableJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/DataSerializableJUnitTest.java
index 5f69393..1a8597a 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/DataSerializableJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/DataSerializableJUnitTest.java
@@ -1212,7 +1212,7 @@ public class DataSerializableJUnitTest extends TestCase
}
/**
- * Tests writing a {@link Replaceable} object
+ * Tests writing a {@link com.gemstone.gemfire.DataSerializable.Replaceable} object
*/
public void testReplaceable()
throws IOException, ClassNotFoundException {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/AbstractRegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/AbstractRegionJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/AbstractRegionJUnitTest.java
index 991bd30..128dc93 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/AbstractRegionJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/AbstractRegionJUnitTest.java
@@ -66,7 +66,7 @@ public class AbstractRegionJUnitTest {
* Test method for {@link AbstractRegion#getExtensionPoint()}.
*
* Assert that method returns a {@link SimpleExtensionPoint} instance and
- * assume that {@link SimpleExtensionPointJUnitTest} has covered the rest.
+ * assume that {@link com.gemstone.gemfire.internal.cache.extension.SimpleExtensionPointJUnitTest} has covered the rest.
*
*/
@Test
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37244JUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37244JUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37244JUnitTest.java
index 5af0d15..cedda47 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37244JUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37244JUnitTest.java
@@ -61,9 +61,6 @@ public class Bug37244JUnitTest
/**
* Method for intializing the VM
- *
- * @return
- * @throws Exception
*/
private static void initializeVM() throws Exception
{
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41733DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41733DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41733DUnitTest.java
index ca93ad8..2679d45 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41733DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41733DUnitTest.java
@@ -165,10 +165,6 @@ public class Bug41733DUnitTest extends CacheTestCase {
putData(vm1, 3, 4, "a");
}
- /**
- * @param vm0
- * @param i
- */
private void createPR(VM vm0, final int redundancy) {
vm0.invoke(new SerializableRunnable("Create PR") {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConflationJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConflationJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConflationJUnitTest.java
index 08153a0..3a4660c 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConflationJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConflationJUnitTest.java
@@ -68,30 +68,18 @@ public class ConflationJUnitTest extends DiskRegionTestingBase
- /**
- *
- * @see com.gemstone.gemfire.internal.cache.DiskRegTest#createOverflowOnly()
- */
protected void createOverflowOnly()
{
region = DiskRegionHelperFactory.getAsyncOverFlowOnlyRegion(cache,
diskProps);
}
- /**
- *
- * @see com.gemstone.gemfire.internal.cache.DiskRegTest#createPersistOnly()
- */
protected void createPersistOnly()
{
region = DiskRegionHelperFactory
.getAsyncPersistOnlyRegion(cache, diskProps);
}
- /**
- *
- * @see com.gemstone.gemfire.internal.cache.DiskRegTest#createOverflowAndPersist()
- */
protected void createOverflowAndPersist()
{
region = DiskRegionHelperFactory.getAsyncOverFlowAndPersistRegion(cache,
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskIdJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskIdJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskIdJUnitTest.java
index c12a7b3..348c667 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskIdJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskIdJUnitTest.java
@@ -119,8 +119,6 @@ public class DiskIdJUnitTest extends TestCase
/**
* Test the whether setting of one set of values does not affect another set of values
- *
- * @throws Exception
*/
public void testAllOperationsValidatingResult1()
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionHelperFactory.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionHelperFactory.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionHelperFactory.java
index de00f8f..b7cc3a7 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionHelperFactory.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionHelperFactory.java
@@ -30,9 +30,6 @@ import com.gemstone.gemfire.cache.*;
public class DiskRegionHelperFactory
{
- /**
- * @param args
- */
public static Region getRegion(Cache cache, DiskRegionProperties diskProps, Scope regionScope)
{
Region region = null;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
index d0911b8..5c405b5 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
@@ -210,8 +210,6 @@ public class DiskRegionTestingBase
/**
* cleans all the directory of all the files present in them
- * @throws IOException
- *
*/
protected static void deleteFiles()
{
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java
index 1571708..e6057f5 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java
@@ -361,8 +361,6 @@ public abstract class DistributedCacheTestCase
* Must be {@link java.io.Serializable}
* @param value
* The value used to replace
- *
- * @see Region#put()
*/
protected static void remoteReplace(String regionName,
String entryName,
@@ -392,8 +390,6 @@ public abstract class DistributedCacheTestCase
* region
* @param entryName
* Must be {@link java.io.Serializable}
- *
- * @see Region#replace()
*/
protected static void remoteInvalidate(String regionName,
String entryName)
@@ -418,8 +414,6 @@ public abstract class DistributedCacheTestCase
* region
* @param entryName
* Must be {@link java.io.Serializable}
- *
- * @see Region#replace()
*/
protected static void remoteDestroy(String regionName,
String entryName)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java
index 54da4b6..1396aba 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java
@@ -304,10 +304,6 @@ public class HABug36773DUnitTest extends DistributedTestCase
return new Integer(server.getPort());
}
- /**
- *
- * @param key Key in which client is interested
- */
public static void registerKeysK1andK2()
{
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
index 2819790..4539321 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
@@ -44,7 +44,7 @@ import com.gemstone.gemfire.test.dunit.VM;
/**
* Tests the size of clientUpdateMessageImpl with the size calculated by
- * {@linkplain MemLRUCapacityController} for HA overFlow
+ * {@link com.gemstone.gemfire.internal.cache.lru.MemLRUCapacityController} for HA overFlow
* @author aingle
* @since 5.7
*/
@@ -155,9 +155,6 @@ public class HAOverflowMemObjectSizerDUnitTest extends DistributedTestCase {
/**
* create client cache
- *
- * @param port1
- * @param port2 - end points ports
*/
public static void createCacheClient(Integer port1, String host)
throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java
index 9c42a1f..0d1f0b4 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java
@@ -296,7 +296,6 @@ public class IncrementalBackupDUnitTest extends CacheTestCase {
/**
* Invokes {@link Cache#close()} on a member.
- * @param vm a member of the distributed system.
*/
private void closeCache(final VM closeVM) {
closeVM.invoke(new SerializableRunnable() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
index d5e7f9c..f3d5182 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
@@ -755,13 +755,6 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest extends
/**
* This function performs validation of bucket2Node region of multiple
* partition regions on 4 VMs.
- *
- * @param vm0
- * @param vm1
- * @param vm2
- * @param vm3
- * @param startIndexForRegion
- * @param endIndexForRegion
*/
private void validateBucket2NodeBeforePutInMultiplePartitionedRegion(
int startIndexForRegion, int endIndexForRegion) throws Throwable
@@ -795,13 +788,6 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest extends
/**
* This function performs validation of bucket regions of multiple partition
* regions on 4 VMs.
- *
- * @param vm0
- * @param vm1
- * @param vm2
- * @param vm3
- * @param startIndexForRegion
- * @param endIndexForRegion
*/
private void validateBucketsAfterPutInMultiplePartitionRegion(
final int startIndexForRegion, final int endIndexForRegion)
@@ -858,13 +844,6 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest extends
/**
* This function performs validation of bucket regions of multiple partition
* regions on 4 VMs.
- *
- * @param vm0
- * @param vm1
- * @param vm2
- * @param vm3
- * @param startIndexForRegion
- * @param endIndexForRegion
*/
private void validateBucketsDistributionInMultiplePartitionRegion(
final int startIndexForRegion, final int endIndexForRegion,
@@ -896,13 +875,6 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest extends
/**
* This function is used for the validation of bucket on all the region.
- *
- * @param vm0
- * @param vm1
- * @param vm2
- * @param vm3
- * @param startIndexForRegion
- * @param endIndexForRegion
*/
private void validateBucketsOnAllNodes(final int startIndexForRegion,
final int endIndexForRegion)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCreationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCreationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCreationDUnitTest.java
index 367782a..a81570b 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCreationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCreationDUnitTest.java
@@ -665,13 +665,6 @@ public class PartitionedRegionCreationDUnitTest extends
/**
* this function creates partion region with the given name and throws
* appropriate exception
- * @param regionName
- * @param cnt
- * @param redundancy
- * @param exceptionType
- * @param objName
- *
- * @return
*/
public CacheSerializableRunnable getCacheSerializableRunnableForPRCreate(
final String regionName, final int cnt, final int redundancy,
@@ -758,13 +751,6 @@ public class PartitionedRegionCreationDUnitTest extends
/**
* this function creates partition region with the specified persistence and
* throws appropriate exception
- * @param regionName
- * @param cnt
- * @param redundancy
- * @param exceptionType
- * @param objName
- *
- * @return
*/
public CacheSerializableRunnable getCacheSerializableRunnableForPRPersistence(
final String regionName, final int localMaxMemory, final boolean isPersistent, final boolean expectException)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDUnitTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDUnitTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDUnitTestCase.java
index d81e686..498d835 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDUnitTestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDUnitTestCase.java
@@ -119,12 +119,6 @@ public class PartitionedRegionDUnitTestCase extends CacheTestCase
* Used in the name of the Partition Region
*
* These indices Represents range of the Partition Region
- * @param startIndexForRegion :
- * @param endIndexForRegion
- * @param redundancy
- * @param localmaxMemory
- * @param evict
- * @return
*/
public CacheSerializableRunnable createMultiplePartitionRegion(
final String PRPrefix, final int startIndexForRegion,
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHADUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHADUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHADUnitTest.java
index 9ce79e1..a787a6f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHADUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHADUnitTest.java
@@ -386,7 +386,7 @@ public class PartitionedRegionHADUnitTest extends PartitionedRegionDUnitTestCase
/**
* This verifies the Bucket Regions on the basis of
* redundantCopies set in RegionAttributes.
- * @see PartitionedRegionSingleNodeOperationsJUnitTest#testBucketScope()
+ * @see PartitionedRegionSingleNodeOperationsJUnitTest#test018BucketScope()
* @throws Exception
*/
public void testBucketsScope() throws Exception
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestHelper.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestHelper.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestHelper.java
index 6e27a35..002c9b9 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestHelper.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestHelper.java
@@ -79,10 +79,6 @@ public class PartitionedRegionTestHelper
/**
* This method creates a local region with all the default values.
* The cache created is a loner, so this is only suitable for single VM tests.
- *
- * @param regionname
- * @return region
- * @throws RegionExistsException
*/
public static Region createLocalRegion(String regionName)throws RegionExistsException{
@@ -99,12 +95,7 @@ public class PartitionedRegionTestHelper
* This method compares two selectResult Objects by
* 1. Size
* 2. SelectResults#CollectionType#ElementType()
- *
- * @param SelectResults
- * @return void
- * @throws
*/
-
public static String compareResultSets(SelectResults sr1 , SelectResults sr2){
@@ -163,11 +154,6 @@ public class PartitionedRegionTestHelper
* 3) redundancy and scope.
*
* The cache created is a loner, so this is only suitable for single VM tests.
- *
- * @param regionName
- * @param redundancy
- * @param localMemory
- * @return Region
*/
public static Region createPartitionedRegion(String regionName,
@@ -247,9 +233,6 @@ public class PartitionedRegionTestHelper
/**
* This method closes the cache.
- *
- *
- * @return
*/
public static synchronized void closeCache()
{
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
index 7840a2b..f43c8b8 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
@@ -54,8 +54,8 @@ public class PartitionedRegionTestUtilsDUnitTest extends
}
/**
- * Test the {@link PartitionedRegion#getSomeKeys(Random)} method, making sure it
- * returns keys when there are keys and {@link Collections#EMPTY_SET} when there are none.
+ * Test the {@link PartitionedRegion#getSomeKeys(java.util.Random)} method, making sure it
+ * returns keys when there are keys and {@link java.util.Collections#EMPTY_SET} when there are none.
* @throws Exception
*/
public void testGetKeys() throws Exception {
@@ -140,8 +140,6 @@ public class PartitionedRegionTestUtilsDUnitTest extends
* Test the test method PartitionedRegion.getAllNodes
* Verify that it returns nodes after a value has been placed into the PartitionedRegion.
* @see PartitionedRegion#getAllNodes()
- *
- * @throws Exception
*/
public static class TestGetNodesKey implements DataSerializable {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionWithSameNameDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionWithSameNameDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionWithSameNameDUnitTest.java
index 55d9a82..6a7807f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionWithSameNameDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionWithSameNameDUnitTest.java
@@ -343,9 +343,6 @@ public class PartitionedRegionWithSameNameDUnitTest extends
* 1. Creates partitoned region as parent region on all vms </br> <br>
* 2. Creates distributed subregion of parent region </br>
* OperationNotSupportedException is expected.
- *
- * @param vmList
- * @param firstCreationFlag
*/
public void testWithPartitionedRegionAsParentRegionAndDistributedSubRegion()
{
@@ -383,9 +380,6 @@ public class PartitionedRegionWithSameNameDUnitTest extends
* 1. Creates partitoned region as parent region on all vms </br> <br>
* 2. Creates partitioned subregion of parent region </br>
* OperationNotSupportedException is expected
- *
- * @param vmList
- * @param firstCreationFlag
*/
public void testWithPartitionedRegionAsParentRegionAndPartitionedSubRegion()
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java
index 8a58653..9afffe4 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java
@@ -2840,8 +2840,6 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
}
/**
- * @param ds1
- * @param pr
* @return first key found on the given member
*/
CustId getKeyOnMember(final DistributedMember owner,
@@ -2857,10 +2855,7 @@ public class RemoteTransactionDUnitTest extends CacheTestCase {
}
return retVal;
}
- /**
- * @param i
- * @return
- */
+
protected Set<Customer> getCustomerSet(int size) {
Set<Customer> expectedSet = new HashSet<Customer>();
for (int i=0; i<size; i++) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java
index 1c25dcc..1ce05c7 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java
@@ -2947,9 +2947,7 @@ public class RebalanceOperationDUnitTest extends CacheTestCase {
/**
* Test to ensure that we wait for
* in progress write operations before moving a primary.
- * @throws InterruptedException
* @throws CancellationException
- * @throws TimeoutException
*/
public void moveBucketsWithUnrecoveredValuesRedundancy(final boolean simulate) {
Host host = Host.getHost(0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java
index 3c36a60..edcbfda 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java
@@ -951,8 +951,6 @@ public class FunctionServiceStatsDUnitTest extends PRClientServerTestBase{
/**
* Test the function execution statistics in case of the distributed Region P2P
* DataStore0 is with Empty datapolicy
- *
- * @throws Exception
*/
public void testP2PDistributedRegionFunctionExecutionStats() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java
index 7424088..359143f 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java
@@ -2764,9 +2764,7 @@ public class PRFunctionExecutionDUnitTest extends
}
/**
- * Assert the {@link RegionFunctionContext} yields the proper objects and works
- * in concert with the associated {@link PartitionedRegionUtil} methods.
- * @throws Exception
+ * Assert the {@link RegionFunctionContext} yields the proper objects.
*/
public void testLocalDataContext() throws Exception
{
@@ -2841,10 +2839,7 @@ public class PRFunctionExecutionDUnitTest extends
}
/**
- * Assert the {@link RegionFunctionContext} yields the proper objects and works
- * in concert with the associated {@link PartitionedRegionUtil} methods when
- * there are colocated regions.
- * @throws Exception
+ * Assert the {@link RegionFunctionContext} yields the proper objects.
*/
public void testLocalDataContextWithColocation() throws Exception
{
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java
index 1a4d040..df36f8f 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java
@@ -600,8 +600,6 @@ public class PRFunctionExecutionWithResultSenderDUnitTest extends
}
/**
* Ensure that the execution is happening all the PR as a whole
- *
- * @throws Exception
*/
public static class TestResolver implements PartitionResolver, Serializable {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/AlterMockRegionExtensionFunction.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/AlterMockRegionExtensionFunction.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/AlterMockRegionExtensionFunction.java
index 9a82929..2b0fc79 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/AlterMockRegionExtensionFunction.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/AlterMockRegionExtensionFunction.java
@@ -43,7 +43,7 @@ import com.gemstone.gemfire.management.internal.configuration.domain.XmlEntity;
* <dt>{@link String} regionName</dt>
* <dd>Name of region on which to create {@link MockCacheExtension}.</dd>
* <dt>{@link String} value</dt>
- * <dd>Value to set. See {@link MockCacheExtension#setValue()}.</dd>
+ * <dd>Value to set. See {@link MockCacheExtension#setValue(String)}.</dd>
* </dl>
* </dt>
* </dl>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockCacheExtension.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockCacheExtension.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockCacheExtension.java
index caded4d..05c221a 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockCacheExtension.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockCacheExtension.java
@@ -26,8 +26,8 @@ import com.gemstone.gemfire.internal.cache.xmlcache.XmlGenerator;
*
* <dl>
* <dt>Uses</dt>
- * <dd>{@link ClusterConfigurationDUnitTest}</dd>
- * <dd>{@link CacheXml81DUnitTest}</dd>
+ * <dd>com.gemstone.gemfire.management.internal.configuration.ClusterConfigurationDUnitTest</dd>
+ * <dd>{@link com.gemstone.gemfire.cache30.CacheXml81DUnitTest}</dd>
* </dl>
*
* @author jbarrett@pivotal.io
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
index 63b2ea8..2c319cd 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
@@ -132,9 +132,6 @@ public class Bug36853EventsExpiryDUnitTest extends CacheTestCase
/**
* Creates cache and starts the bridge-server
- *
- * @throws thrown
- * in any problem occurs in creating and starting cache-server
*/
public static Integer createServerCache() throws Exception
{
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/ConflatableObject.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/ConflatableObject.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/ConflatableObject.java
index 6d54ac4..ada6aa2 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/ConflatableObject.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/ConflatableObject.java
@@ -57,7 +57,7 @@ public class ConflatableObject implements Conflatable, Serializable
* The key for this entry
* @param value -
* The value for this entry
- * @param eventid -
+ * @param eventId -
* eventID object for this entry
* @param conflate -
* conflate it true
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationJUnitTest.java
index 891b92a..8db9083 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationJUnitTest.java
@@ -33,7 +33,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
* sent as long if their value is small. This is a junit test for testing the
* methods written in <code>EventID</code> class for the above optmization.
* For distributed testing for the same , please refer
- * {@link old_EventIdOptimizationDUnitTest}}.
+ * {@link EventIdOptimizationDUnitTest}.
*
* @author Dinesh Patel
*
@@ -223,11 +223,11 @@ public class EventIdOptimizationJUnitTest extends TestCase
* byte-array using <code>EventID#readEventIdPartsFromOptmizedByteArray</code>
* api and verifies that they are decoded properly.
*
- * @param threadId -
+ * @param threadId
* the long value of threadId
- * @param sequenceId-
+ * @param sequenceId
* the long value of sequenceId
- * @param expectedArrayLength-
+ * @param expectedArrayLength
* expected length of the optimized byte-array
*/
private void writeReadAndVerifyOpmitizedByteArray(long threadId,
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionJUnitTest.java
index 4621120..c1e0212 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionJUnitTest.java
@@ -89,10 +89,8 @@ public class HARegionJUnitTest
*
* create the cache
*
- * @return @throws
- * TimeoutException
+ * @throws TimeoutException
* @throws CacheWriterException
- * @throws CapacityControllerException
* @throws GatewayException
* @throws CacheExistsException
* @throws RegionExistsException
@@ -107,10 +105,8 @@ public class HARegionJUnitTest
/**
* create the HARegion
*
- * @return @throws
- * TimeoutException
+ * @throws TimeoutException
* @throws CacheWriterException
- * @throws CapacityControllerException
* @throws GatewayException
* @throws CacheExistsException
* @throws RegionExistsException
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java
index fc15226..f4c50cd 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java
@@ -109,9 +109,6 @@ public class HARegionQueueDUnitTest extends DistributedTestCase
/**
* create cache
- *
- * @return
- * @throws Exception
*/
protected Cache createCache() throws CacheException
{
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueJUnitTest.java
index 55df641..f73a5a6 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueJUnitTest.java
@@ -520,7 +520,7 @@ public class HARegionQueueJUnitTest
* prefix to keys of all objects put by this thread
* @param startingId -
* startingId for sequence-ids of all objects put by this thread
- * @param totalPuts-
+ * @param totalPuts
* total number of puts by this thread
* @param createConflatableEvents -
* boolean to indicate whether this thread should create conflation
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java
index f246a8a..788692f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java
@@ -238,7 +238,7 @@ public class StatsBugDUnitTest extends DistributedTestCase
*
* @param port1 -
* port for the primary cache-server
- * @param port2-port
+ * @param port2
* for the secondary cache-server
* @throws Exception-thrown
* if any problem occurs in initializing the client
@@ -262,7 +262,7 @@ public class StatsBugDUnitTest extends DistributedTestCase
*
* @param port1 -
* port for the primary cache-server
- * @param port2-port
+ * @param port2
* for the secondary cache-server
* @throws Exception-thrown
* if any problem occurs in initializing the client
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionLoadModelJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionLoadModelJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionLoadModelJUnitTest.java
index f357950..4954cd2 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionLoadModelJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionLoadModelJUnitTest.java
@@ -1395,11 +1395,7 @@ public class PartitionedRegionLoadModelJUnitTest {
public static class Move {
public final InternalDistributedMember sourceMember;
public final InternalDistributedMember targetMember;
- /**
- * @param sourceMember
- * @param targetMember
- * @param bucketId
- */
+
public Move(InternalDistributedMember sourceMember,
InternalDistributedMember targetMember) {
this.sourceMember = sourceMember;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
index dc89894..cacdc61 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
@@ -1455,7 +1455,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest extends
* Create three PRs on a VM, named region1, region2, and region3.
* The colocated with attribute describes which region region3
* should be colocated with.
- * @param vm0
+ *
* @param colocatedWith
*/
private void createColocatedPRs(final String colocatedWith) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionWithTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionWithTransactionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionWithTransactionDUnitTest.java
index 845a14c..e92d6b1 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionWithTransactionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionWithTransactionDUnitTest.java
@@ -109,12 +109,6 @@ public class PersistentPartitionedRegionWithTransactionDUnitTest extends Persist
checkData(vm2, 0, numBuckets, "b");
}
- /**
- * @param vm0
- * @param i
- * @param numBuckets
- * @param string
- */
private void createDataWithRollback(VM vm, final int startKey, final int endKey, final String value) {
SerializableRunnable createData = new SerializableRunnable() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/ShutdownAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/ShutdownAllDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/ShutdownAllDUnitTest.java
index 97ff82d..4918f00 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/ShutdownAllDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/ShutdownAllDUnitTest.java
@@ -72,10 +72,6 @@ public class ShutdownAllDUnitTest extends CacheTestCase {
protected static HangingCacheListener listener;
- /**
- * @param name
- */
-
final String expectedExceptions = InternalGemFireError.class.getName()+"||ShutdownAllRequest: disconnect distributed without response";
public ShutdownAllDUnitTest(String name) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
index 2921554..3418ae2 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
@@ -70,9 +70,6 @@ public class CacheServerMaxConnectionsJUnitTest
/**
* Close the cache and disconnects from the distributed system
- *
- * @exception -
- * thrown if any exception occured in closing cache/ds
*/
@After
public void tearDown() throws Exception
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java
index 1f47d72..f70a808 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java
@@ -282,10 +282,6 @@ public class CacheServerTestUtil extends DistributedTestCase
/**
* Create client regions
- * @param props
- * @param regionName1
- * @param regionName2
- * @throws Exception
*/
public static void createCacheClients(Pool poolAttr, String regionName1,
String regionName2, Properties dsProperties) throws Exception
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
index 79dd760..404d977 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
@@ -419,10 +419,6 @@ public class ClearPropagationDUnitTest extends DistributedTestCase
return new Integer(server.getPort());
}
- /**
- *
- * @param key Key in which client is interested
- */
public static void registerKeysK1andK2()
{
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
index cdfda98..0a8a45a 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
@@ -77,9 +77,6 @@ public class ClientHealthMonitorJUnitTest
/**
* Close the cache and disconnects from the distributed system
- *
- * @exception -
- * thrown if any exception occured in closing cache/ds
*/
@After
public void tearDown() throws Exception
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
index 55bd889..ba8ee2e 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
@@ -471,11 +471,6 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase
return new Integer(server.getPort());
}
- /**
- *
- * @param key
- * Key in which client is interested
- */
public static void registerKey1()
{
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
index 0896c5a..74fde05 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
@@ -118,7 +118,6 @@ public class NewRegionAttributesDUnitTest extends DistributedTestCase
* @throws Exception
* thrown if any problem occurs while creating cache or test-region
*
- * @see AttributesFactory#setEnableWAN(boolean)
* @see AttributesFactory#setPublisher(boolean)
* @see AttributesFactory#setEnableConflation(boolean)
* @see AttributesFactory#setEnableAsyncConflation(boolean)
@@ -180,7 +179,6 @@ public class NewRegionAttributesDUnitTest extends DistributedTestCase
* 3)Perform PUTs,INVALIDATEs and DESTROYs from one VM and verify at the end
* that all are destroyed in the other VM also<br>
*
- * @see AttributesFactory#setEnableWAN(boolean)
* @see AttributesFactory#setPublisher(boolean)
* @see AttributesFactory#setEnableConflation(boolean)
* @see AttributesFactory#setEnableAsyncConflation(boolean)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
index c21cbcb..c4dca37 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
@@ -525,10 +525,6 @@ public class UpdatePropagationDUnitTest extends DistributedTestCase
return factory.create();
}
- /**
- *
- * @param key Key in which client is interested
- */
public static void registerKeysK1andK2()
{
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/CommitCommandTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/CommitCommandTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/CommitCommandTest.java
index b6bfe22..328a796 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/CommitCommandTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/CommitCommandTest.java
@@ -38,7 +38,7 @@ public class CommitCommandTest {
/**
* Test for GEODE-537
- * No NPE should be thrown from the {@link CommitCommand.writeCommitResponse()}
+ * No NPE should be thrown from the {@link CommitCommand#writeCommitResponse(com.gemstone.gemfire.internal.cache.TXCommitMessage, Message, ServerConnection)}
* if the response message is null as it is the case when JTA
* transaction is rolled back with TX_SYNCHRONIZATION AFTER_COMPLETION STATUS_ROLLEDBACK
* @throws IOException
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/compression/SnappyCompressorJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/compression/SnappyCompressorJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/compression/SnappyCompressorJUnitTest.java
index daf6a9d..deff1ea 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/compression/SnappyCompressorJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/compression/SnappyCompressorJUnitTest.java
@@ -50,7 +50,7 @@ public class SnappyCompressorJUnitTest extends TestCase {
}
/**
- * Tests {@link SnappyCompressor()} constructor.
+ * Tests {@link SnappyCompressor#SnappyCompressor()} constructor.
* @throws SecurityException
* @throws NoSuchMethodException
* @throws InvocationTargetException
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/functional/TestXACacheLoader.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/functional/TestXACacheLoader.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/functional/TestXACacheLoader.java
index e0a744c..c49ac1f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/functional/TestXACacheLoader.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/jta/functional/TestXACacheLoader.java
@@ -29,9 +29,6 @@ import javax.transaction.*;
* A <code>CacheLoader</code> used in testing. Users should override
* the "2" method.
*
- * @see #wasInvoked
- * @see TestCacheWriter
- *
* @author GemStone Systems, Inc.
*
* @since 3.0
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
index 40aa750..9f35f05 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
@@ -611,7 +611,6 @@ public class StatisticsDUnitTest extends CacheTestCase {
/**
* @author Kirk Lund
* @since 7.0
- * @see cacheperf.CachePerfStats
*/
static class PubSubStats {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/util/ArrayUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/util/ArrayUtilsJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/util/ArrayUtilsJUnitTest.java
index ee4aa40..906a5fb 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/util/ArrayUtilsJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/util/ArrayUtilsJUnitTest.java
@@ -28,7 +28,6 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
* The ArrayUtilsJUnitTest class... </p>
*
* @author jblum
- * @see ?
* @since 7.x
*/
@Category(UnitTest.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/util/SerializableImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/util/SerializableImpl.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/util/SerializableImpl.java
index cf3f7b9..1596295 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/util/SerializableImpl.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/util/SerializableImpl.java
@@ -22,8 +22,6 @@ import java.io.*;
* A {@link Serializable} class that is loaded by a class loader other
* than the one that is used to load test classes.
*
- * @see DeserializerTest
- *
* @author David Whitlock
*
* @since 2.0.1
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/internal/util/SerializableImplWithValue.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/util/SerializableImplWithValue.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/util/SerializableImplWithValue.java
index 0a8cd6b..e385658 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/util/SerializableImplWithValue.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/util/SerializableImplWithValue.java
@@ -22,8 +22,6 @@ package com.gemstone.gemfire.internal.util;
* A {@link SerializableImpl} that implements an interface and has
* some object state.
*
- * @see DeserializerTest
- *
* @author David Whitlock
*
* @since 2.0.3
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/management/CompositeTypeTestDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/CompositeTypeTestDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/CompositeTypeTestDUnitTest.java
index 54078e8..e7c11a7 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/CompositeTypeTestDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/CompositeTypeTestDUnitTest.java
@@ -70,9 +70,6 @@ public class CompositeTypeTestDUnitTest extends ManagementTestBase {
*
* @param vm
* reference to VM
- * @param localRegionName
- * name of the local region
- * @throws Throwable
*/
protected void registerMBeanWithCompositeTypeGetters(VM vm,final String memberID)
throws Exception {
@@ -108,9 +105,6 @@ public class CompositeTypeTestDUnitTest extends ManagementTestBase {
*
* @param vm
* reference to VM
- * @param localRegionName
- * name of the local region
- * @throws Throwable
*/
protected void checkMBeanWithCompositeTypeGetters(VM vm,final String memberID)
throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/management/DiskManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/DiskManagementDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/DiskManagementDUnitTest.java
index c9a177a..b9f49ab 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/DiskManagementDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/DiskManagementDUnitTest.java
@@ -283,9 +283,6 @@ public class DiskManagementDUnitTest extends ManagementTestBase {
/**
* get Distributed member for a given vm
- *
- * @param vm
- * reference to VM
*/
@SuppressWarnings("serial")
protected static DistributedMember getMember() throws Exception {
@@ -429,10 +426,6 @@ public class DiskManagementDUnitTest extends ManagementTestBase {
/**
* Takes a back up of all the disk store in a given directory
- *
- * @param vm1
- * reference to VM
- * @throws Exception
*/
@SuppressWarnings("serial")
public void backupAllMembers(final VM managingVM) throws Exception {
@@ -453,10 +446,6 @@ public class DiskManagementDUnitTest extends ManagementTestBase {
/**
* Compact a disk store from Managing node
- *
- * @param vm1
- * reference to VM
- * @throws Exception
*/
@SuppressWarnings("serial")
public void compactDiskStoresRemote(VM managingVM) throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
index 631c9d0..4c9aaee 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
@@ -149,7 +149,6 @@ public class LocatorManagementDUnitTest extends ManagementTestBase {
*
* @param vm
* reference to VM
- * @throws Throwable
*/
protected String startLocator(final VM vm, final boolean isPeer,
final int port) {
@@ -192,7 +191,6 @@ public class LocatorManagementDUnitTest extends ManagementTestBase {
*
* @param vm
* reference to VM
- * @throws Throwable
*/
protected String stopLocator(VM vm) {
@@ -212,7 +210,6 @@ public class LocatorManagementDUnitTest extends ManagementTestBase {
*
* @param vm
* reference to VM
- * @throws Throwable
*/
protected void locatorMBeanExist(VM vm, final int locPort,
final boolean isPeer) {
@@ -241,7 +238,6 @@ public class LocatorManagementDUnitTest extends ManagementTestBase {
*
* @param vm
* reference to VM
- * @throws Throwable
*/
protected void remoteLocatorMBeanExist(VM vm, final DistributedMember member) {
@@ -268,7 +264,6 @@ public class LocatorManagementDUnitTest extends ManagementTestBase {
*
* @param vm
* reference to VM
- * @throws Throwable
*/
protected void listManagers(VM vm, final int locPort, final boolean isPeer) {
@@ -307,7 +302,6 @@ public class LocatorManagementDUnitTest extends ManagementTestBase {
*
* @param vm
* reference to VM
- * @throws Throwable
*/
protected void listWillingManagers(VM vm, final int locPort,
final boolean isPeer) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
index ab2f1ce..ecfc698 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
@@ -141,8 +141,6 @@ public class ManagementTestBase extends DistributedTestCase {
/**
* Enable system property gemfire.disableManagement false in each VM.
- *
- * @throws Exception
*/
public void enableManagement() {
invokeInEveryVM(new SerializableRunnable("Enable Management") {
@@ -155,8 +153,6 @@ public class ManagementTestBase extends DistributedTestCase {
/**
* Disable system property gemfire.disableManagement true in each VM.
- *
- * @throws Exception
*/
public void disableManagement() {
invokeInEveryVM(new SerializableRunnable("Disable Management") {
@@ -527,7 +523,6 @@ public class ManagementTestBase extends DistributedTestCase {
* reference to VM
* @param regionName
* name of the distributed region
- * @throws Throwable
*/
protected void createDistributedRegion(VM vm, final String regionName)
throws Exception {
@@ -548,7 +543,6 @@ public class ManagementTestBase extends DistributedTestCase {
* reference to VM
* @param localRegionName
* name of the local region
- * @throws Throwable
*/
protected void createLocalRegion(VM vm, final String localRegionName)
throws Exception {
@@ -573,9 +567,6 @@ public class ManagementTestBase extends DistributedTestCase {
*
* @param vm
* reference to VM
- * @param localRegionName
- * name of the local region
- * @throws Throwable
*/
protected void createSubRegion(VM vm, final String parentRegionPath, final String subregionName)
throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
index 296d13d..ba642a1 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
@@ -1331,11 +1331,8 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
/**
- * Waits for client to create {@link
- * com.gemstone.gemfire.internal.cache.tier.Endpoint#getNumConnections
- * Endpoint.getNumConnections()} to {@link
- * com.gemstone.gemfire.internal.cache.tier.Endpoint}. Note: This probably
- * won't work if the pool has more than one Endpoint.
+ * Waits for client to create an expected number of connections.
+ * Note: This probably won't work if the pool has more than one Endpoint.
*/
protected void waitForClientToFullyConnect(final PoolImpl pool) {
getLogWriter().info("[waitForClientToFullyConnect]");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/GfshParserJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/GfshParserJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/GfshParserJUnitTest.java
index f28b5cc..45d3414 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/GfshParserJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/GfshParserJUnitTest.java
@@ -161,7 +161,7 @@ public class GfshParserJUnitTest {
/**
* Tests the auto-completion capability of {@link GfshParser} with the method
- * {@link GfshParser#complete(String, int, List<{@link String}>)}
+ * {@link GfshParser#complete(String, int, List)}
*
* @throws IllegalAccessException
* @throws InstantiationException
@@ -457,7 +457,7 @@ public class GfshParserJUnitTest {
/**
* Tests the auto-completion capability of {@link GfshParser} with the method
- * {@link GfshParser#completeAdvanced(String, int, List<{@link Completion}>)}
+ * {@link GfshParser#completeAdvanced(String, int, List)}
*
* @throws IllegalAccessException
* @throws InstantiationException
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
index d09e596..c327f41 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
@@ -163,11 +163,6 @@ public class ShowMetricsDUnitTest extends CliCommandTestBase {
/***
* Creates WaitCriterion based on creation of different types of MBeans
- *
- * @param beanType
- * @param regionName
- * @param memberName
- * @return
*/
private WaitCriterion createMBeanWaitCriterion(final int beanType, final String regionName,
final DistributedMember distributedMember, final int cacheServerPort) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
index 894d2ec..955d9f9 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
@@ -57,7 +57,7 @@ import com.gemstone.gemfire.test.dunit.VM;
/***
* Tests the starting up of shared configuration, installation of {@link ConfigurationRequestHandler}
- * and {@link ConfigurationChangeHandler}
+ *
* @author bansods
*
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.java
index b327a6f..60905b5 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.java
@@ -54,7 +54,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
public class XmlUtilsJUnitTest {
/**
- * Test method for {@link XmlUtils#buildSchemaLocationMap(Attribute)}.
+ * Test method for {@link XmlUtils#buildSchemaLocationMap(String)}.
* @throws IOException
* @throws ParserConfigurationException
* @throws SAXException
@@ -86,7 +86,7 @@ public class XmlUtilsJUnitTest {
}
/**
- * Test method for {@link XmlUtils#buildSchemaLocationMap(Map, Attribute)}.
+ * Test method for {@link XmlUtils#buildSchemaLocationMap(Map, String)}.
* @throws IOException
* @throws ParserConfigurationException
* @throws SAXException
@@ -132,7 +132,7 @@ public class XmlUtilsJUnitTest {
}
/**
- * Test method for {@link XmlUtils#buildSchemaLocationMap(Map, Attribute)}.
+ * Test method for {@link XmlUtils#buildSchemaLocationMap(Map, String)}.
* Asserts map is empty if schemaLocation attribute is <code>null</code>.
* @throws IOException
* @throws ParserConfigurationException
@@ -150,7 +150,7 @@ public class XmlUtilsJUnitTest {
}
/**
- * Test method for {@link XmlUtils#buildSchemaLocationMap(Map, Attribute)}.
+ * Test method for {@link XmlUtils#buildSchemaLocationMap(Map, String)}.
* Asserts map is empty if schemaLocation attribute is empty.
* @throws IOException
* @throws ParserConfigurationException
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
index b096bd8..88b2b3d 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
@@ -197,8 +197,6 @@ public class TestClientIdsDUnitTest extends DistributedTestCase {
/**
* get member id
- *
- * @param vm
*/
@SuppressWarnings("serial")
protected static DistributedMember getMember() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
index 56fcbb1..b415eac 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
@@ -195,8 +195,6 @@ public class TestSubscriptionsDUnitTest extends DistributedTestCase {
/**
* get member id
- *
- * @param vm
*/
@SuppressWarnings("serial")
protected static DistributedMember getMember() throws Exception {
[17/50] [abbrv] incubator-geode git commit: Merge remote-tracking
branch 'origin/develop' into develop
Posted by kl...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/c194f766
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/c194f766
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/c194f766
Branch: refs/heads/feature/GEODE-773-2
Commit: c194f76653cbeaa40f2efb42ace5511a0556d222
Parents: 46ae4ef 6df4b8f
Author: Dan Smith <up...@apache.org>
Authored: Thu Jan 28 10:12:27 2016 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Thu Jan 28 10:12:27 2016 -0800
----------------------------------------------------------------------
gemfire-pulse/build.gradle | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
[23/50] [abbrv] incubator-geode git commit: Revert "GEODE-871:
build-up of sockets in TIME_WAIT on locator machine"
Posted by kl...@apache.org.
Revert "GEODE-871: build-up of sockets in TIME_WAIT on locator machine"
This reverts commit c01506b27e233538ecc2ca5a81ca113c15cc388a.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/0994a45b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/0994a45b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/0994a45b
Branch: refs/heads/feature/GEODE-773-2
Commit: 0994a45b5a584925b3c646b8b9607047c7869531
Parents: de7afae
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Fri Jan 29 08:42:07 2016 -0800
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Fri Jan 29 08:42:50 2016 -0800
----------------------------------------------------------------------
.../distributed/internal/tcpserver/TcpClient.java | 8 +++-----
.../distributed/internal/tcpserver/TcpServer.java | 17 ++++++++++++++++-
2 files changed, 19 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0994a45b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpClient.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpClient.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpClient.java
index 836416b..47f50b3 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpClient.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpClient.java
@@ -167,15 +167,14 @@ public class TcpClient {
}
return null;
} finally {
+ if (out != null) {
+ out.close();
+ }
try {
- sock.setSoLinger(true, 0); // initiate an abort on close to shut down the locator's socket
sock.close();
} catch(Exception e) {
logger.error("Error closing socket ", e);
}
- if (out != null) {
- out.close();
- }
}
}
@@ -224,7 +223,6 @@ public class TcpClient {
}
} finally {
try {
- sock.setSoLinger(true, 0); // initiate an abort on close to shut down the server's socket
sock.close();
} catch(Exception e) {
logger.error("Error closing socket ", e);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0994a45b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
index e5ad416..f52b9ab 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
@@ -398,6 +398,7 @@ public class TcpServer {
DataSerializer.writeObject(response, output);
output.flush();
+ output.close();
}
handler.endResponse(request,startTime);
@@ -466,10 +467,24 @@ public class TcpServer {
t.printStackTrace();
}
} finally {
+ // Normal path closes input first, so let's do that here...
+ if (input != null) {
+ try {
+ input.close();
+ } catch (IOException e) {
+ log.warn(
+ "Exception closing input stream", e);
+ }
+ }
+
+ // Closing the ObjectInputStream is supposed to close
+ // the underlying InputStream, but we do it here just for
+ // good measure. Closing a closed socket is a no-op.
try {
sock.close();
} catch (IOException e) {
- // ignore
+ log.warn(
+ "Exception closing socket", e);
}
}
}
[25/50] [abbrv] incubator-geode git commit: GEODE-875: CI failure:
ParallelGatewaySenderOperationsOffHeapDUnitTest.testParallelGatewaySender_SingleNode_UserPR_localDestroy_SimultenuousPut_RecreateRegion
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c6e0d2d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
index 19f6c4b..68614a0 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
@@ -18,14 +18,12 @@ package com.gemstone.gemfire.internal.cache.wan.parallel;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionDestroyedException;
-import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
import com.gemstone.gemfire.internal.cache.wan.GatewaySenderException;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.RMIException;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase.ExpectedException;
/**
* DUnit test for operations on ParallelGatewaySender
@@ -46,41 +44,11 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
}
public void testParallelGatewaySenderWithoutStarting() {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
+ Integer[] locatorPorts = createLNAndNYLocators();
+ Integer lnPort = locatorPorts[0];
+ Integer nyPort = locatorPorts[1];
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
-
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
+ createSendersReceiversAndPartitionedRegion(lnPort, nyPort, false, false);
vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
@@ -89,68 +57,30 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
vm6.invoke(WANTestBase.class, "verifySenderStoppedState", new Object[] { "ln" });
vm7.invoke(WANTestBase.class, "verifySenderStoppedState", new Object[] { "ln" });
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 0 });
- vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 0 });
+ validateRegionSizes(testName + "_PR", 0, vm2, vm3);
}
/**
* Defect 44323 (ParallelGatewaySender should not be started on Accessor node)
*/
public void testParallelGatewaySenderStartOnAccessorNode() {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
+ Integer[] locatorPorts = createLNAndNYLocators();
+ Integer lnPort = locatorPorts[0];
+ Integer nyPort = locatorPorts[1];
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm6.invoke(WANTestBase.class, "createPartitionedRegionAsAccessor", new Object[] {
- testName + "_PR", "ln", 1, 100 });
- vm7.invoke(WANTestBase.class, "createPartitionedRegionAsAccessor", new Object[] {
- testName + "_PR", "ln", 1, 100 });
+ createSendersReceiversAndPartitionedRegion(lnPort, nyPort, true, true);
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
-
- //start the senders
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
pause(2000);
vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+ vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 10 });
vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
-
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 1000 });
- vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 1000 });
+
+ validateRegionSizes(testName + "_PR", 10, vm2, vm3);
}
@@ -159,52 +89,14 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
* @throws Exception
*/
public void testParallelPropagationSenderPause() throws Exception {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+ Integer[] locatorPorts = createLNAndNYLocators();
+ Integer lnPort = locatorPorts[0];
+ Integer nyPort = locatorPorts[1];
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
+ createSendersReceiversAndPartitionedRegion(lnPort, nyPort, false, true);
//make sure all the senders are running before doing any puts
- vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+ waitForSendersRunning();
//FIRST RUN: now, the senders are started. So, start the puts
vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 100 });
@@ -227,52 +119,14 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
* @throws Exception
*/
public void testParallelPropagationSenderResume() throws Exception {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+ Integer[] locatorPorts = createLNAndNYLocators();
+ Integer lnPort = locatorPorts[0];
+ Integer nyPort = locatorPorts[1];
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
+ createSendersReceiversAndPartitionedRegion(lnPort, nyPort, false, true);
//make sure all the senders are running before doing any puts
- vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+ waitForSendersRunning();
//now, the senders are started. So, start the puts
vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
@@ -293,17 +147,14 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
pause(2000);
-
- vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
- vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
- vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
- vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+
+ validateParallelSenderQueueAllBucketsDrained();
//find the region size on remote vm
vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 1000 });
}
-
+
/**
* Negative scenario in which a sender that is stopped (and not paused) is resumed.
* Expected: resume is only valid for pause. If a sender which is stopped is resumed,
@@ -312,10 +163,9 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
* @throws Exception
*/
public void testParallelPropagationSenderResumeNegativeScenario() throws Exception {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
+ Integer[] locatorPorts = createLNAndNYLocators();
+ Integer lnPort = locatorPorts[0];
+ Integer nyPort = locatorPorts[1];
vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
@@ -373,61 +223,20 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
*/
public void testParallelPropagationSenderStop() throws Exception {
addExpectedException("Broken pipe");
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+ Integer[] locatorPorts = createLNAndNYLocators();
+ Integer lnPort = locatorPorts[0];
+ Integer nyPort = locatorPorts[1];
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
+ createSendersReceiversAndPartitionedRegion(lnPort, nyPort, false, true);
//make sure all the senders are running before doing any puts
- vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+ waitForSendersRunning();
//FIRST RUN: now, the senders are started. So, do some of the puts
vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 100 });
//now, stop all of the senders
- vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+ stopSenders();
//SECOND RUN: keep one thread doing puts
vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
@@ -442,61 +251,20 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
*/
public void testParallelPropagationSenderStartAfterStop() throws Exception {
addExpectedException("Broken pipe");
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
+ Integer[] locatorPorts = createLNAndNYLocators();
+ Integer lnPort = locatorPorts[0];
+ Integer nyPort = locatorPorts[1];
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
+ createSendersReceiversAndPartitionedRegion(lnPort, nyPort, false, true);
//make sure all the senders are running before doing any puts
- vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+ waitForSendersRunning();
//FIRST RUN: now, the senders are started. So, do some of the puts
vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 200 });
//now, stop all of the senders
- vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+ stopSenders();
pause(2000);
@@ -507,10 +275,7 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {testName + "_PR", 200 });
//start the senders again
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+ startSenders();
//Region size on remote site should remain same and below the number of puts done in the FIRST RUN
vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {testName + "_PR", 200 });
@@ -522,10 +287,7 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
pause(2000);
//verify all the buckets on all the sender nodes are drained
- vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
- vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
- vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
- vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+ validateParallelSenderQueueAllBucketsDrained();
//verify the events propagate to remote site
vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 1000 });
@@ -544,52 +306,14 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
*/
public void testParallelPropagationSenderStartAfterStop_Scenario2() throws Exception {
addExpectedException("Broken pipe");
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
+ Integer[] locatorPorts = createLNAndNYLocators();
+ Integer lnPort = locatorPorts[0];
+ Integer nyPort = locatorPorts[1];
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
+ createSendersReceiversAndPartitionedRegion(lnPort, nyPort, false, true);
//make sure all the senders are running before doing any puts
- vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+ waitForSendersRunning();
getLogWriter().info("All the senders are now started");
@@ -599,10 +323,7 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
getLogWriter().info("Done few puts");
//now, stop all of the senders
- vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+ stopSenders();
getLogWriter().info("All the senders are stopped");
pause(2000);
@@ -632,10 +353,7 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
pause(2000);
//verify all the buckets on all the sender nodes are drained
- vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
- vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
- vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
- vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+ validateParallelSenderQueueAllBucketsDrained();
//verify that the queue size ultimately becomes zero. That means all the events propagate to remote site.
vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln", 0 });
@@ -649,62 +367,20 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
addExpectedException("Broken pipe");
addExpectedException("Connection reset");
addExpectedException("Unexpected IOException");
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm6.invoke(WANTestBase.class, "createPartitionedRegionAsAccessor", new Object[] {
- testName + "_PR", "ln", 1, 100 });
- vm7.invoke(WANTestBase.class, "createPartitionedRegionAsAccessor", new Object[] {
- testName + "_PR", "ln", 1, 100 });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+ Integer[] locatorPorts = createLNAndNYLocators();
+ Integer lnPort = locatorPorts[0];
+ Integer nyPort = locatorPorts[1];
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
+ createSendersReceiversAndPartitionedRegion(lnPort, nyPort, true, true);
//make sure all the senders are not running on accessor nodes and running on non-accessor nodes
- vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
-
- vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+ waitForSendersRunning();
//FIRST RUN: now, the senders are started. So, do some of the puts
vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 200 });
//now, stop all of the senders
- vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+ stopSenders();
pause(2000);
@@ -715,10 +391,7 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {testName + "_PR", 200 });
//start the senders again
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+ startSenders();
//Region size on remote site should remain same and below the number of puts done in the FIRST RUN
vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {testName + "_PR", 200 });
@@ -736,57 +409,19 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 1000 });
}
-
/**
* Normal scenario in which a combinations of start, pause, resume operations
* is tested
*/
public void testStartPauseResumeParallelGatewaySender() throws Exception {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+ Integer[] locatorPorts = createLNAndNYLocators();
+ Integer lnPort = locatorPorts[0];
+ Integer nyPort = locatorPorts[1];
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+ createSendersReceiversAndPartitionedRegion(lnPort, nyPort, false, true);
- getLogWriter().info("Created cache on local site");
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
-
- getLogWriter().info("Created senders on local site");
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
-
- getLogWriter().info("Created PRs on local site");
-
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
- getLogWriter().info("Created PRs on remote site");
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
- getLogWriter().info("Done 1000 puts on local site");
+ vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+ getLogWriter().info("Done 1000 puts on local site");
//Since puts are already done on userPR, it will have the buckets created.
//During sender start, it will wait until those buckets are created for shadowPR as well.
@@ -796,11 +431,8 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+
+ waitForSendersRunning();
getLogWriter().info("Started senders on local site");
@@ -841,999 +473,24 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
}
//verify all buckets drained on all sender nodes.
- vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
- vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
- vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
- vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
-
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 5000 });
- vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 5000 });
- }
-
- // to test that when userPR is locally destroyed, shadow Pr is also locally
- // destroyed and on recreation usrePr , shadow Pr is also recreated.
- public void testParallelGatewaySender_SingleNode_UserPR_localDestroy_RecreateRegion() throws Exception {
- addExpectedException("RegionDestroyedException");
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- try {
- vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
+ validateParallelSenderQueueAllBucketsDrained();
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, false });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
-
- getLogWriter().info("Created PRs on local site");
-
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 10, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
- 10 });
-
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
-
- // since sender is paused, no dispatching
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 0 });
-
- vm4.invoke(WANTestBase.class, "localDestroyRegion",
- new Object[] { testName + "_PR" });
-
- // since shodowPR is locally destroyed, so no data to dispatch
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 0 });
-
- vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
- testName + "_PR", 10, 20 });
-
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
-
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
- } finally {
- vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
- }
+ validateRegionSizes(testName + "_PR", 5000, vm2, vm3);
}
-
- public void testParallelGatewaySender_SingleNode_UserPR_Destroy_RecreateRegion() throws Exception {
- addExpectedException("RegionDestroyedException");
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- try {
- vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, false });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
-
- getLogWriter().info("Created PRs on local site");
-
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 10, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
- 10 });
-
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
-
- // since resume is paused, no dispatching
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 0 });
-
- vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "destroyRegion", new Object[] { testName
- + "_PR" });
-
- // before destoy, there is wait for queue to drain, so data will be
- // dispatched
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
- testName + "_PR", 10, 20 });
-
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
-
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 20 });
-
- } finally {
- vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
- }
- }
-
-
- public void testParallelGatewaySender_SingleNode_UserPR_Close_RecreateRegion() throws Exception {
- ExpectedException exp = addExpectedException(RegionDestroyedException.class
- .getName());
- try {
- Integer lnPort = (Integer) vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer) vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- try {
- vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
-
- getLogWriter().info("Created cache on local site");
-
- getLogWriter().info("Created senders on local site");
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, false });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
-
- getLogWriter().info("Created PRs on local site");
-
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 10, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] {
- testName + "_PR", 10 });
-
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
-
- // since resume is paused, no dispatching
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 0 });
-
- vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "closeRegion", new Object[] { testName + "_PR" });
-
- vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-
- pause(500); // paused if there is any element which is received on
- // remote
- // site
-
- // before close, there is wait for queue to drain, so data will be
- // dispatched
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 0 });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
- testName + "_PR", 10, 20 });
-
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
-
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
- } finally {
- vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
- }
- } finally {
- exp.remove();
- }
- }
-
- //to test that while localDestroy is in progress, put operation does not successed
- public void testParallelGatewaySender_SingleNode_UserPR_localDestroy_SimultenuousPut_RecreateRegion() throws Exception {
- addExpectedException("RegionDestroyedException");
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- try {
- vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
-
- getLogWriter().info("Created cache on local site");
-
- getLogWriter().info("Created senders on local site");
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, false });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
-
- getLogWriter().info("Created PRs on local site");
-
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 10, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
- 10 });
-
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
-
- // since resume is paused, no dispatching
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 0 });
-
- AsyncInvocation putAsync = vm4.invokeAsync(WANTestBase.class,
- "doPutsFrom", new Object[] { testName + "_PR", 100, 2000 });
- AsyncInvocation localDestroyAsync = vm4.invokeAsync(WANTestBase.class,
- "localDestroyRegion", new Object[] { testName + "_PR" });
- try {
- putAsync.join();
- localDestroyAsync.join();
- } catch (InterruptedException e) {
- e.printStackTrace();
- fail("Interrupted the async invocation.");
- }
-
- if (localDestroyAsync.getException() != null) {
- fail("Not Expected Exception got", putAsync.getException());
- }
-
- if (putAsync.getException() != null
- && !(putAsync.getException() instanceof RegionDestroyedException)) {
- fail("Expected RegionDestroyedException but got",
- putAsync.getException());
- }
-
- vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-
- pause(500); // paused if there is any element which is received on remote
- // site
-
- // since shodowPR is locally destroyed, so no data to dispatch
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 0 });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
- testName + "_PR", 10, 20 });
-
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
-
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
-
- } finally {
- vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
- }
- }
-
- public void testParallelGatewaySender_SingleNode_UserPR_Destroy_SimultenuousPut_RecreateRegion() throws Exception {
- addExpectedException("RegionDestroyedException");
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- try {
- vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, false });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "addCacheListenerAndDestroyRegion", new Object[] {
- testName + "_PR"});
-
- getLogWriter().info("Created PRs on local site");
-
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 10, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
- 10 });
-
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
-
- // since resume is paused, no dispatching
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 0 });
-
- vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-
- AsyncInvocation putAsync = vm4.invokeAsync(WANTestBase.class,
- "doPutsFrom", new Object[] { testName + "_PR", 10, 101 });
- try {
- putAsync.join();
- } catch (InterruptedException e) {
- e.printStackTrace();
- fail("Interrupted the async invocation.");
- }
-
- if (putAsync.getException() != null
- && !(putAsync.getException() instanceof RegionDestroyedException)) {
- fail("Expected RegionDestroyedException but got",
- putAsync.getException());
- }
-
- // before destroy, there is wait for queue to drain, so data will be
- // dispatched
- vm2.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "validateRegionSizeWithinRange", new Object[] { testName + "_PR", 10,
- 101 }); // possible size is more than 10
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
- testName + "_PR", 10, 20 });
-
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
-
- vm2.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "validateRegionSizeWithinRange", new Object[] { testName + "_PR", 20,
- 101 });// possible size is more than 20
-
- } finally {
- vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
- }
- }
-
- public void testParallelGatewaySender_SingleNode_UserPR_Destroy_NodeDown() throws Exception {
- addExpectedException("RegionDestroyedException");
- addExpectedException("Connection reset");
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- try {
- vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
- vm5.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
- vm6.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, false });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, false });
- vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, false });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
- vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
- vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
-
- getLogWriter().info("Created PRs on local site");
-
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 10, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
- 10000 });
-
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10000 });
-
- // since resume is paused, no dispatching
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 0 });
-
- vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-
- pause(200);
- AsyncInvocation localDestroyAsync = vm4.invokeAsync(WANTestBase.class,
- "destroyRegion", new Object[] { testName + "_PR" });
-
- AsyncInvocation closeAsync = vm4.invokeAsync(WANTestBase.class,
- "closeCache");
- try {
- localDestroyAsync.join();
- closeAsync.join();
- } catch (InterruptedException e) {
- e.printStackTrace();
- fail("Interrupted the async invocation.");
- }
-
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10000 });// possible size is more than 20
-
- } finally {
- vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
- vm5.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
- vm6.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
- }
- }
-
- public void testParallelGatewaySender_SingleNode_UserPR_Close_SimultenuousPut_RecreateRegion() throws Exception {
- addExpectedException("RegionDestroyedException");
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- try {
- vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
-
- getLogWriter().info("Created cache on local site");
-
- getLogWriter().info("Created senders on local site");
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, false });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
-
- getLogWriter().info("Created PRs on local site");
-
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 10, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
- 10 });
-
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
-
- // since resume is paused, no dispatching
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 0 });
-
- AsyncInvocation putAsync = vm4.invokeAsync(WANTestBase.class,
- "doPutsFrom", new Object[] { testName + "_PR", 10, 2000 });
- AsyncInvocation localDestroyAsync = vm4.invokeAsync(
- ParallelGatewaySenderOperationsDUnitTest.class, "closeRegion",
- new Object[] { testName + "_PR" });
- try {
- putAsync.join();
- localDestroyAsync.join();
- } catch (InterruptedException e) {
- e.printStackTrace();
- fail("Interrupted the async invocation.");
- }
-
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 0 });
-
- vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 10, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
- testName + "_PR", 10, 20 });
-
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
-
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
- } finally {
- vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
- }
- }
-
- public void testParallelGatewaySenders_SingleNode_UserPR_localDestroy_RecreateRegion()
- throws Exception {
- addExpectedException("RegionDestroyedException");
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
- Integer tkPort = (Integer)vm2.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 3, lnPort });
- Integer pnPort = (Integer)vm3.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 4, lnPort });
-
- vm4.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm5.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
- vm6.invoke(WANTestBase.class, "createReceiver", new Object[] { pnPort });
-
- try {
- vm7.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
-
- getLogWriter().info("Created cache on local site");
-
- vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
- true, 100, 10, false, false, null, true });
-
- vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln2", 3,
- true, 100, 10, false, false, null, true });
-
- vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln3", 4,
- true, 100, 10, false, false, null, true });
-
- vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
- vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln2" });
- vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln3" });
-
- vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln1,ln2,ln3", 1, 10, isOffHeap() });
-
- getLogWriter().info("Created PRs on local site");
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 10, isOffHeap() });
- vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 10, isOffHeap() });
- vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 10, isOffHeap() });
-
- vm7.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
- 10 });
-
- vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
- vm7.invoke(WANTestBase.class, "validateQueueContents",
- new Object[] { "ln1", 0 });
- vm7.invoke(WANTestBase.class, "validateQueueContents",
- new Object[] { "ln2", 0 });
- vm7.invoke(WANTestBase.class, "validateQueueContents",
- new Object[] { "ln3", 0 });
-
- vm7.invoke(WANTestBase.class, "localDestroyRegion",
- new Object[] { testName + "_PR" });
-
- vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln1,ln2,ln3", 1, 10, isOffHeap() });
-
- vm7.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
- testName + "_PR", 10, 20 });
-
- vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 10 });
-
- vm7.invoke(WANTestBase.class, "validateQueueContents",
- new Object[] { "ln1", 0 });
- vm7.invoke(WANTestBase.class, "validateQueueContents",
- new Object[] { "ln2", 0 });
- vm7.invoke(WANTestBase.class, "validateQueueContents",
- new Object[] { "ln3", 0 });
-
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 20 });
- vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 20 });
- vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 20 });
- } finally {
- vm7.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
- }
- }
-
- public void testParallelGatewaySender_MultipleNode_UserPR_localDestroy_Recreate() throws Exception {
- addExpectedException("RegionDestroyedException");
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- try {
- vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
- vm5.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- getLogWriter().info("Created PRs on local site");
-
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
-
- AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
- new Object[] { testName + "_PR", 1000 });
- pause(1000);
- vm5.invoke(WANTestBase.class, "localDestroyRegion",
- new Object[] { testName + "_PR" });
-
- try {
- inv1.join();
- } catch (InterruptedException ex) {
- ex.printStackTrace();
- fail("Interrupted the async invocation.");
- }
-
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 1000 });
-
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 1000 });
-
- vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
- testName + "_PR", 1000, 2000 });
-
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 2000 });
-
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 2000 });
- } finally {
- vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
- vm5.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
- }
- }
-
- public void testParallelGatewaySenders_MultiplNode_UserPR_localDestroy_Recreate()
- throws Exception {
- addExpectedException("RegionDestroyedException");
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
- Integer tkPort = (Integer)vm2.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 3, lnPort });
-
- vm6.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm7.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
- try {
- vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
- vm5.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln1,ln2", 1, 100, isOffHeap() });
- vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln1,ln2", 1, 100, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
- true, 100, 10, false, false, null, true });
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln2", 3,
- true, 100, 10, false, false, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
- true, 100, 10, false, false, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln2", 3,
- true, 100, 10, false, false, null, true });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln2" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln2" });
-
- vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
- vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
-
- AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
- new Object[] { testName + "_PR", 1000 });
- pause(1000);
- vm5.invoke(WANTestBase.class, "localDestroyRegion",
- new Object[] { testName + "_PR" });
-
- try {
- inv1.join();
- } catch (InterruptedException ex) {
- ex.printStackTrace();
- fail("Interrupted the async invocation.");
- }
-
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 1000 });
-
- vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 1000 });
- vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 1000 });
-
- vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln1,ln2", 1, 100, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
- testName + "_PR", 1000, 2000 });
-
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 2000 });
-
- vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 2000 });
- vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_PR", 2000 });
- } finally {
- vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
- vm5.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
- }
- }
-
- public void testParallelGatewaySender_ColocatedPartitionedRegions_localDestroy() throws Exception {
- addExpectedException("RegionDestroyedException");
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- try {
- vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
- vm5.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class,
- "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
- "ln", 1, 100, isOffHeap() });
- vm5.invoke(WANTestBase.class,
- "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
- "ln", 1, 100, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- getLogWriter().info("Created PRs on local site");
-
- vm2.invoke(WANTestBase.class,
- "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
- null, 1, 100, isOffHeap() });
-
- AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class,
- "putcolocatedPartitionedRegion", new Object[] { 2000 });
- pause(1000);
-
- try {
- vm5.invoke(WANTestBase.class, "localDestroyRegion",
- new Object[] { customerRegionName });
- } catch (Exception ex) {
- assertTrue(ex.getCause() instanceof UnsupportedOperationException);
- }
-
- try {
- inv1.join();
- } catch (Exception e) {
- fail("Unexpected exception", e);
- }
-
- vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- customerRegionName, 2000 });
- vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- customerRegionName, 2000 });
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- customerRegionName, 2000 });
- } finally {
- vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
- vm5.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
- }
-
- }
-
- public void testParallelGatewaySender_ColocatedPartitionedRegions_destroy() throws Exception {
- addExpectedException("RegionDestroyedException");
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- try {
- vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
- vm5.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
- new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class,
- "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
- "ln", 1, 100, isOffHeap() });
- vm5.invoke(WANTestBase.class,
- "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
- "ln", 1, 100, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- true, 100, 10, false, false, null, true });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- getLogWriter().info("Created PRs on local site");
-
- vm2.invoke(WANTestBase.class,
- "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
- null, 1, 100, isOffHeap() });
-
- AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class,
- "putcolocatedPartitionedRegion", new Object[] { 2000 });
- pause(1000);
-
- try {
- vm5.invoke(WANTestBase.class, "destroyRegion",
- new Object[] { customerRegionName });
- } catch (Exception ex) {
- assertTrue(ex.getCause() instanceof IllegalStateException);
- return;
- }
- fail("Excpeted UnsupportedOperationException");
- } finally {
- vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
- vm5.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
- "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
- }
- }
-
/**
* Since the sender is attached to a region and in use, it can not be
* destroyed. Hence, exception is thrown by the sender API.
*/
public void testDestroyParallelGatewaySenderExceptionScenario() {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
+ Integer[] locatorPorts = createLNAndNYLocators();
+ Integer lnPort = locatorPorts[0];
+ Integer nyPort = locatorPorts[1];
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
- 100, 10, false, false, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
- 100, 10, false, false, null, true });
- vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
- 100, 10, false, false, null, true });
- vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
- 100, 10, false, false, null, true });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
+ createSendersReceiversAndPartitionedRegion(lnPort, nyPort, false, true);
// make sure all the senders are running before doing any puts
- vm4.invoke(WANTestBase.class, "waitForSenderRunningState",
- new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "waitForSenderRunningState",
- new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "waitForSenderRunningState",
- new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "waitForSenderRunningState",
- new Object[] { "ln" });
+ waitForSendersRunning();
vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
1000 });
@@ -1859,56 +516,14 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
}
public void testDestroyParallelGatewaySender() {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
+ Integer[] locatorPorts = createLNAndNYLocators();
+ Integer lnPort = locatorPorts[0];
+ Integer nyPort = locatorPorts[1];
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
- 100, 10, false, false, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
- 100, 10, false, false, null, true });
- vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
- 100, 10, false, false, null, true });
- vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
- 100, 10, false, false, null, true });
-
- vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
- vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", "ln", 1, 100, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
- testName + "_PR", null, 1, 100, isOffHeap() });
+ createSendersReceiversAndPartitionedRegion(lnPort, nyPort, false, true);
// make sure all the senders are running
- vm4.invoke(WANTestBase.class, "waitForSenderRunningState",
- new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "waitForSenderRunningState",
- new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "waitForSenderRunningState",
- new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "waitForSenderRunningState",
- new Object[] { "ln" });
+ waitForSendersRunning();
vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
1000 });
@@ -1916,10 +531,7 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
pause(2000);
//stop the sender and remove from region before calling destroy on it
- vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
- vm6.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
- vm7.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+ stopSenders();
vm4.invoke(WANTestBase.class, "removeSenderFromTheRegion", new Object[] {
"ln", testName + "_PR" });
@@ -1945,40 +557,80 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
new Object[] { "ln", true });
}
-
- public static void createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME(
- Integer locPort) {
- createCache(false, locPort);
- AbstractGatewaySender.MAXIMUM_SHUTDOWN_WAIT_TIME = -1;
+ private void createSendersReceiversAndPartitionedRegion(Integer lnPort, Integer nyPort, boolean createAccessors,
+ boolean startSenders) {
+ // Note: This is a test-specific method used by several test to create
+ // receivers, senders and partitioned regions.
+ createSendersAndReceivers(lnPort, nyPort);
+
+ createPartitionedRegions(createAccessors);
+
+ if (startSenders) {
+ startSenders();
+ }
}
- public static void clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME() {
- AbstractGatewaySender.MAXIMUM_SHUTDOWN_WAIT_TIME = 0;
+ private void createSendersAndReceivers(Integer lnPort, Integer nyPort) {
+ // Note: This is a test-specific method used by several test to create
+ // receivers and senders.
+ vm2.invoke(() -> createReceiver(nyPort));
+ vm3.invoke(() -> createReceiver(nyPort));
+
+ vm4.invoke(() -> createCache(lnPort));
+ vm5.invoke(() -> createCache(lnPort));
+ vm6.invoke(() -> createCache(lnPort));
+ vm7.invoke(() -> createCache(lnPort));
+
+ vm4.invoke(() -> createSender("ln", 2, true, 100, 10, false, false, null, true));
+ vm5.invoke(() -> createSender("ln", 2, true, 100, 10, false, false, null, true));
+ vm6.invoke(() -> createSender("ln", 2, true, 100, 10, false, false, null, true));
+ vm7.invoke(() -> createSender("ln", 2, true, 100, 10, false, false, null, true));
}
-
- public static void closeRegion(String regionName) {
- Region r = cache.getRegion(Region.SEPARATOR + regio
<TRUNCATED>
[48/50] [abbrv] incubator-geode git commit: Merge remote-tracking
branch 'origin/develop' into feature/GEODE-773-2
Posted by kl...@apache.org.
Merge remote-tracking branch 'origin/develop' into feature/GEODE-773-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/035e3ed3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/035e3ed3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/035e3ed3
Branch: refs/heads/feature/GEODE-773-2
Commit: 035e3ed3e014731e4d86e536c25a1f653f180246
Parents: 0d759cb 172135e
Author: Kirk Lund <kl...@pivotal.io>
Authored: Mon Feb 1 11:35:18 2016 -0800
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Mon Feb 1 11:35:18 2016 -0800
----------------------------------------------------------------------
build.gradle | 527 +-
gemfire-assembly/build.gradle | 18 +-
gemfire-assembly/src/main/dist/NOTICE | 462 ++
.../com/gemstone/gemfire/SystemFailure.java | 49 +-
.../gemfire/admin/AdminDistributedSystem.java | 5 -
.../internal/AdminDistributedSystemImpl.java | 3 -
.../gemfire/admin/internal/package.html | 4 +-
.../gemfire/admin/jmx/internal/package.html | 6 +-
.../java/com/gemstone/gemfire/cache/Cache.java | 3 +-
.../gemstone/gemfire/cache/CacheFactory.java | 2 -
.../gemfire/cache/CacheTransactionManager.java | 2 +-
.../com/gemstone/gemfire/cache/DataPolicy.java | 1 -
.../gemfire/cache/DiskStoreFactory.java | 3 -
.../gemstone/gemfire/cache/RegionFactory.java | 2 -
.../gemfire/cache/client/ClientCache.java | 4 +-
.../internal/AutoConnectionSourceImpl.java | 2 +-
.../cache/control/RebalanceOperation.java | 2 +-
.../gemfire/cache/control/ResourceManager.java | 2 +-
.../gemfire/cache/execute/ResultSender.java | 9 +-
.../gemfire/cache/hdfs/HDFSStoreFactory.java | 2 +-
.../org/apache/hadoop/io/SequenceFile.java | 24 +-
.../com/gemstone/gemfire/cache/package.html | 83 +-
.../gemfire/cache/query/QueryService.java | 6 +-
.../query/internal/CompiledSortCriterion.java | 11 -
.../query/internal/index/AbstractIndex.java | 4 -
.../query/internal/index/MemoryIndexStore.java | 67 +-
.../query/internal/index/PartitionedIndex.java | 2 +-
.../gemstone/gemfire/cache/server/package.html | 2 +-
.../gemfire/compression/SnappyCompressor.java | 3 +-
.../gemfire/distributed/LocatorLauncher.java | 13 +
.../distributed/internal/DistributedState.java | 143 -
.../internal/DistributionConfigImpl.java | 2 +-
.../internal/DistributionManager.java | 5 +-
.../internal/ForceDisconnectOperation.java | 42 -
.../internal/InternalDistributedSystem.java | 28 +-
.../distributed/internal/InternalLocator.java | 28 +-
.../distributed/internal/ReplyProcessor21.java | 5 +-
.../distributed/internal/ServerLocator.java | 2 +-
.../internal/StartupMessageData.java | 4 +-
.../internal/deadlock/DeadlockDetector.java | 2 +-
.../internal/deadlock/UnsafeThreadLocal.java | 1 -
.../internal/direct/DirectChannel.java | 7 -
.../internal/locks/DLockGrantor.java | 33 +-
.../membership/InternalDistributedMember.java | 2 +-
.../internal/membership/MemberServices.java | 1 -
.../membership/gms/fd/GMSHealthMonitor.java | 3 +-
.../gms/interfaces/HealthMonitor.java | 1 -
.../membership/gms/interfaces/Manager.java | 1 -
.../gms/locator/FindCoordinatorResponse.java | 1 -
.../membership/gms/membership/GMSJoinLeave.java | 2 -
.../membership/gms/messenger/Transport.java | 27 +-
.../gms/mgr/GMSMembershipManager.java | 9 +-
.../internal/tcpserver/TcpClient.java | 15 +-
.../internal/tcpserver/TcpServer.java | 17 +-
.../internal/InternalDataSerializer.java | 2 -
.../gemfire/internal/admin/package.html | 4 +-
.../admin/remote/DistributionLocatorId.java | 1 -
.../gemfire/internal/admin/remote/package.html | 4 +-
.../internal/cache/AbstractRegionMap.java | 133 +-
.../gemfire/internal/cache/BucketAdvisor.java | 6 +-
.../gemfire/internal/cache/CacheObserver.java | 1 -
.../internal/cache/DistTXRollbackMessage.java | 2 +-
.../gemfire/internal/cache/DistTXState.java | 6 +-
.../gemfire/internal/cache/EventTracker.java | 2 +-
.../internal/cache/GemFireCacheImpl.java | 9 +-
.../internal/cache/IdentityArrayList.java | 2 +-
.../internal/cache/InitialImageOperation.java | 6 +-
.../gemfire/internal/cache/LocalRegion.java | 22 +-
.../internal/cache/PartitionedRegion.java | 2 +-
.../internal/cache/RemoteInvalidateMessage.java | 1 -
.../internal/cache/RemoteOperationMessage.java | 2 -
.../CompressedCachedDeserializable.java | 2 +-
.../internal/cache/control/ResourceAdvisor.java | 1 -
.../cache/control/ResourceListener.java | 2 +-
.../cache/execute/FunctionServiceStats.java | 1 -
.../cache/execute/InternalExecution.java | 2 -
.../cache/execute/InternalFunctionService.java | 14 +-
.../cache/execute/util/CommitFunction.java | 3 +-
.../cache/execute/util/RollbackFunction.java | 3 +-
.../StreamingPartitionOperation.java | 2 -
.../rebalance/PartitionedRegionLoadModel.java | 2 -
.../persistence/PersistenceAdvisorImpl.java | 4 -
.../cache/persistence/PersistentMemberView.java | 1 -
.../region/entry/RegionEntryFactoryBuilder.java | 103 +
.../cache/tier/InternalClientMembership.java | 2 +-
.../cache/tier/sockets/CacheClientProxy.java | 2 +-
.../concurrent/CompactConcurrentHashSet2.java | 6 +-
.../gemfire/internal/jta/GlobalTransaction.java | 13 +-
.../internal/process/ProcessController.java | 2 +-
.../gemfire/internal/process/signal/Signal.java | 6 +-
.../internal/redis/ByteArrayWrapper.java | 2 +-
.../internal/redis/ByteToCommandDecoder.java | 2 +-
.../gemstone/gemfire/internal/redis/Coder.java | 2 +-
.../redis/RedisCommandParserException.java | 2 +-
.../internal/redis/RegionCreationException.java | 2 +-
.../gemfire/internal/redis/RegionProvider.java | 1 -
.../redis/executor/AbstractExecutor.java | 8 -
.../redis/executor/hll/HyperLogLogPlus.java | 1 -
.../gemfire/internal/shared/NativeCalls.java | 2 -
.../CustomEntryConcurrentHashMap.java | 14 +-
.../gemfire/management/internal/AgentUtil.java | 1 -
.../management/internal/FederatingManager.java | 2 -
.../management/internal/JmxManagerAdvisor.java | 1 -
.../management/internal/MBeanProxyFactory.java | 2 -
.../configuration/domain/CacheElement.java | 1 -
.../management/internal/web/domain/Link.java | 2 +-
.../internal/web/http/ClientHttpRequest.java | 2 +-
.../internal/web/http/HttpHeader.java | 2 +-
.../main/java/com/gemstone/gemfire/package.html | 6 +-
.../com/gemstone/gemfire/pdx/PdxInstance.java | 2 +-
.../gemfire/redis/GemFireRedisServer.java | 3 +-
.../security/GemFireSecurityException.java | 2 +-
.../src/test/java/com/examples/TestObject.java | 6 +-
.../com/examples/ds/PutDataSerializables.java | 6 +-
.../com/gemstone/gemfire/GemFireTestCase.java | 2 +-
.../gemfire/SystemFailureJUnitTest.java | 60 +
.../internal/AutoConnectionSourceDUnitTest.java | 2 +-
.../management/MXMemoryPoolListenerExample.java | 4 -
.../management/MemoryThresholdsDUnitTest.java | 3 +-
.../MemoryThresholdsOffHeapDUnitTest.java | 3 -
.../gemfire/cache/query/QueryTestUtils.java | 10 -
.../QueryUsingFunctionContextDUnitTest.java | 7 +-
.../query/functional/CountStarJUnitTest.java | 3 -
...ctResultsWithDupValuesInRegionJUnitTest.java | 3 -
.../index/MemoryIndexStoreJUnitTest.java | 396 ++
...exStoreWithInplaceModificationJUnitTest.java | 54 +
.../PRQueryCacheClosedJUnitTest.java | 6 -
.../query/partitioned/PRQueryDUnitHelper.java | 38 -
.../PRQueryRegionClosedJUnitTest.java | 6 -
.../PRQueryRegionDestroyedJUnitTest.java | 5 -
.../query/transaction/QueryAndJtaJUnitTest.java | 1 -
.../gemfire/cache30/CacheLogRollDUnitTest.java | 16 -
.../gemfire/cache30/CacheXml81DUnitTest.java | 5 +-
.../MemLRUEvictionControllerDUnitTest.java | 2 +-
.../gemfire/cache30/ReconnectDUnitTest.java | 39 +
.../gemfire/cache30/TXOrderDUnitTest.java | 1 -
.../codeAnalysis/CompiledClassUtils.java | 1 -
.../distributed/AbstractLauncherJUnitTest.java | 1 -
.../distributed/LocatorLauncherJUnitTest.java | 1 -
.../distributed/ServerLauncherJUnitTest.java | 1 -
.../ConsoleDistributionManagerDUnitTest.java | 4 +-
.../InternalDistributedSystemJUnitTest.java | 2 +-
.../gemfire/distributed/internal/LDM.java | 2 +-
.../internal/SharedConfigurationJUnitTest.java | 2 +-
.../gemstone/gemfire/internal/ClassBuilder.java | 1 -
.../internal/DataSerializableJUnitTest.java | 2 +-
.../internal/cache/AbstractRegionJUnitTest.java | 2 +-
.../internal/cache/Bug37244JUnitTest.java | 3 -
.../internal/cache/Bug41733DUnitTest.java | 4 -
.../internal/cache/ConflationJUnitTest.java | 12 -
.../gemfire/internal/cache/DiskIdJUnitTest.java | 2 -
.../internal/cache/DiskRegionHelperFactory.java | 3 -
.../internal/cache/DiskRegionTestingBase.java | 2 -
.../cache/DistributedCacheTestCase.java | 6 -
.../internal/cache/HABug36773DUnitTest.java | 4 -
.../HAOverflowMemObjectSizerDUnitTest.java | 5 +-
.../cache/IncrementalBackupDUnitTest.java | 1 -
...gionBucketCreationDistributionDUnitTest.java | 28 -
.../PartitionedRegionCreationDUnitTest.java | 14 -
.../cache/PartitionedRegionDUnitTestCase.java | 6 -
.../cache/PartitionedRegionHADUnitTest.java | 2 +-
.../cache/PartitionedRegionTestHelper.java | 17 -
.../PartitionedRegionTestUtilsDUnitTest.java | 6 +-
.../PartitionedRegionWithSameNameDUnitTest.java | 6 -
.../cache/RemoteTransactionDUnitTest.java | 7 +-
.../control/RebalanceOperationDUnitTest.java | 2 -
.../execute/FunctionServiceStatsDUnitTest.java | 2 -
.../execute/PRFunctionExecutionDUnitTest.java | 9 +-
...ctionExecutionWithResultSenderDUnitTest.java | 2 -
.../mock/AlterMockRegionExtensionFunction.java | 2 +-
.../extension/mock/MockCacheExtension.java | 4 +-
.../cache/ha/Bug36853EventsExpiryDUnitTest.java | 3 -
.../internal/cache/ha/ConflatableObject.java | 2 +-
.../cache/ha/EventIdOptimizationJUnitTest.java | 8 +-
.../internal/cache/ha/HARegionJUnitTest.java | 8 +-
.../cache/ha/HARegionQueueDUnitTest.java | 3 -
.../cache/ha/HARegionQueueJUnitTest.java | 2 +-
.../internal/cache/ha/StatsBugDUnitTest.java | 4 +-
.../PartitionedRegionLoadModelJUnitTest.java | 6 +-
...tentColocatedPartitionedRegionDUnitTest.java | 2 +-
...rtitionedRegionWithTransactionDUnitTest.java | 6 -
.../cache/partitioned/ShutdownAllDUnitTest.java | 4 -
.../RegionEntryFactoryBuilderJUnitTest.java | 85 +
.../CacheServerMaxConnectionsJUnitTest.java | 3 -
.../cache/tier/sockets/CacheServerTestUtil.java | 4 -
.../tier/sockets/ClearPropagationDUnitTest.java | 4 -
.../sockets/ClientHealthMonitorJUnitTest.java | 3 -
.../DestroyEntryPropagationDUnitTest.java | 5 -
.../sockets/NewRegionAttributesDUnitTest.java | 2 -
.../sockets/UpdatePropagationDUnitTest.java | 4 -
.../tier/sockets/command/CommitCommandTest.java | 2 +-
.../compression/SnappyCompressorJUnitTest.java | 2 +-
.../jta/functional/TestXACacheLoader.java | 3 -
.../offheap/OffHeapHelperJUnitTest.java | 314 ++
.../statistics/StatisticsDUnitTest.java | 1 -
.../internal/util/ArrayUtilsJUnitTest.java | 1 -
.../gemfire/internal/util/SerializableImpl.java | 2 -
.../util/SerializableImplWithValue.java | 2 -
.../management/CompositeTypeTestDUnitTest.java | 6 -
.../management/DiskManagementDUnitTest.java | 11 -
.../management/DistributedSystemDUnitTest.java | 3 +-
.../management/LocatorManagementDUnitTest.java | 6 -
.../gemfire/management/ManagementTestBase.java | 9 -
...ersalMembershipListenerAdapterDUnitTest.java | 7 +-
.../internal/cli/GfshParserJUnitTest.java | 4 +-
.../cli/commands/ShowMetricsDUnitTest.java | 5 -
.../SharedConfigurationDUnitTest.java | 2 +-
.../configuration/utils/XmlUtilsJUnitTest.java | 8 +-
.../internal/pulse/TestClientIdsDUnitTest.java | 2 -
.../pulse/TestSubscriptionsDUnitTest.java | 2 -
...rDistributedSystemMXBeanIntegrationTest.java | 50 +
...horizeOperationForMBeansIntegrationTest.java | 323 ++
...erationForRegionCommandsIntegrationTest.java | 136 +
.../internal/security/JSONAuthCodeTest.java | 143 -
...JSONAuthorizationDetailsIntegrationTest.java | 163 +
.../security/JSONAuthorizationTest.java | 168 -
...tionCodesForDataCommandsIntegrationTest.java | 101 +
...tionCodesForDistributedSystemMXBeanTest.java | 76 +
.../security/ResourceOperationJUnit.java | 394 --
.../WanCommandsControllerJUnitTest.java | 4 +-
.../security/P2PAuthenticationDUnitTest.java | 2 -
.../gemfire/test/dunit/DistributedTestCase.java | 10 +-
.../gemfire/test/dunit/RMIException.java | 2 +-
.../test/dunit/SerializableCallable.java | 2 +-
.../test/dunit/SerializableRunnable.java | 2 +-
.../com/gemstone/gemfire/test/dunit/VM.java | 6 +-
.../gemstone/gemfire/util/JSR166TestCase.java | 17 +-
.../gemstone/persistence/logging/Logger.java | 2 +-
.../gemfire/GemfireSequenceDisplay.java | 7 -
gemfire-core/src/test/java/hydra/GsRandom.java | 1 -
.../src/test/java/hydra/log/AnyLogWriter.java | 4 +-
.../java/security/AuthzCredentialGenerator.java | 5 +-
.../test/java/security/CredentialGenerator.java | 2 +-
gemfire-cq/build.gradle | 22 +
.../cache/client/internal/CloseCQOp.java | 72 +
.../cache/client/internal/CreateCQOp.java | 163 +
.../cache/client/internal/CreateCQWithIROp.java | 92 +
.../cache/client/internal/GetDurableCQsOp.java | 135 +
.../client/internal/ServerCQProxyImpl.java | 111 +
.../gemfire/cache/client/internal/StopCQOp.java | 72 +
.../cache/query/internal/cq/ClientCQImpl.java | 615 +++
.../internal/cq/CqAttributesMutatorImpl.java | 68 +
.../cache/query/internal/cq/CqConflatable.java | 223 +
.../cache/query/internal/cq/CqEventImpl.java | 162 +
.../cache/query/internal/cq/CqListenerImpl.java | 56 +
.../cache/query/internal/cq/CqQueryImpl.java | 383 ++
.../query/internal/cq/CqServiceFactoryImpl.java | 69 +
.../cache/query/internal/cq/CqServiceImpl.java | 2087 +++++++
.../internal/cq/CqServiceStatisticsImpl.java | 100 +
.../query/internal/cq/CqServiceVsdStats.java | 411 ++
.../query/internal/cq/CqStatisticsImpl.java | 75 +
.../cache/query/internal/cq/ServerCQImpl.java | 655 +++
.../tier/sockets/command/BaseCQCommand.java | 59 +
.../cache/tier/sockets/command/CloseCQ.java | 131 +
.../cache/tier/sockets/command/ExecuteCQ.java | 168 +
.../cache/tier/sockets/command/ExecuteCQ61.java | 220 +
.../cache/tier/sockets/command/GetCQStats.java | 100 +
.../tier/sockets/command/GetDurableCQs.java | 143 +
.../cache/tier/sockets/command/MonitorCQ.java | 100 +
.../cache/tier/sockets/command/StopCQ.java | 135 +
...cache.query.internal.cq.spi.CqServiceFactory | 15 +
.../gemfire/cache/query/cq/CQJUnitTest.java | 150 +
.../cache/query/cq/dunit/CqDataDUnitTest.java | 1162 ++++
.../dunit/CqDataOptimizedExecuteDUnitTest.java | 54 +
.../cq/dunit/CqDataUsingPoolDUnitTest.java | 1567 ++++++
...qDataUsingPoolOptimizedExecuteDUnitTest.java | 53 +
.../cache/query/cq/dunit/CqPerfDUnitTest.java | 1044 ++++
.../cq/dunit/CqPerfUsingPoolDUnitTest.java | 1004 ++++
.../cache/query/cq/dunit/CqQueryDUnitTest.java | 4004 ++++++++++++++
.../dunit/CqQueryOptimizedExecuteDUnitTest.java | 311 ++
.../cq/dunit/CqQueryUsingPoolDUnitTest.java | 3322 +++++++++++
...QueryUsingPoolOptimizedExecuteDUnitTest.java | 50 +
.../cq/dunit/CqResultSetUsingPoolDUnitTest.java | 1139 ++++
...ltSetUsingPoolOptimizedExecuteDUnitTest.java | 231 +
.../cache/query/cq/dunit/CqStateDUnitTest.java | 134 +
.../cache/query/cq/dunit/CqStatsDUnitTest.java | 441 ++
.../dunit/CqStatsOptimizedExecuteDUnitTest.java | 50 +
.../cq/dunit/CqStatsUsingPoolDUnitTest.java | 452 ++
...StatsUsingPoolOptimizedExecuteDUnitTest.java | 50 +
.../query/cq/dunit/CqTimeTestListener.java | 266 +
.../PartitionedRegionCqQueryDUnitTest.java | 1788 ++++++
...dRegionCqQueryOptimizedExecuteDUnitTest.java | 246 +
.../query/cq/dunit/PrCqUsingPoolDUnitTest.java | 2029 +++++++
.../PrCqUsingPoolOptimizedExecuteDUnitTest.java | 50 +
.../cache/query/dunit/PdxQueryCQDUnitTest.java | 702 +++
.../cache/query/dunit/PdxQueryCQTestBase.java | 494 ++
.../dunit/QueryIndexUpdateRIDUnitTest.java | 819 +++
.../query/dunit/QueryMonitorDUnitTest.java | 1296 +++++
.../cache/snapshot/ClientSnapshotDUnitTest.java | 284 +
.../AnalyzeCQSerializablesJUnitTest.java | 79 +
.../cache/PRDeltaPropagationDUnitTest.java | 1212 ++++
.../internal/cache/PutAllCSDUnitTest.java | 4419 +++++++++++++++
.../cache/RemoteCQTransactionDUnitTest.java | 1116 ++++
.../internal/cache/ha/CQListGIIDUnitTest.java | 820 +++
.../cache/ha/HADispatcherDUnitTest.java | 695 +++
.../sockets/ClientToServerDeltaDUnitTest.java | 1037 ++++
.../DeltaPropagationWithCQDUnitTest.java | 341 ++
...ToRegionRelationCQRegistrationDUnitTest.java | 786 +++
.../sockets/DurableClientCrashDUnitTest.java | 99 +
.../sockets/DurableClientNetDownDUnitTest.java | 80 +
.../sockets/DurableClientSimpleDUnitTest.java | 3404 ++++++++++++
.../tier/sockets/DurableClientTestCase.java | 2089 +++++++
.../CacheServerManagementDUnitTest.java | 571 ++
.../cli/commands/ClientCommandsDUnitTest.java | 1443 +++++
.../DurableClientCommandsDUnitTest.java | 433 ++
.../internal/pulse/TestCQDUnitTest.java | 147 +
.../internal/pulse/TestClientsDUnitTest.java | 108 +
.../internal/pulse/TestServerDUnitTest.java | 99 +
.../ClientAuthorizationTwoDUnitTest.java | 245 +
.../security/ClientAuthzObjectModDUnitTest.java | 416 ++
.../ClientCQPostAuthorizationDUnitTest.java | 522 ++
.../ClientPostAuthorizationDUnitTest.java | 398 ++
.../gemfire/security/MultiuserAPIDUnitTest.java | 391 ++
.../MultiuserDurableCQAuthzDUnitTest.java | 489 ++
.../gemfire/codeAnalysis/excludedClasses.txt | 2 +
.../gemstone/gemfire/codeAnalysis/openBugs.txt | 21 +
.../sanctionedDataSerializables.txt | 4 +
.../codeAnalysis/sanctionedSerializables.txt | 1 +
.../tier/sockets/durablecq-client-cache.xml | 37 +
.../tier/sockets/durablecq-server-cache.xml | 32 +
.../joptsimple/internal/AbbreviationMap.java | 1 -
.../src/main/java/org/json/JSONObject.java | 3 -
.../cache/lucene/LuceneQueryFactory.java | 11 +-
.../cache/lucene/LuceneQueryProvider.java | 2 +-
.../gemfire/cache/lucene/LuceneService.java | 9 +-
.../internal/repository/RepositoryManager.java | 1 -
gemfire-pulse/build.gradle | 62 +-
.../tools/pulse/internal/data/DataBrowser.java | 3 -
.../pulse/internal/data/JMXDataUpdater.java | 91 -
.../pulse/internal/data/JmxManagerFinder.java | 4 -
.../pulse/internal/data/PulseConstants.java | 4 +-
.../tools/pulse/internal/json/JSONObject.java | 3 -
.../tools/pulse/internal/json/JSONWriter.java | 2 +-
.../ClusterSelectedRegionsMemberService.java | 3 -
.../gemfire/tools/pulse/tests/PulseTest.java | 32 +-
.../gemfire/cache/util/AutoBalancer.java | 4 +-
gemfire-site/website/layouts/footer.html | 2 +-
gemfire-wan/build.gradle | 22 +
.../client/internal/GatewaySenderBatchOp.java | 313 ++
.../cache/client/internal/SenderProxy.java | 43 +
.../internal/locator/wan/LocatorDiscovery.java | 227 +
.../internal/locator/wan/LocatorHelper.java | 143 +
.../locator/wan/LocatorJoinMessage.java | 105 +
.../wan/LocatorMembershipListenerImpl.java | 230 +
.../locator/wan/RemoteLocatorJoinRequest.java | 87 +
.../locator/wan/RemoteLocatorJoinResponse.java | 89 +
.../locator/wan/RemoteLocatorPingRequest.java | 56 +
.../locator/wan/RemoteLocatorPingResponse.java | 55 +
.../locator/wan/RemoteLocatorRequest.java | 66 +
.../locator/wan/RemoteLocatorResponse.java | 74 +
.../internal/locator/wan/WANFactoryImpl.java | 74 +
.../locator/wan/WanLocatorDiscovererImpl.java | 138 +
.../cache/wan/AbstractRemoteGatewaySender.java | 169 +
.../cache/wan/GatewayReceiverFactoryImpl.java | 147 +
.../internal/cache/wan/GatewayReceiverImpl.java | 253 +
.../wan/GatewaySenderEventRemoteDispatcher.java | 766 +++
.../cache/wan/GatewaySenderFactoryImpl.java | 389 ++
.../wan/parallel/ParallelGatewaySenderImpl.java | 267 +
...rentParallelGatewaySenderEventProcessor.java | 67 +
...moteParallelGatewaySenderEventProcessor.java | 122 +
...urrentSerialGatewaySenderEventProcessor.java | 45 +
...RemoteSerialGatewaySenderEventProcessor.java | 50 +
.../wan/serial/SerialGatewaySenderImpl.java | 260 +
...ternal.locator.wan.LocatorMembershipListener | 15 +
...ne.gemfire.internal.cache.wan.spi.WANFactory | 15 +
.../cache/CacheXml70GatewayDUnitTest.java | 243 +
.../cache/CacheXml80GatewayDUnitTest.java | 77 +
.../AnalyzeWANSerializablesJUnitTest.java | 91 +
.../internal/cache/UpdateVersionDUnitTest.java | 960 ++++
.../gemfire/internal/cache/wan/WANTestBase.java | 5183 ++++++++++++++++++
...oncurrentParallelGatewaySenderDUnitTest.java | 860 +++
...ntParallelGatewaySenderOffHeapDUnitTest.java | 32 +
...allelGatewaySenderOperation_1_DUnitTest.java | 848 +++
...allelGatewaySenderOperation_2_DUnitTest.java | 537 ++
...tSerialGatewaySenderOperationsDUnitTest.java | 111 +
...GatewaySenderOperationsOffHeapDUnitTest.java | 32 +
.../ConcurrentWANPropogation_1_DUnitTest.java | 608 ++
.../ConcurrentWANPropogation_2_DUnitTest.java | 485 ++
.../cache/wan/disttx/DistTXWANDUnitTest.java | 209 +
.../CommonParallelGatewaySenderDUnitTest.java | 481 ++
...onParallelGatewaySenderOffHeapDUnitTest.java | 32 +
...wWANConcurrencyCheckForDestroyDUnitTest.java | 526 ++
.../cache/wan/misc/PDXNewWanDUnitTest.java | 787 +++
...dRegion_ParallelWANPersistenceDUnitTest.java | 752 +++
...dRegion_ParallelWANPropogationDUnitTest.java | 1132 ++++
.../SenderWithTransportFilterDUnitTest.java | 274 +
...downAllPersistentGatewaySenderDUnitTest.java | 205 +
.../wan/misc/WANConfigurationJUnitTest.java | 609 ++
.../wan/misc/WANLocatorServerDUnitTest.java | 193 +
.../cache/wan/misc/WANSSLDUnitTest.java | 151 +
.../wan/misc/WanAutoDiscoveryDUnitTest.java | 557 ++
.../cache/wan/misc/WanValidationsDUnitTest.java | 1678 ++++++
...tewaySenderOperation_2_OffHeapDUnitTest.java | 32 +
...tewaySenderOperation_2_OffHeapDUnitTest.java | 32 +
...GatewaySenderOperationsOffHeapDUnitTest.java | 34 +
...ewaySenderQueueOverflowOffHeapDUnitTest.java | 34 +
.../ParallelWANConflationOffHeapDUnitTest.java | 34 +
...nceEnabledGatewaySenderOffHeapDUnitTest.java | 34 +
...ropogationConcurrentOpsOffHeapDUnitTest.java | 34 +
.../ParallelWANPropogationOffHeapDUnitTest.java | 34 +
...erialGatewaySenderQueueOffHeapDUnitTest.java | 34 +
...nceEnabledGatewaySenderOffHeapDUnitTest.java | 34 +
.../SerialWANPropogationOffHeapDUnitTest.java | 34 +
...ation_PartitionedRegionOffHeapDUnitTest.java | 34 +
...allelGatewaySenderOperation_2_DUnitTest.java | 38 +
...arallelGatewaySenderOperationsDUnitTest.java | 636 +++
...llelGatewaySenderQueueOverflowDUnitTest.java | 531 ++
.../ParallelWANConflationDUnitTest.java | 496 ++
...ersistenceEnabledGatewaySenderDUnitTest.java | 1823 ++++++
...llelWANPropagationClientServerDUnitTest.java | 114 +
...lelWANPropagationConcurrentOpsDUnitTest.java | 290 +
.../ParallelWANPropagationDUnitTest.java | 1448 +++++
...ParallelWANPropagationLoopBackDUnitTest.java | 425 ++
.../wan/parallel/ParallelWANStatsDUnitTest.java | 632 +++
...tewaySenderDistributedDeadlockDUnitTest.java | 407 ++
...rialGatewaySenderEventListenerDUnitTest.java | 390 ++
.../SerialGatewaySenderOperationsDUnitTest.java | 654 +++
.../SerialGatewaySenderQueueDUnitTest.java | 337 ++
...ersistenceEnabledGatewaySenderDUnitTest.java | 602 ++
.../SerialWANPropagationLoopBackDUnitTest.java | 538 ++
.../serial/SerialWANPropogationDUnitTest.java | 1602 ++++++
...NPropogation_PartitionedRegionDUnitTest.java | 439 ++
.../SerialWANPropogationsFeatureDUnitTest.java | 373 ++
.../wan/serial/SerialWANStatsDUnitTest.java | 596 ++
.../wan/wancommand/WANCommandTestBase.java | 511 ++
...anCommandCreateGatewayReceiverDUnitTest.java | 699 +++
.../WanCommandCreateGatewaySenderDUnitTest.java | 763 +++
...WanCommandGatewayReceiverStartDUnitTest.java | 327 ++
.../WanCommandGatewayReceiverStopDUnitTest.java | 332 ++
.../WanCommandGatewaySenderStartDUnitTest.java | 416 ++
.../WanCommandGatewaySenderStopDUnitTest.java | 367 ++
.../wan/wancommand/WanCommandListDUnitTest.java | 403 ++
.../WanCommandPauseResumeDUnitTest.java | 716 +++
.../wancommand/WanCommandStatusDUnitTest.java | 582 ++
.../management/WANManagementDUnitTest.java | 525 ++
.../ClusterConfigurationDUnitTest.java | 1055 ++++
.../pulse/TestRemoteClusterDUnitTest.java | 274 +
.../gemfire/codeAnalysis/excludedClasses.txt | 2 +
.../gemstone/gemfire/codeAnalysis/openBugs.txt | 21 +
.../sanctionedDataSerializables.txt | 28 +
.../codeAnalysis/sanctionedSerializables.txt | 0
gradle/code-analysis.gradle | 113 +
gradle/dependency-versions.properties | 2 +
gradle/ide.gradle | 53 +
gradle/java.gradle | 108 +
gradle/publish.gradle | 83 +
gradle/rat.gradle | 5 +-
gradle/test.gradle | 243 +
settings.gradle | 2 +
449 files changed, 96573 insertions(+), 2537 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitHelper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml81DUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HABug36773DUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCreationDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHADUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionWithSameNameDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/ShutdownAllDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/035e3ed3/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java
----------------------------------------------------------------------
[19/50] [abbrv] incubator-geode git commit: GEODE-735: create unit
test for OffHeapHelper
Posted by kl...@apache.org.
GEODE-735: create unit test for OffHeapHelper
This closes #79
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/46eaaa9b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/46eaaa9b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/46eaaa9b
Branch: refs/heads/feature/GEODE-773-2
Commit: 46eaaa9b10fe11101c8f7e0c8cb601d43789ceca
Parents: a5437b2
Author: Ken Howe <kh...@pivotal.io>
Authored: Tue Jan 26 14:37:18 2016 -0800
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Thu Jan 28 11:34:35 2016 -0800
----------------------------------------------------------------------
.../offheap/OffHeapHelperJUnitTest.java | 314 +++++++++++++++++++
1 file changed, 314 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/46eaaa9b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapHelperJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapHelperJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapHelperJUnitTest.java
new file mode 100644
index 0000000..fd0eb4f
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapHelperJUnitTest.java
@@ -0,0 +1,314 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.internal.offheap;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
+import static org.hamcrest.CoreMatchers.*;
+
+import java.nio.ByteBuffer;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.LogWriter;
+import com.gemstone.gemfire.internal.cache.EntryEventImpl;
+import com.gemstone.gemfire.internal.cache.VMCachedDeserializable;
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
+
+/**
+ * @author khowe
+ */
+@Category(UnitTest.class)
+public class OffHeapHelperJUnitTest extends AbstractStoredObjectTestBase {
+
+ private MemoryChunkWithRefCount storedObject = null;
+ private Object deserializedRegionEntryValue = null;
+ private byte[] serializedRegionEntryValue = null;
+ private MemoryAllocator ma;
+
+ @Before
+ public void setUp() {
+ OutOfOffHeapMemoryListener ooohml = mock(OutOfOffHeapMemoryListener.class);
+ OffHeapMemoryStats stats = mock(OffHeapMemoryStats.class);
+ LogWriter lw = mock(LogWriter.class);
+
+ ma = SimpleMemoryAllocatorImpl.create(ooohml, stats, lw, 3, OffHeapStorage.MIN_SLAB_SIZE * 3,
+ OffHeapStorage.MIN_SLAB_SIZE);
+
+ }
+
+ /**
+ * Extracted from JUnit setUp() to reduce test overhead for cases where
+ * offheap memory isn't needed.
+ */
+ private void allocateOffHeapSerialized() {
+ Object regionEntryValue = getValue();
+ storedObject = createValueAsSerializedStoredObject(regionEntryValue);
+ deserializedRegionEntryValue = storedObject.getValueAsDeserializedHeapObject();
+ serializedRegionEntryValue = storedObject.getSerializedValue();
+ }
+
+ private void allocateOffHeapDeserialized() {
+ Object regionEntryValue = getValue();
+ storedObject = createValueAsUnserializedStoredObject(regionEntryValue);
+ deserializedRegionEntryValue = storedObject.getValueAsDeserializedHeapObject();
+ serializedRegionEntryValue = storedObject.getSerializedValue();
+ }
+
+ @After
+ public void tearDown() {
+ SimpleMemoryAllocatorImpl.freeOffHeapMemory();
+ }
+
+ @Override
+ public Object getValue() {
+ return Long.valueOf(Long.MAX_VALUE);
+ }
+
+ @Override
+ public byte[] getValueAsByteArray() {
+ return convertValueToByteArray(getValue());
+ }
+
+ private byte[] convertValueToByteArray(Object value) {
+ return ByteBuffer.allocate(Long.SIZE / Byte.SIZE).putLong((Long) value).array();
+ }
+
+ @Override
+ public Object convertByteArrayToObject(byte[] valueInByteArray) {
+ return ByteBuffer.wrap(valueInByteArray).getLong();
+ }
+
+ @Override
+ public Object convertSerializedByteArrayToObject(byte[] valueInSerializedByteArray) {
+ return EntryEventImpl.deserialize(valueInSerializedByteArray);
+ }
+
+ @Override
+ protected MemoryChunkWithRefCount createValueAsUnserializedStoredObject(Object value) {
+ byte[] valueInByteArray;
+ if (value instanceof Long) {
+ valueInByteArray = convertValueToByteArray(value);
+ } else {
+ valueInByteArray = (byte[]) value;
+ }
+
+ boolean isSerialized = false;
+ boolean isCompressed = false;
+
+ MemoryChunkWithRefCount createdObject = createChunk(valueInByteArray, isSerialized, isCompressed);
+ return createdObject;
+ }
+
+ @Override
+ protected MemoryChunkWithRefCount createValueAsSerializedStoredObject(Object value) {
+ byte[] valueInSerializedByteArray = EntryEventImpl.serialize(value);
+
+ boolean isSerialized = true;
+ boolean isCompressed = false;
+
+ MemoryChunkWithRefCount createdObject = createChunk(valueInSerializedByteArray, isSerialized, isCompressed);
+ return createdObject;
+ }
+
+ private GemFireChunk createChunk(byte[] v, boolean isSerialized, boolean isCompressed) {
+ GemFireChunk chunk = (GemFireChunk) ma.allocateAndInitialize(v, isSerialized, isCompressed, GemFireChunk.TYPE);
+ return chunk;
+ }
+
+ @Test
+ public void getHeapFormOfSerializedStoredObjectReturnsDeserializedObject() {
+ allocateOffHeapSerialized();
+ Object heapObject = OffHeapHelper.getHeapForm(storedObject);
+ assertThat("getHeapForm returns non-null object", heapObject, notNullValue());
+ assertThat("Heap and off heap objects are different objects", heapObject, is(not(storedObject)));
+ assertThat("Deserialzed values of offHeap object and returned object are equal", heapObject,
+ is(equalTo(deserializedRegionEntryValue)));
+ }
+
+ @Test
+ public void getHeapFormOfNonOffHeapObjectReturnsOriginal() {
+ Object testObject = getValue();
+ Object heapObject = OffHeapHelper.getHeapForm(testObject);
+ assertNotNull(heapObject);
+ assertSame(testObject, heapObject);
+ }
+
+ @Test
+ public void getHeapFormWithNullReturnsNull() {
+ Object testObject = null;
+ Object returnObject = OffHeapHelper.getHeapForm(testObject);
+ assertThat(returnObject, is(equalTo(null)));
+ }
+
+ @Test
+ public void copyAndReleaseWithNullReturnsNull() {
+ Object testObject = null;
+ Object returnObject = OffHeapHelper.copyAndReleaseIfNeeded(testObject);
+ assertThat(returnObject, is(equalTo(null)));
+ }
+
+ @Test
+ public void copyAndReleaseWithRetainedDeserializedObjectDecreasesRefCnt() {
+ allocateOffHeapDeserialized();
+ assertTrue(storedObject.retain());
+ assertThat("Retained chunk ref count", storedObject.getRefCount(), is(2));
+ OffHeapHelper.copyAndReleaseIfNeeded(storedObject);
+ assertThat("Chunk ref count decreases", storedObject.getRefCount(), is(1));
+ }
+
+ @Test
+ public void copyAndReleaseWithNonRetainedObjectDecreasesRefCnt() {
+ allocateOffHeapDeserialized();
+ // assertTrue(storedObject.retain());
+ assertThat("Retained chunk ref count", storedObject.getRefCount(), is(1));
+ OffHeapHelper.copyAndReleaseIfNeeded(storedObject);
+ assertThat("Chunk ref count decreases", storedObject.getRefCount(), is(0));
+ }
+
+ @Test
+ public void copyAndReleaseWithDeserializedReturnsValueOfOriginal() {
+ allocateOffHeapDeserialized();
+ assertTrue(storedObject.retain());
+ Object returnObject = OffHeapHelper.copyAndReleaseIfNeeded(storedObject);
+ assertThat(returnObject, is(equalTo(deserializedRegionEntryValue)));
+ }
+
+ @Test
+ public void copyAndReleaseWithSerializedReturnsValueOfOriginal() {
+ allocateOffHeapSerialized();
+ assertTrue(storedObject.retain());
+ Object returnObject = ((VMCachedDeserializable) OffHeapHelper.copyAndReleaseIfNeeded(storedObject))
+ .getSerializedValue();
+ assertThat(returnObject, is(equalTo(serializedRegionEntryValue)));
+ }
+
+ @Test
+ public void copyAndReleaseNonStoredObjectReturnsOriginal() {
+ Object testObject = getValue();
+ Object returnObject = OffHeapHelper.copyAndReleaseIfNeeded(testObject);
+ assertThat(returnObject, is(testObject));
+ }
+
+ @Test
+ public void copyIfNeededWithNullReturnsNull() {
+ Object testObject = null;
+ Object returnObject = OffHeapHelper.copyAndReleaseIfNeeded(testObject);
+ assertThat(returnObject, is(equalTo(null)));
+ }
+
+ @Test
+ public void copyIfNeededNonOffHeapReturnsOriginal() {
+ Object testObject = getValue();
+ Object returnObject = OffHeapHelper.copyIfNeeded(testObject);
+ assertThat(returnObject, is(testObject));
+ }
+
+ @Test
+ public void copyIfNeededOffHeapSerializedReturnsValueOfOriginal() {
+ allocateOffHeapSerialized();
+ Object returnObject = ((VMCachedDeserializable) OffHeapHelper.copyIfNeeded(storedObject)).getSerializedValue();
+ assertThat(returnObject, is(equalTo(serializedRegionEntryValue)));
+ }
+
+ @Test
+ public void copyIfNeededOffHeapDeserializedReturnsOriginal() {
+ allocateOffHeapDeserialized();
+ Object returnObject = OffHeapHelper.copyIfNeeded(storedObject);
+ assertThat(returnObject, is(equalTo(deserializedRegionEntryValue)));
+ }
+
+ @Test
+ public void copyIfNeededWithOffHeapDeserializedObjDoesNotRelease() {
+ allocateOffHeapDeserialized();
+ int initialRefCountOfObject = storedObject.getRefCount();
+ OffHeapHelper.copyIfNeeded(storedObject);
+ assertThat("Ref count after copy", storedObject.getRefCount(), is(initialRefCountOfObject));
+ }
+
+ @Test
+ public void copyIfNeededWithOffHeapSerializedObjDoesNotRelease() {
+ allocateOffHeapSerialized();
+ int initialRefCountOfObject = storedObject.getRefCount();
+ OffHeapHelper.copyIfNeeded(storedObject);
+ assertThat("Ref count after copy", storedObject.getRefCount(), is(initialRefCountOfObject));
+ }
+
+ @Test
+ public void releaseOfOffHeapDecrementsRefCount() {
+ allocateOffHeapSerialized();
+ assertThat("Initial Ref Count", storedObject.getRefCount(), is(1));
+ OffHeapHelper.release(storedObject);
+ assertThat("Ref Count Decremented", storedObject.getRefCount(), is(0));
+ }
+
+ @Test
+ public void releaseOfOffHeapReturnsTrue() {
+ allocateOffHeapSerialized();
+ assertThat("Releasing OFfHeap object is true", OffHeapHelper.release(storedObject), is(true));
+ }
+
+ @Test
+ public void releaseOfNonOffHeapReturnsFalse() {
+ Object testObject = getValue();
+ assertThat("Releasing OFfHeap object is true", OffHeapHelper.release(testObject), is(false));
+ }
+
+ @Test
+ public void releaseWithOutTrackingOfOffHeapDecrementsRefCount() {
+ allocateOffHeapSerialized();
+ assertThat("Initial Ref Count", storedObject.getRefCount(), is(1));
+ OffHeapHelper.releaseWithNoTracking(storedObject);
+ assertThat("Ref Count Decremented", storedObject.getRefCount(), is(0));
+ }
+
+ @Test
+ public void releaseWithoutTrackingOfOffHeapReturnsTrue() {
+ allocateOffHeapSerialized();
+ assertThat("Releasing OFfHeap object is true", OffHeapHelper.releaseWithNoTracking(storedObject), is(true));
+ }
+
+ @Test
+ public void releaseWithoutTrackingOfNonOffHeapReturnsFalse() {
+ Object testObject = getValue();
+ assertThat("Releasing OFfHeap object is true", OffHeapHelper.releaseWithNoTracking(testObject), is(false));
+ }
+
+ @Test
+ public void releaseAndTrackOwnerOfOffHeapDecrementsRefCount() {
+ allocateOffHeapSerialized();
+ assertThat("Initial Ref Count", storedObject.getRefCount(), is(1));
+ OffHeapHelper.releaseAndTrackOwner(storedObject, "owner");
+ assertThat("Ref Count Decremented", storedObject.getRefCount(), is(0));
+ }
+
+ @Test
+ public void releaseAndTrackOwnerOfOffHeapReturnsTrue() {
+ allocateOffHeapSerialized();
+ assertThat("Releasing OFfHeap object is true", OffHeapHelper.releaseAndTrackOwner(storedObject, "owner"), is(true));
+ }
+
+ @Test
+ public void releaseAndTrackOwnerOfNonOffHeapReturnsFalse() {
+ Object testObject = getValue();
+ assertThat("Releasing OFfHeap object is true", OffHeapHelper.releaseAndTrackOwner(testObject, "owner"), is(false));
+ }
+
+}
[49/50] [abbrv] incubator-geode git commit: Organize imports
Posted by kl...@apache.org.
Organize imports
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3b5d2a00
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3b5d2a00
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3b5d2a00
Branch: refs/heads/feature/GEODE-773-2
Commit: 3b5d2a0032ea226ee1799058b16acef3e2087406
Parents: 035e3ed
Author: Kirk Lund <kl...@pivotal.io>
Authored: Mon Feb 1 12:53:47 2016 -0800
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Mon Feb 1 12:53:47 2016 -0800
----------------------------------------------------------------------
.../com/gemstone/gemfire/test/dunit/DistributedTestCase.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3b5d2a00/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java
index 8c47afb..f967acc 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java
@@ -24,7 +24,6 @@ import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Properties;
-import java.util.Random;
import org.apache.logging.log4j.Logger;
import org.junit.experimental.categories.Category;
@@ -72,11 +71,10 @@ import com.gemstone.gemfire.internal.logging.LogWriterFactory;
import com.gemstone.gemfire.internal.logging.LogWriterImpl;
import com.gemstone.gemfire.internal.logging.ManagerLogWriter;
import com.gemstone.gemfire.internal.logging.log4j.LogWriterLogger;
-import com.gemstone.gemfire.internal.util.Callable;
import com.gemstone.gemfire.management.internal.cli.LogWrapper;
-import com.jayway.awaitility.Awaitility;
import com.gemstone.gemfire.test.dunit.standalone.DUnitLauncher;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import com.jayway.awaitility.Awaitility;
import junit.framework.TestCase;
[14/50] [abbrv] incubator-geode git commit: GEODE-872: Removing
duplicate code from ConcurrentSerialGatewaySenderOperationsDUnitTest
Posted by kl...@apache.org.
GEODE-872: Removing duplicate code from ConcurrentSerialGatewaySenderOperationsDUnitTest
This test was almost an exact copy of
SerialGatewaySenderOperationsDUnitTest, with a few lines changes. The
non concurrent test had already fixed the suspect string, but the
concurrent test did not. By throwing away the code from Concurrent* and
making it extend the non-concurrent test, this bug is fixed.
The test has also been tuned to do fewer operations and take less time.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/22606309
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/22606309
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/22606309
Branch: refs/heads/feature/GEODE-773-2
Commit: 22606309a2cb95db34d10fbd3000ca31755c8fad
Parents: 68a85fe
Author: Dan Smith <up...@apache.org>
Authored: Wed Jan 27 15:05:58 2016 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Thu Jan 28 09:37:50 2016 -0800
----------------------------------------------------------------------
.../gemfire/internal/cache/wan/WANTestBase.java | 8 +-
...tSerialGatewaySenderOperationsDUnitTest.java | 469 +---------
.../SerialGatewaySenderOperationsDUnitTest.java | 901 ++++++++-----------
3 files changed, 407 insertions(+), 971 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/22606309/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
index 3dd4742..a212baa 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
@@ -2239,10 +2239,14 @@ public class WANTestBase extends DistributedTestCase{
}
}
- public static void startReceivers() throws IOException {
+ public static void startReceivers() {
Set<GatewayReceiver> receivers = cache.getGatewayReceivers();
for (GatewayReceiver receiver : receivers) {
- receiver.start();
+ try {
+ receiver.start();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/22606309/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
index b709334..b2a9a3b 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
@@ -19,16 +19,17 @@ package com.gemstone.gemfire.internal.cache.wan.concurrent;
import java.util.Set;
import com.gemstone.gemfire.cache.wan.GatewaySender;
+import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-import com.gemstone.gemfire.test.dunit.AsyncInvocation;
-import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
+import com.gemstone.gemfire.internal.cache.wan.serial.SerialGatewaySenderOperationsDUnitTest;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* @author skumar
*
*/
-public class ConcurrentSerialGatewaySenderOperationsDUnitTest extends WANTestBase {
+public class ConcurrentSerialGatewaySenderOperationsDUnitTest extends SerialGatewaySenderOperationsDUnitTest {
private static final long serialVersionUID = 1L;
@@ -36,466 +37,24 @@ public class ConcurrentSerialGatewaySenderOperationsDUnitTest extends WANTestBa
super(name);
}
- public void setUp() throws Exception {
- super.setUp();
- addExpectedException("Broken pipe");
- addExpectedException("Connection reset");
- addExpectedException("Unexpected IOException");
+ protected void createSenderVM5() {
+ vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+ false, 100, 10, false, true, null, true, 5, OrderPolicy.KEY ));
}
- public void testSerialGatewaySenderOperationsWithoutStarting() {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true, 5, OrderPolicy.KEY });
- vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true, 5, OrderPolicy.KEY });
-
- vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 1000 });
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 10000 });
-
- vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
- "verifyGatewaySenderOperations", new Object[] { "ln" });
- vm5.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
- "verifyGatewaySenderOperations", new Object[] { "ln" });
-
+ protected void createSenderVM4() {
+ vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+ false, 100, 10, false, true, null, true, 5, OrderPolicy.KEY ));
}
-
- public void testStartPauseResumeSerialGatewaySender() {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true, 5 , OrderPolicy.KEY});
- vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true, 5 , OrderPolicy.KEY});
-
- vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 1000 });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 10000 });
-
- vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
- vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderPausedState", new Object[] { "ln" });
- vm5.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderPausedState", new Object[] { "ln" });
-
- AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
- new Object[] { testName + "_RR", 1000 });
-
- vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-
- vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderResumedState", new Object[] { "ln" });
- vm5.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderResumedState", new Object[] { "ln" });
-
- try {
- inv1.join();
- } catch (InterruptedException e) {
- e.printStackTrace();
- fail("Interrupted the async invocation.");
- }
-
- getLogWriter().info("Completed puts in the region");
-
- vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
- "validateQueueContentsForConcurrentSerialGatewaySender", new Object[] { "ln", 0 });
- vm5.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
- "validateQueueContentsForConcurrentSerialGatewaySender", new Object[] { "ln", 0 });
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 10000 });
- vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 10000 });
-
- }
-
- public void testStopSerialGatewaySender() throws Throwable {
- addExpectedException("Broken pipe");
- addExpectedException("Connection reset");
- addExpectedException("RegionDestroyedException");
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true, 3, OrderPolicy.KEY});
- vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true, 3, OrderPolicy.KEY });
-
- vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 20 });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 20 });
-
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 20 });
- vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 20 });
-
- vm2.invoke(WANTestBase.class, "stopReceivers");
- vm3.invoke(WANTestBase.class, "stopReceivers");
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 20 });
-
- vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 20 });
- vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 20 });
-
- vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-
- vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderStoppedState", new Object[] { "ln" });
- vm5.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderStoppedState", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
- vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
- /**
- * Should have no effect on GatewaySenderState
- */
- vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-
- vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderStoppedState", new Object[] { "ln" });
- vm5.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderStoppedState", new Object[] { "ln" });
-
- AsyncInvocation vm4async = vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
- AsyncInvocation vm5async = vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
- int START_WAIT_TIME = 30000;
- vm4async.getResult(START_WAIT_TIME);
- vm5async.getResult(START_WAIT_TIME);
-
- vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 20 });
- vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 20 });
-
- vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 110 });
-
- vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 130 });
- vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 130 });
-
- vm2.invoke(WANTestBase.class, "startReceivers");
- vm3.invoke(WANTestBase.class, "startReceivers");
-
- vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderResumedState", new Object[] { "ln" });
- vm5.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderResumedState", new Object[] { "ln" });
-
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 110 });
- vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 110 });
-
- vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
- vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
- }
-
-
- public void testStopOneSerialGatewaySenderBothPrimary() throws Throwable {
- addExpectedException("Broken pipe");
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true, 4, OrderPolicy.KEY });
- vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true, 4, OrderPolicy.KEY });
-
- vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 100 });
-
- vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-
- vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderStoppedState", new Object[] { "ln" });
-
- vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 200 });
-
- getLogWriter().info("Completed puts in the region");
-
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 200 });
- vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 200 });
-
- //Do some puts while restarting a sender
- AsyncInvocation asyncPuts = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 2000 });
-
- Thread.sleep(10);
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- asyncPuts.getResult();
- getLogWriter().info("Completed puts in the region");
-
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 2000 });
- vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 2000 });
-
- vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
- }
-
- public void Bug46921_testStopOneSerialGatewaySender_PrimarySecondary() {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true, 4, OrderPolicy.PARTITION });
- vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true, 4, OrderPolicy.PARTITION });
-
- vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 1000 });
-
- vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-
- vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderStoppedState", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 10000 });
-
- getLogWriter().info("Completed puts in the region");
-
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 10000 });
- vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 10000 });
+ protected void validateQueueClosedVM4() {
+ vm4.invoke(() -> WANTestBase.validateQueueClosedForConcurrentSerialGatewaySender( "ln"));
}
- public void testStopOneSender_StartAnotherSender() {
- addExpectedException("Broken pipe");
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true, 4, OrderPolicy.PARTITION });
- vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 1000 });
- vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
- vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderStoppedState", new Object[] { "ln" });
-
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true, 4, OrderPolicy.PARTITION });
- vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 10000 });
- getLogWriter().info("Completed puts in the region");
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 10000 });
+ private void validateQueueContents(VM vm, String site, int size) {
+ vm.invoke(() -> WANTestBase.validateQueueContentsForConcurrentSerialGatewaySender( site, size));
}
- public void test_Bug44153_StopOneSender_StartAnotherSender_CheckQueueSize() {
- addExpectedException("Broken pipe");
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true, 3, OrderPolicy.PARTITION });
- vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 1000 });
- vm4.invoke(WANTestBase.class, "validateQueueContentsForConcurrentSerialGatewaySender", new Object[] { "ln", 1000});
-
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true, 3, OrderPolicy.PARTITION });
- vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "validateQueueContentsForConcurrentSerialGatewaySender", new Object[] { "ln", 1000});
-
- vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
- vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderStoppedState", new Object[] { "ln" });
- vm4.invoke(WANTestBase.class, "validateQueueClosedForConcurrentSerialGatewaySender", new Object[] { "ln"});
-
-
- vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 10000 });
-
- vm5.invoke(WANTestBase.class, "validateQueueContentsForConcurrentSerialGatewaySender", new Object[] { "ln",
- 11000 });
- vm4.invoke(WANTestBase.class, "validateQueueClosedForConcurrentSerialGatewaySender", new Object[] { "ln"});
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
- getLogWriter().info("Completed puts in the region");
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 10000 });
- }
-
public static void verifySenderPausedState(String senderId) {
Set<GatewaySender> senders = cache.getGatewaySenders();
AbstractGatewaySender sender = null;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/22606309/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
index d30289b..7f4535e 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
@@ -27,6 +27,7 @@ import com.gemstone.gemfire.internal.cache.wan.GatewaySenderException;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
import com.gemstone.gemfire.test.dunit.RMIException;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* @author skumar
@@ -42,11 +43,11 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
public void setUp() throws Exception {
super.setUp();
- addExpectedException("Connection reset");
addExpectedException("Broken pipe");
+ addExpectedException("Connection reset");
+ addExpectedException("Unexpected IOException");
addExpectedException("Connection refused");
addExpectedException("could not get remote locator information");
- addExpectedException("Unexpected IOException");
//Stopping the gateway closed the region,
//which causes this exception to get logged
@@ -54,111 +55,107 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
}
public void testSerialGatewaySenderOperationsWithoutStarting() {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true });
-
- vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 1000 });
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 10000 });
-
- vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
- "verifyGatewaySenderOperations", new Object[] { "ln" });
- vm5.invoke(SerialGatewaySenderOperationsDUnitTest.class,
- "verifyGatewaySenderOperations", new Object[] { "ln" });
+ Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+ Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+ createReceivers(nyPort);
+
+ createSenderCaches(lnPort);
+
+ createSenderVM4();
+ createSenderVM5();
+
+ createReceiverRegions();
+
+ createSenderRegions();
+
+ vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+ 10 ));
+ vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+ 100 ));
+
+ vm4.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifyGatewaySenderOperations( "ln" ));
+ vm5.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifyGatewaySenderOperations( "ln" ));
+
+ }
+
+ protected void createSenderRegions() {
+ vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+ testName + "_RR", "ln", isOffHeap() ));
+ vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+ testName + "_RR", "ln", isOffHeap() ));
+ vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+ testName + "_RR", "ln", isOffHeap() ));
+ vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+ testName + "_RR", "ln", isOffHeap() ));
+ }
+
+ protected void createReceiverRegions() {
+ vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+ testName + "_RR", null, isOffHeap() ));
+ vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+ testName + "_RR", null, isOffHeap() ));
+ }
+
+ protected void createSenderCaches(Integer lnPort) {
+ vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+ vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+ vm6.invoke(() -> WANTestBase.createCache( lnPort ));
+ vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+ }
+
+ protected void createReceivers(Integer nyPort) {
+ vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm3.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ }
+ protected void createSenderVM5() {
+ vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+ false, 100, 10, false, true, null, true ));
+ }
+
+ protected void createSenderVM4() {
+ vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+ false, 100, 10, false, true, null, true ));
}
public void testStartPauseResumeSerialGatewaySender() {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true });
-
- vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 1000 });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 10000 });
-
- vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
- vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderPausedState", new Object[] { "ln" });
- vm5.invoke(SerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderPausedState", new Object[] { "ln" });
-
- AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
- new Object[] { testName + "_RR", 1000 });
-
- vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-
- vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderResumedState", new Object[] { "ln" });
- vm5.invoke(SerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderResumedState", new Object[] { "ln" });
+ Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+ Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+ createReceivers(nyPort);
+
+ createSenderCaches(lnPort);
+
+ createSenderVM4();
+ createSenderVM5();
+
+ createReceiverRegions();
+
+ createSenderRegions();
+
+ vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+ 10 ));
+
+ startSenders();
+
+ vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+ 100 ));
+
+ vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
+ vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
+
+ vm4.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderPausedState( "ln" ));
+ vm5.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderPausedState( "ln" ));
+
+ AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( testName + "_RR", 10 ));
+
+ vm4.invoke(() -> WANTestBase.resumeSender( "ln" ));
+ vm5.invoke(() -> WANTestBase.resumeSender( "ln" ));
+
+ vm4.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderResumedState( "ln" ));
+ vm5.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderResumedState( "ln" ));
try {
inv1.join();
@@ -169,456 +166,351 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
getLogWriter().info("Completed puts in the region");
- vm4.invoke(WANTestBase.class,
- "validateQueueContents", new Object[] { "ln", 0 });
- vm5.invoke(WANTestBase.class,
- "validateQueueContents", new Object[] { "ln", 0 });
-
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 10000 });
- vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 10000 });
+ validateQueueContents(vm4, "ln", 0);
+ validateQueueContents(vm5, "ln", 0);
+ vm2.invoke(() -> WANTestBase.validateRegionSize(
+ testName + "_RR", 100 ));
+ vm3.invoke(() -> WANTestBase.validateRegionSize(
+ testName + "_RR", 100 ));
}
public void testStopSerialGatewaySender() throws Throwable {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true });
-
- vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 20 });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 20 });
+ Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+ Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+ createReceivers(nyPort);
+
+ createSenderCaches(lnPort);
+
+ createSenderVM4();
+ createSenderVM5();
+
+ createReceiverRegions();
+
+ createSenderRegions();
+
+ vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+ 20 ));
+
+ startSenders();
+
+ vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+ 20 ));
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 20 });
- vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 20 });
+ vm2.invoke(() -> WANTestBase.validateRegionSize(
+ testName + "_RR", 20 ));
+ vm3.invoke(() -> WANTestBase.validateRegionSize(
+ testName + "_RR", 20 ));
- vm2.invoke(WANTestBase.class, "stopReceivers");
- vm3.invoke(WANTestBase.class, "stopReceivers");
+ vm2.invoke(() -> WANTestBase.stopReceivers());
+ vm3.invoke(() -> WANTestBase.stopReceivers());
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 20 });
+ vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+ 20 ));
- vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 20 });
- vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 20 });
+ vm4.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 20 ));
+ vm5.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 20 ));
- vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+ vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
+ vm5.invoke(() -> WANTestBase.stopSender( "ln" ));
- vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderStoppedState", new Object[] { "ln" });
- vm5.invoke(SerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderStoppedState", new Object[] { "ln" });
+ vm4.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderStoppedState( "ln" ));
+ vm5.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderStoppedState( "ln" ));
- vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
- vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+ vm4.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 0 ));
+ vm5.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 0 ));
/**
* Should have no effect on GatewaySenderState
*/
- vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+ vm4.invoke(() -> WANTestBase.resumeSender( "ln" ));
+ vm5.invoke(() -> WANTestBase.resumeSender( "ln" ));
- vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderStoppedState", new Object[] { "ln" });
- vm5.invoke(SerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderStoppedState", new Object[] { "ln" });
+ vm4.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderStoppedState( "ln" ));
+ vm5.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderStoppedState( "ln" ));
- AsyncInvocation vm4async = vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
- AsyncInvocation vm5async = vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+ AsyncInvocation vm4async = vm4.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+ AsyncInvocation vm5async = vm5.invokeAsync(() -> WANTestBase.startSender( "ln" ));
int START_WAIT_TIME = 30000;
vm4async.getResult(START_WAIT_TIME);
vm5async.getResult(START_WAIT_TIME);
- vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 20 });
- vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 20 });
+ vm4.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 20 ));
+ vm5.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 20 ));
- vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 110 });
+ vm5.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+ 110 ));
- vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 130 });
- vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 130 });
+ vm4.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 130 ));
+ vm5.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 130 ));
- vm2.invoke(WANTestBase.class, "startReceivers");
- vm3.invoke(WANTestBase.class, "startReceivers");
+ vm2.invoke(() -> WANTestBase.startReceivers());
+ vm3.invoke(() -> WANTestBase.startReceivers());
- vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderResumedState", new Object[] { "ln" });
- vm5.invoke(SerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderResumedState", new Object[] { "ln" });
+ vm4.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderResumedState( "ln" ));
+ vm5.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderResumedState( "ln" ));
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 110 });
- vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 110 });
+ vm2.invoke(() -> WANTestBase.validateRegionSize(
+ testName + "_RR", 110 ));
+ vm3.invoke(() -> WANTestBase.validateRegionSize(
+ testName + "_RR", 110 ));
- vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
- vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+ vm4.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 0 ));
+ vm5.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 0 ));
+ }
+
+ protected void startSenders() {
+ vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+ vm5.invoke(() -> WANTestBase.startSender( "ln" ));
}
public void testStopOneSerialGatewaySenderBothPrimary() throws Throwable {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true });
-
- vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 100 });
-
- vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-
- vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderStoppedState", new Object[] { "ln" });
+ Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+ Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+ createReceivers(nyPort);
+
+ createSenderCaches(lnPort);
+
+ createSenderVM4();
+ createSenderVM5();
+
+ createReceiverRegions();
+
+ createSenderRegions();
+
+ startSenders();
+
+ vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+ 100 ));
+
+ vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
+
+ vm4.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderStoppedState( "ln" ));
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 200 });
+ vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+ 200 ));
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 200 });
- vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 200 });
+ vm2.invoke(() -> WANTestBase.validateRegionSize(
+ testName + "_RR", 200 ));
+ vm3.invoke(() -> WANTestBase.validateRegionSize(
+ testName + "_RR", 200 ));
//Do some puts while restarting a sender
- AsyncInvocation asyncPuts = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 2000 });
+ AsyncInvocation asyncPuts = vm4.invokeAsync(() -> WANTestBase.doPuts( testName + "_RR",
+ 300 ));
Thread.sleep(10);
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+ vm4.invoke(() -> WANTestBase.startSender( "ln" ));
asyncPuts.getResult();
getLogWriter().info("Completed puts in the region");
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 2000 });
- vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 2000 });
+ vm2.invoke(() -> WANTestBase.validateRegionSize(
+ testName + "_RR", 300 ));
+ vm3.invoke(() -> WANTestBase.validateRegionSize(
+ testName + "_RR", 300 ));
- Thread.sleep(5000);
- vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+ vm4.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 0 ));
}
public void testStopOneSerialGatewaySender_PrimarySecondary() {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true });
-
- vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 1000 });
-
- vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-
- vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderStoppedState", new Object[] { "ln" });
+ Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+ Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+ createReceivers(nyPort);
+
+ createSenderCaches(lnPort);
+
+ createSenderVM4();
+ createSenderVM5();
+
+ createReceiverRegions();
+
+ createSenderRegions();
+
+ startSenders();
+
+ vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+ 10 ));
+
+ vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
+
+ vm4.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderStoppedState( "ln" ));
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 10000 });
+ vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+ 100 ));
getLogWriter().info("Completed puts in the region");
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 10000 });
- vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 10000 });
+ vm2.invoke(() -> WANTestBase.validateRegionSize(
+ testName + "_RR", 100 ));
+ vm3.invoke(() -> WANTestBase.validateRegionSize(
+ testName + "_RR", 100 ));
}
public void testStopOneSender_StartAnotherSender() {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true });
- vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 1000 });
- vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
- vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderStoppedState", new Object[] { "ln" });
-
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true });
- vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 10000 });
+ Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+ Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+ vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+ testName + "_RR", null, isOffHeap() ));
+
+ vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+ createSenderVM4();
+ vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+ testName + "_RR", "ln", isOffHeap() ));
+ vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+
+ vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+ 10 ));
+ vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
+ vm4.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderStoppedState( "ln" ));
+
+ vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+ createSenderVM5();
+ vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+ testName + "_RR", "ln", isOffHeap() ));
+ vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+ vm5.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+ 100 ));
getLogWriter().info("Completed puts in the region");
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 10000 });
+ vm2.invoke(() -> WANTestBase.validateRegionSize(
+ testName + "_RR", 100 ));
}
public void test_Bug44153_StopOneSender_StartAnotherSender_CheckQueueSize() {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true });
- vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 1000 });
- vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
- 1000 });
- vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-
- vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderStoppedState", new Object[] { "ln" });
-
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true });
- vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm5.invoke(WANTestBase.class, "doPutsFrom", new Object[] { testName + "_RR", 1000, 11000 });
-
- vm5.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
- 10000 });
- vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
- vm5.invoke(SerialGatewaySenderOperationsDUnitTest.class,
- "verifySenderStoppedState", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
- 1000 });
- vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
+ Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+ Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+ vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+ createSenderVM4();
+ vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+ testName + "_RR", "ln", isOffHeap() ));
+ vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+
+ vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+ 10 ));
+ validateQueueContents(vm4, "ln", 10);
+ vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
+
+ vm4.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderStoppedState( "ln" ));
+
+ vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+ createSenderVM5();
+ vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+ testName + "_RR", "ln", isOffHeap() ));
+ vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+ vm5.invoke(() -> WANTestBase.doPutsFrom( testName + "_RR", 10, 110 ));
+
+ validateQueueContents(vm5, "ln", 100);
+ validateQueueClosedVM4();
+ vm5.invoke(() -> WANTestBase.stopSender( "ln" ));
+ vm5.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderStoppedState( "ln" ));
+
+ vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+ validateQueueContents(vm4, "ln", 10);
+ vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
+
+ vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+ vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+ vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+ testName + "_RR", null, isOffHeap() ));
getLogWriter().info("Completed puts in the region");
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 10000 });
- vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 11000 });
- vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+ vm2.invoke(() -> WANTestBase.validateRegionSize(
+ testName + "_RR", 100 ));
+ vm5.invoke(() -> WANTestBase.stopSender( "ln" ));
+
+ vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+ vm2.invoke(() -> WANTestBase.validateRegionSize(
+ testName + "_RR", 110 ));
+ vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
}
+ private void validateQueueClosedVM4() {
+ // TODO Auto-generated method stub
+
+ }
+
+ private void validateQueueContents(VM vm, String site, int size) {
+ vm.invoke(() -> WANTestBase.validateQueueContents( site,
+ size ));
+ }
+
/**
* Destroy SerialGatewaySender on all the nodes.
*/
public void testDestroySerialGatewaySenderOnAllNodes() {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true });
-
- vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 1000 });
+ Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+ Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+ createReceivers(nyPort);
+
+ createSenderCaches(lnPort);
+
+ createSenderVM4();
+ createSenderVM5();
+
+ createReceiverRegions();
+
+ createSenderRegions();
+
+ startSenders();
+
+ vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+ 10 ));
//before destroying, stop the sender
- vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+ vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
+ vm5.invoke(() -> WANTestBase.stopSender( "ln" ));
- vm4.invoke(WANTestBase.class, "removeSenderFromTheRegion", new Object[] { "ln", testName + "_RR" });
- vm5.invoke(WANTestBase.class, "removeSenderFromTheRegion", new Object[] { "ln", testName + "_RR" });
+ vm4.invoke(() -> WANTestBase.removeSenderFromTheRegion( "ln", testName + "_RR" ));
+ vm5.invoke(() -> WANTestBase.removeSenderFromTheRegion( "ln", testName + "_RR" ));
- vm4.invoke(WANTestBase.class, "destroySender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "destroySender", new Object[] { "ln" });
+ vm4.invoke(() -> WANTestBase.destroySender( "ln" ));
+ vm5.invoke(() -> WANTestBase.destroySender( "ln" ));
- vm4.invoke(WANTestBase.class, "verifySenderDestroyed", new Object[] { "ln", false });
- vm5.invoke(WANTestBase.class, "verifySenderDestroyed", new Object[] { "ln", false });
+ vm4.invoke(() -> WANTestBase.verifySenderDestroyed( "ln", false ));
+ vm5.invoke(() -> WANTestBase.verifySenderDestroyed( "ln", false ));
}
/**
* Destroy SerialGatewaySender on a single node.
*/
public void testDestroySerialGatewaySenderOnSingleNode() {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true });
-
- vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 1000 });
+ Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+ Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+ createReceivers(nyPort);
+
+ createSenderCaches(lnPort);
+
+ createSenderVM4();
+ createSenderVM5();
+
+ createReceiverRegions();
+
+ createSenderRegions();
+
+ startSenders();
+
+ vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+ 10 ));
//before destroying, stop the sender
- vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+ vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
- vm4.invoke(WANTestBase.class, "removeSenderFromTheRegion", new Object[] { "ln", testName + "_RR" });
+ vm4.invoke(() -> WANTestBase.removeSenderFromTheRegion( "ln", testName + "_RR" ));
- vm4.invoke(WANTestBase.class, "destroySender", new Object[] { "ln" });
+ vm4.invoke(() -> WANTestBase.destroySender( "ln" ));
- vm4.invoke(WANTestBase.class, "verifySenderDestroyed", new Object[] { "ln", false });
- vm5.invoke(WANTestBase.class, "verifySenderRunningState", new Object[] { "ln" });
+ vm4.invoke(() -> WANTestBase.verifySenderDestroyed( "ln", false ));
+ vm5.invoke(() -> WANTestBase.verifySenderRunningState( "ln" ));
}
/**
@@ -626,56 +518,37 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
* Hence, exception is thrown by the sender API.
*/
public void testDestroySerialGatewaySenderExceptionScenario() {
- Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
- "createFirstLocatorWithDSId", new Object[] { 1 });
- Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
- "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
- vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
- vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
- vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
- vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
- vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true });
- vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
- false, 100, 10, false, true, null, true });
-
- vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
- vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", null, isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
- vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
- testName + "_RR", "ln", isOffHeap() });
-
- vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
- vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
- vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
- 1000 });
+ Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+ Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+ createReceivers(nyPort);
+
+ createSenderCaches(lnPort);
+
+ createSenderVM4();
+ createSenderVM5();
+
+ createReceiverRegions();
+
+ createSenderRegions();
+
+ startSenders();
+
+ vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+ 10 ));
try {
- vm4.invoke(WANTestBase.class, "destroySender", new Object[] { "ln" });
+ vm4.invoke(() -> WANTestBase.destroySender( "ln" ));
} catch (RMIException e) {
assertTrue("Cause of the exception should be GatewaySenderException", e.getCause() instanceof GatewaySenderException);
}
- vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
- testName + "_RR", 1000 });
+ vm2.invoke(() -> WANTestBase.validateRegionSize(
+ testName + "_RR", 10 ));
}
public static void verifySenderPausedState(String senderId) {
Set<GatewaySender> senders = cache.getGatewaySenders();
- GatewaySender sender = null;
+ AbstractGatewaySender sender = null;
for (GatewaySender s : senders) {
if (s.getId().equals(senderId)) {
sender = (AbstractGatewaySender)s;
[20/50] [abbrv] incubator-geode git commit: removing two unused
classes
Posted by kl...@apache.org.
removing two unused classes
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/4a6b0dd5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/4a6b0dd5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/4a6b0dd5
Branch: refs/heads/feature/GEODE-773-2
Commit: 4a6b0dd58fe0819474f7778aec7d7e9c9235312d
Parents: 46eaaa9
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Thu Jan 28 14:01:45 2016 -0800
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Thu Jan 28 14:06:35 2016 -0800
----------------------------------------------------------------------
.../distributed/internal/DistributedState.java | 143 -------------------
.../internal/ForceDisconnectOperation.java | 42 ------
2 files changed, 185 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4a6b0dd5/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributedState.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributedState.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributedState.java
deleted file mode 100644
index 484511c..0000000
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributedState.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gemstone.gemfire.distributed.internal;
-
-import com.gemstone.gemfire.DataSerializable;
-import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.internal.HeapDataOutputStream;
-import com.gemstone.gemfire.internal.Version;
-//import com.gemstone.gemfire.InternalGemFireException;
-import java.io.*;
-
-/**
- * Contains state that is distributed among distribution managers
- * using the JGroups {@link
- * com.gemstone.org.jgroups.Channel#getState "state"} mechanism.
- * It contains information that distribution managers need when
- * starting up.
- *
- * @author David Whitlock
- *
- *
- * @since 2.1
- */
-class DistributedState implements DataSerializable {
- private static final long serialVersionUID = -4776743091985815549L;
-
- /** The version of GemFire being used */
- private String version;
-
- /** The current "cache time" */
- private long cacheTime;
-
- ///////////////////// Static Methods /////////////////////
-
- /**
- * Returns a <code>DistributedState</code> created from the given
- * byte array.
- *
- * @throws IOException
- * Something went wrong while deserializing
- * <code>bytes</code>
- */
- public static DistributedState fromBytes(byte[] bytes)
- throws IOException {
-
- DistributedState state = new DistributedState();
-
- ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
- DataInputStream dis = new DataInputStream(bais);
-
- state.fromData(dis);
- return state;
- }
-
- /**
- * Returns a <code>byte</code> representation of the given
- * <code>DistributedState</code>.
- *
- * @throws IOException
- * Something went wrong while serializing <code>state</code>
- */
- public static byte[] toBytes(DistributedState state)
- throws IOException {
-
- HeapDataOutputStream hdos = new HeapDataOutputStream(256, Version.CURRENT);
- state.toData(hdos);
- return hdos.toByteArray();
- }
-
- ////////////////////// Constructors //////////////////////
-
- /**
- * Creates a new <Code>DistributedState</code>. This method is
- * invoked when a member (usually the "coordinator") of the
- * JGroups group receives a {@link
- * com.gemstone.org.jgroups.GetStateEvent}.
- */
- public DistributedState() {
-
- }
-
- ///////////////////// Instance Methods /////////////////////
-
- /**
- * Sets the version of GemFire being used
- */
- public void setGemFireVersion(String version) {
- this.version = version;
- }
-
- /**
- * Returns the version of GemFire being used (by the sender of this
- * state).
- */
- public String getGemFireVersion() {
- return this.version;
- }
-
- /**
- * Sets the current "cache time"
- */
- public void setCacheTime(long cacheTime) {
- this.cacheTime = cacheTime;
- }
-
- /**
- * Returns the "cache time" of the sender of this state
- */
- public long getCacheTime() {
- return this.cacheTime;
- }
-
- /**
- * Serializes this <code>DistributedState</code> as data
- */
- public void toData(DataOutput out) throws IOException {
- DataSerializer.writeString(this.version, out);
- out.writeLong(this.cacheTime);
- }
-
- /**
- * Popuplates the <code>DistributedState</code> from the given
- * data.
- */
- public void fromData(DataInput in) throws IOException {
- this.version = DataSerializer.readString(in);
- this.cacheTime = in.readLong();
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4a6b0dd5/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/ForceDisconnectOperation.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/ForceDisconnectOperation.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/ForceDisconnectOperation.java
deleted file mode 100644
index e7b3704..0000000
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/ForceDisconnectOperation.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gemstone.gemfire.distributed.internal;
-
-import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
-
-/**
- * Used to force a current member of the distributed system to disconnect.
- * @deprecated starting with Ganges, use MembeshipManager.requestMemberRemoval instead
- * @author Darrel
- * @since 4.2.1
- */
-@Deprecated
-public class ForceDisconnectOperation {
-// protected DM dm;
-// protected ReplyProcessor21 processor;
-// protected ForceDisconnectMessage msg;
-
- public ForceDisconnectOperation(DM dm, InternalDistributedMember destination) {
- throw new UnsupportedOperationException("ForceDisconnectOperation is no longer supported - use MembershipManager.requestMemberRemoval instead");
-// this.dm = dm;
-// this.processor = new ReplyProcessor21(dm, destination);
-// this.msg = new ForceDisconnectMessage();
-// msg.setRecipient(destination);
-// msg.setProcessorId(this.processor.getProcessorId());
- }
-
-}
[35/50] [abbrv] incubator-geode git commit: GEODE-805: Fix javadoc
warnings.
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java
index 1eaabf1..98e72bd 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java
@@ -506,7 +506,7 @@ public final class BucketAdvisor extends CacheDistributionAdvisor {
}
/**
- * @guarded.By this
+ * Concurrency: protected by synchronizing on *this*
*/
@Override
protected void profileCreated(Profile profile) {
@@ -527,7 +527,7 @@ public final class BucketAdvisor extends CacheDistributionAdvisor {
}
/**
- * @guarded.By this
+ * Concurrency: protected by synchronizing on *this*
*/
@Override
protected void profileUpdated(Profile profile) {
@@ -548,7 +548,7 @@ public final class BucketAdvisor extends CacheDistributionAdvisor {
}
/**
- * @guarded.By this
+ * Concurrency: protected by synchronizing on *this*
*/
@Override
protected void profileRemoved(Profile profile) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheObserver.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheObserver.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheObserver.java
index 6b18d86..e74760c 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheObserver.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheObserver.java
@@ -185,7 +185,6 @@ public interface CacheObserver
/**
* Invoked just before ShutdownAll operation
- * @param emptyOplog
*/
void beforeShutdownAll();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/DistTXRollbackMessage.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/DistTXRollbackMessage.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/DistTXRollbackMessage.java
index d21fc28..a69a276 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/DistTXRollbackMessage.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/DistTXRollbackMessage.java
@@ -256,7 +256,7 @@ public final class DistTXRollbackMessage extends TXMessage {
/**
* A processor to capture the value returned by
- * {@link DistTXRollbackMessage.DistTXCommitReplyMessage}
+ * {@link DistTXRollbackReplyMessage}
*
*/
public static class DistTXRollbackResponse extends RemoteOperationResponse {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/DistTXState.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/DistTXState.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/DistTXState.java
index 95deab6..c81db38 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/DistTXState.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/DistTXState.java
@@ -345,10 +345,6 @@ public class DistTXState extends TXState {
// Cleanup is called next
}
- /**
- * @param txStateProxy
- * @return
- */
protected boolean applyOpsOnRedundantCopy(DistributedMember sender,
ArrayList<DistTxEntryEvent> secondaryTransactionalOperations) {
boolean returnValue = true;
@@ -434,7 +430,7 @@ public class DistTXState extends TXState {
* Apply the individual tx op on secondary
*
* Calls local function such as putEntry instead of putEntryOnRemote as for
- * this {@link DistTXStateOnCoordinator) as events will always be local. In
+ * this {@link DistTXStateOnCoordinator} as events will always be local. In
* parent {@link DistTXState} class will call remote version of functions
*
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/EventTracker.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/EventTracker.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/EventTracker.java
index a4f53a5..83b00b4 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/EventTracker.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/EventTracker.java
@@ -62,7 +62,7 @@ public class EventTracker
* a mapping of originator to the last event applied to this cache
*
* Keys are instances of {@link ThreadIdentifier}, values are instances
- * of {@link EventSeqnoHolder}.
+ * of {@link com.gemstone.gemfire.internal.cache.EventTracker.EventSeqnoHolder}.
*/
protected final ConcurrentMap<ThreadIdentifier, EventSeqnoHolder> recordedEvents
= new ConcurrentHashMap<ThreadIdentifier, EventSeqnoHolder>(100);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
index 4e8f0c9..256e293 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
@@ -1127,8 +1127,6 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
/**
* Perform initialization, solve the early escaped reference problem by putting publishing references to this instance
* in this method (vs. the constructor).
- *
- * @return the initialized instance of the cache
*/
private void initialize() {
if (GemFireCacheImpl.instance != null) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/IdentityArrayList.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/IdentityArrayList.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/IdentityArrayList.java
index 71d8f4e..3b54687 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/IdentityArrayList.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/IdentityArrayList.java
@@ -46,7 +46,7 @@ import it.unimi.dsi.fastutil.objects.ObjectListIterator;
* <em>never</em> made smaller (even on a {@link #clear()}). A family of
* {@linkplain #trim() trimming methods} lets you control the size of the
* backing array; this is particularly useful if you reuse instances of this class.
- * Range checks are equivalent to those of {@link java.util}'s classes, but
+ * Range checks are equivalent to those of <code>java.util</code>'s classes, but
* they are delayed as much as possible.
*
* <p>The backing array is exposed by the {@link #elements()} method. If an instance
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/InitialImageOperation.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/InitialImageOperation.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/InitialImageOperation.java
index c7ceff4..7ca8a29 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/InitialImageOperation.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/InitialImageOperation.java
@@ -1566,7 +1566,7 @@ public class InitialImageOperation {
public String regionPath;
/**
- * Id of the {@link ImageProcessor} that will handle the replies
+ * Id of the {@link InitialImageOperation.ImageProcessor} that will handle the replies
*/
protected int processorId;
@@ -2237,7 +2237,7 @@ public class InitialImageOperation {
protected String regionPath;
/**
- * Id of the {@link ImageProcessor} that will handle the replies
+ * Id of the {@link InitialImageOperation.ImageProcessor} that will handle the replies
*/
protected int processorId;
@@ -2499,7 +2499,7 @@ public class InitialImageOperation {
protected String regionPath;
/**
- * Id of the {@link ImageProcessor} that will handle the replies
+ * Id of the {@link InitialImageOperation.ImageProcessor} that will handle the replies
*/
protected int processorId;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
index 3186989..1c5f321 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
@@ -12828,7 +12828,11 @@ public class LocalRegion extends AbstractRegion
* or it may recover an index map that was previously persisted, depending
* on whether the index previously existed.
*
+ * @param indexName the name of the index
+ * @param indexedExpression the index expression
+ * @param fromClause the from clause.
*
+ * @return The index map.
*
* @throws IllegalStateException if this region is not using
* soplog persistence
@@ -12836,12 +12840,6 @@ public class LocalRegion extends AbstractRegion
* @throws IllegalStateException if this index was previously
* persisted with a different expression or from clause.
*
- * @param indexName the name of the index
- * @param indexedExpression the index expression
- * @param fromClause the from clause.
- *
- *
- * @return The index map.
*/
public IndexMap getIndexMap(String indexName, String indexedExpression,
String fromClause) {
@@ -12860,18 +12858,18 @@ public class LocalRegion extends AbstractRegion
* or it may recover an index map that was previously persisted, depending
* on whether the index previously existed.
*
+ * @param indexName the name of the index
+ * @param indexedExpression the index expression
+ * @param fromClause the from clause.
+ *
+ * @return The index map.
+ *
* @throws IllegalStateException if this region is not using
* soplog persistence
*
* @throws IllegalStateException if this index was previously
* persisted with a different expression or from clause.
*
- * @param indexName the name of the index
- * @param indexedExpression the index expression
- * @param fromClause the from clause.
- *
- *
- * @return The index map.
*/
public IndexMap getUnsortedIndexMap(String indexName, String indexedExpression,
String fromClause) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
index a14e99f..09e945b 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
@@ -407,7 +407,7 @@ public class PartitionedRegion extends LocalRegion implements
* the thread locally destroying this pr. not volatile,
* so always check isLocallyDestroyed before checking locallyDestroyingThread
*
- * @guarded.By {@link #isLocallyDestroyed}
+ * Concurrency: {@link #isLocallyDestroyed} is volatile
*/
public Thread locallyDestroyingThread;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteInvalidateMessage.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteInvalidateMessage.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteInvalidateMessage.java
index 3a1a664..ee01c9b 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteInvalidateMessage.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteInvalidateMessage.java
@@ -174,7 +174,6 @@ public final class RemoteInvalidateMessage extends RemoteDestroyMessage {
* acknowledgement
*
* @throws EntryExistsException
- * @throws DataLocationException
*/
@Override
protected boolean operateOnRegion(DistributionManager dm,
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteOperationMessage.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteOperationMessage.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteOperationMessage.java
index ba7659b..b6af62a 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteOperationMessage.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteOperationMessage.java
@@ -581,8 +581,6 @@ public abstract class RemoteOperationMessage extends DistributionMessage impleme
/**
* Waits for the response from the {@link RemoteOperationMessage}'s recipient
* @throws CacheException if the recipient threw a cache exception during message processing
- * @throws ForceReattemptException if the recipient left the distributed system before the response
- * was received.
* @throws PrimaryBucketException
*/
final public void waitForCacheException()
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/compression/CompressedCachedDeserializable.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/compression/CompressedCachedDeserializable.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/compression/CompressedCachedDeserializable.java
index 2214b93..ff200ac 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/compression/CompressedCachedDeserializable.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/compression/CompressedCachedDeserializable.java
@@ -134,7 +134,7 @@ public abstract class CompressedCachedDeserializable implements
/**
* Returns the deserialized value. However, unlike the specification of this method as described in
- * @link {@link CachedDeserializable#getDeserializedForReading()} this method does not
+ * {@link CachedDeserializable#getDeserializedForReading()} this method does not
* optimize for future calls leaving the value serialized and compressed.
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/control/ResourceAdvisor.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/control/ResourceAdvisor.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/control/ResourceAdvisor.java
index 7ac5340..3b28628 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/control/ResourceAdvisor.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/control/ResourceAdvisor.java
@@ -186,7 +186,6 @@ public class ResourceAdvisor extends DistributionAdvisor {
* @param irm The resource manager which is requesting distribution
* @param recips The recipients of the message
* @param profile Profile to send in this message
- * @throws InterruptedException
* @throws ReplyException
*/
public static void send(final InternalResourceManager irm, Set<InternalDistributedMember> recips,
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/control/ResourceListener.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/control/ResourceListener.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/control/ResourceListener.java
index 947ee96..aa8845c 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/control/ResourceListener.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/control/ResourceListener.java
@@ -18,7 +18,7 @@
package com.gemstone.gemfire.internal.cache.control;
/**
- * Provides notification of {@link com.gemstone.gemfire.cache GemFire Cache}
+ * Provides notification of {@link com.gemstone.gemfire.cache.Cache}
* resource management events.
*
* @since 6.0
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStats.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStats.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStats.java
index 2683964..905211a 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStats.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStats.java
@@ -198,7 +198,6 @@ public class FunctionServiceStats {
* <code>Statistics</code> instance
* @param name
* The name of the <code>Statistics</code>
- * @throws Exception
*/
public FunctionServiceStats(StatisticsFactory factory, String name) {
this._stats = factory.createAtomicStatistics(_type, name);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalExecution.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalExecution.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalExecution.java
index 829ac71..fa4d283 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalExecution.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalExecution.java
@@ -71,8 +71,6 @@ public interface InternalExecution extends Execution {
* @param bucketIDs
* Set of bucketIDs defining the buckets to be used for executing the function
* @return an Execution with the filter
- * @throws FunctionExecutionException
- * if bucketIDs is null or empty.
* @throws UnsupportedOperationException
* if not called after
* {@link FunctionService#onRegion(com.gemstone.gemfire.cache.Region)}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalFunctionService.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalFunctionService.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalFunctionService.java
index ea0fcf4..eae2bc8 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalFunctionService.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalFunctionService.java
@@ -114,16 +114,13 @@ public class InternalFunctionService {
*
* @param regionService
* obtained from {@link ClientCacheFactory#create} or
- * {@link ClientCache#createAuthenticatedView(Properties)}.
+ * {@link ClientCache#createAuthenticatedView(java.util.Properties)}.
* @param groups
* optional list of GemFire configuration property "groups" (see
* <a href="../../distributed/DistributedSystem.html#groups">
* <code>groups</code></a>) on which to execute the function.
* Function will be executed on all servers of each group
* @return Execution
- * @throws FunctionException
- * if cache is null, is not on a client, or it does not have a
- * default pool
* @since 7.0
*/
public static Execution onServers(RegionService regionService, String... groups) {
@@ -141,16 +138,13 @@ public class InternalFunctionService {
*
* @param regionService
* obtained from {@link ClientCacheFactory#create()} or
- * {@link ClientCache#createAuthenticatedView(Properties)}.
+ * {@link ClientCache#createAuthenticatedView(java.util.Properties)}.
* @param groups
* optional list of GemFire configuration property "groups" (see
* <a href="../../distributed/DistributedSystem.html#groups">
* <code>groups</code></a>) on which to execute the function.
* Function will be executed on one server of each group
* @return Execution
- * @throws FunctionException
- * if cache is null, is not on a client, or it does not have a
- * default pool
* @since 7.0
*/
public static Execution onServer(RegionService regionService, String... groups) {
@@ -174,8 +168,6 @@ public class InternalFunctionService {
* <code>groups</code></a>) on which to execute the function.
* Function will be executed on all servers of each group
* @return Execution
- * @throws FunctionException
- * if Pool instance passed in is null
* @since 7.0
*/
public static Execution onServers(Pool pool, String... groups) {
@@ -199,8 +191,6 @@ public class InternalFunctionService {
* <code>groups</code></a>) on which to execute the function.
* Function will be executed on one server of each group
* @return Execution
- * @throws FunctionException
- * if Pool instance passed in is null
* @since 7.0
*/
public static Execution onServer(Pool pool, String... groups) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/util/CommitFunction.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/util/CommitFunction.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/util/CommitFunction.java
index b0f4d93..b5a9478 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/util/CommitFunction.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/util/CommitFunction.java
@@ -51,7 +51,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
* <code>Boolean.FALSE</code>.<br />
*
* To execute this function, it is recommended to use the {@link Execution} obtained by
- * using {@link TransactionFunctionService}. <br />
+ * using TransactionFunctionService. <br />
*
* To summarize, this function should be used as follows:
*
@@ -65,7 +65,6 @@ import com.gemstone.gemfire.internal.logging.LogService;
* it is the user's responsibility to register this function. see
* {@link FunctionService#registerFunction(Function)}
*
- * @see TransactionFunctionService
* @since 6.6.1
* @author sbawaska
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/util/RollbackFunction.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/util/RollbackFunction.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/util/RollbackFunction.java
index 459cd47..beccebb 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/util/RollbackFunction.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/util/RollbackFunction.java
@@ -50,7 +50,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
* <code>Boolean.FALSE</code>.<br />
*
* To execute this function, it is recommended to use the {@link Execution} obtained by
- * using {@link TransactionFunctionService}. <br />
+ * using TransactionFunctionService. <br />
*
* To summarize, this function should be used as follows:
*
@@ -64,7 +64,6 @@ import com.gemstone.gemfire.internal.logging.LogService;
* it is the user's responsibility to register this function. see
* {@link FunctionService#registerFunction(Function)}
*
- * @see TransactionFunctionService
* @since 6.6.1
* @author sbawaska
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/StreamingPartitionOperation.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/StreamingPartitionOperation.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/StreamingPartitionOperation.java
index e21644d..e0bf42d 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/StreamingPartitionOperation.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/StreamingPartitionOperation.java
@@ -211,8 +211,6 @@ public abstract class StreamingPartitionOperation extends StreamingOperation {
/**
* Waits for the response from the {@link PartitionMessage}'s recipient
* @throws CacheException if the recipient threw a cache exception during message processing
- * @throws ForceReattemptException if the recipient left the distributed system before the response
- * was received.
* @throws QueryException if the recipient threw a query exception
* @throws RegionDestroyedException if the peer has closed its copy of the region
* @return The set of members that failed.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java
index 96bf657..2bbde75 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java
@@ -161,8 +161,6 @@ public class PartitionedRegionLoadModel {
* Create a new model
* @param operator the operator which performs the actual creates/moves for buckets
* @param redundancyLevel The expected redundancy level for the region
- * @param enforceLocalMaxMemory
- * @param criticalMembers
*/
public PartitionedRegionLoadModel(BucketOperator operator,
int redundancyLevel, int numBuckets, AddressComparor addressComparor,
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/PersistenceAdvisorImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/PersistenceAdvisorImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/PersistenceAdvisorImpl.java
index 168fbfc..750cf81 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/PersistenceAdvisorImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/PersistenceAdvisorImpl.java
@@ -285,10 +285,6 @@ public class PersistenceAdvisorImpl implements PersistenceAdvisor {
return memberManager.isRevoked(this.regionPath, id);
}
- /**
- * @throws ReplyException
- * @throws IOException
- */
public void setOnline(boolean didGII, boolean atomicCreation,
PersistentMemberID newId) throws ReplyException {
if(online) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/PersistentMemberView.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/PersistentMemberView.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/PersistentMemberView.java
index f4d9e94..3f4f2ab 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/PersistentMemberView.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/PersistentMemberView.java
@@ -81,7 +81,6 @@ public interface PersistentMemberView {
* This is only called after this member is online.
*
* @param persistentID
- * @throws IOException
*/
public void memberRemoved(PersistentMemberID persistentID);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/InternalClientMembership.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/InternalClientMembership.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/InternalClientMembership.java
index 00d1539..806a412 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/InternalClientMembership.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/InternalClientMembership.java
@@ -73,7 +73,7 @@ public final class InternalClientMembership {
/**
* Must be locked whenever references to the volatile field
- * {@link #membershipListeners} is changed.
+ * {@link #clientMembershipListeners} is changed.
*/
private static final Object membershipLock = new Object();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java
index 5101770..adaf400 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java
@@ -137,7 +137,7 @@ public class CacheClientProxy implements ClientSession {
protected String _remoteHostAddress;
/**
- * @guarded.By {@link #isMarkedForRemovalLock}
+ * Concurrency: protected by synchronization of {@link #isMarkedForRemovalLock}
*/
protected boolean isMarkedForRemoval = false;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/concurrent/CompactConcurrentHashSet2.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/concurrent/CompactConcurrentHashSet2.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/concurrent/CompactConcurrentHashSet2.java
index 2276758..549c04e 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/concurrent/CompactConcurrentHashSet2.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/concurrent/CompactConcurrentHashSet2.java
@@ -929,10 +929,10 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
/**
* Returns a string representation of this map. The string
* representation consists of a list of key-value mappings (in no
- * particular order) enclosed in braces ("{@code {}}"). Adjacent
- * mappings are separated by the characters {@code ", "} (comma
+ * particular order) enclosed in braces (<code>{}</code>). Adjacent
+ * mappings are separated by the characters <code>", "</code> (comma
* and space). Each key-value mapping is rendered as the key
- * followed by an equals sign ("{@code =}") followed by the
+ * followed by an equals sign (<code>=</code>) followed by the
* associated value.
*
* @return a string representation of this map
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/jta/GlobalTransaction.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/jta/GlobalTransaction.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/jta/GlobalTransaction.java
index 189c006..585470a 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/jta/GlobalTransaction.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/jta/GlobalTransaction.java
@@ -117,7 +117,8 @@ public class GlobalTransaction {
* Delists the XAResources associated with the Global Transaction and
* Completes the Global transaction associated with the current thread. If any
* exception is encountered, rollback is called on the current transaction.
- * @.concurrency Some paths invoke this method after taking a lock on "this" while
+ *
+ * Concurrency: Some paths invoke this method after taking a lock on "this" while
* other paths invoke this method without taking a lock on "this". Since both types of path do
* act on the resourceMap collection, it is being protected by a lock on resourceMap too.
*
@@ -236,6 +237,10 @@ public class GlobalTransaction {
* Delists the XAResources associated with the Global Transaction and Roll
* back the transaction associated with the current thread.
*
+ * Concurrency: Some paths invoke this method after taking a lock on "this" while
+ * other paths invoke this method without taking a lock on "this". Since both types of path do
+ * act on the resourceMap collection, it is being protected by a lock on resourceMap too.
+ *
* @throws java.lang.SecurityException -
* Thrown to indicate that the thread is not allowed to roll back
* the transaction.
@@ -245,9 +250,6 @@ public class GlobalTransaction {
* @throws SystemException -
* Thrown if the transaction manager encounters an unexpected error
* condition.
- * @.concurrency Some paths invoke this method after taking a lock on "this" while
- * other paths invoke this method without taking a lock on "this". Since both types of path do
- * act on the resourceMap collection, it is being protected by a lock on resourceMap too.
*
* @see javax.transaction.TransactionManager#rollback()
*/
@@ -331,7 +333,8 @@ public class GlobalTransaction {
* XAResource, then enlists the current XAResource. For subsequent
* XAResources, it checks if is the same Resource Manager. If it is, then the
* XAResources are addded, else an exception is thrown
- * @.concurrency The order of acquiring lock will be lock on "this" followed
+ *
+ * Concurrency: The order of acquiring lock will be lock on "this" followed
* by lock on resourceMap. It is possible that in some functions of this
* class both the locks are not needed , but if the two are acquired then the realitive
* order will always be"this" followed by resourceMap.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessController.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessController.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessController.java
index 94ea8cf..71fb2e3 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessController.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessController.java
@@ -47,7 +47,7 @@ public interface ProcessController {
* is provided. Only the {@link MBeanProcessController} supports the use of
* specifying a PID because it uses the Attach API.
*
- * @throws AttachAPINotFoundException if the Attach API is not found
+ * @throws com.gemstone.gemfire.lang.AttachAPINotFoundException if the Attach API is not found
*/
public void checkPidSupport();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/process/signal/Signal.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/process/signal/Signal.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/process/signal/Signal.java
index 98a9b79..6649f40 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/process/signal/Signal.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/process/signal/Signal.java
@@ -25,9 +25,9 @@ import com.gemstone.gemfire.internal.lang.StringUtils;
* @author John Blum
* @see com.gemstone.gemfire.internal.process.signal.SignalType
* @since 7.0
- * @link http://www.fromdual.com/operating-system-signals
- * @link http://www.ibm.com/developerworks/java/library/i-signalhandling/#table1
- * @link http://publib.boulder.ibm.com/infocenter/java7sdk/v7r0/index.jsp?topic=%2Fcom.ibm.java.aix.70.doc%2Fuser%2Fsighand.html
+ * @see <a href="http://www.fromdual.com/operating-system-signals">http://www.fromdual.com/operating-system-signals</a>
+ * @see <a href="http://www.ibm.com/developerworks/java/library/i-signalhandling/#table1">http://www.ibm.com/developerworks/java/library/i-signalhandling/#table1</a>
+ * @see <a href="http://publib.boulder.ibm.com/infocenter/java7sdk/v7r0/index.jsp?topic=%2Fcom.ibm.java.aix.70.doc%2Fuser%2Fsighand.html">http://publib.boulder.ibm.com/infocenter/java7sdk/v7r0/index.jsp?topic=%2Fcom.ibm.java.aix.70.doc%2Fuser%2Fsighand.html</a>
*/
@SuppressWarnings("unused")
public enum Signal {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/ByteArrayWrapper.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/ByteArrayWrapper.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/ByteArrayWrapper.java
index cc36e1d..1554b1c 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/ByteArrayWrapper.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/ByteArrayWrapper.java
@@ -117,7 +117,7 @@ public class ByteArrayWrapper implements DataSerializable, Comparable<ByteArrayW
/**
* This equals is neither symmetric and therefore not transitive,
* because a String with the same underlying bytes is considered
- * equal. Clearly calling {@link String#equals(Object)) would not
+ * equal. Clearly calling {@link String#equals(Object)} would not
* yield the same result
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/ByteToCommandDecoder.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/ByteToCommandDecoder.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/ByteToCommandDecoder.java
index dcd080e..96d7853 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/ByteToCommandDecoder.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/ByteToCommandDecoder.java
@@ -26,7 +26,7 @@ import java.util.List;
/**
* This is the first part of the channel pipeline for Netty. Here incoming
* bytes are read and a created {@link Command} is sent down the pipeline.
- * It is unfortunate that this class is not {@link Sharable} because no state
+ * It is unfortunate that this class is not {@link io.netty.channel.ChannelHandler.Sharable} because no state
* is kept in this class. State is kept by {@link ByteToMessageDecoder}, it may
* be worthwhile to look at a different decoder setup as to avoid allocating a decoder
* for every new connection.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/Coder.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/Coder.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/Coder.java
index 50486c1..6906eb6 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/Coder.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/Coder.java
@@ -489,7 +489,7 @@ public class Coder {
* so it is converted as a string not as a literal double
* @param bytes Array holding double
* @return Parsed value
- * @throw NumberFormatException if bytes to string does not yield a convertable double
+ * @throws NumberFormatException if bytes to string does not yield a convertible double
*/
public static Double bytesToDouble(byte[] bytes) {
return stringToDouble(bytesToString(bytes));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/RedisCommandParserException.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/RedisCommandParserException.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/RedisCommandParserException.java
index f660206..d58e20d 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/RedisCommandParserException.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/RedisCommandParserException.java
@@ -17,7 +17,7 @@
package com.gemstone.gemfire.internal.redis;
/**
- * Exception thrown by {@link CommandParser} when a command has illegal syntax
+ * Exception thrown by CommandParser (non-existent class) when a command has illegal syntax
*
* @author Vitaliy Gavrilov
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/RegionCreationException.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/RegionCreationException.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/RegionCreationException.java
index b21ce14..6ecaf8b 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/RegionCreationException.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/RegionCreationException.java
@@ -17,7 +17,7 @@
package com.gemstone.gemfire.internal.redis;
/**
- * This exception is used when an error happens while creating a {@link Region} globally
+ * This exception is used when an error happens while creating a {@link com.gemstone.gemfire.cache.Region} globally
*
* @author Vitaliy Gavrilov
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/RegionProvider.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/RegionProvider.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/RegionProvider.java
index d568386..f9539e5 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/RegionProvider.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/RegionProvider.java
@@ -503,7 +503,6 @@ public class RegionProvider implements Closeable {
* Removes an expiration from a key
*
* @param key Key
- * @param context Context
* @return True is expiration cancelled on the key, false otherwise
*/
public final boolean cancelKeyExpiration(ByteArrayWrapper key) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/executor/AbstractExecutor.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/executor/AbstractExecutor.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/executor/AbstractExecutor.java
index 787268e..c6b275f 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/executor/AbstractExecutor.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/executor/AbstractExecutor.java
@@ -90,14 +90,6 @@ public abstract class AbstractExecutor implements Executor {
throw new RedisDataTypeMismatchException("The key name \"" + key + "\" is already used by a " + currentType.toString());
}
- /**
- * Getter method for a {@link QueryType}
- *
- * @param key Key
- * @param type The specific query
- * @param context context
- * @return The Query of this key and QueryType
- */
protected Query getQuery(ByteArrayWrapper key, Enum<?> type, ExecutionHandlerContext context) {
return context.getRegionProvider().getQuery(key, type);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/executor/hll/HyperLogLogPlus.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/executor/hll/HyperLogLogPlus.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/executor/hll/HyperLogLogPlus.java
index 059c7c9..8bba36d 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/executor/hll/HyperLogLogPlus.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/executor/hll/HyperLogLogPlus.java
@@ -789,7 +789,6 @@ public class HyperLogLogPlus implements ICardinality, Serializable {
* This operation does not imply a loss of precision.
*
* @param other A compatible Hyperloglog++ instance (same p and sp)
- * @throws CardinalityMergeException if other is not compatible
*/
public void addAll(HyperLogLogPlus other) throws HyperLogLogPlusMergeException {
if (other.sizeof() != sizeof()) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeCalls.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeCalls.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeCalls.java
index dcffd75..c1b40e4 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeCalls.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeCalls.java
@@ -381,8 +381,6 @@ public abstract class NativeCalls {
/**
* Set given extended socket options on a Java {@link Socket}.
*
- * @throws SocketException
- * if there was an exception setting the option on the socket
* @throws UnsupportedOperationException
* if the native API to set the option could not be found or invoked
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/CustomEntryConcurrentHashMap.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/CustomEntryConcurrentHashMap.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/CustomEntryConcurrentHashMap.java
index 75dc330..0695e4c 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/CustomEntryConcurrentHashMap.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/CustomEntryConcurrentHashMap.java
@@ -275,7 +275,7 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V> implem
* never exported out as a user-visible Map.Entry.
*
* Made this public so RegionEntries can directly implement this to reduce
- * memory overhead of separate {@link HashEntry} objects for each entry in the
+ * memory overhead of separate {@link com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry} objects for each entry in the
* map.
*/
public static interface HashEntry<K, V> {
@@ -398,13 +398,13 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V> implem
}
/**
- * Interface to enable creation of new {@link HashEntry} objects by caller.
+ * Interface to enable creation of new {@link com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry} objects by caller.
* This can be used, for example, to return GemFire RegionEntries directly.
*/
public static interface HashEntryCreator<K, V> {
/**
- * Create a new {@link HashEntry} given the key, hash, value and next
+ * Create a new {@link com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry} given the key, hash, value and next
* element.
*/
public HashEntry<K, V> newEntry(K key, int hash, HashEntry<K, V> next,
@@ -502,12 +502,12 @@ public class CustomEntryConcurrentHashMap<K, V> extends AbstractMap<K, V> implem
// GemStone addition
/**
- * {@link HashEntryCreator} for the map to create {@link HashEntry}s.
+ * {@link com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntryCreator} for the map to create {@link com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry}s.
*/
final HashEntryCreator<K, V> entryCreator;
/**
- * Lock used when updating the {@link HashEntry#getNextEntry()} link of an
+ * Lock used when updating the {@link com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry#getNextEntry()} link of an
* entry.
*/
final ReentrantReadWriteLock listUpdateLock;
@@ -1129,7 +1129,7 @@ RETRYLOOP:
}
/**
- * Extension of {@link Segment} using reference-equality comparison for key,
+ * Extension of {@link com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.Segment} using reference-equality comparison for key,
* value equality instead of equals method.
*
* @author swale
@@ -1738,7 +1738,7 @@ RETRYLOOP:
/**
* Simple adapter class providing empty default implementations for
- * {@link MapCallback}.
+ * {@link com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.MapCallback}.
*/
public static class MapCallbackAdapter<K, V, C, P> implements
MapCallback<K, V, C, P> {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/AgentUtil.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/AgentUtil.java b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/AgentUtil.java
index b8a68c0..4bfabeb 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/AgentUtil.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/AgentUtil.java
@@ -52,7 +52,6 @@ public class AgentUtil {
* classpath
*
* @param warFilePrefix : the prefix of the war file, e.g. gemfire-web, gemfire-pulse, or gemfire-web-api
- * @return
*/
public String findWarLocation(String warFilePrefix) {
String gemfireHome = getGemFireHome();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/FederatingManager.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/FederatingManager.java b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/FederatingManager.java
index 91e7b22..ccfa0a8 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/FederatingManager.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/FederatingManager.java
@@ -584,8 +584,6 @@ public class FederatingManager extends Manager {
* @param objectName
* {@link javax.management.ObjectName} of the MBean
* @return last updated time of the proxy
- *
- * @throws InstanceNotFoundException
*/
public long getLastUpdateTime(ObjectName objectName) {
return proxyFactory.getLastUpdateTime(objectName);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerAdvisor.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerAdvisor.java b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerAdvisor.java
index e47400d..c0d1c0b 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerAdvisor.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerAdvisor.java
@@ -241,7 +241,6 @@ public class JmxManagerAdvisor extends DistributionAdvisor {
/**
* Send profile to the provided members
* @param recips The recipients of the message
- * @throws InterruptedException
* @throws ReplyException
*/
public static void send(final DM dm, Set<InternalDistributedMember> recips,
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/MBeanProxyFactory.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/MBeanProxyFactory.java b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/MBeanProxyFactory.java
index 4e14e5e..58e1adf 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/MBeanProxyFactory.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/MBeanProxyFactory.java
@@ -342,8 +342,6 @@ public class MBeanProxyFactory {
* @param objectName
* {@link javax.management.ObjectName} of the MBean
* @return last updated time of the proxy
- *
- * @throws InstanceNotFoundException
*/
public long getLastUpdateTime(ObjectName objectName) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElement.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElement.java b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElement.java
index aed1058..7779d0f 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElement.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElement.java
@@ -169,7 +169,6 @@ public class CacheElement {
* @throws IOException
* @throws ParserConfigurationException
* @throws XPathExpressionException
- * @throws ValidityException
* @since 8.1
*/
private static final void buildElementMapCacheType(final LinkedHashMap<String, CacheElement> elementMap, final InputSource inputSource) throws SAXException,
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/domain/Link.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/domain/Link.java b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/domain/Link.java
index d557cb7..92677d6 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/domain/Link.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/domain/Link.java
@@ -141,7 +141,7 @@ public class Link implements Comparable<Link>, Serializable {
* @return a String representation of the HTTP request-line.
* @see java.net.URI
* @see com.gemstone.gemfire.management.internal.web.http.HttpMethod
- * @link http://www.w3.org/Protocols/rfc2616/rfc2616-sec5.html
+ * @see <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec5.html">http://www.w3.org/Protocols/rfc2616/rfc2616-sec5.html</a>
*/
public String toHttpRequestLine() {
return getMethod().name().concat(StringUtils.SPACE).concat(UriUtils.decode(getHref().toString()));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequest.java b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequest.java
index 667b444..1b8f42f 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequest.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequest.java
@@ -392,7 +392,7 @@ public class ClientHttpRequest implements HttpRequest {
* <p/>
* @param headerName a String specifying the name of the HTTP header.
* @param headerValue a String containing the value of the HTTP header.
- * @see org.springframework.http.HttpHeaders#set(Object, Object)
+ * @see org.springframework.http.HttpHeaders#set(String, String)
*/
public void setHeader(final String headerName, final String headerValue) {
getHeaders().set(headerName, headerValue);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/HttpHeader.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/HttpHeader.java b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/HttpHeader.java
index 2896a97..4e17503 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/HttpHeader.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/HttpHeader.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.internal.lang.StringUtils;
* The HttpHeader enum is an enumeration of all HTTP request/response header names.
* <p/>
* @author John Blum
- * @link http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
+ * @see <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html">http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html</a>
* @since 8.0
*/
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/package.html
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/package.html b/gemfire-core/src/main/java/com/gemstone/gemfire/package.html
index 1da3b37..198df7c 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/package.html
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/package.html
@@ -19,9 +19,9 @@ limitations under the License.
<P>The base package of the GemFire Java product, featuring highly
concurrent distributed {@linkplain com.gemstone.gemfire.cache.Cache caching}
-with {@linkplain com.gemstone.gemfire.cache.CacheEvent cache event} delivery, {@linkplain
-com.gemstone.gemfire.cache.query OQL querying}, and {@linkplain
-com.gemstone.gemfire.admin remote cache administration}, built using a {@linkplain
+with {@linkplain com.gemstone.gemfire.cache.CacheEvent cache event} delivery,
+<a href="{@docRoot}/com/gemstone/gemfire/cache/query/package-summary.html#package_description">OQL querying</a>, and
+<a href="{@docRoot}/com/gemstone/gemfire/admin/package-summary.html#package_description">remote cache administration</a>, built using a {@linkplain
com.gemstone.gemfire.distributed.DistributedSystem} which includes a
{@linkplain com.gemstone.gemfire.distributed.DistributedLockService}.
</P>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/pdx/PdxInstance.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/pdx/PdxInstance.java b/gemfire-core/src/main/java/com/gemstone/gemfire/pdx/PdxInstance.java
index 69236e4..7f6b831 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/pdx/PdxInstance.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/pdx/PdxInstance.java
@@ -195,7 +195,7 @@ public boolean isIdentityField(String fieldName);
* made to the returned value will not modify this PdxInstance.
*
* @return a {@link WritablePdxInstance}
- * @throws IllegaStateException if the PdxInstance is an enum.
+ * @throws IllegalStateException if the PdxInstance is an enum.
*/
public WritablePdxInstance createWriter();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java b/gemfire-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java
index 15929d5..e90b724 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java
@@ -283,7 +283,7 @@ public class GemFireRedisServer {
* Helper method to set the number of worker threads
*
* @return If the System property {@value #NUM_THREADS_SYS_PROP_NAME} is set then that number
- * is used, otherwise {@value #DEFAULT_WORKER_THREADS_PER_CORE} * # of cores
+ * is used, otherwise 4 * # of cores
*/
private int setNumWorkerThreads() {
String prop = System.getProperty(NUM_THREADS_SYS_PROP_NAME);
@@ -631,7 +631,6 @@ public class GemFireRedisServer {
* <br>-log-level=
*
* @param args Command line args
- * @throws IOException
*/
public static void main(String[] args) {
int port = DEFAULT_REDIS_SERVER_PORT;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/security/GemFireSecurityException.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/security/GemFireSecurityException.java b/gemfire-core/src/main/java/com/gemstone/gemfire/security/GemFireSecurityException.java
index 0a2aeb9..1f97420 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/security/GemFireSecurityException.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/security/GemFireSecurityException.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.security;
import com.gemstone.gemfire.GemFireException;
/**
- * The base class for all {@link com.gemstone.gemfire.security} related
+ * The base class for all com.gemstone.gemfire.security package related
* exceptions.
*
* @author Sumedh Wale
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/examples/TestObject.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/examples/TestObject.java b/gemfire-core/src/test/java/com/examples/TestObject.java
index fe7a4dc..0eb5d4a 100644
--- a/gemfire-core/src/test/java/com/examples/TestObject.java
+++ b/gemfire-core/src/test/java/com/examples/TestObject.java
@@ -17,8 +17,10 @@
package com.examples;
/**
- * A simple test object used by the {@link
- * com.gemstone.gemfire.internal.enhancer.serializer.SerializingStreamPerfTest} * that must be in a non-<code>com.gemstone</code> package.
+ * A simple test object used by the
+ * com.gemstone.gemfire.internal.enhancer.serializer.SerializingStreamPerfTest
+ * (this test no longer exists?)
+ * that must be in a non-<code>com.gemstone</code> package.
*
* @author David Whitlock
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/examples/ds/PutDataSerializables.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/examples/ds/PutDataSerializables.java b/gemfire-core/src/test/java/com/examples/ds/PutDataSerializables.java
index 938665f..2a5e891 100644
--- a/gemfire-core/src/test/java/com/examples/ds/PutDataSerializables.java
+++ b/gemfire-core/src/test/java/com/examples/ds/PutDataSerializables.java
@@ -22,9 +22,9 @@ import java.util.Date;
import java.util.Properties;
/**
- * Places various objects that use {@link DataSerializer}s and {@link
- * Instantiator}s into a cache {@link Region}. Among other things,
- * this is used to test bug 31573.
+ * Places various objects that use {@link com.gemstone.gemfire.DataSerializer}s
+ * and {@link com.gemstone.gemfire.Instantiator}s into a cache {@link Region}.
+ * Among other things, this is used to test bug 31573.
*
* @since 3.5
* @author David Whitlock
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java
index f856d3f..8857992 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java
@@ -82,7 +82,7 @@ public abstract class GemFireTestCase {
/**
* Assert an Invariant condition on an object.
* @param inv the Invariant to assert. If null, this method just returns
- * @param the obj to assert the Invariant on.
+ * @param obj the Object to assert the Invariant on.
*/
protected void assertInvariant(Invariant inv, Object obj) {
if (inv == null) return;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/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..2d5f8fe 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
@@ -427,7 +427,7 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
* Assert that there is one endpoint with the given host in port
* on the client vm.
* @param vm - the vm the client is running in
- * @param expectedPort - The server port we expect the client to be connected to.
+ * @param expectedPorts - The server ports we expect the client to be connected to.
*/
protected void checkEndpoints(VM vm, final int[] expectedPorts) {
vm.invoke(new SerializableRunnable("Check endpoint") {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MXMemoryPoolListenerExample.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MXMemoryPoolListenerExample.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MXMemoryPoolListenerExample.java
index e6863a2..eb9f4c7 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MXMemoryPoolListenerExample.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MXMemoryPoolListenerExample.java
@@ -151,10 +151,6 @@ public class MXMemoryPoolListenerExample implements NotificationListener {
private final Cache cache;
private final AtomicBoolean criticalState;
- /**
- * @param logWriter
- * @param criticalState
- */
public MemoryHog(String n, Cache c, AtomicBoolean critical) {
this.name = n;
this.cache = c;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/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..b9e213a 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
@@ -1440,8 +1440,7 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
* Verifies that the test listener value on the given vm is what is expected
* Note that for remote events useWaitCriterion must be true
* @param vm the vm where verification should take place
- * @param type the type of event to validate, use {@link MemoryEventType#UNKNOWN}
- * to verify all events
+ * @param state
* @param value the expected value
* @param useWaitCriterion must be true for remote events
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/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..43b53a3 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
@@ -1668,9 +1668,6 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
*
* @param vm
* the vm where verification should take place
- * @param type
- * the type of event to validate, use {@link MemoryEventType#UNKNOWN}
- * to verify all events
* @param value
* the expected value
* @param useWaitCriterion
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/QueryTestUtils.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/QueryTestUtils.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/QueryTestUtils.java
index 5ce23a4..ce7c9fd 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/QueryTestUtils.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/QueryTestUtils.java
@@ -1323,7 +1323,6 @@ public class QueryTestUtils implements Serializable {
* The VM on which the queries are to be executed
* @param qarr
* Array of keys, queries in the values of which to be executed
- * @return
*/
public void executeQueries(VM vm, final String qarr[]) {
vm.invoke(new CacheSerializableRunnable("Executing query") {
@@ -1441,7 +1440,6 @@ public class QueryTestUtils implements Serializable {
/**
* Execute all the queries in the map
* @param vm
- * @param qarr
*/
public void executeAllQueries(VM vm) {
vm.invoke(new CacheSerializableRunnable("Execute all queries") {
@@ -1453,8 +1451,6 @@ public class QueryTestUtils implements Serializable {
/**
* Execute all the queries in the map
- * @param qarr
- * @throws Exception
*/
public Object[] executeAllQueries() {
qs = cache.getQueryService();
@@ -1483,9 +1479,6 @@ public class QueryTestUtils implements Serializable {
* </code></P>
* @param vm
* The vm on which the query is to be executed
- * @param qarr
- * Array of keys, queries in the values of which to be executed
- * @return
*/
public void executeBindQuery(VM vm, final String queryId,
final Object[] params) {
@@ -1502,9 +1495,6 @@ public class QueryTestUtils implements Serializable {
* String[] arr = {"1", "2", "3"};<br>
* new QueryTestUtils().executeBindQuery("1", arr);
* </code></P>
- * @param qarr
- * Array of keys, queries in the values of which to be executed
- * @return
*/
public Object executeBindQuery(final String queryId, final Object[] params) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/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..8384c18 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
@@ -854,9 +854,6 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
/**
* Run query on server using LocalDataSet.executeQuery() to compare results
* received from client function execution.
- * @param queries
- * @param filter
- * @return
*/
public static ArrayList runQueryOnServerLocalDataSet(String query, Set filter) {
return new QueryUsingFunctionContextDUnitTest("temp").runQueryOnServerLDS(query, filter);
@@ -883,9 +880,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
}
/**
- * Run query on server to compare the results recieved from client function execution.
- * @param queries
- * @return ArrayList of results
+ * Run query on server to compare the results received from client function execution.
*/
public static ArrayList runQueryOnServerRegion(String query) {
return new QueryUsingFunctionContextDUnitTest("temp").runQueryOnServerReg(query);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/CountStarJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/CountStarJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/CountStarJUnitTest.java
index 60aeef3..922c5a4 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/CountStarJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/CountStarJUnitTest.java
@@ -59,9 +59,6 @@ public class CountStarJUnitTest {
private static String exampleRegionName = "employee";
private int numElem = 100;
- /**
- * @param name
- */
public CountStarJUnitTest() {
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java
index 76595ff..4a351aa 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java
@@ -53,9 +53,6 @@ public class DistinctResultsWithDupValuesInRegionJUnitTest {
private static String regionName = "test";
private int numElem = 100;
- /**
- * @param name
- */
public DistinctResultsWithDupValuesInRegionJUnitTest() {
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java
index 6a546b1..620caa3 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java
@@ -70,12 +70,6 @@ public class PRQueryCacheClosedJUnitTest
static final int delayQuery = 1000;
- /**
- * setUp*
- *
- * @param name
- */
-
@Before
public void setUp() throws Exception
{
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitHelper.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitHelper.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitHelper.java
index 333cb07..04dd49b 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitHelper.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryDUnitHelper.java
@@ -114,11 +114,6 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
/**
* This function creates a appropriate region (Local or PR ) given the scope &
* the isPR parameters *
- *
- * @param regionName
- * @param isPR
- *
- * @return cacheSerializable object
*/
public CacheSerializableRunnable getCacheSerializableRunnableForLocalRegionCreation(
final String regionName) {
@@ -631,11 +626,6 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
* 1. Creates & executes a query with Logical Operators on the given PR Region
* 2. Executes the same query on the local region <br>
* 3. Compares the appropriate resultSet <br>
- *
- * @param regionName
- * @param localRegionNeme
- *
- * @return cacheSerializable object
*/
public CacheSerializableRunnable getCacheSerializableRunnableForPRQueryAndCompareResults(
@@ -1399,11 +1389,6 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
* 1. Creates & executes a query with Constants on the given PR Region <br>
* 2. Executes the same query on the local region <br>
* 3. Compares the appropriate resultSet <br>
- *
- * @param regionName
- * @param localRegionNeme
- *
- * @return cacheSerializable object
*/
public CacheSerializableRunnable getCacheSerializableRunnableForPRQueryWithConstantsAndComparingResults(
@@ -1855,10 +1840,6 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
* This function <br>
* 1. The Creates an array of PortfolioData objects
*
- * @param count ,
- * CountDestisnation
- *
- *
* @return PortFolioData Objects
*/
@@ -1935,11 +1916,6 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
* 2. Executes the same query on the local region <br>
* 3. Compares the appropriate resultSet <br>
* 4. Compares and Print's the time taken for each <br>
- *
- * @param regionName
- * @param localRegionNeme
- *
- * @return cacheSerializable object
*/
public CacheSerializableRunnable PRQueryingVsLocalQuerying(
@@ -2065,11 +2041,6 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
/**
* This function creates a appropriate index on a PR given the name and
* other parameters.
- *
- * @param regionName
- * @param indexName
- *
- * @return cacheSerializable object
*/
public CacheSerializableRunnable getCacheSerializableRunnableForPRIndexCreate(
final String prRegionName, final String indexName,
@@ -2134,11 +2105,6 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
/**
* This function defines a appropriate index on a PR given the name and
* other parameters.
- *
- * @param regionName
- * @param indexName
- *
- * @return cacheSerializable object
*/
public CacheSerializableRunnable getCacheSerializableRunnableForDefineIndex(
final String prRegionName, final ArrayList<String> indexName,
@@ -2395,10 +2361,6 @@ public class PRQueryDUnitHelper extends PartitionedRegionDUnitTestCase
/**
* This function creates a duplicate index should throw an IndexNameConflictException
* and if not the test should fail.
- *
- * @param regionName
- * @param IndexName
- *
*/
public CacheSerializableRunnable getCacheSerializableRunnableForDuplicatePRIndexCreate(
final String prRegionName, final String indexName,
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionClosedJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionClosedJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionClosedJUnitTest.java
index 6b76b04..0a804af 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionClosedJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionClosedJUnitTest.java
@@ -61,12 +61,6 @@ public class PRQueryRegionClosedJUnitTest
- /**
- * setUp*
- *
- * @param name
- */
-
@Before
public void setUp() throws Exception
{
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java
index 95d846e..4b9ae3d 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java
@@ -63,11 +63,6 @@ public class PRQueryRegionDestroyedJUnitTest
boolean encounteredException = false;
static final int dataSize =100;
static final int delayQuery = 1000;
- /**
- * setUp*
- *
- * @param name
- */
@Before
public void setUp() throws Exception
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/transaction/QueryAndJtaJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/transaction/QueryAndJtaJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/transaction/QueryAndJtaJUnitTest.java
index f4d1a10..162ffb1 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/transaction/QueryAndJtaJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/transaction/QueryAndJtaJUnitTest.java
@@ -277,7 +277,6 @@ public class QueryAndJtaJUnitTest {
/**
* verify that queries on indexes work with transaction
*
- * @see bug#40842
* @throws Exception
*/
@Test
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
index 3d06eab..2689096 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
@@ -43,13 +43,6 @@ public class CacheLogRollDUnitTest extends CacheTestCase {
////////////////////// Test Methods //////////////////////
- /**
- * @param baseLogName
- * @param logfile
- * @param ds
- * @throws FileNotFoundException
- * @throws IOException
- */
private void logAndRollAndVerify(String baseLogName,
DistributedSystem ds,String mainId) throws FileNotFoundException, IOException {
String logfile = baseLogName+".log";
@@ -124,15 +117,6 @@ public class CacheLogRollDUnitTest extends CacheTestCase {
}
}
- /**
- * @param baseLogName
- * @param logfile
- * @param ds
- * @throws FileNotFoundException
- * @throws IOException
- *
- * @author xzhou
- */
private void SecurityLogAndRollAndVerify(String baseLogName,
DistributedSystem ds,String mainId) throws FileNotFoundException, IOException {
String logfile = baseLogName+".log";
[02/50] [abbrv] incubator-geode git commit: GEODE-819: Fix dunit
imports in WAN and CQ tests
Posted by kl...@apache.org.
GEODE-819: Fix dunit imports in WAN and CQ tests
Merging from develop to wan_cq_donation picked up some package renames
of the dunit framework. These needed to be applied to all of the wan and
cq tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/27d965d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/27d965d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/27d965d9
Branch: refs/heads/feature/GEODE-773-2
Commit: 27d965d96d0131d094ec1d54172d40d6439ff191
Parents: 8d8b573
Author: Dan Smith <up...@apache.org>
Authored: Tue Jan 26 11:07:34 2016 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Tue Jan 26 11:10:25 2016 -0800
----------------------------------------------------------------------
.../cache/query/cq/dunit/CqDataDUnitTest.java | 11 +++++------
.../cq/dunit/CqDataOptimizedExecuteDUnitTest.java | 3 +--
.../query/cq/dunit/CqDataUsingPoolDUnitTest.java | 9 ++++-----
.../CqDataUsingPoolOptimizedExecuteDUnitTest.java | 3 +--
.../cache/query/cq/dunit/CqPerfDUnitTest.java | 7 +++----
.../query/cq/dunit/CqPerfUsingPoolDUnitTest.java | 7 +++----
.../cache/query/cq/dunit/CqQueryDUnitTest.java | 15 +++++++--------
.../cq/dunit/CqQueryOptimizedExecuteDUnitTest.java | 7 +++----
.../query/cq/dunit/CqQueryUsingPoolDUnitTest.java | 13 ++++++-------
.../CqQueryUsingPoolOptimizedExecuteDUnitTest.java | 3 +--
.../cq/dunit/CqResultSetUsingPoolDUnitTest.java | 7 +++----
...qResultSetUsingPoolOptimizedExecuteDUnitTest.java | 7 +++----
.../cache/query/cq/dunit/CqStateDUnitTest.java | 11 +++++------
.../cache/query/cq/dunit/CqStatsDUnitTest.java | 7 +++----
.../cq/dunit/CqStatsOptimizedExecuteDUnitTest.java | 3 +--
.../query/cq/dunit/CqStatsUsingPoolDUnitTest.java | 7 +++----
.../CqStatsUsingPoolOptimizedExecuteDUnitTest.java | 3 +--
.../cache/query/cq/dunit/CqTimeTestListener.java | 5 ++---
.../cq/dunit/PartitionedRegionCqQueryDUnitTest.java | 7 +++----
...tionedRegionCqQueryOptimizedExecuteDUnitTest.java | 7 +++----
.../cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java | 7 +++----
.../PrCqUsingPoolOptimizedExecuteDUnitTest.java | 3 +--
.../cache/query/dunit/PdxQueryCQDUnitTest.java | 8 ++++----
.../cache/query/dunit/PdxQueryCQTestBase.java | 12 +++---------
.../query/dunit/QueryIndexUpdateRIDUnitTest.java | 7 +++----
.../cache/query/dunit/QueryMonitorDUnitTest.java | 11 +++++------
.../cache/snapshot/ClientSnapshotDUnitTest.java | 5 ++---
.../internal/cache/PRDeltaPropagationDUnitTest.java | 9 ++++-----
.../gemfire/internal/cache/PutAllCSDUnitTest.java | 13 ++++++-------
.../internal/cache/RemoteCQTransactionDUnitTest.java | 7 +++----
.../internal/cache/ha/CQListGIIDUnitTest.java | 6 +++---
.../internal/cache/ha/HADispatcherDUnitTest.java | 7 +++----
.../tier/sockets/ClientToServerDeltaDUnitTest.java | 7 +++----
.../sockets/DeltaPropagationWithCQDUnitTest.java | 7 +++----
...DeltaToRegionRelationCQRegistrationDUnitTest.java | 9 ++++-----
.../tier/sockets/DurableClientSimpleDUnitTest.java | 11 +++++------
.../cache/tier/sockets/DurableClientTestCase.java | 7 +++----
.../management/CacheServerManagementDUnitTest.java | 9 ++++-----
.../cli/commands/ClientCommandsDUnitTest.java | 10 +++++-----
.../cli/commands/DurableClientCommandsDUnitTest.java | 7 +++----
.../management/internal/pulse/TestCQDUnitTest.java | 2 +-
.../internal/pulse/TestClientsDUnitTest.java | 3 +--
.../internal/pulse/TestServerDUnitTest.java | 2 +-
.../security/ClientAuthorizationTwoDUnitTest.java | 3 +--
.../security/ClientAuthzObjectModDUnitTest.java | 7 +++----
.../security/ClientCQPostAuthorizationDUnitTest.java | 7 +++----
.../security/ClientPostAuthorizationDUnitTest.java | 3 +--
.../gemfire/security/MultiuserAPIDUnitTest.java | 4 ++--
.../security/MultiuserDurableCQAuthzDUnitTest.java | 5 ++---
.../internal/cache/UpdateVersionDUnitTest.java | 11 +++++------
.../gemfire/internal/cache/wan/WANTestBase.java | 6 +++---
.../ConcurrentParallelGatewaySenderDUnitTest.java | 3 +--
...ntParallelGatewaySenderOperation_1_DUnitTest.java | 3 +--
...ntParallelGatewaySenderOperation_2_DUnitTest.java | 5 ++---
...urrentSerialGatewaySenderOperationsDUnitTest.java | 2 +-
.../ConcurrentWANPropogation_1_DUnitTest.java | 3 +--
.../ConcurrentWANPropogation_2_DUnitTest.java | 3 +--
.../cache/wan/disttx/DistTXWANDUnitTest.java | 5 ++---
.../misc/CommonParallelGatewaySenderDUnitTest.java | 5 ++---
.../NewWANConcurrencyCheckForDestroyDUnitTest.java | 3 +--
.../internal/cache/wan/misc/PDXNewWanDUnitTest.java | 3 +--
...icatedRegion_ParallelWANPersistenceDUnitTest.java | 5 ++---
...icatedRegion_ParallelWANPropogationDUnitTest.java | 9 ++++-----
.../wan/misc/SenderWithTransportFilterDUnitTest.java | 3 +--
.../ShutdownAllPersistentGatewaySenderDUnitTest.java | 9 ++++-----
.../cache/wan/misc/WANLocatorServerDUnitTest.java | 3 +--
.../internal/cache/wan/misc/WANSSLDUnitTest.java | 3 +--
.../cache/wan/misc/WanAutoDiscoveryDUnitTest.java | 5 ++---
.../ParallelGatewaySenderOperationsDUnitTest.java | 9 ++++-----
.../ParallelGatewaySenderQueueOverflowDUnitTest.java | 3 +--
...lWANPersistenceEnabledGatewaySenderDUnitTest.java | 5 ++---
.../ParallelWANPropagationClientServerDUnitTest.java | 3 +--
...ParallelWANPropagationConcurrentOpsDUnitTest.java | 3 +--
.../parallel/ParallelWANPropagationDUnitTest.java | 3 +--
.../wan/parallel/ParallelWANStatsDUnitTest.java | 3 +--
...ialGatewaySenderDistributedDeadlockDUnitTest.java | 2 +-
.../SerialGatewaySenderEventListenerDUnitTest.java | 3 +--
.../SerialGatewaySenderOperationsDUnitTest.java | 5 ++---
.../serial/SerialGatewaySenderQueueDUnitTest.java | 3 +--
...lWANPersistenceEnabledGatewaySenderDUnitTest.java | 3 +--
.../wan/serial/SerialWANPropogationDUnitTest.java | 3 +--
...ialWANPropogation_PartitionedRegionDUnitTest.java | 3 +--
.../cache/wan/serial/SerialWANStatsDUnitTest.java | 3 +--
.../cache/wan/wancommand/WANCommandTestBase.java | 7 +++----
.../WanCommandCreateGatewayReceiverDUnitTest.java | 5 ++---
.../WanCommandGatewayReceiverStartDUnitTest.java | 5 ++---
.../WanCommandGatewayReceiverStopDUnitTest.java | 5 ++---
.../gemfire/management/WANManagementDUnitTest.java | 7 +++----
.../configuration/ClusterConfigurationDUnitTest.java | 9 +++++----
.../internal/pulse/TestRemoteClusterDUnitTest.java | 7 +++----
90 files changed, 222 insertions(+), 306 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java
index 63235d4..c26282c 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java
@@ -38,12 +38,11 @@ import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.cache30.CertifiableTestCacheListener;
import com.gemstone.gemfire.internal.AvailablePortHelper;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+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.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* This class tests the ContiunousQuery mechanism in GemFire.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
index 2a44b3e..45f61f8 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
@@ -18,8 +18,7 @@ package com.gemstone.gemfire.cache.query.cq.dunit;
import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
-
-import dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
/**
* Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
index 245b6e4..5feb1b5 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
@@ -57,11 +57,10 @@ import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.PoolFactoryImpl;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
-
-import dunit.AsyncInvocation;
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* This class tests the ContiunousQuery mechanism in GemFire.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
index dd0adec..e157fb0 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
@@ -18,8 +18,7 @@ package com.gemstone.gemfire.cache.query.cq.dunit;
import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
-
-import dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
/**
* Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
index 989fee0..cdc11f2 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
@@ -35,10 +35,9 @@ import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.internal.AvailablePortHelper;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* This class tests the ContiunousQuery mechanism in GemFire.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
index 5fd1998..059c8a0 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
@@ -35,10 +35,9 @@ import com.gemstone.gemfire.cache.query.internal.cq.InternalCqQuery;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.internal.AvailablePortHelper;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* This class tests the ContiunousQuery mechanism in GemFire.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
index 5ee75e3..1ea2fdd 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
@@ -64,11 +64,10 @@ import com.gemstone.gemfire.internal.cache.DistributedRegion;
import com.gemstone.gemfire.internal.cache.DistributedTombstoneOperation;
import com.gemstone.gemfire.internal.cache.EventID;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* This class tests the ContiunousQuery mechanism in GemFire.
@@ -2066,7 +2065,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
try {
createCQ(client, "testCQCreateClose_0", cqs[0]);
fail("Trying to create CQ with same name. Should have thrown CQExistsException");
- } catch (dunit.RMIException rmiExc) {
+ } catch (com.gemstone.gemfire.test.dunit.RMIException rmiExc) {
Throwable cause = rmiExc.getCause();
assertTrue("unexpected cause: " + cause.getClass().getName(), cause instanceof AssertionError);
Throwable causeCause = cause.getCause(); // should be a CQExistsException
@@ -2081,7 +2080,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
try {
createCQ(server, "testCQCreateClose_1", cqs[0]);
fail("Trying to create CQ on Cache Server. Should have thrown Exception.");
- } catch (dunit.RMIException rmiExc) {
+ } catch (com.gemstone.gemfire.test.dunit.RMIException rmiExc) {
Throwable cause = rmiExc.getCause();
assertTrue("unexpected cause: " + cause.getClass().getName(),
cause instanceof AssertionError);
@@ -2095,7 +2094,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
try {
executeCQ(client, "testCQCreateClose_2", false, "RegionNotFoundException");
fail("Trying to create CQ on non-existing Region. Should have thrown Exception.");
- } catch (dunit.RMIException rmiExc) {
+ } catch (com.gemstone.gemfire.test.dunit.RMIException rmiExc) {
Throwable cause = rmiExc.getCause();
if (!(cause instanceof AssertionError)) {
getLogWriter().severe("Expected to see an AssertionError.", cause);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
index 8688057..54ec12d 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
@@ -24,10 +24,9 @@ import com.gemstone.gemfire.cache.query.internal.cq.CqServiceProvider;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
index 343b529..4988831 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
@@ -66,11 +66,10 @@ import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy;
import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* This class tests the ContiunousQuery mechanism in GemFire.
@@ -1783,7 +1782,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
try {
createCQ(client, poolName, "testCQCreateClose_0", cqs[0]);
fail("Trying to create CQ with same name. Should have thrown CQExistsException");
- } catch (dunit.RMIException rmiExc) {
+ } catch (com.gemstone.gemfire.test.dunit.RMIException rmiExc) {
Throwable cause = rmiExc.getCause();
assertTrue("unexpected cause: " + cause.getClass().getName(), cause instanceof AssertionError);
Throwable causeCause = cause.getCause(); // should be a CQExistsException
@@ -1798,7 +1797,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
try {
createCQ(server, "testCQCreateClose_1", cqs[0]);
fail("Trying to create CQ on Cache Server. Should have thrown Exception.");
- } catch (dunit.RMIException rmiExc) {
+ } catch (com.gemstone.gemfire.test.dunit.RMIException rmiExc) {
Throwable cause = rmiExc.getCause();
assertTrue("unexpected cause: " + cause.getClass().getName(),
cause instanceof AssertionError);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
index acfb473..07c1650 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
@@ -17,8 +17,7 @@
package com.gemstone.gemfire.cache.query.cq.dunit;
import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
-
-import dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
/**
* Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
index 2346e91..de349a5 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
@@ -32,10 +32,9 @@ import com.gemstone.gemfire.cache.query.internal.index.IndexManager;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.internal.AvailablePortHelper;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* This class tests the ContiunousQuery mechanism in GemFire.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
index 14affa6..74351b0 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
@@ -30,10 +30,9 @@ import com.gemstone.gemfire.cache.query.internal.cq.ServerCQImpl;
import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.internal.AvailablePortHelper;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
public class CqResultSetUsingPoolOptimizedExecuteDUnitTest extends CqResultSetUsingPoolDUnitTest{
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
index 56d8f77..6d6213b 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
@@ -21,12 +21,11 @@ import java.util.Properties;
import com.gemstone.gemfire.cache.query.CqQuery;
import com.gemstone.gemfire.cache.query.dunit.HelperTestCase;
import com.gemstone.gemfire.internal.AvailablePortHelper;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.VM;
+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.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.VM;
public class CqStateDUnitTest extends HelperTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
index 2109e24..8f3c260 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
@@ -34,10 +34,9 @@ import com.gemstone.gemfire.cache.query.internal.cq.CqServiceVsdStats;
import com.gemstone.gemfire.cache.query.internal.cq.InternalCqQuery;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.cache30.CacheTestCase;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* This class tests the ContiunousQuery mechanism in GemFire.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
index fdb46c3..f52d655 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
@@ -18,8 +18,7 @@ package com.gemstone.gemfire.cache.query.cq.dunit;
import com.gemstone.gemfire.cache.query.internal.cq.CqService;
import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
-
-import dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
/**
* Test class for testing {@link CqService#EXECUTE_QUERY_DURING_INIT} flag
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
index 249f3da..1210426 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
@@ -34,10 +34,9 @@ import com.gemstone.gemfire.cache.query.internal.cq.CqServiceVsdStats;
import com.gemstone.gemfire.cache.query.internal.cq.InternalCqQuery;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.cache30.CacheTestCase;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* This class tests the ContiunousQuery mechanism in GemFire.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
index 9769ddd..8723eb3 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
@@ -18,8 +18,7 @@ package com.gemstone.gemfire.cache.query.cq.dunit;
import com.gemstone.gemfire.cache.query.internal.cq.CqService;
import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
-
-import dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
/**
* Test class for testing {@link CqService#EXECUTE_QUERY_DURING_INIT} flag
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqTimeTestListener.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqTimeTestListener.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqTimeTestListener.java
index cd75e97..23d0728 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqTimeTestListener.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqTimeTestListener.java
@@ -25,9 +25,8 @@ import com.gemstone.gemfire.cache.Operation;
import com.gemstone.gemfire.cache.query.CqEvent;
import com.gemstone.gemfire.cache.query.CqListener;
import com.gemstone.gemfire.cache.query.data.Portfolio;
-
-import dunit.DistributedTestCase;
-import dunit.DistributedTestCase.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
/**
* @author anil.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
index a236909..360c0d9 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
@@ -46,10 +46,9 @@ import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.internal.cache.LocalRegion;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* Test class for Partitioned Region and CQs
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
index 4bbc5e7..e5544b7 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
@@ -23,10 +23,9 @@ import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
import com.gemstone.gemfire.cache.query.internal.cq.CqServiceProvider;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
public class PartitionedRegionCqQueryOptimizedExecuteDUnitTest extends PartitionedRegionCqQueryDUnitTest{
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
index c8e502f..80cd738 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
@@ -40,12 +40,11 @@ import com.gemstone.gemfire.cache.query.Struct;
import com.gemstone.gemfire.cache.query.data.Portfolio;
import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.cache30.ClientServerTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.cache30.CacheTestCase;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
/**
* Test class for Partitioned Region and CQs
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
index c890c87..5db4b22 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
@@ -17,8 +17,7 @@
package com.gemstone.gemfire.cache.query.cq.dunit;
import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
-
-import dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
/**
* Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java
index 15a74ce..8abed40 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java
@@ -35,12 +35,12 @@ import com.gemstone.gemfire.cache.query.Struct;
import com.gemstone.gemfire.cache.query.cq.dunit.CqQueryTestListener;
import com.gemstone.gemfire.cache.query.dunit.PdxQueryCQTestBase.TestObject;
import com.gemstone.gemfire.cache30.ClientServerTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
-import dunit.DistributedTestCase.WaitCriterion;
public class PdxQueryCQDUnitTest extends PdxQueryCQTestBase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
index 7129f62..3637dce 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
@@ -35,15 +35,10 @@ import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.client.PoolFactory;
import com.gemstone.gemfire.cache.client.PoolManager;
import com.gemstone.gemfire.cache.query.CacheUtils;
-import com.gemstone.gemfire.cache.query.CqAttributes;
-import com.gemstone.gemfire.cache.query.CqEvent;
-import com.gemstone.gemfire.cache.query.CqListener;
-import com.gemstone.gemfire.cache.query.CqQuery;
import com.gemstone.gemfire.cache.query.Query;
import com.gemstone.gemfire.cache.query.QueryService;
import com.gemstone.gemfire.cache.query.SelectResults;
import com.gemstone.gemfire.cache.query.Struct;
-import com.gemstone.gemfire.cache.query.cq.dunit.CqQueryTestListener;
import com.gemstone.gemfire.cache.query.data.PortfolioPdx;
import com.gemstone.gemfire.cache.query.data.PositionPdx;
import com.gemstone.gemfire.cache.server.CacheServer;
@@ -56,10 +51,9 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.pdx.PdxReader;
import com.gemstone.gemfire.pdx.PdxSerializable;
import com.gemstone.gemfire.pdx.PdxWriter;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
public abstract class PdxQueryCQTestBase extends CacheTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
index 8f80f48..a39f5e8 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
@@ -40,14 +40,13 @@ import com.gemstone.gemfire.cache.query.internal.QueryObserverAdapter;
import com.gemstone.gemfire.cache.query.internal.QueryObserverHolder;
import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.cache30.ClientServerTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.cache30.CertifiableTestCacheListener;
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
-
/**
* This class tests register interest behavior on client at startup given that
* client has already created a Index on region on which it registers interest.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
index f421273..14884bd 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
@@ -48,12 +48,11 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+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.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* Tests for QueryMonitoring service.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
index 5ccaeb3..cc053fc 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
@@ -40,9 +40,8 @@ import com.gemstone.gemfire.cache.util.CacheWriterAdapter;
import com.gemstone.gemfire.cache.util.CqListenerAdapter;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.internal.AvailablePortHelper;
-
-import dunit.Host;
-import dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
public class ClientSnapshotDUnitTest extends CacheTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
index 4810e28..f77f845 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
@@ -56,11 +56,10 @@ import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy;
import com.gemstone.gemfire.internal.cache.tier.sockets.ConflationDUnitTest;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
index 3737ffb..cd2a26e 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
@@ -75,13 +75,12 @@ import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.versions.VersionTag;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.SerializableRunnable;
-import dunit.VM;
+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.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* Tests putAll for c/s. Also tests removeAll
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
index 0f089c5..3722afb 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
@@ -69,10 +69,9 @@ import com.gemstone.gemfire.internal.cache.execute.data.CustId;
import com.gemstone.gemfire.internal.cache.execute.data.Customer;
import com.gemstone.gemfire.internal.cache.execute.data.Order;
import com.gemstone.gemfire.internal.cache.execute.data.OrderId;
-
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* @author sbawaska
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
index 4bce2ac..f5f1fc1 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
@@ -58,9 +58,9 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.ConflationDUnitTest;
import com.gemstone.gemfire.internal.cache.InternalRegionArguments;
import com.gemstone.gemfire.internal.cache.LocalRegion;
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.VM;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
index 2f64285..ddc907c 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
@@ -54,10 +54,9 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
import com.gemstone.gemfire.internal.cache.tier.sockets.ConflationDUnitTest;
import com.gemstone.gemfire.internal.cache.tier.sockets.HAEventWrapper;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* This Dunit test is to verify that when the dispatcher of CS dispatches the
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
index 968eda9..d04d249 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
@@ -50,10 +50,9 @@ import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegionLocalMaxMemoryDUnitTest.TestObject1;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* Test client to server flow for delta propogation
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
index 382b056..2e7efe7 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
@@ -52,10 +52,9 @@ import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* @author ashetkar
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
index 6902619..ed7232f 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
@@ -42,11 +42,10 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.CacheServerImpl;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.VM;
-import dunit.DistributedTestCase.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
/**
* This tests the flag setting for region ( DataPolicy as Empty ) for
* Delta propogation for a client while registering CQ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
index 7771e67..04ce137 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
@@ -41,12 +41,11 @@ import com.gemstone.gemfire.internal.cache.ClientServerObserver;
import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.cache.PoolFactoryImpl;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.VM;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+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.VM;
public class DurableClientSimpleDUnitTest extends DurableClientTestCase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
index 98e0624..c3a3482 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
@@ -62,10 +62,9 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.InternalCache;
import com.gemstone.gemfire.internal.cache.PoolFactoryImpl;
import com.gemstone.gemfire.internal.cache.ha.HARegionQueue;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* Class <code>DurableClientTestCase</code> tests durable client
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
index bc9c6a9..58c682b 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
@@ -49,11 +49,10 @@ import com.gemstone.gemfire.management.internal.JmxManagerLocatorRequest;
import com.gemstone.gemfire.management.internal.JmxManagerLocatorResponse;
import com.gemstone.gemfire.management.internal.MBeanJMXAdapter;
import com.gemstone.gemfire.management.internal.SystemManagementService;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* Cache Server related management test cases
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
index 5908c5f..d1d9559 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
@@ -63,12 +63,12 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.management.internal.cli.result.CompositeResultData;
import com.gemstone.gemfire.management.internal.cli.result.CompositeResultData.SectionResultData;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.management.internal.cli.result.TabularResultData;
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.SerializableRunnable;
-import dunit.VM;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
index 6010f38..89c7d5e 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
@@ -44,10 +44,9 @@ import com.gemstone.gemfire.management.cli.Result.Status;
import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
-
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.VM;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java
index 0497305..131cbcd 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.management.DistributedSystemMXBean;
import com.gemstone.gemfire.management.ManagementService;
import com.gemstone.gemfire.management.ManagementTestBase;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* This is for testing continuous query.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java
index 9fff40d..814e07e 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java
@@ -21,8 +21,7 @@ import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.management.DistributedSystemMXBean;
import com.gemstone.gemfire.management.ManagementService;
import com.gemstone.gemfire.management.ManagementTestBase;
-
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* This is for testing Number of clients and can be extended for relevant test
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java
index d53e085..6475fa5 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.management.DistributedSystemMXBean;
import com.gemstone.gemfire.management.ManagementService;
import com.gemstone.gemfire.management.ManagementTestBase;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* This is for testing server count details from MBean
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java
index bd6529a..7725ef6 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java
@@ -17,8 +17,7 @@
package com.gemstone.gemfire.security;
import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode;
-
-import dunit.Host;
+import com.gemstone.gemfire.test.dunit.Host;
/**
* Tests for authorization from client to server. This tests for authorization
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
index 3fe7652..58f26bb 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
@@ -32,10 +32,9 @@ import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.security.ObjectWithAuthz;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
/**
* Tests for authorization callback that modify objects and callbacks from
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java
index 6115f17..2854c24 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java
@@ -42,10 +42,9 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.logging.InternalLogWriter;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
/**
* This is for multiuser-authentication
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
index 4ae7430..bd22dfb 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
@@ -26,8 +26,7 @@ import security.AuthzCredentialGenerator;
import security.CredentialGenerator;
import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode;
import com.gemstone.gemfire.internal.AvailablePort;
-
-import dunit.Host;
+import com.gemstone.gemfire.test.dunit.Host;
/**
* Tests for authorization from client to server. This tests for authorization
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
index 57f649e..26f2e31 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
@@ -36,9 +36,9 @@ import com.gemstone.gemfire.cache.query.Query;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.PoolManagerImpl;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.VM;
-import dunit.Host;
-import dunit.VM;
import security.DummyCredentialGenerator;
public class MultiuserAPIDUnitTest extends ClientAuthorizationTestBase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
index c44683f..675f8c6 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
@@ -38,9 +38,8 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.logging.InternalLogWriter;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
/**
* @author ashetkar
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
index 065ba6c..70ecac5 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
@@ -53,12 +53,11 @@ import com.gemstone.gemfire.internal.cache.versions.VersionSource;
import com.gemstone.gemfire.internal.cache.versions.VersionStamp;
import com.gemstone.gemfire.internal.cache.versions.VersionTag;
import com.gemstone.gemfire.internal.cache.wan.InternalGatewaySenderFactory;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
/**
* @author Shobhit Agarwal
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
index e3c3a89..230c8d8 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
@@ -113,11 +113,11 @@ import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelGatewaySenderEve
import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelGatewaySenderQueue;
import com.gemstone.gemfire.pdx.SimpleClass;
import com.gemstone.gemfire.pdx.SimpleClass1;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.util.test.TestUtil;
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.VM;
import junit.framework.Assert;
public class WANTestBase extends DistributedTestCase{
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
index b2e2fd2..c14af54 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
@@ -24,12 +24,11 @@ import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
import com.gemstone.gemfire.internal.cache.wan.BatchException70;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
import com.gemstone.gemfire.internal.cache.wan.parallel.ConcurrentParallelGatewaySenderEventProcessor;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
import java.net.SocketException;
import java.util.Set;
-import dunit.AsyncInvocation;
-
/**
* Test the functionality of ParallelGatewaySender with multiple dispatchers.
* @author skumar
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
index 216c76a..e0775b7 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
@@ -18,8 +18,7 @@ package com.gemstone.gemfire.internal.cache.wan.concurrent;
import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
/**
* @author skumar
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
index be8c3ac..f770062 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
@@ -21,9 +21,8 @@ import com.gemstone.gemfire.cache.RegionDestroyedException;
import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
/**
* @author skumar
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
index 3126c4e..b709334 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
@@ -21,8 +21,8 @@ import java.util.Set;
import com.gemstone.gemfire.cache.wan.GatewaySender;
import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
-import dunit.AsyncInvocation;
/**
* @author skumar
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java
index 7066fc5..804c3ed 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java
@@ -23,8 +23,7 @@ import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.internal.cache.wan.BatchException70;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
/**
* All the test cases are similar to SerialWANPropogationDUnitTest except that
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java
index 1700664..9bcc72b 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java
@@ -23,8 +23,7 @@ import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase.MyGatewayEventFilter;
-
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
/**
* All the test cases are similar to SerialWANPropogationDUnitTest except that
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
index 242dfbe..ca68454 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
@@ -20,9 +20,8 @@ import com.gemstone.gemfire.CancelException;
import com.gemstone.gemfire.cache.CacheClosedException;
import com.gemstone.gemfire.internal.cache.ForceReattemptException;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
-import dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
public class DistTXWANDUnitTest extends WANTestBase {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
index d2b6595..39e3fed 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
@@ -25,9 +25,8 @@ import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
import com.gemstone.gemfire.internal.cache.wan.parallel.ConcurrentParallelGatewaySenderEventProcessor;
import com.gemstone.gemfire.internal.cache.wan.parallel.ConcurrentParallelGatewaySenderQueue;
import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelGatewaySenderQueue;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import java.util.Set;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
index 68be55b..62ed047 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
@@ -30,8 +30,7 @@ import com.gemstone.gemfire.internal.cache.RegionEntry;
import com.gemstone.gemfire.internal.cache.Token.Tombstone;
import com.gemstone.gemfire.internal.cache.versions.VersionTag;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
/**
* @author shobhit
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
index b4d4f2f..0393e82 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
@@ -19,8 +19,7 @@ package com.gemstone.gemfire.internal.cache.wan.misc;
import com.gemstone.gemfire.cache.CacheWriterException;
import com.gemstone.gemfire.cache.client.ServerOperationException;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
public class PDXNewWanDUnitTest extends WANTestBase{
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
index e9d9a2c..7d3da8b 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
@@ -20,9 +20,8 @@ import com.gemstone.gemfire.cache.CacheClosedException;
import com.gemstone.gemfire.cache.DataPolicy;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase.ExpectedException;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase.ExpectedException;
public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBase {
[32/50] [abbrv] incubator-geode git commit: GEODE-871: Frequient use
of executeOnAllServers causes build-up of TIME_WAIT sockets
Posted by kl...@apache.org.
GEODE-871: Frequient use of executeOnAllServers causes build-up of TIME_WAIT sockets
Modified the fix to not abort the connection if a response wasn't read.
I also propagated this pattern to GMSHealthMonitor so that the "final
check" sockets are quickly released.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/d22176bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/d22176bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/d22176bb
Branch: refs/heads/feature/GEODE-773-2
Commit: d22176bb1632dc5593a1755a1355aacd0360c5e8
Parents: 02c67e2
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Mon Feb 1 08:35:00 2016 -0800
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Mon Feb 1 08:37:05 2016 -0800
----------------------------------------------------------------------
.../membership/gms/fd/GMSHealthMonitor.java | 3 +--
.../distributed/internal/tcpserver/TcpClient.java | 15 +++++++++++----
.../distributed/internal/tcpserver/TcpServer.java | 17 +----------------
3 files changed, 13 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d22176bb/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
index b6f6c12..dc549bf 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
@@ -312,7 +312,6 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
&& uuidLSBs == myUUID.getLeastSignificantBits()
&& uuidMSBs == myUUID.getMostSignificantBits()
&& vmViewId == myVmViewId) {
- socket.setSoLinger(true, (int)memberTimeout);
out.write(OK);
out.flush();
socket.shutdownOutput();
@@ -323,7 +322,6 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
}
}
else {
- socket.setSoLinger(true, (int)memberTimeout);
out.write(ERROR);
out.flush();
socket.shutdownOutput();
@@ -494,6 +492,7 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
finally {
try {
if (clientSocket != null) {
+ clientSocket.setSoLinger(true, 0); // abort the connection
clientSocket.close();
}
} catch (IOException e) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d22176bb/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpClient.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpClient.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpClient.java
index 47f50b3..dfcb78c 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpClient.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpClient.java
@@ -167,14 +167,21 @@ public class TcpClient {
}
return null;
} finally {
- if (out != null) {
- out.close();
- }
try {
+ if (replyExpected) {
+ // Since we've read a response we know that the Locator is finished
+ // with the socket and is closing it. Aborting the connection by
+ // setting SO_LINGER to zero will clean up the TIME_WAIT socket on
+ // the locator's machine.
+ sock.setSoLinger(true, 0);
+ }
sock.close();
} catch(Exception e) {
logger.error("Error closing socket ", e);
}
+ if (out != null) {
+ out.close();
+ }
}
}
@@ -184,7 +191,6 @@ public class TcpClient {
Short serverVersion = null;
// Get GemFire version of TcpServer first, before sending any other request.
- VersionResponse verRes = null;
synchronized(serverVersions) {
serverVersion = serverVersions.get(ipAddr);
}
@@ -223,6 +229,7 @@ public class TcpClient {
}
} finally {
try {
+ sock.setSoLinger(true, 0); // initiate an abort on close to shut down the server's socket
sock.close();
} catch(Exception e) {
logger.error("Error closing socket ", e);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d22176bb/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
index f52b9ab..e5ad416 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
@@ -398,7 +398,6 @@ public class TcpServer {
DataSerializer.writeObject(response, output);
output.flush();
- output.close();
}
handler.endResponse(request,startTime);
@@ -467,24 +466,10 @@ public class TcpServer {
t.printStackTrace();
}
} finally {
- // Normal path closes input first, so let's do that here...
- if (input != null) {
- try {
- input.close();
- } catch (IOException e) {
- log.warn(
- "Exception closing input stream", e);
- }
- }
-
- // Closing the ObjectInputStream is supposed to close
- // the underlying InputStream, but we do it here just for
- // good measure. Closing a closed socket is a no-op.
try {
sock.close();
} catch (IOException e) {
- log.warn(
- "Exception closing socket", e);
+ // ignore
}
}
}
[31/50] [abbrv] incubator-geode git commit: GEODE-795: Changed
RegionEntryFactory code from complex nested if-else block to more
maintainable bit masking.
Posted by kl...@apache.org.
GEODE-795: Changed RegionEntryFactory code from complex nested if-else block to more maintainable bit masking.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/02c67e25
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/02c67e25
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/02c67e25
Branch: refs/heads/feature/GEODE-773-2
Commit: 02c67e2578b31c8e3babb654e55fb97f688ef0b4
Parents: 554ecae
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Thu Jan 28 08:54:29 2016 +1100
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Mon Feb 1 14:14:40 2016 +1100
----------------------------------------------------------------------
.../internal/cache/AbstractRegionMap.java | 133 +------------------
.../region/entry/RegionEntryFactoryBuilder.java | 103 ++++++++++++++
.../RegionEntryFactoryBuilderJUnitTest.java | 85 ++++++++++++
3 files changed, 190 insertions(+), 131 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/02c67e25/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java
index 096bd0a..3679519 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java
@@ -28,6 +28,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
+import com.gemstone.gemfire.internal.cache.region.entry.RegionEntryFactoryBuilder;
import org.apache.logging.log4j.Logger;
import com.gemstone.gemfire.GemFireIOException;
@@ -193,137 +194,7 @@ abstract class AbstractRegionMap implements RegionMap {
}
}
else {
- final RegionEntryFactory factory;
- if (attr.statisticsEnabled) {
- if (isLRU) {
- if (isDisk) {
- if (withVersioning) {
- if (offHeap) {
- factory = VersionedStatsDiskLRURegionEntryOffHeap.getEntryFactory();
- } else {
- factory = VersionedStatsDiskLRURegionEntryHeap.getEntryFactory();
- }
- } else {
- if (offHeap) {
- factory = VMStatsDiskLRURegionEntryOffHeap.getEntryFactory();
- } else {
- factory = VMStatsDiskLRURegionEntryHeap.getEntryFactory();
- }
- }
- } else {
- if (withVersioning) {
- if (offHeap) {
- factory = VersionedStatsLRURegionEntryOffHeap.getEntryFactory();
- } else {
- factory = VersionedStatsLRURegionEntryHeap.getEntryFactory();
- }
- } else {
- if (offHeap) {
- factory = VMStatsLRURegionEntryOffHeap.getEntryFactory();
- } else {
- factory = VMStatsLRURegionEntryHeap.getEntryFactory();
- }
- }
- }
- } else { // !isLRU
- if (isDisk) {
- if (withVersioning) {
- if (offHeap) {
- factory = VersionedStatsDiskRegionEntryOffHeap.getEntryFactory();
- } else {
- factory = VersionedStatsDiskRegionEntryHeap.getEntryFactory();
- }
- } else {
- if (offHeap) {
- factory = VMStatsDiskRegionEntryOffHeap.getEntryFactory();
- } else {
- factory = VMStatsDiskRegionEntryHeap.getEntryFactory();
- }
- }
- } else {
- if (withVersioning) {
- if (offHeap) {
- factory = VersionedStatsRegionEntryOffHeap.getEntryFactory();
- } else {
- factory = VersionedStatsRegionEntryHeap.getEntryFactory();
- }
- } else {
- if (offHeap) {
- factory = VMStatsRegionEntryOffHeap.getEntryFactory();
- } else {
- factory = VMStatsRegionEntryHeap.getEntryFactory();
- }
- }
- }
- }
- }
- else { // !statistics enabled
- if (isLRU) {
- if (isDisk) {
- if (withVersioning) {
- if (offHeap) {
- factory = VersionedThinDiskLRURegionEntryOffHeap.getEntryFactory();
- } else {
- factory = VersionedThinDiskLRURegionEntryHeap.getEntryFactory();
- }
- } else {
- if (offHeap) {
- factory = VMThinDiskLRURegionEntryOffHeap.getEntryFactory();
- } else {
- factory = VMThinDiskLRURegionEntryHeap.getEntryFactory();
- }
- }
- }
- else {
- if (withVersioning) {
- if (offHeap) {
- factory = VersionedThinLRURegionEntryOffHeap.getEntryFactory();
- } else {
- factory = VersionedThinLRURegionEntryHeap.getEntryFactory();
- }
- } else {
- if (offHeap) {
- factory = VMThinLRURegionEntryOffHeap.getEntryFactory();
- } else {
- factory = VMThinLRURegionEntryHeap.getEntryFactory();
- }
- }
- }
- }
- else { // !isLRU
- if (isDisk) {
- if (withVersioning) {
- if (offHeap) {
- factory = VersionedThinDiskRegionEntryOffHeap.getEntryFactory();
- } else {
- factory = VersionedThinDiskRegionEntryHeap.getEntryFactory();
- }
- } else {
- if (offHeap) {
- factory = VMThinDiskRegionEntryOffHeap.getEntryFactory();
- } else {
- factory = VMThinDiskRegionEntryHeap.getEntryFactory();
- }
- }
- }
- else {
- if (withVersioning) {
- if (offHeap) {
- factory = VersionedThinRegionEntryOffHeap.getEntryFactory();
- } else {
- factory = VersionedThinRegionEntryHeap.getEntryFactory();
- }
- } else {
- if (offHeap) {
- factory = VMThinRegionEntryOffHeap.getEntryFactory();
- } else {
- factory = VMThinRegionEntryHeap.getEntryFactory();
- }
- }
- }
- }
- }
- setEntryFactory(factory);
+ setEntryFactory(new RegionEntryFactoryBuilder().getRegionEntryFactoryOrNull(attr.statisticsEnabled,isLRU,isDisk,withVersioning,offHeap));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/02c67e25/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/region/entry/RegionEntryFactoryBuilder.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/region/entry/RegionEntryFactoryBuilder.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/region/entry/RegionEntryFactoryBuilder.java
new file mode 100644
index 0000000..f4e55ed
--- /dev/null
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/region/entry/RegionEntryFactoryBuilder.java
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.internal.cache.region.entry;
+
+import com.gemstone.gemfire.internal.cache.*;
+
+public class RegionEntryFactoryBuilder {
+ public RegionEntryFactory getRegionEntryFactoryOrNull(boolean statsEnabled, boolean isLRU, boolean isDisk, boolean withVersioning, boolean offHeap) {
+ int bitRepresentation = 0;
+ bitRepresentation |= statsEnabled ? 1 : 0;
+ bitRepresentation |= isLRU ? 2 : 0;
+ bitRepresentation |= isDisk ? 4 : 0;
+ bitRepresentation |= withVersioning ? 8 : 0;
+ bitRepresentation |= offHeap ? 16 : 0;
+
+ /**
+ * The bits represent all options
+ * |offHeap|versioning|disk|lru|stats|
+ */
+ switch (bitRepresentation) {
+ case (0):
+ return VMThinRegionEntryHeap.getEntryFactory(); // Bits: 00000
+ case (1):
+ return VMStatsRegionEntryHeap.getEntryFactory(); // Bits: 00001
+ case (2):
+ return VMThinLRURegionEntryHeap.getEntryFactory(); // Bits: 00010
+ case (3):
+ return VMStatsLRURegionEntryHeap.getEntryFactory(); // Bits: 00011
+ case (4):
+ return VMThinDiskRegionEntryHeap.getEntryFactory(); // Bits: 00100
+ case (5):
+ return VMStatsDiskRegionEntryHeap.getEntryFactory(); // Bits: 00101
+ case (6):
+ return VMThinDiskLRURegionEntryHeap.getEntryFactory(); // Bits: 00110
+ case (7):
+ return VMStatsDiskLRURegionEntryHeap.getEntryFactory(); // Bits: 00111
+ case (8):
+ return VersionedThinRegionEntryHeap.getEntryFactory(); // Bits: 01000
+ case (9):
+ return VersionedStatsRegionEntryHeap.getEntryFactory(); // Bits: 01001
+ case (10):
+ return VersionedThinLRURegionEntryHeap.getEntryFactory(); // Bits: 01010
+ case (11):
+ return VersionedStatsLRURegionEntryHeap.getEntryFactory(); // Bits: 01011
+ case (12):
+ return VersionedThinDiskRegionEntryHeap.getEntryFactory(); // Bits: 01100
+ case (13):
+ return VersionedStatsDiskRegionEntryHeap.getEntryFactory(); // Bits: 01101
+ case (14):
+ return VersionedThinDiskLRURegionEntryHeap.getEntryFactory(); // Bits: 01110
+ case (15):
+ return VersionedStatsDiskLRURegionEntryHeap.getEntryFactory(); // Bits: 01111
+ case (16):
+ return VMThinRegionEntryOffHeap.getEntryFactory(); // Bits: 10000
+ case (17):
+ return VMStatsRegionEntryOffHeap.getEntryFactory(); // Bits: 10001
+ case (18):
+ return VMThinLRURegionEntryOffHeap.getEntryFactory(); // Bits: 10010
+ case (19):
+ return VMStatsLRURegionEntryOffHeap.getEntryFactory(); // Bits: 10011
+ case (20):
+ return VMThinDiskRegionEntryOffHeap.getEntryFactory(); // Bits: 10100
+ case (21):
+ return VMStatsDiskRegionEntryOffHeap.getEntryFactory(); // Bits: 10101
+ case (22):
+ return VMThinDiskLRURegionEntryOffHeap.getEntryFactory(); // Bits: 10110
+ case (23):
+ return VMStatsDiskLRURegionEntryOffHeap.getEntryFactory(); // Bits: 10111
+ case (24):
+ return VersionedThinRegionEntryOffHeap.getEntryFactory(); // Bits: 11000
+ case (25):
+ return VersionedStatsRegionEntryOffHeap.getEntryFactory(); // Bits: 11001
+ case (26):
+ return VersionedThinLRURegionEntryOffHeap.getEntryFactory(); // Bits: 11010
+ case (27):
+ return VersionedStatsLRURegionEntryOffHeap.getEntryFactory(); // Bits: 11011
+ case (28):
+ return VersionedThinDiskRegionEntryOffHeap.getEntryFactory(); // Bits: 11100
+ case (29):
+ return VersionedStatsDiskRegionEntryOffHeap.getEntryFactory(); // Bits: 11101
+ case (30):
+ return VersionedThinDiskLRURegionEntryOffHeap.getEntryFactory(); // Bits: 11110
+ case (31):
+ return VersionedStatsDiskLRURegionEntryOffHeap.getEntryFactory(); // Bits: 11111
+ default:
+ return null;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/02c67e25/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/region/entry/RegionEntryFactoryBuilderJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/region/entry/RegionEntryFactoryBuilderJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/region/entry/RegionEntryFactoryBuilderJUnitTest.java
new file mode 100644
index 0000000..09fde8a
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/region/entry/RegionEntryFactoryBuilderJUnitTest.java
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.internal.cache.region.entry;
+
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertEquals;
+
+@Category(UnitTest.class)
+@RunWith(JUnitParamsRunner.class)
+public class RegionEntryFactoryBuilderJUnitTest {
+
+ private RegionEntryFactoryBuilder regionEntryFactoryBuilder;
+
+ @Before
+ public void setup() {
+ regionEntryFactoryBuilder = new RegionEntryFactoryBuilder();
+ }
+
+ /**
+ * This method will test that the correct RegionEntryFactory is created
+ * dependent on the 5 conditionals:
+ * enableStats, enableLRU, enableDisk, enableVersion, enableOffHeap
+ */
+ @Test
+ @Parameters({
+ "VMThinRegionEntryHeapFactory,false,false,false,false,false",
+ "VMThinRegionEntryOffHeapFactory,false,false,false,false,true",
+ "VersionedThinRegionEntryHeapFactory,false,false,false,true,false",
+ "VersionedThinRegionEntryOffHeapFactory,false,false,false,true,true",
+ "VMThinDiskRegionEntryHeapFactory,false,false,true,false,false",
+ "VMThinDiskRegionEntryOffHeapFactory,false,false,true,false,true",
+ "VersionedThinDiskRegionEntryHeapFactory,false,false,true,true,false",
+ "VersionedThinDiskRegionEntryOffHeapFactory,false,false,true,true,true",
+ "VMThinLRURegionEntryHeapFactory,false,true,false,false,false",
+ "VMThinLRURegionEntryOffHeapFactory,false,true,false,false,true",
+ "VersionedThinLRURegionEntryHeapFactory,false,true,false,true,false",
+ "VersionedThinLRURegionEntryOffHeapFactory,false,true,false,true,true",
+ "VMThinDiskLRURegionEntryHeapFactory,false,true,true,false,false",
+ "VMThinDiskLRURegionEntryOffHeapFactory,false,true,true,false,true",
+ "VersionedThinDiskLRURegionEntryHeapFactory,false,true,true,true,false",
+ "VersionedThinDiskLRURegionEntryOffHeapFactory,false,true,true,true,true",
+ "VMStatsRegionEntryHeapFactory,true,false,false,false,false",
+ "VMStatsRegionEntryOffHeapFactory,true,false,false,false,true",
+ "VersionedStatsRegionEntryHeapFactory,true,false,false,true,false",
+ "VersionedStatsRegionEntryOffHeapFactory,true,false,false,true,true",
+ "VMStatsDiskRegionEntryHeapFactory,true,false,true,false,false",
+ "VMStatsDiskRegionEntryOffHeapFactory,true,false,true,false,true",
+ "VersionedStatsDiskRegionEntryHeapFactory,true,false,true,true,false",
+ "VersionedStatsDiskRegionEntryOffHeapFactory,true,false,true,true,true",
+ "VMStatsLRURegionEntryHeapFactory,true,true,false,false,false",
+ "VMStatsLRURegionEntryOffHeapFactory,true,true,false,false,true",
+ "VersionedStatsLRURegionEntryHeapFactory,true,true,false,true,false",
+ "VersionedStatsLRURegionEntryOffHeapFactory,true,true,false,true,true",
+ "VMStatsDiskLRURegionEntryHeapFactory,true,true,true,false,false",
+ "VMStatsDiskLRURegionEntryOffHeapFactory,true,true,true,false,true",
+ "VersionedStatsDiskLRURegionEntryHeapFactory,true,true,true,true,false",
+ "VersionedStatsDiskLRURegionEntryOffHeapFactory,true,true,true,true,true"
+ })
+ public void testRegionEntryFactoryUnitTest(String factoryName, boolean enableStats, boolean enableLRU, boolean enableDisk,
+ boolean enableVersioning, boolean enableOffHeap) {
+ assertEquals(factoryName,
+ regionEntryFactoryBuilder.getRegionEntryFactoryOrNull(enableStats, enableLRU, enableDisk, enableVersioning, enableOffHeap).getClass().getSimpleName());
+ }
+}
\ No newline at end of file
[41/50] [abbrv] incubator-geode git commit: Refactor dunit
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRColocationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRColocationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRColocationDUnitTest.java
index 63b2334..90f9aef 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRColocationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRColocationDUnitTest.java
@@ -60,7 +60,9 @@ import com.gemstone.gemfire.internal.cache.execute.data.OrderId;
import com.gemstone.gemfire.internal.cache.execute.data.Shipment;
import com.gemstone.gemfire.internal.cache.execute.data.ShipmentId;
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.IgnoredException;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
@@ -719,7 +721,7 @@ public class PRColocationDUnitTest extends CacheTestCase {
});
// add expected exception string
- final ExpectedException ex = addExpectedException(
+ final IgnoredException ex = IgnoredException.addExpectedException(
"Colocated regions should have accessors at the same node", dataStore1);
dataStore1.invoke(new CacheSerializableRunnable(
"Colocated PR with Accessor on different nodes") {
@@ -791,7 +793,7 @@ public class PRColocationDUnitTest extends CacheTestCase {
});
// add expected exception string
- final ExpectedException ex = addExpectedException(
+ final IgnoredException ex = IgnoredException.addExpectedException(
"Colocated regions should have accessors at the same node", dataStore1);
dataStore1.invoke(new CacheSerializableRunnable(
"Colocated PR with accessor on different nodes") {
@@ -890,7 +892,7 @@ public class PRColocationDUnitTest extends CacheTestCase {
});
// add expected exception string
- final ExpectedException ex = addExpectedException("Cannot create buckets",
+ final IgnoredException ex = IgnoredException.addExpectedException("Cannot create buckets",
dataStore2);
dataStore2.invoke(new CacheSerializableRunnable(
"Colocated PR with PR on different node") {
@@ -960,7 +962,7 @@ public class PRColocationDUnitTest extends CacheTestCase {
NotExpected.printStackTrace();
getLogWriter().info(
"Unexpected Exception Message : " + NotExpected.getMessage());
- fail("Unpexpected Exception" , NotExpected);
+ Assert.fail("Unpexpected Exception" , NotExpected);
}
}
});
@@ -999,7 +1001,7 @@ public class PRColocationDUnitTest extends CacheTestCase {
// add expected exception string
final String expectedExMessage =
"Any Region in colocation chain cannot be destroyed locally.";
- final ExpectedException ex = addExpectedException(expectedExMessage,
+ final IgnoredException ex = IgnoredException.addExpectedException(expectedExMessage,
dataStore1);
dataStore1.invoke(new CacheSerializableRunnable(
"PR with Local destroy") {
@@ -1077,7 +1079,7 @@ public class PRColocationDUnitTest extends CacheTestCase {
// add expected exception string
final String expectedExMessage = "colocation chain cannot be destroyed, "
+ "unless all its children";
- final ExpectedException ex = addExpectedException(expectedExMessage,
+ final IgnoredException ex = IgnoredException.addExpectedException(expectedExMessage,
dataStore1);
dataStore1.invoke(new CacheSerializableRunnable(
"PR with destroy") {
@@ -1513,7 +1515,7 @@ public class PRColocationDUnitTest extends CacheTestCase {
@Override
public void run2() throws CacheException {
getCache();
- addExpectedException("redundancy should be same as the redundancy");
+ IgnoredException.addExpectedException("redundancy should be same as the redundancy");
createPR(rName, red1, Integer.valueOf(100), Integer.valueOf(3), null, Boolean.FALSE, Boolean.FALSE);
try {
createPR(rName+"colo", red0, Integer.valueOf(100), Integer.valueOf(3), rName, Boolean.FALSE, Boolean.FALSE);
@@ -2302,7 +2304,7 @@ public class PRColocationDUnitTest extends CacheTestCase {
+ partitionedRegionName);
}
catch (Exception e) {
- fail(
+ Assert.fail(
"validateBeforePutCustomerPartitionedRegion : Failed while getting the region from cache",
e);
}
@@ -2328,7 +2330,7 @@ public class PRColocationDUnitTest extends CacheTestCase {
.getRegion(Region.SEPARATOR + shipmentPartitionedRegionName);
}
catch (Exception e) {
- fail(
+ Assert.fail(
"validateAfterPutPartitionedRegion : failed while getting the region",
e);
}
@@ -2401,7 +2403,7 @@ public class PRColocationDUnitTest extends CacheTestCase {
assertEquals(customer, pr.get(custid));
}
catch (Exception e) {
- fail("putInPartitionedRegion : failed while doing put operation in "
+ Assert.fail("putInPartitionedRegion : failed while doing put operation in "
+ pr.getFullPath(), e);
}
}
@@ -2415,7 +2417,7 @@ public class PRColocationDUnitTest extends CacheTestCase {
try {
partitionedregion.close();
} catch (Exception e) {
- fail(
+ Assert.fail(
"closeRegion : failed to close region : " + partitionedregion,
e);
}
@@ -2451,7 +2453,7 @@ public class PRColocationDUnitTest extends CacheTestCase {
assertEquals(customer,partitionedregion.get(custid));
}
catch (Exception e) {
- fail(
+ Assert.fail(
"putCustomerPartitionedRegion : failed while doing put operation in CustomerPartitionedRegion ",
e);
}
@@ -2477,7 +2479,7 @@ public class PRColocationDUnitTest extends CacheTestCase {
}
catch (Exception e) {
- fail(
+ Assert.fail(
"putOrderPartitionedRegion : failed while doing put operation in OrderPartitionedRegion ",
e);
}
@@ -2504,7 +2506,7 @@ public class PRColocationDUnitTest extends CacheTestCase {
}
catch (Exception e) {
- fail(
+ Assert.fail(
"putOrderPartitionedRegion : failed while doing put operation in OrderPartitionedRegion ",
e);
}
@@ -2533,7 +2535,7 @@ public class PRColocationDUnitTest extends CacheTestCase {
assertEquals(shipment,partitionedregion.get(shipmentId));
}
catch (Exception e) {
- fail(
+ Assert.fail(
"putShipmentPartitionedRegion : failed while doing put operation in ShipmentPartitionedRegion ",
e);
}
@@ -2576,7 +2578,7 @@ public class PRColocationDUnitTest extends CacheTestCase {
fail("Did not get the expected ISE");
} catch (Exception e) {
if (!(e instanceof IllegalStateException)) {
- fail("Expected IllegalStateException, but it's not.", e);
+ Assert.fail("Expected IllegalStateException, but it's not.", e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRCustomPartitioningDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRCustomPartitioningDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRCustomPartitioningDUnitTest.java
index 302edd7..5a619f9 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRCustomPartitioningDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRCustomPartitioningDUnitTest.java
@@ -51,6 +51,7 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDUnitTestCase;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDataStore.BucketVisitor;
import com.gemstone.gemfire.internal.cache.xmlcache.Declarable2;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -204,7 +205,7 @@ public class PRCustomPartitioningDUnitTest extends
ppr.dumpAllBuckets(false);
}
catch (ReplyException re) {
- fail("dumpAllBuckets", re);
+ Assert.fail("dumpAllBuckets", re);
}
}
});
@@ -240,7 +241,7 @@ public class PRCustomPartitioningDUnitTest extends
ppr.dumpAllBuckets(false);
}
catch (ReplyException re) {
- fail("dumpAllBuckets", re);
+ Assert.fail("dumpAllBuckets", re);
}
}
});
@@ -275,7 +276,7 @@ public class PRCustomPartitioningDUnitTest extends
ppr.dumpAllBuckets(false);
}
catch (ReplyException re) {
- fail("dumpAllBuckets", re);
+ Assert.fail("dumpAllBuckets", re);
}
}
});
@@ -310,7 +311,7 @@ public class PRCustomPartitioningDUnitTest extends
ppr.dumpAllBuckets(false);
}
catch (ReplyException re) {
- fail("dumpAllBuckets", re);
+ Assert.fail("dumpAllBuckets", re);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java
index 7424088..7fdf866 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java
@@ -66,9 +66,11 @@ import com.gemstone.gemfire.internal.cache.execute.data.Order;
import com.gemstone.gemfire.internal.cache.execute.data.OrderId;
import com.gemstone.gemfire.internal.cache.functions.TestFunction;
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;
@@ -316,7 +318,7 @@ public class PRFunctionExecutionDUnitTest extends
}
catch (Throwable e) {
e.printStackTrace();
- fail("This is not expected Exception", e);
+ Assert.fail("This is not expected Exception", e);
}
return Boolean.TRUE;
}
@@ -390,7 +392,7 @@ public class PRFunctionExecutionDUnitTest extends
}
catch (Throwable e) {
e.printStackTrace();
- fail("This is not expected Exception", e);
+ Assert.fail("This is not expected Exception", e);
}
return Boolean.TRUE;
}
@@ -750,7 +752,7 @@ public class PRFunctionExecutionDUnitTest extends
}
public void testLocalMultiKeyExecution_BucketMoved() throws Exception {
- addExpectedException("BucketMovedException");
+ IgnoredException.addExpectedException("BucketMovedException");
final String rName = getUniqueName();
Host host = Host.getHost(0);
final VM datastore0 = host.getVM(0);
@@ -893,7 +895,7 @@ public class PRFunctionExecutionDUnitTest extends
}
catch (Throwable e) {
e.printStackTrace();
- fail("This is not expected Exception", e);
+ Assert.fail("This is not expected Exception", e);
}
return Boolean.TRUE;
}
@@ -993,7 +995,7 @@ public class PRFunctionExecutionDUnitTest extends
DistributedTestCase.join(async[0], 60 * 1000, getLogWriter());
if (async[0].getException() != null) {
- fail("UnExpected Exception Occured : ", async[0].getException());
+ Assert.fail("UnExpected Exception Occured : ", async[0].getException());
}
List l = (List)async[0].getReturnValue();
assertEquals(2, l.size());
@@ -1091,7 +1093,7 @@ public class PRFunctionExecutionDUnitTest extends
DistributedTestCase.join(async[0], 60 * 1000, getLogWriter());
if (async[0].getException() != null) {
- fail("UnExpected Exception Occured : ", async[0].getException());
+ Assert.fail("UnExpected Exception Occured : ", async[0].getException());
}
List l = (List)async[0].getReturnValue();
assertEquals(2, l.size());
@@ -2603,7 +2605,7 @@ public class PRFunctionExecutionDUnitTest extends
testKeys.add(custid);
}
catch (Exception e) {
- fail(
+ Assert.fail(
"putCustomerPartitionedRegion : failed while doing put operation in CustomerPartitionedRegion ",
e);
}
@@ -2714,7 +2716,7 @@ public class PRFunctionExecutionDUnitTest extends
testKeys.add(custid);
}
catch (Exception e) {
- fail(
+ Assert.fail(
"putCustomerPartitionedRegion : failed while doing put operation in CustomerPartitionedRegion ",
e);
}
@@ -2736,7 +2738,7 @@ public class PRFunctionExecutionDUnitTest extends
}
catch (Exception e) {
- fail(
+ Assert.fail(
"putOrderPartitionedRegion : failed while doing put operation in OrderPartitionedRegion ",
e);
}
@@ -3056,7 +3058,7 @@ public class PRFunctionExecutionDUnitTest extends
catch (Exception e) {
getLogWriter().info("Exception Occured : " + e.getMessage());
e.printStackTrace();
- fail("Test failed", e);
+ Assert.fail("Test failed", e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionTimeOutDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionTimeOutDUnitTest.java
index 6ded986..2d5e640 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionTimeOutDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionTimeOutDUnitTest.java
@@ -41,6 +41,7 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegionTestHelper;
import com.gemstone.gemfire.internal.cache.functions.TestFunction;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
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.VM;
@@ -666,7 +667,7 @@ public class PRFunctionExecutionTimeOutDUnitTest extends
* @throws Exception
*/
public void testLocalMultiKeyExecution_byName() throws Exception {
- addExpectedException("BucketMovedException");
+ IgnoredException.addExpectedException("BucketMovedException");
final String rName = getUniqueName();
Host host = Host.getHost(0);
VM localOnly = host.getVM(3);
@@ -797,7 +798,7 @@ public class PRFunctionExecutionTimeOutDUnitTest extends
final VM datastore1 = host.getVM(1);
final VM datastore2 = host.getVM(2);
final VM datastore3 = host.getVM(3);
- addExpectedException("BucketMovedException");
+ IgnoredException.addExpectedException("BucketMovedException");
getCache();
SerializableCallable dataStoreCreate = new SerializableCallable(
"Create PR with Function Factory") {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRPerformanceTestDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRPerformanceTestDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRPerformanceTestDUnitTest.java
index 8f99059..5e12a50 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRPerformanceTestDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRPerformanceTestDUnitTest.java
@@ -52,6 +52,7 @@ import com.gemstone.gemfire.distributed.DistributedMember;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDUnitTestCase;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -252,7 +253,7 @@ public class PRPerformanceTestDUnitTest extends
}
catch (Exception ex) {
getLogWriter().info("Exception Occured :" + ex.getMessage());
- fail("Test failed",ex);
+ Assert.fail("Test failed",ex);
}
Object val = list.get(0);
assertNotNull(val);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java
index 75a9f20..dd2fab3 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java
@@ -43,6 +43,7 @@ import com.gemstone.gemfire.internal.cache.execute.data.Order;
import com.gemstone.gemfire.internal.cache.execute.data.OrderId;
import com.gemstone.gemfire.internal.cache.execute.data.Shipment;
import com.gemstone.gemfire.internal.cache.execute.data.ShipmentId;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
/**
@@ -389,7 +390,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest {
.getRegion(Region.SEPARATOR + OrderPartitionedRegionName);
}
catch (Exception e) {
- fail(
+ Assert.fail(
"validateAfterPutPartitionedRegion : failed while getting the region",
e);
}
@@ -715,7 +716,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest {
}
catch (Exception e) {
// mgr.rollback();
- fail(" failed while doing put operation in CacheListener ", e);
+ Assert.fail(" failed while doing put operation in CacheListener ", e);
}
}
mgr.commit();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java
index 5ed07ab..9f4fbbc 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/SingleHopGetAllPutAllDUnitTest.java
@@ -31,6 +31,7 @@ import com.gemstone.gemfire.cache.client.internal.ClientPartitionAdvisor;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.LocalRegion;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
public class SingleHopGetAllPutAllDUnitTest extends PRClientServerTestBase{
@@ -96,7 +97,7 @@ public class SingleHopGetAllPutAllDUnitTest extends PRClientServerTestBase{
assertTrue(secondResultMap.equals(origVals));
}
catch (Exception e) {
- fail("Test failed after the getAll operation", e);
+ Assert.fail("Test failed after the getAll operation", e);
}
}
@@ -192,7 +193,7 @@ public class SingleHopGetAllPutAllDUnitTest extends PRClientServerTestBase{
assertEquals(noValueMap, region.getAll(testKeysList));
}
catch (Exception e) {
- fail("Test failed after the putAll operation", e);
+ Assert.fail("Test failed after the putAll operation", e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
index 63b2ea8..8063470 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
@@ -36,6 +36,7 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.tier.sockets.ConflationDUnitTest;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.VM;
/**
@@ -242,8 +243,8 @@ public class Bug36853EventsExpiryDUnitTest extends CacheTestCase
*/
public void testEventsExpiryBug() throws Exception
{
- addExpectedException("Unexpected IOException");
- addExpectedException("Connection reset");
+ IgnoredException.addExpectedException("Unexpected IOException");
+ IgnoredException.addExpectedException("Connection reset");
server.invoke(Bug36853EventsExpiryDUnitTest.class, "generateEvents");
client.invoke(Bug36853EventsExpiryDUnitTest.class,
"validateEventCountAtClient");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java
index 6278d9e..2d599f8 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java
@@ -40,6 +40,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
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.VM;
public class Bug48571DUnitTest extends DistributedTestCase {
@@ -83,7 +84,7 @@ public class Bug48571DUnitTest extends DistributedTestCase {
}
public void testStatsMatchWithSize() throws Exception {
- addExpectedException("Unexpected IOException||Connection reset");
+ IgnoredException.addExpectedException("Unexpected IOException||Connection reset");
// start a server
int port = (Integer) server.invoke(Bug48571DUnitTest.class, "createServerCache");
// create durable client, with durable RI
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java
index fa07821..c10bf55 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java
@@ -39,6 +39,7 @@ import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
import com.gemstone.gemfire.internal.cache.tier.sockets.ConflationDUnitTest;
+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;
@@ -206,7 +207,7 @@ public class FailoverDUnitTest extends DistributedTestCase
r.registerInterest("key-5");
}
catch (Exception ex) {
- fail("failed while registering keys k1 to k5", ex);
+ Assert.fail("failed while registering keys k1 to k5", ex);
}
}
@@ -224,7 +225,7 @@ public class FailoverDUnitTest extends DistributedTestCase
r.create("key-5", "key-5");
}
catch (Exception ex) {
- fail("failed while createEntries()", ex);
+ Assert.fail("failed while createEntries()", ex);
}
}
@@ -255,7 +256,7 @@ public class FailoverDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
- fail("failed while r.put()", ex);
+ Assert.fail("failed while r.put()", ex);
}
}
@@ -298,7 +299,7 @@ public class FailoverDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
- fail("failed while r.putDuringFailover()", ex);
+ Assert.fail("failed while r.putDuringFailover()", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
index b4fd1ac..9821af8 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
@@ -40,6 +40,7 @@ import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.CacheServerImpl;
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.VM;
/**
@@ -160,8 +161,8 @@ public class HADuplicateDUnitTest extends DistributedTestCase
public void testSample() throws Exception
{
- addExpectedException("IOException");
- addExpectedException("Connection reset");
+ IgnoredException.addExpectedException("IOException");
+ IgnoredException.addExpectedException("Connection reset");
createClientServerConfiguration();
server1.invoke(new CacheSerializableRunnable("putKey") {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
index ae3a4dc..802193e 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
@@ -46,6 +46,7 @@ import com.gemstone.gemfire.internal.cache.EntryEventImpl;
import com.gemstone.gemfire.internal.cache.EventID;
import com.gemstone.gemfire.internal.cache.RegionEventImpl;
import com.gemstone.gemfire.internal.cache.tier.sockets.ConflationDUnitTest;
+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;
@@ -415,7 +416,7 @@ public class HAEventIdPropagationDUnitTest extends DistributedTestCase
}
catch (Exception e) {
e.printStackTrace();
- fail("test failed due to " + e, e);
+ Assert.fail("test failed due to " + e, e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java
index 1c151e7..cc21b6f 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java
@@ -37,6 +37,7 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.cache.EntryEventImpl;
import com.gemstone.gemfire.internal.cache.HARegion;
import com.gemstone.gemfire.internal.cache.RegionQueue;
+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;
@@ -190,7 +191,7 @@ public class HAGIIBugDUnitTest extends DistributedTestCase
for (int count = 0; count < 1; count++) {
DistributedTestCase.join(async[count], 30 * 1000, getLogWriter());
if (async[count].exceptionOccurred()) {
- fail("Got exception on " + count, async[count].getException());
+ Assert.fail("Got exception on " + count, async[count].getException());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java
index 93cd77e..a08eea3 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java
@@ -47,6 +47,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier;
import com.gemstone.gemfire.internal.cache.tier.sockets.ClientTombstoneMessage;
import com.gemstone.gemfire.internal.cache.tier.sockets.ConflationDUnitTest;
import com.gemstone.gemfire.internal.cache.versions.VersionSource;
+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.SerializableRunnable;
@@ -231,7 +232,7 @@ public class HAGIIDUnitTest extends DistributedTestCase
r.registerInterest("key-3",InterestResultPolicy.KEYS_VALUES);
}
catch (Exception ex) {
- fail("failed while registering keys ", ex);
+ Assert.fail("failed while registering keys ", ex);
}
}
public static void createEntries()
@@ -245,7 +246,7 @@ public class HAGIIDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
- fail("failed while createEntries()", ex);
+ Assert.fail("failed while createEntries()", ex);
}
}
@@ -275,7 +276,7 @@ public class HAGIIDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
- fail("failed while r.put()", ex);
+ Assert.fail("failed while r.put()", ex);
}
}
@@ -344,7 +345,7 @@ public class HAGIIDUnitTest extends DistributedTestCase
// assertEquals( "key-3",r.getEntry("key-3").getValue());
}
catch (Exception ex) {
- fail("failed while verifyEntries()", ex);
+ Assert.fail("failed while verifyEntries()", ex);
}
}
@@ -438,7 +439,7 @@ public class HAGIIDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
- fail("failed while verifyEntriesAfterGII()", ex);
+ Assert.fail("failed while verifyEntriesAfterGII()", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
index 84c2f05..6e34675 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
@@ -52,6 +52,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
import com.gemstone.gemfire.internal.cache.tier.sockets.ClientUpdateMessage;
import com.gemstone.gemfire.internal.cache.tier.sockets.ConflationDUnitTest;
import com.gemstone.gemfire.internal.cache.tier.sockets.HAEventWrapper;
+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;
@@ -258,7 +259,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
r.registerInterest("ALL_KEYS");
}
catch (Exception ex) {
- fail("failed in registerInterestListAll", ex);
+ Assert.fail("failed in registerInterestListAll", ex);
}
}
@@ -271,7 +272,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
r.registerInterest("k5");
}
catch (Exception ex) {
- fail("failed while registering keys", ex);
+ Assert.fail("failed while registering keys", ex);
}
}
@@ -288,7 +289,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
r.put("k5", "pv5");
}
catch (Exception ex) {
- fail("failed in putEntries()", ex);
+ Assert.fail("failed in putEntries()", ex);
}
}
@@ -304,7 +305,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
r.create("k5", "v5");
}
catch (Exception ex) {
- fail("failed in createEntries()", ex);
+ Assert.fail("failed in createEntries()", ex);
}
}
@@ -317,7 +318,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
}
}
catch (Exception ex) {
- fail("failed in createEntries(Long)", ex);
+ Assert.fail("failed in createEntries(Long)", ex);
}
}
@@ -332,7 +333,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
}
}
catch (Exception ex) {
- fail("failed in putHeavyEntries(Long)", ex);
+ Assert.fail("failed in putHeavyEntries(Long)", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionDUnitTest.java
index 59780ef..6f864dc 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionDUnitTest.java
@@ -311,7 +311,7 @@ public class HARegionDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
ex.printStackTrace();
- fail("failed while region.put()", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("failed while region.put()", ex);
}
}
@@ -327,7 +327,7 @@ public class HARegionDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
ex.printStackTrace();
- fail("failed while region.put()", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("failed while region.put()", ex);
}
}
@@ -346,7 +346,7 @@ public class HARegionDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
ex.printStackTrace();
- fail("failed while region.get()", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("failed while region.get()", ex);
}
}
@@ -365,7 +365,7 @@ public class HARegionDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
ex.printStackTrace();
- fail("failed while region.get()", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("failed while region.get()", ex);
}
}
@@ -384,7 +384,7 @@ public class HARegionDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
ex.printStackTrace();
- fail("failed while region.get()", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("failed while region.get()", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java
index fc15226..ad9f1e5 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueDUnitTest.java
@@ -447,7 +447,7 @@ public class HARegionQueueDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
ex.printStackTrace();
- fail("failed while region.put()", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("failed while region.put()", ex);
}
}
@@ -463,7 +463,7 @@ public class HARegionQueueDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
ex.printStackTrace();
- fail("failed while region.put()", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("failed while region.put()", ex);
}
}
@@ -557,7 +557,7 @@ public class HARegionQueueDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
ex.printStackTrace();
- fail("failed while region.put()", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("failed while region.put()", ex);
}
}
@@ -573,7 +573,7 @@ public class HARegionQueueDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
ex.printStackTrace();
- fail("failed while region.put()", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("failed while region.put()", ex);
}
}
@@ -592,7 +592,7 @@ public class HARegionQueueDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
ex.printStackTrace();
- fail("failed while region.get()", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("failed while region.get()", ex);
}
}
@@ -611,7 +611,7 @@ public class HARegionQueueDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
ex.printStackTrace();
- fail("failed while region.get()", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("failed while region.get()", ex);
}
}
@@ -630,7 +630,7 @@ public class HARegionQueueDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
ex.printStackTrace();
- fail("failed while region.get()", ex);
+ com.gemstone.gemfire.test.dunit.Assert.fail("failed while region.get()", ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
index 90fc817..2186cd1 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
@@ -37,7 +37,9 @@ import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
+import com.gemstone.gemfire.test.dunit.Assert;
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;
@@ -196,7 +198,7 @@ public class HASlowReceiverDUnitTest extends DistributedTestCase {
r.registerInterest("ALL_KEYS");
}
catch (Exception ex) {
- fail("failed in registerInterestListAll", ex);
+ Assert.fail("failed in registerInterestListAll", ex);
}
}
@@ -211,7 +213,7 @@ public class HASlowReceiverDUnitTest extends DistributedTestCase {
}
}
catch (Exception ex) {
- fail("failed in putEntries()", ex);
+ Assert.fail("failed in putEntries()", ex);
}
}
@@ -224,7 +226,7 @@ public class HASlowReceiverDUnitTest extends DistributedTestCase {
}
}
catch (Exception ex) {
- fail("failed in createEntries(Long)", ex);
+ Assert.fail("failed in createEntries(Long)", ex);
}
}
@@ -250,9 +252,9 @@ public class HASlowReceiverDUnitTest extends DistributedTestCase {
new Integer(PORT1), new Integer(PORT2), new Integer(2) });
clientVM.invoke(HASlowReceiverDUnitTest.class, "registerInterest");
// add expected socket exception string
- final ExpectedException ex1 = addExpectedException(SocketException.class
+ final IgnoredException ex1 = IgnoredException.addExpectedException(SocketException.class
.getName());
- final ExpectedException ex2 = addExpectedException(InterruptedException.class
+ final IgnoredException ex2 = IgnoredException.addExpectedException(InterruptedException.class
.getName());
putEntries();
Thread.sleep(20000);// wait for put to block and allow server to remove
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java
index de0979e..fd96840 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java
@@ -33,6 +33,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.CacheServerImpl;
+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;
@@ -282,7 +283,7 @@ public class OperationsPropagationDUnitTest extends DistributedTestCase
region.put(DESTROY_KEY, DESTROY_VALUE);
}
catch (Exception e) {
- fail(" Test failed due to " + e, e);
+ Assert.fail(" Test failed due to " + e, e);
}
}
@@ -304,7 +305,7 @@ public class OperationsPropagationDUnitTest extends DistributedTestCase
region.putAll(map);
}
catch (Exception e) {
- fail(" Test failed due to " + e, e);
+ Assert.fail(" Test failed due to " + e, e);
}
}
@@ -370,7 +371,7 @@ public class OperationsPropagationDUnitTest extends DistributedTestCase
}
catch (Exception e) {
- fail(" Test failed due to " + e, e);
+ Assert.fail(" Test failed due to " + e, e);
}
}
@@ -478,7 +479,7 @@ public class OperationsPropagationDUnitTest extends DistributedTestCase
DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
}
catch (Exception e) {
- fail(" Test failed due to " + e, e);
+ Assert.fail(" Test failed due to " + e, e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
index 8410030..b1f0316 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
@@ -37,6 +37,7 @@ import com.gemstone.gemfire.internal.cache.RegionEntry;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
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.VM;
/**
@@ -76,7 +77,7 @@ public class Bug43684DUnitTest extends DistributedTestCase {
server2 = host.getVM(1);
server3 = host.getVM(2);
client1 = host.getVM(3);
- addExpectedException("Connection refused: connect");
+ IgnoredException.addExpectedException("Connection refused: connect");
}
public void tearDown2() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/ElidedPutAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/ElidedPutAllDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/ElidedPutAllDUnitTest.java
index 681d0d9..26103c9 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/ElidedPutAllDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/ElidedPutAllDUnitTest.java
@@ -35,6 +35,7 @@ import com.gemstone.gemfire.internal.cache.RegionEntry;
import com.gemstone.gemfire.internal.cache.tier.sockets.VersionedObjectList;
import com.gemstone.gemfire.internal.cache.versions.ConcurrentCacheModificationException;
import com.gemstone.gemfire.internal.cache.versions.VersionTag;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -98,14 +99,14 @@ public class ElidedPutAllDUnitTest extends CacheTestCase {
try {
region.postPutAllSend(dpao, successfulPuts);
} catch (ConcurrentCacheModificationException e) {
- fail("Should not have received an exception for an elided operation", e);
+ Assert.fail("Should not have received an exception for an elided operation", e);
} finally {
event.release();
dpao.getBaseEvent().release();
dpao.freeOffHeapResources();
}
} catch (Exception e) {
- fail("caught unexpected exception", e);
+ Assert.fail("caught unexpected exception", e);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java
index 2678621..bb8b108 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java
@@ -32,6 +32,7 @@ import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.util.CacheWriterAdapter;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.distributed.DistributedSystem;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.VM;
@@ -159,7 +160,7 @@ public class PartitionedRegionLoaderWriterDUnitTest extends CacheTestCase {
cache.createRegion(PartitionedRegionName, attrs);
}
catch (Exception e) {
- fail("Not Expected : " , e);
+ Assert.fail("Not Expected : " , e);
}
}
@@ -200,7 +201,7 @@ public class PartitionedRegionLoaderWriterDUnitTest extends CacheTestCase {
assertNotNull(cache);
}
catch (Exception e) {
- fail("Failed while creating the cache", e);
+ Assert.fail("Failed while creating the cache", e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionMetaDataCleanupDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionMetaDataCleanupDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionMetaDataCleanupDUnitTest.java
index 825774d..ff6c112 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionMetaDataCleanupDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionMetaDataCleanupDUnitTest.java
@@ -21,6 +21,8 @@ import com.gemstone.gemfire.cache.RegionFactory;
import com.gemstone.gemfire.cache.RegionShortcut;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.test.dunit.Assert;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.RMIException;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
@@ -43,7 +45,7 @@ public class PartitionedRegionMetaDataCleanupDUnitTest extends CacheTestCase {
createPR(vm0, "region1", 5);
createPR(vm1, "region2", 10);
//This should fail
- ExpectedException ex = addExpectedException( "IllegalStateException", vm1);
+ IgnoredException ex = IgnoredException.addExpectedException( "IllegalStateException", vm1);
try {
createPR(vm1, "region1", 10);
fail("Should have received an exception");
@@ -63,7 +65,7 @@ public class PartitionedRegionMetaDataCleanupDUnitTest extends CacheTestCase {
createPR(vm0, "region1", 5);
createPR(vm1, "region2", 10);
//This should fail
- ExpectedException ex = addExpectedException( "IllegalStateException", vm1);
+ IgnoredException ex = IgnoredException.addExpectedException( "IllegalStateException", vm1);
try {
createPR(vm1, "region1", 10);
fail("Should have received an exception");
@@ -83,7 +85,7 @@ public class PartitionedRegionMetaDataCleanupDUnitTest extends CacheTestCase {
createPR(vm0, "region1", 5);
createPR(vm1, "region2", 10);
//This should fail
- ExpectedException ex = addExpectedException("IllegalStateException", vm1);
+ IgnoredException ex = IgnoredException.addExpectedException("IllegalStateException", vm1);
try {
createPR(vm1, "region1", 10);
fail("Should have received an exception");
@@ -93,7 +95,7 @@ public class PartitionedRegionMetaDataCleanupDUnitTest extends CacheTestCase {
ex.remove();
}
- ex = addExpectedException("DistributedSystemDisconnectedException", vm0);
+ ex = IgnoredException.addExpectedException("DistributedSystemDisconnectedException", vm0);
try {
fakeCrash(vm0);
} finally {
@@ -161,7 +163,7 @@ public class PartitionedRegionMetaDataCleanupDUnitTest extends CacheTestCase {
.setEntryTimeToLive(new ExpirationAttributes(expirationTime));
//We may log an exception if the create fails. Ignore thse.
- ExpectedException ex = addExpectedException("IllegalStateException");
+ IgnoredException ex = IgnoredException.addExpectedException("IllegalStateException");
try {
int i= 0;
//Loop until a successful create
@@ -174,7 +176,7 @@ public class PartitionedRegionMetaDataCleanupDUnitTest extends CacheTestCase {
} catch(IllegalStateException expected) {
//give up if we can't create the region in 20 tries
if(i == 20) {
- fail("Metadata was never cleaned up in 20 tries", expected);
+ Assert.fail("Metadata was never cleaned up in 20 tries", expected);
}
//wait a bit before the next attempt.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistPRKRFDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistPRKRFDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistPRKRFDUnitTest.java
index c0a0149..2a7ea11 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistPRKRFDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistPRKRFDUnitTest.java
@@ -29,6 +29,7 @@ import com.gemstone.gemfire.internal.cache.DiskStoreImpl;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
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;
@@ -73,7 +74,7 @@ public class PersistPRKRFDUnitTest extends PersistentPartitionedRegionTestBase {
AsyncInvocation async1 = vm0.invokeAsync(new CacheSerializableRunnable(title+"async create") {
public void run2() throws CacheException {
Region region = getRootRegion(PR_REGION_NAME);
- ExpectedException expect = addExpectedException("CacheClosedException");
+ IgnoredException expect = IgnoredException.addExpectedException("CacheClosedException");
try {
region.put(10, "b");
fail("Expect CacheClosedException here");
@@ -116,7 +117,7 @@ public class PersistPRKRFDUnitTest extends PersistentPartitionedRegionTestBase {
async1 = vm0.invokeAsync(new CacheSerializableRunnable(title+"async update") {
public void run2() throws CacheException {
Region region = getRootRegion(PR_REGION_NAME);
- ExpectedException expect = addExpectedException("CacheClosedException");
+ IgnoredException expect = IgnoredException.addExpectedException("CacheClosedException");
try {
region.put(1, "b");
fail("Expect CacheClosedException here");
@@ -159,7 +160,7 @@ public class PersistPRKRFDUnitTest extends PersistentPartitionedRegionTestBase {
async1 = vm0.invokeAsync(new CacheSerializableRunnable(title+"async destroy") {
public void run2() throws CacheException {
Region region = getRootRegion(PR_REGION_NAME);
- ExpectedException expect = addExpectedException("CacheClosedException");
+ IgnoredException expect = IgnoredException.addExpectedException("CacheClosedException");
try {
region.destroy(2, "b");
fail("Expect CacheClosedException here");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
index dc89894..19bb655 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
@@ -43,7 +43,9 @@ import com.gemstone.gemfire.internal.cache.InitialImageOperation.RequestImageMes
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.control.InternalResourceManager;
import com.gemstone.gemfire.internal.cache.control.InternalResourceManager.ResourceObserver;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
@@ -107,7 +109,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest extends
af.setPartitionAttributes(paf.create());
//Try to colocate a persistent PR with the non persistent PR. This should fail.
- ExpectedException exp = addExpectedException("IllegalStateException");
+ IgnoredException exp = IgnoredException.addExpectedException("IllegalStateException");
try {
cache.createRegion("colocated", af.create());
fail("should not have been able to create a persistent region colocated with a non persistent region");
@@ -351,7 +353,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest extends
try {
recoveryDone.await(MAX_WAIT, TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
- fail("interrupted", e);
+ Assert.fail("interrupted", e);
}
}
};
@@ -498,7 +500,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest extends
fail("timed out");
}
} catch (InterruptedException e) {
- fail("interrupted", e);
+ Assert.fail("interrupted", e);
}
}
};
@@ -556,7 +558,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest extends
fail("timed out");
}
} catch (InterruptedException e) {
- fail("interrupted", e);
+ Assert.fail("interrupted", e);
}
}
};
@@ -602,7 +604,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest extends
createData(vm0, 0, NUM_BUCKETS, "b");
createData(vm0, 0, NUM_BUCKETS, "b", "region2");
- ExpectedException expected = addExpectedException("PartitionOfflineException");
+ IgnoredException expected = IgnoredException.addExpectedException("PartitionOfflineException");
try {
//Close the remaining members.
@@ -714,7 +716,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest extends
fail("timed out");
}
} catch (InterruptedException e) {
- fail("interrupted", e);
+ Assert.fail("interrupted", e);
}
}
};
@@ -779,7 +781,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest extends
fail("timed out");
}
} catch (InterruptedException e) {
- fail("interrupted", e);
+ Assert.fail("interrupted", e);
}
}
};
@@ -804,8 +806,8 @@ public class PersistentColocatedPartitionedRegionDUnitTest extends
* @throws Throwable
*/
public void replaceOfflineMemberAndRestartCreateColocatedPRLate(SerializableRunnable createParentPR, SerializableRunnable createChildPR) throws Throwable {
- addExpectedException("PartitionOfflineException");
- addExpectedException("RegionDestroyedException");
+ IgnoredException.addExpectedException("PartitionOfflineException");
+ IgnoredException.addExpectedException("RegionDestroyedException");
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
@@ -975,7 +977,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest extends
}
});
- ExpectedException ex = addExpectedException("PartitionOfflineException", vm1);
+ IgnoredException ex = IgnoredException.addExpectedException("PartitionOfflineException", vm1);
try {
//Do a rebalance to create buckets in vm1. THis will cause vm0 to disconnect
@@ -1292,7 +1294,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest extends
try {
observer.waitForCreate();
} catch (InterruptedException e) {
- fail("interrupted", e);
+ Assert.fail("interrupted", e);
}
}
};
@@ -1415,7 +1417,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest extends
closeCache();
//Restart colocated with "region2"
- ExpectedException ex = addExpectedException("DiskAccessException|IllegalStateException");
+ IgnoredException ex = IgnoredException.addExpectedException("DiskAccessException|IllegalStateException");
try {
createColocatedPRs("region2");
fail("Should have received an illegal state exception");
@@ -1437,7 +1439,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest extends
//Restart uncolocated. We don't allow changing
//from uncolocated to colocated.
- ex = addExpectedException("DiskAccessException|IllegalStateException");
+ ex = IgnoredException.addExpectedException("DiskAccessException|IllegalStateException");
try {
createColocatedPRs(null);
fail("Should have received an illegal state exception");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
index 794d418..2ef4441 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
@@ -74,8 +74,10 @@ import com.gemstone.gemfire.internal.cache.InitialImageOperation.RequestImageMes
import com.gemstone.gemfire.internal.cache.control.InternalResourceManager;
import com.gemstone.gemfire.internal.cache.partitioned.ManageBucketMessage.ManageBucketReplyMessage;
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.IgnoredException;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.RMIException;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
@@ -143,8 +145,8 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
createPR(vm0, 0, 0, 5);
createData(vm0, 0, 5, "a");
closeCache(vm0);
- ExpectedException expect = addExpectedException("IllegalStateException", vm0);
- expect = addExpectedException("DiskAccessException", vm0);
+ IgnoredException expect = IgnoredException.addExpectedException("IllegalStateException", vm0);
+ expect = IgnoredException.addExpectedException("DiskAccessException", vm0);
try {
createPR(vm0, 0, 0, 2);
fail("Expect to get java.lang.IllegalStateException, but it did not");
@@ -254,8 +256,8 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
}
});
- ExpectedException expected1 = addExpectedException("Fatal error from asynch");
- ExpectedException expected2 = addExpectedException("ToDataException");
+ IgnoredException expected1 = IgnoredException.addExpectedException("Fatal error from asynch");
+ IgnoredException expected2 = IgnoredException.addExpectedException("ToDataException");
try {
int redundancy=1;
createPR(vm0, redundancy, -1, 113, false);
@@ -422,7 +424,7 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
createData(vm0, numBuckets, 113, "b");
checkData(vm0, numBuckets, 113, "b");
- ExpectedException ex = addExpectedException(RevokedPersistentDataException.class.getName(), vm1);
+ IgnoredException ex = IgnoredException.addExpectedException(RevokedPersistentDataException.class.getName(), vm1);
try {
createPR(vm1, 1);
fail("Should have recieved a SplitDistributedSystemException");
@@ -437,7 +439,7 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
}
public void testRevokeBeforeStartup() throws Throwable {
- addExpectedException("RevokeFailedException");
+ IgnoredException.addExpectedException("RevokeFailedException");
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
@@ -491,7 +493,7 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
createData(vm0, numBuckets, 113, "b");
checkData(vm0, numBuckets, 113, "b");
- ExpectedException ex = addExpectedException(RevokedPersistentDataException.class.getName(), vm1);
+ IgnoredException ex = IgnoredException.addExpectedException(RevokedPersistentDataException.class.getName(), vm1);
try {
createPR(vm1, 1);
fail("Should have recieved a SplitDistributedSystemException");
@@ -537,7 +539,7 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
final int aVM1Bucket = vm1Buckets.iterator().next();
closeCache(vm1);
- ExpectedException ex = addExpectedException("PartitionOfflineException");
+ IgnoredException ex = IgnoredException.addExpectedException("PartitionOfflineException");
try {
checkReadWriteOperationsWithOfflineMember(vm0, aVM0Bucket, aVM1Bucket);
//Make sure that a newly created member is informed about the offline member
@@ -574,7 +576,7 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
}
}
- ExpectedException expect = addExpectedException("PartitionOfflineException", vm0);
+ IgnoredException expect = IgnoredException.addExpectedException("PartitionOfflineException", vm0);
//Try a function execution
vm0.invoke(new SerializableRunnable("Test ways to read") {
public void run() {
@@ -803,7 +805,7 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
//This should work, because this bucket is still available.
checkData(vm0, aVM0Bucket, aVM0Bucket + 1, "a");
- ExpectedException expect = addExpectedException("PartitionOfflineException", vm0);
+ IgnoredException expect = IgnoredException.addExpectedException("PartitionOfflineException", vm0);
try {
checkData(vm0, aVM1Bucket, aVM1Bucket + 1, "a");
fail("Should not have been able to read from missing buckets!");
@@ -836,7 +838,7 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
createData(vm2, aVM1Bucket, aVM1Bucket + 1, "a");
checkData(vm2, aVM1Bucket, aVM1Bucket + 1, "a");
- ExpectedException ex = addExpectedException(RevokedPersistentDataException.class.getName(), vm1);
+ IgnoredException ex = IgnoredException.addExpectedException(RevokedPersistentDataException.class.getName(), vm1);
try {
createPR(vm1, 0);
fail("Should have recieved a RevokedPersistentDataException");
@@ -884,7 +886,7 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
Set<Integer> vm2Buckets = getBucketList(vm2);
assertEquals(vm1Buckets, vm2Buckets);
- ExpectedException ex = addExpectedException(RevokedPersistentDataException.class.getName(), vm1);
+ IgnoredException ex = IgnoredException.addExpectedException(RevokedPersistentDataException.class.getName(), vm1);
try {
createPR(vm1, 1);
fail("Should have recieved a SplitDistributedSystemException");
@@ -1336,11 +1338,11 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
public void testRegisterInterestNoDataStores() {
//Closing the client may log a warning on the server
- addExpectedException("Connection reset");
- addExpectedException("SocketTimeoutException");
- addExpectedException("ServerConnectivityException");
- addExpectedException("Socket Closed");
- addExpectedException("Unexpected IOException");
+ IgnoredException.addExpectedException("Connection reset");
+ IgnoredException.addExpectedException("SocketTimeoutException");
+ IgnoredException.addExpectedException("ServerConnectivityException");
+ IgnoredException.addExpectedException("Socket Closed");
+ IgnoredException.addExpectedException("Unexpected IOException");
final Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
@@ -1663,7 +1665,7 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
//This should recover redundancy, which should cause vm0 to disconnect
- ExpectedException ex = addExpectedException("PartitionOfflineException");
+ IgnoredException ex = IgnoredException.addExpectedException("PartitionOfflineException");
try {
getLogWriter().info("Creating region in VM1");
createPR(vm1, 1, 0, 1);
@@ -1746,7 +1748,7 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
try {
recoveryObserver.recoveryDone.await();
} catch (InterruptedException e) {
- fail("Interrupted", e);
+ Assert.fail("Interrupted", e);
}
InternalResourceManager.setResourceObserver(null);
}
@@ -1821,7 +1823,7 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
* to make sure that later we can recover redundancy.
*/
public void testCrashDuringBucketGII() {
- addExpectedException("PartitionOfflineException");
+ IgnoredException.addExpectedException("PartitionOfflineException");
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
@@ -1875,7 +1877,7 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
* @throws InterruptedException
*/
public void testCrashDuringBucketGII2() throws InterruptedException {
- addExpectedException("PartitionOfflineException");
+ IgnoredException.addExpectedException("PartitionOfflineException");
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
final VM vm1 = host.getVM(1);
@@ -1956,7 +1958,7 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
createData(vm1, 1, 2, "a");
//this should throw a conflicting data exception.
- ExpectedException expect = addExpectedException("ConflictingPersistentDataException", vm0);
+ IgnoredException expect = IgnoredException.addExpectedException("ConflictingPersistentDataException", vm0);
try {
createPR(vm0, 0);
fail("should have seen a conflicting data exception");
@@ -1974,7 +1976,7 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
//view from vm0 because vm0 was in conflict!
//In fact, this is a bit of a problem, because now vm1 is dependent
//on vm vm0.
- expect = addExpectedException("PartitionOfflineException", vm1);
+ expect = IgnoredException.addExpectedException("PartitionOfflineException", vm1);
try {
createData(vm1, 0, 1, "a");
fail("Should have seen a PartitionOfflineException for bucket 0");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
index 267136a..eae178f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
@@ -56,6 +56,7 @@ import com.gemstone.gemfire.internal.cache.control.InternalResourceManager;
import com.gemstone.gemfire.internal.cache.control.InternalResourceManager.ResourceObserver;
import com.gemstone.gemfire.internal.cache.persistence.PersistenceAdvisor;
import com.gemstone.gemfire.internal.cache.persistence.PersistentMemberID;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
@@ -154,7 +155,7 @@ public abstract class PersistentPartitionedRegionTestBase extends CacheTestCase
try {
rf.start().getResults();
} catch (Exception e) {
- fail("interupted", e);
+ Assert.fail("interupted", e);
}
}
});
@@ -367,7 +368,7 @@ public abstract class PersistentPartitionedRegionTestBase extends CacheTestCase
try {
recoveryDone.await(MAX_WAIT, TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
- fail("interrupted", e);
+ Assert.fail("interrupted", e);
}
}
};
@@ -410,7 +411,7 @@ public abstract class PersistentPartitionedRegionTestBase extends CacheTestCase
try {
recoveryDone.await();
} catch (InterruptedException e) {
- fail("Interrupted", e);
+ Assert.fail("Interrupted", e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/ShutdownAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/ShutdownAllDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/ShutdownAllDUnitTest.java
index 97ff82d..e7c8816 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/ShutdownAllDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/ShutdownAllDUnitTest.java
@@ -55,6 +55,7 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.PutAllPartialResultException;
import com.gemstone.gemfire.internal.cache.control.InternalResourceManager;
import com.gemstone.gemfire.internal.cache.control.InternalResourceManager.ResourceObserver;
+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;
@@ -722,7 +723,7 @@ public class ShutdownAllDUnitTest extends CacheTestCase {
try {
recoveryDone.await();
} catch (InterruptedException e) {
- fail("Interrupted", e);
+ Assert.fail("Interrupted", e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java
index b9e8ebe..f5e0b71 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/StreamingPartitionOperationOneDUnitTest.java
@@ -47,6 +47,7 @@ import com.gemstone.gemfire.distributed.internal.ReplyProcessor21;
import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.Token;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.VM;
@@ -108,7 +109,7 @@ public class StreamingPartitionOperationOneDUnitTest extends CacheTestCase {
throw e;
}
catch (Throwable t) {
- fail("getPartitionedDataFrom failed", t);
+ Assert.fail("getPartitionedDataFrom failed", t);
}
assertTrue(streamOp.dataValidated);
}
[18/50] [abbrv] incubator-geode git commit: GEODE-862: Suppress
suspect log statement
Posted by kl...@apache.org.
GEODE-862: Suppress suspect log statement
Added a TODO to the code to clean this up further. I believe the removeNotificationListener was being called as a form of tearDown near the end of the test but there are no registered NotificationListeners and that's not what the test is testing.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a5437b2f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a5437b2f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a5437b2f
Branch: refs/heads/feature/GEODE-773-2
Commit: a5437b2fb1f379cd7713ef708095ba7b0ca2cfb9
Parents: c194f76
Author: Kirk Lund <kl...@pivotal.io>
Authored: Thu Jan 28 10:43:41 2016 -0800
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Thu Jan 28 10:48:27 2016 -0800
----------------------------------------------------------------------
.../gemstone/gemfire/management/DistributedSystemDUnitTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a5437b2f/gemfire-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java
index 1a52f9b..f234e34 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/DistributedSystemDUnitTest.java
@@ -452,7 +452,8 @@ public class DistributedSystemDUnitTest extends ManagementTestBase {
} catch (InstanceNotFoundException e) {
getLogWriter().error(e);
} catch (ListenerNotFoundException e) {
- getLogWriter().error(e);
+ // TODO: apparently there is never a notification listener on any these mbeans at this point
+ // fix this test so it doesn't hit these unexpected exceptions -- getLogWriter().error(e);
}
}
}
[05/50] [abbrv] incubator-geode git commit: GEODE-857: Fixing
synchronization in SystemFailure.stopWatchDog
Posted by kl...@apache.org.
GEODE-857: Fixing synchronization in SystemFailure.stopWatchDog
Don't join the watchDog thread or the proctor thread while holding the
failureSync lock.
Adding a unit test for SystemFailure.stopThreads.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/30d2d64d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/30d2d64d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/30d2d64d
Branch: refs/heads/feature/GEODE-773-2
Commit: 30d2d64d02c50df54d98aede41cdbbe56569dc43
Parents: 45d5eda
Author: Dan Smith <up...@apache.org>
Authored: Mon Jan 25 16:42:25 2016 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Tue Jan 26 17:01:37 2016 -0800
----------------------------------------------------------------------
.../com/gemstone/gemfire/SystemFailure.java | 49 ++++++++++------
.../gemfire/SystemFailureJUnitTest.java | 60 ++++++++++++++++++++
2 files changed, 93 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30d2d64d/gemfire-core/src/main/java/com/gemstone/gemfire/SystemFailure.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/SystemFailure.java b/gemfire-core/src/main/java/com/gemstone/gemfire/SystemFailure.java
index 494f5f7..1775063 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/SystemFailure.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/SystemFailure.java
@@ -192,6 +192,11 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
public final class SystemFailure {
/**
+ * Time to wait during stopWatchdog and stopProctor. Not final
+ * for tests
+ */
+ static int SHUTDOWN_WAIT = 1000;
+ /**
* Preallocated error messages\
* LocalizedStrings may use memory (in the form of an iterator)
* so we must get the translated messages in advance.
@@ -384,23 +389,26 @@ public final class SystemFailure {
}
private static void stopWatchDog() {
+ Thread watchDogSnapshot = null;
synchronized (failureSync) {
stopping = true;
if (watchDog != null && watchDog.isAlive()) {
failureSync.notifyAll();
+ watchDogSnapshot = watchDog;
+ }
+ }
+ if(watchDogSnapshot != null) {
+ try {
+ watchDogSnapshot.join(100);
+ } catch (InterruptedException ignore) {
+ }
+ if (watchDogSnapshot.isAlive()) {
+ watchDogSnapshot.interrupt();
try {
- watchDog.join(100);
+ watchDogSnapshot.join(SHUTDOWN_WAIT);
} catch (InterruptedException ignore) {
}
- if (watchDog.isAlive()) {
- watchDog.interrupt();
- try {
- watchDog.join(1000);
- } catch (InterruptedException ignore) {
- }
- }
}
- watchDog = null;
}
}
@@ -634,16 +642,17 @@ public final class SystemFailure {
}
private static void stopProctor() {
+ Thread proctorSnapshot = null;
synchronized (failureSync) {
stopping = true;
- if (proctor != null && proctor.isAlive()) {
- proctor.interrupt();
- try {
- proctor.join(1000);
- } catch (InterruptedException ignore) {
- }
+ proctorSnapshot = proctor;
+ }
+ if (proctorSnapshot != null && proctorSnapshot.isAlive()) {
+ proctorSnapshot.interrupt();
+ try {
+ proctorSnapshot.join(SHUTDOWN_WAIT);
+ } catch (InterruptedException ignore) {
}
- proctor = null;
}
}
@@ -1219,4 +1228,12 @@ public final class SystemFailure {
stopProctor();
stopWatchDog();
}
+
+ static Thread getWatchDogForTest() {
+ return watchDog;
+ }
+
+ static Thread getProctorForTest() {
+ return proctor;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30d2d64d/gemfire-core/src/test/java/com/gemstone/gemfire/SystemFailureJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/SystemFailureJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/SystemFailureJUnitTest.java
new file mode 100644
index 0000000..e33eba4
--- /dev/null
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/SystemFailureJUnitTest.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire;
+
+import static org.junit.Assert.*;
+
+import java.util.concurrent.TimeUnit;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.test.junit.categories.UnitTest;
+
+@Category(UnitTest.class)
+public class SystemFailureJUnitTest {
+
+ private static final int LONG_WAIT = 30000;
+ private int oldWaitTime;
+ @Before
+ public void setWaitTime() {
+ oldWaitTime = SystemFailure.SHUTDOWN_WAIT;
+ SystemFailure.SHUTDOWN_WAIT = LONG_WAIT;
+ }
+
+ @After
+ public void restoreWaitTime() {
+ SystemFailure.SHUTDOWN_WAIT = oldWaitTime;
+ }
+ @Test
+ public void testStopThreads() {
+ SystemFailure.startThreads();
+ long start = System.nanoTime();
+ Thread watchDog = SystemFailure.getWatchDogForTest();
+ Thread proctor= SystemFailure.getProctorForTest();
+ assertTrue(watchDog.isAlive());
+ assertTrue(proctor.isAlive());
+ SystemFailure.stopThreads();
+ long elapsed = System.nanoTime() - start;
+ assertTrue("Waited too long to shutdown: " + elapsed, elapsed < TimeUnit.MILLISECONDS.toNanos(LONG_WAIT));
+ assertFalse(watchDog.isAlive());
+ assertFalse(proctor.isAlive());
+ }
+
+}
[46/50] [abbrv] incubator-geode git commit: Refactor dunit
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
index 35f71fe..9165c2e 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
@@ -49,7 +49,9 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier;
+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;
@@ -94,8 +96,8 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
public void setUp() throws Exception {
super.setUp();
disconnectAllFromDS();
- addExpectedException("Connection reset");
- addExpectedException("Socket input is shutdown");
+ IgnoredException.addExpectedException("Connection reset");
+ IgnoredException.addExpectedException("Socket input is shutdown");
}
public void tearDown2() throws Exception {
@@ -178,7 +180,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
try {
startBridgeServer(0, false);
} catch (Exception ex) {
- fail("While starting CacheServer", ex);
+ Assert.fail("While starting CacheServer", ex);
}
}
});
@@ -213,7 +215,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
try {
qService = (PoolManager.find(poolName)).getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
queryString = "import com.gemstone.gemfire.admin.QueryUsingPoolDUnitTest.TestObject; select distinct * from " + regionName;
@@ -222,7 +224,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString);
results = (SelectResults)query.execute();
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(numberOfEntries, results.size());
@@ -233,7 +235,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString);
results = (SelectResults)query.execute();
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(numberOfEntries, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates());
@@ -243,7 +245,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString);
results = (SelectResults)query.execute();
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(0, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates());
@@ -253,7 +255,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString);
results = (SelectResults)query.execute();
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(numberOfEntries/2, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates());
@@ -263,7 +265,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString);
results = (SelectResults)query.execute();
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates());
@@ -273,7 +275,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString);
results = (SelectResults)query.execute();
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates());
@@ -315,7 +317,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
try {
startBridgeServer(0, false);
} catch (Exception ex) {
- fail("While starting CacheServer", ex);
+ Assert.fail("While starting CacheServer", ex);
}
}
});
@@ -350,7 +352,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
try {
qService = (PoolManager.find(poolName)).getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
queryString = "import com.gemstone.gemfire.admin.QueryUsingPoolDUnitTest.TestObject; select distinct ticker, price from " + regionName;
@@ -358,7 +360,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString);
results = (SelectResults)query.execute();
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(numberOfEntries, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates() && results.getCollectionType().getElementType().isStructType());
@@ -368,7 +370,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString);
results = (SelectResults)query.execute();
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(numberOfEntries, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates() && results.getCollectionType().getElementType().isStructType());
@@ -378,7 +380,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString);
results = (SelectResults)query.execute();
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(0, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates() && results.getCollectionType().getElementType().isStructType());
@@ -388,7 +390,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString);
results = (SelectResults)query.execute();
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(numberOfEntries/2, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates() && results.getCollectionType().getElementType().isStructType());
@@ -398,7 +400,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString);
results = (SelectResults)query.execute();
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates() && results.getCollectionType().getElementType().isStructType());
@@ -408,7 +410,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString);
results = (SelectResults)query.execute();
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates() && results.getCollectionType().getElementType().isStructType());
@@ -447,7 +449,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
try {
startBridgeServer(0, false);
} catch (Exception ex) {
- fail("While starting CacheServer", ex);
+ Assert.fail("While starting CacheServer", ex);
}
}
});
@@ -600,7 +602,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
getLogWriter().fine("size: " + results.size());
//assertEquals(numberOfEntries, results.size());
@@ -643,7 +645,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
try {
startBridgeServer(0, false);
} catch (Exception ex) {
- fail("While starting CacheServer", ex);
+ Assert.fail("While starting CacheServer", ex);
}
}
});
@@ -681,7 +683,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
try {
qService = (PoolManager.find(poolName)).getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
// value query
@@ -690,7 +692,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString);
results = (SelectResults)query.execute();
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates());
@@ -702,7 +704,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString);
results = (SelectResults)query.execute();
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates());
@@ -714,7 +716,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString);
results = (SelectResults)query.execute();
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(numberOfEntries, results.size());
// All order-by query results are stored in a ResultsCollectionWrapper
@@ -738,7 +740,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString);
results = (SelectResults)query.execute();
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(numberOfEntries, results.size());
// All order-by query results are stored in a ResultsCollectionWrapper
@@ -762,7 +764,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString);
results = (SelectResults)query.execute();
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
Object result = results.iterator().next();
@@ -776,7 +778,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString);
results = (SelectResults)query.execute();
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
assertEquals("key-1", results.asList().get(0));
@@ -861,7 +863,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
try {
qService = (PoolManager.find(poolName)).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++){
@@ -870,7 +872,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString[i]);
results = (SelectResults)query.execute(params[i]);
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
try {
assertEquals(expectedResults[i], results.size());
@@ -894,7 +896,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
try {
qService = (PoolManager.find(poolName)).getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
for (int x=0; x < useMaintainedCompiledQueries; x++){
for (int i=0; i < queryString.length; i++){
@@ -903,7 +905,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString[i]);
results = (SelectResults)query.execute(params[i]);
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
try {
assertEquals(expectedResults[i], results.size());
@@ -1020,7 +1022,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
try {
qService = (PoolManager.find(poolName)).getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
for (int j=0; j < queryString.length; j++){
for (int i=0; i < queryString.length; i++){
@@ -1029,7 +1031,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString[i]);
results = (SelectResults)query.execute(params[i]);
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
try {
assertEquals(expectedResults[i], results.size());
@@ -1527,7 +1529,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
try {
qService = (PoolManager.find(poolName)).getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
// Use minimal query, so that there will be multiple
// clients using the same compiled query at server.
@@ -1541,7 +1543,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
rs[0][1] = (SelectResults)query2.execute();
// Compare results.
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
getLogWriter().info("### Comparing results for Query :" + ((i+1) * (j+1)) + " : " + queryString[i]);
compareQueryResultsWithoutAndWithIndexes(rs, 1);
@@ -1589,7 +1591,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
try {
qService = (PoolManager.find(poolName)).getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
for (int j=0; j < queryString.length; j++){
for (int i=0; i < queryString.length; i++){
@@ -1602,7 +1604,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
// Compare results.
compareQueryResultsWithoutAndWithIndexes(rs, 1);
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
}
}
@@ -1674,7 +1676,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
try {
startBridgeServer(0, false);
} catch (Exception ex) {
- fail("While starting CacheServer", ex);
+ Assert.fail("While starting CacheServer", ex);
}
}
});
@@ -1713,7 +1715,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
try {
qService = (PoolManager.find(poolName)).getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
queryString =
@@ -1722,7 +1724,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString);
results = (SelectResults)query.execute();
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(numberOfEntries, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates() && results.getCollectionType().getElementType().isStructType());
@@ -1733,7 +1735,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString);
results = (SelectResults)query.execute();
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates() && results.getCollectionType().getElementType().isStructType());
@@ -1776,7 +1778,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
try {
startBridgeServer(0, false);
} catch (Exception ex) {
- fail("While starting CacheServer", ex);
+ Assert.fail("While starting CacheServer", ex);
}
}
});
@@ -1813,7 +1815,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
try {
qService = (PoolManager.find(poolName1)).getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
queryString = "SELECT DISTINCT itr.value FROM " + regionName + ".entries itr where itr.key = 'key-1'";
@@ -1821,7 +1823,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString);
results = (SelectResults)query.execute();
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates() && !results.getCollectionType().getElementType().isStructType());
@@ -1832,7 +1834,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString);
results = (SelectResults)query.execute();
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates() && !results.getCollectionType().getElementType().isStructType());
@@ -1850,7 +1852,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
try {
qService = (PoolManager.find(poolName2)).getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
queryString = "SELECT DISTINCT itr.value FROM " + regionName + ".entries itr where itr.key = 'key-1'";
@@ -1858,7 +1860,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString);
results = (SelectResults)query.execute();
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates() && !results.getCollectionType().getElementType().isStructType());
@@ -1869,7 +1871,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString);
results = (SelectResults)query.execute();
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates() && !results.getCollectionType().getElementType().isStructType());
@@ -1912,7 +1914,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
try {
startBridgeServer(0, false);
} catch (Exception ex) {
- fail("While starting CacheServer", ex);
+ Assert.fail("While starting CacheServer", ex);
}
}
});
@@ -1959,7 +1961,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
try {
qService = (PoolManager.find(poolName)).getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
try {
@@ -2010,7 +2012,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
try {
startBridgeServer(0, false);
} catch (Exception ex) {
- fail("While starting CacheServer", ex);
+ Assert.fail("While starting CacheServer", ex);
}
}
});
@@ -2027,7 +2029,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
QueryService qService = region.getCache().getQueryService();
qService.createIndex("idIndex",IndexType.FUNCTIONAL, "id", region.getFullPath());
} catch (Exception e) {
- fail("Failed to create index.", e);
+ Assert.fail("Failed to create index.", e);
}
}
@@ -2058,7 +2060,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
try {
qService = (PoolManager.find(poolName)).getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
// order by value query
@@ -2073,7 +2075,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString);
results = (SelectResults)query.execute();
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(numberOfEntries, results.size());
// All order-by query results are stored in a ResultsCollectionWrapper
@@ -2114,7 +2116,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString);
results = (SelectResults)query.execute();
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(numberOfEntries, results.size());
// All order-by query results are stored in a ResultsCollectionWrapper
@@ -2166,7 +2168,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
try {
startBridgeServer(0, false);
} catch (Exception ex) {
- fail("While starting CacheServer", ex);
+ Assert.fail("While starting CacheServer", ex);
}
}
});
@@ -2210,7 +2212,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
try {
qService = (PoolManager.find(poolName)).getQueryService();
} catch (Exception e) {
- fail("Failed to get QueryService.", e);
+ Assert.fail("Failed to get QueryService.", e);
}
// Testing Remote Query with params.
@@ -2220,7 +2222,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
} catch(UnsupportedOperationException e) {
// Expected behavior.
} catch (Exception e){
- fail("Failed with UnExpected Exception.", e);
+ Assert.fail("Failed with UnExpected Exception.", e);
}
// Test with Index.
@@ -2229,7 +2231,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
} catch(UnsupportedOperationException e) {
// Expected behavior.
} catch (Exception e){
- fail("Failed with UnExpected Exception.", e);
+ Assert.fail("Failed with UnExpected Exception.", e);
}
try {
@@ -2238,7 +2240,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
} catch(UnsupportedOperationException e) {
// Expected behavior.
} catch (Exception e){
- fail("Failed with UnExpected Exception.", e);
+ Assert.fail("Failed with UnExpected Exception.", e);
}
try {
@@ -2384,7 +2386,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
try {
startBridgeServer(0, false);
} catch (Exception ex) {
- fail("While starting CacheServer", ex);
+ Assert.fail("While starting CacheServer", ex);
}
}
@@ -2397,7 +2399,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
try {
qService = (PoolManager.find(poolName)).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++){
@@ -2406,7 +2408,7 @@ public class QueryUsingPoolDUnitTest extends CacheTestCase {
Query query = qService.newQuery(queryString[i]);
results = (SelectResults)query.execute(params[i]);
} catch (Exception e) {
- fail("Failed executing " + queryString[i], e);
+ Assert.fail("Failed executing " + queryString[i], e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
index dfbe69e..de8ca54 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
@@ -42,6 +42,7 @@ import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -107,7 +108,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
startBridgeServer(0, false);
} catch (Exception ex) {
- fail("While starting CacheServer", ex);
+ Assert.fail("While starting CacheServer", ex);
}
}
});
@@ -149,7 +150,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(numberOfEntries, results.size());
assertTrue(results.getClass() == ResultsBag.class);
@@ -159,7 +160,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(0, results.size());
assertTrue(results.getClass() == ResultsBag.class);
@@ -169,7 +170,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(numberOfEntries/2, results.size());
assertTrue(results.getClass() == ResultsBag.class);
@@ -179,7 +180,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
assertTrue(results.getClass() == ResultsBag.class);
@@ -189,7 +190,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
assertTrue(results.getClass() == ResultsBag.class);
@@ -250,7 +251,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
startBridgeServer(0, false);
} catch (Exception ex) {
- fail("While starting CacheServer", ex);
+ Assert.fail("While starting CacheServer", ex);
}
}
});
@@ -293,7 +294,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(numberOfEntries, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates());
@@ -302,7 +303,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(numberOfEntries, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates());
@@ -311,7 +312,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(0, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates());
@@ -320,7 +321,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(numberOfEntries/2, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates());
@@ -329,7 +330,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates());
@@ -338,7 +339,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates());
@@ -378,7 +379,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
startBridgeServer(0, false);
} catch (Exception ex) {
- fail("While starting CacheServer", ex);
+ Assert.fail("While starting CacheServer", ex);
}
}
});
@@ -420,7 +421,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(numberOfEntries, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates() && results.getCollectionType().getElementType().isStructType());
@@ -429,7 +430,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(numberOfEntries, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates() && results.getCollectionType().getElementType().isStructType());
@@ -438,7 +439,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(0, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates() && results.getCollectionType().getElementType().isStructType());
@@ -447,7 +448,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(numberOfEntries/2, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates() && results.getCollectionType().getElementType().isStructType());
@@ -456,7 +457,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates() && results.getCollectionType().getElementType().isStructType());
@@ -465,7 +466,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates() && results.getCollectionType().getElementType().isStructType());
@@ -504,7 +505,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
startBridgeServer(0, false);
} catch (Exception ex) {
- fail("While starting CacheServer", ex);
+ Assert.fail("While starting CacheServer", ex);
}
}
});
@@ -657,7 +658,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
getLogWriter().fine("size: " + results.size());
//assertEquals(numberOfEntries, results.size());
@@ -698,7 +699,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
startBridgeServer(0, false);
} catch (Exception ex) {
- fail("While starting CacheServer", ex);
+ Assert.fail("While starting CacheServer", ex);
}
}
});
@@ -743,7 +744,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates());
@@ -754,7 +755,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates());
@@ -765,7 +766,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(numberOfEntries, results.size());
// All order-by query results are stored in a ResultsCollectionWrapper
@@ -788,7 +789,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(numberOfEntries, results.size());
// All order-by query results are stored in a ResultsCollectionWrapper
@@ -811,7 +812,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
Object result = results.iterator().next();
@@ -824,7 +825,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
assertEquals("key-1", results.asList().get(0));
@@ -864,7 +865,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
startBridgeServer(0, false);
} catch (Exception ex) {
- fail("While starting CacheServer", ex);
+ Assert.fail("While starting CacheServer", ex);
}
}
});
@@ -913,7 +914,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region1.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(numberOfEntries, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates() && results.getCollectionType().getElementType().isStructType());
@@ -923,7 +924,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region1.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates() && results.getCollectionType().getElementType().isStructType());
@@ -963,7 +964,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
startBridgeServer(0, false);
} catch (Exception ex) {
- fail("While starting CacheServer", ex);
+ Assert.fail("While starting CacheServer", ex);
}
}
});
@@ -1022,7 +1023,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates() && !results.getCollectionType().getElementType().isStructType());
@@ -1032,7 +1033,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates() && !results.getCollectionType().getElementType().isStructType());
@@ -1051,7 +1052,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates() && !results.getCollectionType().getElementType().isStructType());
@@ -1061,7 +1062,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryString);
} catch (Exception e) {
- fail("Failed executing " + queryString, e);
+ Assert.fail("Failed executing " + queryString, e);
}
assertEquals(1, results.size());
assertTrue(!results.getCollectionType().allowsDuplicates() && !results.getCollectionType().getElementType().isStructType());
@@ -1122,7 +1123,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
startBridgeServer(0, false);
} catch (Exception ex) {
- fail("While starting CacheServer", ex);
+ Assert.fail("While starting CacheServer", ex);
}
}
});
@@ -1167,7 +1168,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
results = region.query(queryStrings[i]);
} catch (Exception e) {
- fail("Failed executing " + queryStrings[i], e);
+ Assert.fail("Failed executing " + queryStrings[i], e);
}
assertEquals(9, results.size());
String msg = "results expected to be instance of ResultsBag,"
@@ -1233,7 +1234,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
try {
startBridgeServer(0, false);
} catch (Exception ex) {
- fail("While starting CacheServer", ex);
+ Assert.fail("While starting CacheServer", ex);
}
}
});
@@ -1279,7 +1280,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
} catch (QueryInvocationTargetException qte) {
//Ok test passed
} catch(Exception e) {
- fail("Failed executing query " + queryStrings+ " due to unexpected Excecption", e);
+ Assert.fail("Failed executing query " + queryStrings+ " due to unexpected Excecption", e);
}
}
});
@@ -1318,7 +1319,7 @@ public class RemoteQueryDUnitTest extends CacheTestCase {
} catch (QueryInvocationTargetException qte) {
//Ok test passed
} catch(Exception e) {
- fail("Failed executing query " + queryString+ " due to unexpected Excecption", e);
+ Assert.fail("Failed executing query " + queryString+ " due to unexpected Excecption", e);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
index 372111c..f104e9b 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
@@ -68,6 +68,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
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.VM;
@@ -85,8 +86,8 @@ public class ResourceManagerWithQueryMonitorDUnitTest extends ClientServerTestCa
public void setUp() throws Exception {
super.setUp();
invokeInEveryVM(this.setHeapMemoryMonitorTestMode);
- addExpectedException("above heap critical threshold");
- addExpectedException("below heap critical threshold");
+ IgnoredException.addExpectedException("above heap critical threshold");
+ IgnoredException.addExpectedException("below heap critical threshold");
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/SelectStarQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/SelectStarQueryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/SelectStarQueryDUnitTest.java
index b943aca..e21e641 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/SelectStarQueryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/SelectStarQueryDUnitTest.java
@@ -40,6 +40,7 @@ import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.VMCachedDeserializable;
import com.gemstone.gemfire.pdx.PdxInstance;
+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;
@@ -149,7 +150,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
localQS = ((ClientCache) getCache()).getLocalQueryService();
remoteQS = ((ClientCache) getCache()).getQueryService();
} catch (Exception e) {
- fail("Exception getting query service ", e);
+ Assert.fail("Exception getting query service ", e);
}
SelectResults[][] sr = new SelectResults[1][2];
SelectResults res = null;
@@ -161,7 +162,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
sr[0][1] = res;
CacheUtils.compareResultsOfWithAndWithoutIndex(sr);
} catch (Exception e) {
- fail("Error executing query: " + queries[i], e);
+ Assert.fail("Error executing query: " + queries[i], e);
}
assertEquals(resultSize[i], res.size());
if (i == 3) {
@@ -215,14 +216,14 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
try {
qs = getCache().getQueryService();
} catch (Exception e) {
- fail("Exception getting query service ", e);
+ Assert.fail("Exception getting query service ", e);
}
SelectResults res = null;
for (int i = 0; i < queries.length; i++) {
try {
res = (SelectResults) qs.newQuery(queries[i]).execute();
} catch (Exception e) {
- fail("Error executing query: " + queries[i], e);
+ Assert.fail("Error executing query: " + queries[i], e);
}
assertEquals(resultSize[i], res.size());
if (i == 3) {
@@ -323,7 +324,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
localQS = ((ClientCache) getCache()).getLocalQueryService();
remoteQS = ((ClientCache) getCache()).getQueryService();
} catch (Exception e) {
- fail("Exception getting query service ", e);
+ Assert.fail("Exception getting query service ", e);
}
SelectResults res = null;
SelectResults[][] sr = new SelectResults[1][2];
@@ -338,7 +339,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
sr[0][1] = res;
CacheUtils.compareResultsOfWithAndWithoutIndex(sr);
} catch (Exception e) {
- fail("Error executing query: " + multipleRegionQueries[i], e);
+ Assert.fail("Error executing query: " + multipleRegionQueries[i], e);
}
assertEquals(resultSize2[i], res.size());
if (i == 4) {
@@ -395,7 +396,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
try {
qs = getCache().getQueryService();
} catch (Exception e) {
- fail("Exception getting query service ", e);
+ Assert.fail("Exception getting query service ", e);
}
SelectResults res = null;
for (int i = 0; i < multipleRegionQueries.length; i++) {
@@ -403,7 +404,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
res = (SelectResults) qs.newQuery(multipleRegionQueries[i])
.execute();
} catch (Exception e) {
- fail("Error executing query: " + multipleRegionQueries[i], e);
+ Assert.fail("Error executing query: " + multipleRegionQueries[i], e);
}
assertEquals(resultSize2[i], res.size());
if (i == 4) {
@@ -519,7 +520,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
localQS = ((ClientCache) getCache()).getLocalQueryService();
remoteQS = ((ClientCache) getCache()).getQueryService();
} catch (Exception e) {
- fail("Exception getting query service ", e);
+ Assert.fail("Exception getting query service ", e);
}
SelectResults res = null;
SelectResults[][] sr = new SelectResults[1][2];
@@ -532,7 +533,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
sr[0][1] = res;
CacheUtils.compareResultsOfWithAndWithoutIndex(sr);
} catch (Exception e) {
- fail("Error executing query: " + queries[i], e);
+ Assert.fail("Error executing query: " + queries[i], e);
}
assertEquals(resultSize[i], res.size());
if (i == 3) {
@@ -583,14 +584,14 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
try {
qs = getCache().getQueryService();
} catch (Exception e) {
- fail("Exception getting query service ", e);
+ Assert.fail("Exception getting query service ", e);
}
SelectResults res = null;
for (int i = 0; i < 6; i++) {
try {
res = (SelectResults) qs.newQuery(queries[i]).execute();
} catch (Exception e) {
- fail("Error executing query: " + queries[i], e);
+ Assert.fail("Error executing query: " + queries[i], e);
}
assertEquals(resultSize[i], res.size());
if (i == 3) {
@@ -694,7 +695,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
localQS = ((ClientCache) getCache()).getLocalQueryService();
remoteQS = ((ClientCache) getCache()).getQueryService();
} catch (Exception e) {
- fail("Exception getting query service ", e);
+ Assert.fail("Exception getting query service ", e);
}
SelectResults res = null;
SelectResults[][] sr = new SelectResults[1][2];
@@ -707,7 +708,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
sr[0][1] = res;
CacheUtils.compareResultsOfWithAndWithoutIndex(sr);
} catch (Exception e) {
- fail("Error executing query: " + queries[i], e);
+ Assert.fail("Error executing query: " + queries[i], e);
}
assertEquals(resultSize[i], res.size());
if (i == 3) {
@@ -758,14 +759,14 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
try {
qs = getCache().getQueryService();
} catch (Exception e) {
- fail("Exception getting query service ", e);
+ Assert.fail("Exception getting query service ", e);
}
SelectResults res = null;
for (int i = 0; i < 6; i++) {
try {
res = (SelectResults) qs.newQuery(queries[i]).execute();
} catch (Exception e) {
- fail("Error executing query: " + queries[i], e);
+ Assert.fail("Error executing query: " + queries[i], e);
}
assertEquals(resultSize[i], res.size());
if (i == 3) {
@@ -850,7 +851,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
qs = getCache().getQueryService();
qs.createIndex("status", "status", "/" + regName);
} catch (Exception e) {
- fail("Exception getting query service ", e);
+ Assert.fail("Exception getting query service ", e);
}
return null;
@@ -868,7 +869,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
localQS = ((ClientCache) getCache()).getLocalQueryService();
remoteQS = ((ClientCache) getCache()).getQueryService();
} catch (Exception e) {
- fail("Exception getting query service ", e);
+ Assert.fail("Exception getting query service ", e);
}
SelectResults res = null;
SelectResults[][] sr = new SelectResults[1][2];
@@ -883,7 +884,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
sr[0][1] = res;
CacheUtils.compareResultsOfWithAndWithoutIndex(sr);
} catch (Exception e) {
- fail("Error executing query: " + multipleRegionQueries[i], e);
+ Assert.fail("Error executing query: " + multipleRegionQueries[i], e);
}
assertEquals(resultSize2[i], res.size());
if (i == 4) {
@@ -926,7 +927,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
qs = getCache().getQueryService();
qs.createIndex("status", "status", "/" + regName2);
} catch (Exception e) {
- fail("Exception getting query service ", e);
+ Assert.fail("Exception getting query service ", e);
}
return null;
@@ -944,7 +945,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
localQS = ((ClientCache) getCache()).getLocalQueryService();
remoteQS = ((ClientCache) getCache()).getQueryService();
} catch (Exception e) {
- fail("Exception getting query service ", e);
+ Assert.fail("Exception getting query service ", e);
}
SelectResults res = null;
SelectResults[][] sr = new SelectResults[1][2];
@@ -959,7 +960,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
sr[0][1] = res;
CacheUtils.compareResultsOfWithAndWithoutIndex(sr);
} catch (Exception e) {
- fail("Error executing query: " + multipleRegionQueries[i], e);
+ Assert.fail("Error executing query: " + multipleRegionQueries[i], e);
}
assertEquals(resultSize2[i], res.size());
if (i == 4) {
@@ -1050,7 +1051,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
localQS = ((ClientCache) getCache()).getLocalQueryService();
remoteQS = ((ClientCache) getCache()).getQueryService();
} catch (Exception e) {
- fail("Exception getting query service ", e);
+ Assert.fail("Exception getting query service ", e);
}
SelectResults res = null;
SelectResults[][] sr = new SelectResults[1][2];
@@ -1063,7 +1064,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
sr[0][1] = res;
CacheUtils.compareResultsOfWithAndWithoutIndex(sr);
} catch (Exception e) {
- fail("Error executing query: " + queries[i], e);
+ Assert.fail("Error executing query: " + queries[i], e);
}
assertEquals(resultSize[i], res.size());
if (i == 3) {
@@ -1118,14 +1119,14 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
try {
qs = getCache().getQueryService();
} catch (Exception e) {
- fail("Exception getting query service ", e);
+ Assert.fail("Exception getting query service ", e);
}
SelectResults res = null;
for (int i = 0; i < queries.length; i++) {
try {
res = (SelectResults) qs.newQuery(queries[i]).execute();
} catch (Exception e) {
- fail("Error executing query: " + queries[i], e);
+ Assert.fail("Error executing query: " + queries[i], e);
}
assertEquals(resultSize[i], res.size());
if (i == 3) {
@@ -1174,14 +1175,14 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
try {
qs = getCache().getQueryService();
} catch (Exception e) {
- fail("Exception getting query service ", e);
+ Assert.fail("Exception getting query service ", e);
}
SelectResults res = null;
for (int i = 0; i < queries.length; i++) {
try {
res = (SelectResults) qs.newQuery(queries[i]).execute();
} catch (Exception e) {
- fail("Error executing query: " + queries[i], e);
+ Assert.fail("Error executing query: " + queries[i], e);
}
assertEquals(resultSize[i], res.size());
if (i == 3) {
@@ -1271,7 +1272,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
localQS = ((ClientCache) getCache()).getLocalQueryService();
remoteQS = ((ClientCache) getCache()).getQueryService();
} catch (Exception e) {
- fail("Exception getting query service ", e);
+ Assert.fail("Exception getting query service ", e);
}
SelectResults res = null;
SelectResults[][] sr = new SelectResults[1][2];
@@ -1284,7 +1285,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
sr[0][1] = res;
CacheUtils.compareResultsOfWithAndWithoutIndex(sr);
} catch (Exception e) {
- fail("Error executing query: " + queries[i], e);
+ Assert.fail("Error executing query: " + queries[i], e);
}
assertEquals(resultSize[i], res.size());
if (i == 3) {
@@ -1341,14 +1342,14 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
try {
qs = getCache().getQueryService();
} catch (Exception e) {
- fail("Exception getting query service ", e);
+ Assert.fail("Exception getting query service ", e);
}
SelectResults res = null;
for (int i = 0; i < queries.length; i++) {
try {
res = (SelectResults) qs.newQuery(queries[i]).execute();
} catch (Exception e) {
- fail("Error executing query: " + queries[i], e);
+ Assert.fail("Error executing query: " + queries[i], e);
}
assertEquals(resultSize[i], res.size());
if (i == 3) {
@@ -1397,14 +1398,14 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
try {
qs = getCache().getQueryService();
} catch (Exception e) {
- fail("Exception getting query service ", e);
+ Assert.fail("Exception getting query service ", e);
}
SelectResults res = null;
for (int i = 0; i < queries.length; i++) {
try {
res = (SelectResults) qs.newQuery(queries[i]).execute();
} catch (Exception e) {
- fail("Error executing query: " + queries[i], e);
+ Assert.fail("Error executing query: " + queries[i], e);
}
assertEquals(resultSize[i], res.size());
if (i == 3) {
@@ -1490,7 +1491,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
localQS = ((ClientCache) getCache()).getLocalQueryService();
remoteQS = ((ClientCache) getCache()).getQueryService();
} catch (Exception e) {
- fail("Exception getting query service ", e);
+ Assert.fail("Exception getting query service ", e);
}
SelectResults res = null;
SelectResults[][] sr = new SelectResults[1][2];
@@ -1503,7 +1504,7 @@ public class SelectStarQueryDUnitTest extends CacheTestCase {
sr[0][1] = res;
CacheUtils.compareResultsOfWithAndWithoutIndex(sr);
} catch (Exception e) {
- fail("Error executing query: " + queries[i], e);
+ Assert.fail("Error executing query: " + queries[i], e);
}
assertEquals(resultSize[i], res.size());
if (i == 3) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
index 3e69990..bda442f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
@@ -47,6 +47,7 @@ import com.gemstone.gemfire.internal.cache.EvictionAttributesImpl;
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.VM;
/**
@@ -194,8 +195,8 @@ public class ConcurrentIndexInitOnOverflowRegionDUnitTest extends CacheTestCase
VM vm0 = host.getVM(0);
VM vm1 = host.getVM(1);
- addExpectedException("Unexpected IOException:");
- addExpectedException("java.net.SocketException");
+ IgnoredException.addExpectedException("Unexpected IOException:");
+ IgnoredException.addExpectedException("java.net.SocketException");
name = "PartionedPortfoliosPR";
// Create Overflow Persistent Partition Region
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
index 5faba97..8015982 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
@@ -41,6 +41,7 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.RegionEntry;
import com.gemstone.gemfire.internal.cache.Token;
import com.gemstone.gemfire.internal.cache.persistence.query.CloseableIterator;
+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;
@@ -150,7 +151,7 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends
for (AsyncInvocation inv : asyncInvs) {
if (inv.exceptionOccurred()) {
- fail("Random region operation failed on VM_"+inv.getId(), inv.getException());
+ Assert.fail("Random region operation failed on VM_"+inv.getId(), inv.getException());
}
}
@@ -194,7 +195,7 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends
}
for (AsyncInvocation inv : asyncInvs) {
if (inv.exceptionOccurred()) {
- fail("Random region operation failed on VM_"+inv.getId(), inv.getException());
+ Assert.fail("Random region operation failed on VM_"+inv.getId(), inv.getException());
}
}
@@ -253,7 +254,7 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends
for (AsyncInvocation inv : asyncInvs) {
if (inv.exceptionOccurred()) {
- fail("Random region operation failed on VM_"+inv.getId(), inv.getException());
+ Assert.fail("Random region operation failed on VM_"+inv.getId(), inv.getException());
}
}
vm0.invoke(getCacheSerializableRunnableForIndexValidation(regionName, indexName));
@@ -315,7 +316,7 @@ public class ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest extends
}
for (AsyncInvocation inv : asyncInvs) {
if (inv.exceptionOccurred()) {
- fail("Random region operation failed on VM_"+inv.getId(), inv.getException());
+ Assert.fail("Random region operation failed on VM_"+inv.getId(), inv.getException());
}
}
vm0.invoke(getCacheSerializableRunnableForIndexValidation(regionName, rindexName));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
index fbead52..06d5b66 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
@@ -42,6 +42,7 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.RegionEntry;
import com.gemstone.gemfire.internal.cache.Token;
import com.gemstone.gemfire.internal.cache.persistence.query.CloseableIterator;
+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;
@@ -126,7 +127,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest extends
for (AsyncInvocation inv : asyncInvs) {
if (inv.exceptionOccurred()) {
- fail("Random region operation failed on VM_"+inv.getId(), inv.getException());
+ Assert.fail("Random region operation failed on VM_"+inv.getId(), inv.getException());
}
}
@@ -167,7 +168,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest extends
for (AsyncInvocation inv : asyncInvs) {
if (inv.exceptionOccurred()) {
- fail("Random region operation failed on VM_"+inv.getId(), inv.getException());
+ Assert.fail("Random region operation failed on VM_"+inv.getId(), inv.getException());
}
}
@@ -210,7 +211,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest extends
}
for (AsyncInvocation inv : asyncInvs) {
if (inv.exceptionOccurred()) {
- fail("Random region operation failed on VM_"+inv.getId(), inv.getException());
+ Assert.fail("Random region operation failed on VM_"+inv.getId(), inv.getException());
}
}
@@ -269,7 +270,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest extends
for (AsyncInvocation inv : asyncInvs) {
if (inv.exceptionOccurred()) {
- fail("Random region operation failed on VM_"+inv.getId(), inv.getException());
+ Assert.fail("Random region operation failed on VM_"+inv.getId(), inv.getException());
}
}
vm0.invoke(getCacheSerializableRunnableForIndexValidation(regionName, indexName));
@@ -330,7 +331,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest extends
}
for (AsyncInvocation inv : asyncInvs) {
if (inv.exceptionOccurred()) {
- fail("Random region operation failed on VM_"+inv.getId(), inv.getException());
+ Assert.fail("Random region operation failed on VM_"+inv.getId(), inv.getException());
}
}
vm0.invoke(getCacheSerializableRunnableForIndexValidation(regionName, rindexName));
@@ -403,7 +404,7 @@ public class ConcurrentIndexUpdateWithoutWLDUnitTest extends
for (AsyncInvocation inv : asyncInvs) {
if (inv.exceptionOccurred()) {
- fail("Random region operation failed on VM_"+inv.getId(), inv.getException());
+ Assert.fail("Random region operation failed on VM_"+inv.getId(), inv.getException());
}
}
vm0.invoke(getCacheSerializableRunnableForIndexValidation(regionName, indexName));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
index a176ee7..ee431c3 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
@@ -42,6 +42,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
+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;
@@ -401,7 +402,7 @@ public class CopyOnReadIndexDUnitTest extends CacheTestCase {
txManager.commit();
}
catch (CommitConflictException conflict) {
- fail("commit conflict exception", conflict);
+ Assert.fail("commit conflict exception", conflict);
}
//We have created puts from our previous callable
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
index f12df85..fbd6218 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
@@ -42,6 +42,7 @@ import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegionQueryEvaluator.TestHook;
+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.SerializableRunnable;
@@ -121,11 +122,11 @@ public class IndexTrackingQueryObserverDUnitTest extends CacheTestCase {
});
if (async1.exceptionOccurred()) {
- fail("", async1.getException());
+ Assert.fail("", async1.getException());
}
if (async1.exceptionOccurred()) {
- fail("", async1.getException());
+ Assert.fail("", async1.getException());
}
}
@@ -195,7 +196,7 @@ public class IndexTrackingQueryObserverDUnitTest extends CacheTestCase {
assertTrue(keyIndex1 instanceof PartitionedIndex);
}
} catch (Exception e) {
- fail("While creating Index on PR", e);
+ Assert.fail("While creating Index on PR", e);
}
Region region = getCache().getRegion("portfolio");
//Inject TestHook in QueryObserver before running query.
@@ -224,7 +225,7 @@ public class IndexTrackingQueryObserverDUnitTest extends CacheTestCase {
try {
results = (SelectResults) query.execute();
} catch (Exception e) {
- fail("While running query on PR", e);
+ Assert.fail("While running query on PR", e);
}
// The query should return all elements in region.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java
index 6b07d48..8d8d59d 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/InitializeIndexEntryDestroyQueryDUnitTest.java
@@ -34,6 +34,7 @@ import com.gemstone.gemfire.cache.query.internal.Undefined;
import com.gemstone.gemfire.cache.query.partitioned.PRQueryDUnitHelper;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.cache30.CacheTestCase;
+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;
@@ -196,12 +197,12 @@ public class InitializeIndexEntryDestroyQueryDUnitTest extends CacheTestCase {
DistributedTestCase.join(asyInvk0, 1000 * 1000, getLogWriter());
if (asyInvk0.exceptionOccurred()) {
- fail("asyInvk0 failed", asyInvk0.getException());
+ Assert.fail("asyInvk0 failed", asyInvk0.getException());
}
DistributedTestCase.join(asyInvk1, 1000 * 1000, getLogWriter());
if (asyInvk1.exceptionOccurred()) {
- fail("asyInvk1 failed", asyInvk1.getException());
+ Assert.fail("asyInvk1 failed", asyInvk1.getException());
}
}
@@ -332,12 +333,12 @@ public class InitializeIndexEntryDestroyQueryDUnitTest extends CacheTestCase {
DistributedTestCase.join(asyInvk0, 1000 * 1000, getLogWriter());
if (asyInvk0.exceptionOccurred()) {
- fail("asyInvk0 failed", asyInvk0.getException());
+ Assert.fail("asyInvk0 failed", asyInvk0.getException());
}
DistributedTestCase.join(asyInvk1, 1000 * 1000, getLogWriter());
if (asyInvk1.exceptionOccurred()) {
- fail("asyInvk1 failed", asyInvk1.getException());
+ Assert.fail("asyInvk1 failed", asyInvk1.getException());
}
}
@@ -419,7 +420,7 @@ public class InitializeIndexEntryDestroyQueryDUnitTest extends CacheTestCase {
PRQHelp.getCache().getLogger().fine("Querying the region with " + query);
results = (SelectResults)query.execute();
} catch (Exception e) {
- fail("Query: " + query + " execution failed with exception", e);
+ Assert.fail("Query: " + query + " execution failed with exception", e);
}
for (Object obj : results) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
index 040a671..5ca8d74 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
@@ -39,6 +39,7 @@ import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.internal.AvailablePort;
+import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
@@ -93,13 +94,13 @@ public class PutAllWithIndexPerfDUnitTest extends CacheTestCase {
try {
startBridgeServer(0, false);
} catch (Exception ex) {
- fail("While starting CacheServer", ex);
+ Assert.fail("While starting CacheServer", ex);
}
//Create Index on empty region
try {
cache.getQueryService().createIndex("idIndex", "ID", "/"+name);
} catch (Exception e) {
- fail("index creation failed", e);
+ Assert.fail("index creation failed", e);
}
}
});
@@ -157,7 +158,7 @@ public class PutAllWithIndexPerfDUnitTest extends CacheTestCase {
cache.getRegion(name).clear();
cache.getQueryService().createIndex("idIndex", "p.ID", "/"+name+" p");
} catch (Exception e) {
- fail("index creation failed", e);
+ Assert.fail("index creation failed", e);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java
index a72dec2..f71ada7 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRBasicIndexCreationDUnitTest.java
@@ -25,6 +25,7 @@ import com.gemstone.gemfire.cache.query.data.Portfolio;
import com.gemstone.gemfire.cache.query.data.PortfolioData;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDUnitTestCase;
+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;
@@ -260,11 +261,11 @@ public class PRBasicIndexCreationDUnitTest extends
.getCacheSerializableRunnableForPRCreateThrougXML(name, fileName));
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());
}
// printing all the indexes are created.
vm0.invoke(PRQHelp.getCacheSerializableRunnableForIndexCreationCheck(name));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
index c812e72..57934d5 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
@@ -54,6 +54,7 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDUnitTestCase;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
import com.gemstone.gemfire.test.dunit.VM;
/**
@@ -174,7 +175,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
public void testNonColocatedPRLocalQuerying() throws Exception
{
- addExpectedException("UnsupportedOperationException");
+ IgnoredException.addExpectedException("UnsupportedOperationException");
Host host = Host.getHost(0);
VM vm0 = host.getVM(0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0d759cb3/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryCacheCloseDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryCacheCloseDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryCacheCloseDUnitTest.java
index dd12b21..3ac67ac 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryCacheCloseDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryCacheCloseDUnitTest.java
@@ -34,6 +34,7 @@ import java.util.Random;
import com.gemstone.gemfire.cache.query.data.PortfolioData;
import com.gemstone.gemfire.internal.cache.ForceReattemptException;
import com.gemstone.gemfire.internal.cache.PartitionedRegionDUnitTestCase;
+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;
@@ -193,7 +194,7 @@ public class PRQueryCacheCloseDUnitTest extends PartitionedRegionDUnitTestCase
} while (t != null);
if (!isForceReattempt) {
- fail("Unexpected exception during query", async0.getException());
+ Assert.fail("Unexpected exception during query", async0.getException());
}
}
@@ -325,7 +326,7 @@ public class PRQueryCacheCloseDUnitTest extends PartitionedRegionDUnitTestCase
} while (t != null);
if (!isForceReattempt) {
- fail("Unexpected exception during query", async0.getException());
+ Assert.fail("Unexpected exception during query", async0.getException());
}
}
[33/50] [abbrv] incubator-geode git commit: GEODE-805: Fix javadoc
warnings.
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/WanCommandsControllerJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/WanCommandsControllerJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/WanCommandsControllerJUnitTest.java
index 4c3fbe6..34781b2 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/WanCommandsControllerJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/WanCommandsControllerJUnitTest.java
@@ -83,7 +83,7 @@ public class WanCommandsControllerJUnitTest {
* would only be rejected at runtime by the overall framework and is tested
* within an integration test.
*
- * @see WanCommandGatewaySenderStartDUnitTest
+ * see WanCommandGatewaySenderStartDUnitTest
*/
@Test
public void shouldDefineStartGatewayReceiverCommandWithNullGatewaySenderId() {
@@ -100,7 +100,7 @@ public class WanCommandsControllerJUnitTest {
* would only be rejected at runtime by the overall framework and is tested
* within an integration test.
*
- * @see WanCommandGatewaySenderStartDUnitTest
+ * see WanCommandGatewaySenderStartDUnitTest
*/
@Test
public void shouldDefineStartGatewayReceiverCommandWithEmptyGatewaySenderId() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
index 2ff0b2e..5ba7044 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
@@ -489,8 +489,6 @@ public class P2PAuthenticationDUnitTest extends DistributedTestCase {
/**
* The strategy is to test credential size greater than UDP datagram size.
*
- * @see Bug # 38570.
- *
* Here locator will accept the credentials from peer2 and the large credential
* from the first peer. Number of members in the DS
* should be four
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java
index 80f5a47..d238dcd 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestCase.java
@@ -166,7 +166,7 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
* Invokes a <code>SerializableRunnable</code> in every VM that
* DUnit knows about.
*
- * @see VM#invoke(Runnable)
+ * @see VM#invoke(SerializableRunnableIF)
*/
public static void invokeInEveryVM(SerializableRunnable work) {
for (int h = 0; h < Host.getHostCount(); h++) {
@@ -188,7 +188,7 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
* DUnit knows about.
*
* @return a Map of results, where the key is the VM and the value is the result
- * @see VM#invoke(Callable)
+ * @see VM#invoke(SerializableCallableIF)
*/
protected static Map invokeInEveryVM(SerializableCallable work) {
HashMap ret = new HashMap();
@@ -253,7 +253,7 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
* its execution is repeated, until no assertion failure occurs or
* repeatTimeout milliseconds have passed.
*
- * @see VM#invoke(Runnable)
+ * @see VM#invoke(SerializableRunnableIF)
*/
protected void invokeInEveryVMRepeatingIfNecessary(RepeatableRunnable work) {
for (int h = 0; h < Host.getHostCount(); h++) {
@@ -467,7 +467,7 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
* Note: "final" was removed so that WANTestBase can override this method.
* This was part of the xd offheap merge.
*
- * @see hydra.DistributedConnectionMgr#connect
+ * see hydra.DistributedConnectionMgr#connect
* @since 3.0
*/
public /*final*/ InternalDistributedSystem getSystem(Properties props) {
@@ -1200,7 +1200,7 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
* Wait for a thread to join
* @param t thread to wait on
* @param ms maximum time to wait
- * @throws AssertionFailure if the thread does not terminate
+ * @throws AssertionError if the thread does not terminate
*/
static public void join(Thread t, long ms, LogWriter logger) {
final long tilt = System.currentTimeMillis() + ms;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/RMIException.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/RMIException.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/RMIException.java
index b1f262b..8a555d2 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/RMIException.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/RMIException.java
@@ -39,7 +39,7 @@ import com.gemstone.gemfire.GemFireException;
* The stack trace of the exception returned by {@link #getCause()}
* may not be available.
*
- * @see hydra.RemoteTestModuleIF
+ * see hydra.RemoteTestModuleIF
*
* @author David Whitlock
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/SerializableCallable.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/SerializableCallable.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/SerializableCallable.java
index 60c20e3..e330693 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/SerializableCallable.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/SerializableCallable.java
@@ -22,7 +22,7 @@ import java.util.concurrent.Callable;
/**
* This interface provides both {@link Serializable} and {@link
* Callable}. It is often used in conjunction with {@link
- * VM#invoke(Callable)}.
+ * VM#invoke(SerializableCallableIF)}.
*
* <PRE>
* public void testRepilcatedRegionPut() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/SerializableRunnable.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/SerializableRunnable.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/SerializableRunnable.java
index 5798861..658924a 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/SerializableRunnable.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/SerializableRunnable.java
@@ -21,7 +21,7 @@ import java.io.Serializable;
/**
* This interface provides both {@link Serializable} and {@link
* Runnable}. It is often used in conjunction with {@link
- * VM#invoke(Runnable)}.
+ * VM#invoke(SerializableRunnableIF)}.
*
* <PRE>
* public void testRegionPutGet() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/VM.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/VM.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/VM.java
index 7abd20f..0d16196 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/VM.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/dunit/VM.java
@@ -1299,9 +1299,9 @@ public class VM implements java.io.Serializable {
* runner.
*
* @throws RMIException if an exception occurs while bouncing this VM, for
- * example a HydraTimeoutException if the VM fails to stop within {@link
- * hydra.Prms#maxClientShutdownWaitSec} or restart within {@link
- * hydra.Prms#maxClientStartupWaitSec}.
+ * example a HydraTimeoutException if the VM fails to stop within
+ * hydra.Prms#maxClientShutdownWaitSec or restart within
+ * hydra.Prms#maxClientStartupWaitSec.
*/
public synchronized void bounce() {
if (!this.available) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/gemfire/util/JSR166TestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/util/JSR166TestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/util/JSR166TestCase.java
index 2baff7a..a5b8310 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/util/JSR166TestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/util/JSR166TestCase.java
@@ -23,10 +23,13 @@
*/
package com.gemstone.gemfire.util;
-import junit.framework.*;
-//import java.util.*;
-//import java.io.*;
-import java.security.*;
+import java.security.CodeSource;
+import java.security.Permission;
+import java.security.PermissionCollection;
+import java.security.Permissions;
+import java.security.ProtectionDomain;
+
+import junit.framework.TestCase;
/**
* Base class for JSR166 Junit TCK tests. Defines some constants,
@@ -39,14 +42,14 @@ import java.security.*;
* <ol>
*
* <li> All assertions in code running in generated threads must use
- * the forms {@link threadFail} , {@link threadAssertTrue} {@link
- * threadAssertEquals}, or {@link threadAssertNull}, (not
+ * the forms threadFail, threadAssertTrue,
+ * threadAssertEquals, or threadAssertNull, (not
* <tt>fail</tt>, <tt>assertTrue</tt>, etc.) It is OK (but not
* particularly recommended) for other code to use these forms too.
* Only the most typically used JUnit assertion methods are defined
* this way, but enough to live with.</li>
*
- * <li> If you override {@link setUp} or {@link tearDown}, make sure
+ * <li> If you override {@link junit.framework.TestCase#setUp} or {@link junit.framework.TestCase#tearDown}, make sure
* to invoke <tt>super.setUp</tt> and <tt>super.tearDown</tt> within
* them. These methods are used to clear and check for thread
* assertion failures.</li>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/persistence/logging/Logger.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/persistence/logging/Logger.java b/gemfire-core/src/test/java/com/gemstone/persistence/logging/Logger.java
index 23f68fe..364f353 100644
--- a/gemfire-core/src/test/java/com/gemstone/persistence/logging/Logger.java
+++ b/gemfire-core/src/test/java/com/gemstone/persistence/logging/Logger.java
@@ -23,7 +23,7 @@ import java.util.*;
* given level associated with it. There are a number of convenience
* methods for logging events. Events with a level above a certain
* are written to <code>System.err</code>. The default level is
- * {@link LEVEL#INFO LEVEL.INFO}
+ * INFO
*/
public class Logger {
private static boolean DEBUG = Boolean.getBoolean("Logging.DEBUG");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/com/gemstone/sequence/gemfire/GemfireSequenceDisplay.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/sequence/gemfire/GemfireSequenceDisplay.java b/gemfire-core/src/test/java/com/gemstone/sequence/gemfire/GemfireSequenceDisplay.java
index b4ee5b8..6481a30 100644
--- a/gemfire-core/src/test/java/com/gemstone/sequence/gemfire/GemfireSequenceDisplay.java
+++ b/gemfire-core/src/test/java/com/gemstone/sequence/gemfire/GemfireSequenceDisplay.java
@@ -224,13 +224,6 @@ public class GemfireSequenceDisplay {
return sequenceDiagram;
}
- /**
- * @param graphId
- * @param lifeline
- * @param graphs
- * @param dest
- * @return
- */
private static LifelineState createState(Lifeline lifeline, GraphSet graphs, Vertex dest) {
long start = dest.getTimestamp();
long end = dest.getNextVertexOnDest() == null ? graphs.getMaxTime() : dest.getNextVertexOnDest().getTimestamp();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/hydra/GsRandom.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/hydra/GsRandom.java b/gemfire-core/src/test/java/hydra/GsRandom.java
index 61b16b0..bed02da 100644
--- a/gemfire-core/src/test/java/hydra/GsRandom.java
+++ b/gemfire-core/src/test/java/hydra/GsRandom.java
@@ -83,7 +83,6 @@ public class GsRandom extends java.util.Random implements Serializable {
* There is a hack here to prevent '}' so as to eliminate the possiblity
* of generating a sequence which would falsely get marked as a suspect
* string while we are matching the pattern <code>{[0-9]+}</code>.
- * {@link https://svn.gemstone.com/trac/gemfire/ticket/40415}
* @return the next pseudorandom, uniformly distributed <code>char</code>
* value from this random number generator's sequence.
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/hydra/log/AnyLogWriter.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/hydra/log/AnyLogWriter.java b/gemfire-core/src/test/java/hydra/log/AnyLogWriter.java
index c857196..369f35b 100644
--- a/gemfire-core/src/test/java/hydra/log/AnyLogWriter.java
+++ b/gemfire-core/src/test/java/hydra/log/AnyLogWriter.java
@@ -31,10 +31,10 @@ import java.io.*;
/**
*
* A {@link com.gemstone.gemfire.LogWriter} that writes to a file logger,
- * depending on whether it is turned on via {@link LogPrms#file_logging}.
+ * depending on whether it is turned on via LogPrms#file_logging.
* <p>
* The log level query methods answer true if a file logger is active and
- * answer true. See {@link LogPrms#file_logLevel}.
+ * answer true. See LogPrms#file_logLevel.
*/
public class AnyLogWriter implements InternalLogWriter {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/security/AuthzCredentialGenerator.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/security/AuthzCredentialGenerator.java b/gemfire-core/src/test/java/security/AuthzCredentialGenerator.java
index d5e4915..e15a60a 100644
--- a/gemfire-core/src/test/java/security/AuthzCredentialGenerator.java
+++ b/gemfire-core/src/test/java/security/AuthzCredentialGenerator.java
@@ -335,7 +335,7 @@ public abstract class AuthzCredentialGenerator {
* perform the given {@link OperationCode}s for the given regions. The
* credentials are required to be valid for authentication.
*
- * @param opCode
+ * @param opCodes
* the {@link OperationCode}s of the operations requiring
* authorization failure; should not be null
* @param regionNames
@@ -407,9 +407,6 @@ public abstract class AuthzCredentialGenerator {
* @param regionNames
* list of the region names requiring authorization; a value of
* null indicates all regions
- * @param index
- * used to generate multiple such credentials by passing
- * different values for this
*
* @return the number of principals allowed to perform the given operation in
* the given region
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/test/java/security/CredentialGenerator.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/security/CredentialGenerator.java b/gemfire-core/src/test/java/security/CredentialGenerator.java
index c16a8a1..7a430f1 100644
--- a/gemfire-core/src/test/java/security/CredentialGenerator.java
+++ b/gemfire-core/src/test/java/security/CredentialGenerator.java
@@ -58,7 +58,7 @@ public abstract class CredentialGenerator {
* overflowed. Note the methods and fields for existing schemes and add for
* the new one in a similar manner.</li>
* <li>Add an implementation for {@link CredentialGenerator}.</li>
- * <li>Modify the {@link CredentialGenerator.Factory#create} method to add
+ * <li>Modify the CredentialGenerator.Factory#create [no such Factory exists] method to add
* creation of an instance of the new implementation for the
* <code>ClassCode</code> enumeration value.</li>
* </ul>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
index f52d655..987a70a 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
@@ -21,8 +21,7 @@ import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
/**
- * Test class for testing {@link CqService#EXECUTE_QUERY_DURING_INIT} flag
- *
+ * Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
*/
public class CqStatsOptimizedExecuteDUnitTest extends CqStatsDUnitTest{
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
index 8723eb3..95eb789 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
@@ -21,8 +21,7 @@ import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
/**
- * Test class for testing {@link CqService#EXECUTE_QUERY_DURING_INIT} flag
- *
+ * Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
*/
public class CqStatsUsingPoolOptimizedExecuteDUnitTest extends CqStatsUsingPoolDUnitTest{
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
index 3722afb..42d367c 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
@@ -614,8 +614,6 @@ public class RemoteCQTransactionDUnitTest extends CacheTestCase {
}
/**
- * @param ds1
- * @param pr
* @return first key found on the given member
*/
CustId getKeyOnMember(final DistributedMember owner,
@@ -631,10 +629,7 @@ public class RemoteCQTransactionDUnitTest extends CacheTestCase {
}
return retVal;
}
- /**
- * @param i
- * @return
- */
+
protected Set<Customer> getCustomerSet(int size) {
Set<Customer> expectedSet = new HashSet<Customer>();
for (int i=0; i<size; i++) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-joptsimple/src/main/java/joptsimple/internal/AbbreviationMap.java
----------------------------------------------------------------------
diff --git a/gemfire-joptsimple/src/main/java/joptsimple/internal/AbbreviationMap.java b/gemfire-joptsimple/src/main/java/joptsimple/internal/AbbreviationMap.java
index 8394f59..35fad89 100644
--- a/gemfire-joptsimple/src/main/java/joptsimple/internal/AbbreviationMap.java
+++ b/gemfire-joptsimple/src/main/java/joptsimple/internal/AbbreviationMap.java
@@ -54,7 +54,6 @@ import java.util.TreeMap;
*
* @param <V> a constraint on the types of the values in the map
* @author <a href="mailto:pholser@alumni.rice.edu">Paul Holser</a>
- * @see <a href="http://www.perldoc.com/perl5.8.0/lib/Text/Abbrev.html">Perl's Text::Abbrev module</a>
*/
public class AbbreviationMap<V> {
private String key;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-json/src/main/java/org/json/JSONObject.java
----------------------------------------------------------------------
diff --git a/gemfire-json/src/main/java/org/json/JSONObject.java b/gemfire-json/src/main/java/org/json/JSONObject.java
index 6c478db..24f5cc7 100755
--- a/gemfire-json/src/main/java/org/json/JSONObject.java
+++ b/gemfire-json/src/main/java/org/json/JSONObject.java
@@ -165,8 +165,6 @@ public class JSONObject {
* Missing keys are ignored.
* @param jo A JSONObject.
* @param names An array of strings.
- * @throws JSONException
- * @exception JSONException If a value is a non-finite number or if a name is duplicated.
*/
public JSONObject(JSONObject jo, String[] names) {
this();
@@ -241,7 +239,6 @@ public class JSONObject {
*
* @param map A map object that can be used to initialize the contents of
* the JSONObject.
- * @throws JSONException
*/
public JSONObject(Map map) {
this.map = new LinkedHashMap();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
index b707c52..aa4d004 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java
@@ -77,8 +77,8 @@ public interface LuceneQueryFactory {
* @param regionName region name
* @param indexName index name
* @param queryString query string in lucene QueryParser's syntax
- * @param K the key type in the query results
- * @param V the value type in the query results
+ * @param <K> the key type in the query results
+ * @param <V> the value type in the query results
* @return LuceneQuery object
* @throws ParseException
*/
@@ -87,14 +87,13 @@ public interface LuceneQueryFactory {
/**
* Creates a wrapper object for Lucene's Query object. This {@link LuceneQuery} builder method could be used in
- * advanced cases, such as cases where Lucene's Query object construction needs Lucene's API over query string. The
- * {@link QueryDeserializer} will be used to re-construct the Lucene Query object on remote hosts.
+ * advanced cases, such as cases where Lucene's Query object construction needs Lucene's API over query string.
*
* @param indexName index name
* @param regionName region name
* @param provider constructs and provides a Lucene Query object
- * @param K the key type in the query results
- * @param V the value type in the query results
+ * @param <K> the key type in the query results
+ * @param <V> the value type in the query results
* @return LuceneQuery object
*/
public <K, V> LuceneQuery<K, V> create(String indexName, String regionName, LuceneQueryProvider provider);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java
index 8e3500e..ef60158 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java
@@ -38,7 +38,7 @@ import com.gemstone.gemfire.cache.query.QueryException;
public interface LuceneQueryProvider extends Serializable {
/**
* @return A Lucene Query object which could be used for executing Lucene Search on indexed data
- * @param The local lucene index the query is being constructed against.
+ * @param index local lucene index the query is being constructed against.
* @throws QueryException if the provider fails to construct the query object
*/
public Query getQuery(LuceneIndex index) throws QueryException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java
index fbd6dad..f4c665b 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java
@@ -25,8 +25,7 @@ import com.gemstone.gemfire.annotations.Experimental;
import com.gemstone.gemfire.cache.GemFireCache;
/**
- * LuceneService instance is a singleton for each cache. It will be created in cache
- * constructor and get its reference via {@link GemFireCache#getLuceneService()}.
+ * LuceneService instance is a singleton for each cache.
*
* It provides handle for managing the {@link LuceneIndex} and create the {@link LuceneQuery}
* via {@link LuceneQueryFactory}
@@ -73,11 +72,6 @@ public interface LuceneService {
/**
* Create a lucene index using default analyzer.
- *
- * @param indexName
- * @param regionPath
- * @param fields
- * @return LuceneIndex object
*/
public void createIndex(String indexName, String regionPath, String... fields);
@@ -87,7 +81,6 @@ public interface LuceneService {
* @param indexName index name
* @param regionPath region name
* @param analyzerPerField analyzer per field map
- * @return LuceneIndex object
* @deprecated TODO This feature is not yet implemented
*/
@Deprecated
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/RepositoryManager.java
----------------------------------------------------------------------
diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/RepositoryManager.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/RepositoryManager.java
index 20c2d51..8f8d202 100644
--- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/RepositoryManager.java
+++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/RepositoryManager.java
@@ -37,7 +37,6 @@ public interface RepositoryManager {
* Returns a collection of {@link IndexRepository} instances hosting index data of the input list of bucket ids. The
* bucket needs to be present on this member.
*
- * @param localDataSet The local data set of a function
* @return a collection of {@link IndexRepository} instances
* @throws BucketNotFoundException if any of the requested buckets is not found on this member
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/DataBrowser.java
----------------------------------------------------------------------
diff --git a/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/DataBrowser.java b/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/DataBrowser.java
index 4810716..dbad2df 100644
--- a/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/DataBrowser.java
+++ b/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/DataBrowser.java
@@ -149,7 +149,6 @@ public class DataBrowser {
*
* @param userId
* Logged in User's Id
- * @throws JSONException
*/
public JSONArray getQueryHistoryByUserId(String userId) {
@@ -233,8 +232,6 @@ public class DataBrowser {
* generateQueryKey method stores queries in query history file.
*
* @return Boolean true is operation is successful, false otherwise
- * @param properties
- * a collection queries in form of key and values
*/
private boolean storeQueriesInFile(JSONObject queries) {
boolean operationStatus = false;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JMXDataUpdater.java
----------------------------------------------------------------------
diff --git a/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JMXDataUpdater.java b/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JMXDataUpdater.java
index 0e4bd14..1cd5fd7 100644
--- a/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JMXDataUpdater.java
+++ b/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JMXDataUpdater.java
@@ -971,16 +971,6 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
/**
* function used for getting list of Gateway Senders from mBean for giving
* member and update the list of gateway senders for respective member object
- *
- * @param mbeanName
- * @param memberName
- * @throws InstanceNotFoundException
- * @throws IntrospectionException
- * @throws ReflectionException
- * @throws IOException
- * @throws AttributeNotFoundException
- * @throws MBeanException
- *
*/
private void updateGatewaySender(ObjectName mbeanName) throws IOException {
@@ -1089,16 +1079,6 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
/**
* function used for getting list of Gateway Senders from mBean for giving
* member and update the list of gateway senders for respective member object
- *
- * @param mbeanName
- * @param memberName
- * @throws InstanceNotFoundException
- * @throws IntrospectionException
- * @throws ReflectionException
- * @throws IOException
- * @throws AttributeNotFoundException
- * @throws MBeanException
- *
*/
private void updateAsyncEventQueue(ObjectName mbeanName) throws IOException {
try {
@@ -1145,16 +1125,6 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
/**
* function used for getting a Gateway Receiver from mBean for giving member
* and update the gateway receiver for respective member object
- *
- * @param mbeanName
- * @param memberName
- * @throws InstanceNotFoundException
- * @throws IntrospectionException
- * @throws ReflectionException
- * @throws IOException
- * @throws AttributeNotFoundException
- * @throws MBeanException
- *
*/
private void updateGatewayReceiver(ObjectName mbeanName) throws IOException {
@@ -1191,16 +1161,6 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
/**
* function used for getting member clients from mbean and update the clients
* information in member object's client arraylist
- *
- * @param mbeanName
- * @param memberName
- * @throws InstanceNotFoundException
- * @throws IntrospectionException
- * @throws ReflectionException
- * @throws IOException
- * @throws MBeanException
- * @throws AttributeNotFoundException
- *
*/
private void updateMemberClient(ObjectName mbeanName) throws IOException {
@@ -1452,12 +1412,6 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
*
* @param mbeanName
* Cluster Region MBean
- * @throws IOException
- * @throws ReflectionException
- * @throws IntrospectionException
- * @throws InstanceNotFoundException
- * @throws MBeanException
- * @throws AttributeNotFoundException
*/
private void updateClusterRegion(ObjectName mbeanName) throws IOException {
@@ -1780,14 +1734,6 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
/**
* function used to iterate through all member attributes and return the
* updated member
- *
- * @param attrs
- * @param mbeanName
- * @param member
- * @return
- * @throws IOException
- * @throws ReflectionException
- * @throws InstanceNotFoundException
*/
private Cluster.Member initializeMember(ObjectName mbeanName,
Cluster.Member member) throws InstanceNotFoundException,
@@ -2004,13 +1950,6 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
*
* @param mbeanName
* Cluster Member MBean
- * @throws IOException
- * @throws ReflectionException
- * @throws IntrospectionException
- * @throws InstanceNotFoundException
- * @throws MBeanException
- * @throws AttributeNotFoundException
- *
*/
private void updateClusterMember(ObjectName mbeanName) throws IOException {
@@ -2071,11 +2010,6 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
* function used to handle Float data type if the value for mbean for an
* attribute is null then return 0.0 as default value else return the
* attribute value
- *
- * @param name
- * @param mbs
- * @param mBeanName
- * @return
*/
private Float getFloatAttribute(Object object, String name) {
try {
@@ -2102,11 +2036,6 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
* function used to handle Integer data type if the value for mbean for an
* attribute is null then return 0 as default value else return the attribute
* value
- *
- * @param name
- * @param mbs
- * @param mBeanName
- * @return
*/
private Integer getIntegerAttribute(Object object, String name) {
try {
@@ -2133,11 +2062,6 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
* function used to handle Long data type if the value for mbean for an
* attribute is null then return 0 as default value else return the attribute
* value
- *
- * @param name
- * @param mbs
- * @param mBeanName
- * @return
*/
private Long getLongAttribute(Object object, String name) {
try {
@@ -2165,11 +2089,6 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
* function used to handle String data type if the value for mbean for an
* attribute is null then return the empty string as default value else return
* the attribute value
- *
- * @param name
- * @param mbs
- * @param mBeanName
- * @return
*/
private String getStringAttribute(Object object, String name) {
try {
@@ -2196,11 +2115,6 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
* function used to handle Boolean data type if the value for mbean for an
* attribute is null then return false as default value else return the
* attribute value
- *
- * @param name
- * @param mbs
- * @param mBeanName
- * @return
*/
private Boolean getBooleanAttribute(Object object, String name) {
try {
@@ -2227,11 +2141,6 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
* function used to handle Double data type if the value for mbean for an
* attribute is null then return 0.0 as default value else return the
* attribute value
- *
- * @param name
- * @param mbs
- * @param mBeanName
- * @return
*/
private Double getDoubleAttribute(Object object, String name) {
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JmxManagerFinder.java
----------------------------------------------------------------------
diff --git a/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JmxManagerFinder.java b/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JmxManagerFinder.java
index 38c614e..3fb6d6a 100644
--- a/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JmxManagerFinder.java
+++ b/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JmxManagerFinder.java
@@ -48,10 +48,6 @@ public class JmxManagerFinder {
private final static PulseLogWriter LOGGER = PulseLogWriter.getLogger();
- /**
- * @param args
- * @throws IOException
- */
/*
* public static void main(String[] args) throws IOException { if (args.length
* != 2) { System.err.println(
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/json/JSONObject.java
----------------------------------------------------------------------
diff --git a/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/json/JSONObject.java b/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/json/JSONObject.java
index 427d051..d04b1f4 100644
--- a/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/json/JSONObject.java
+++ b/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/json/JSONObject.java
@@ -154,8 +154,6 @@ public class JSONObject {
* Missing keys are ignored.
* @param jo A JSONObject.
* @param names An array of strings.
- * @throws JSONException
- * @exception JSONException If a value is a non-finite number or if a name is duplicated.
*/
public JSONObject(JSONObject jo, String[] names) {
this();
@@ -230,7 +228,6 @@ public class JSONObject {
*
* @param map A map object that can be used to initialize the contents of
* the JSONObject.
- * @throws JSONException
*/
public JSONObject(Map map) {
this.map = new HashMap();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/json/JSONWriter.java
----------------------------------------------------------------------
diff --git a/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/json/JSONWriter.java b/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/json/JSONWriter.java
index 1d3c7b3..7c1590e 100644
--- a/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/json/JSONWriter.java
+++ b/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/json/JSONWriter.java
@@ -264,7 +264,7 @@ public class JSONWriter {
/**
* Push an array or object scope.
- * @param c The scope to open.
+ * @param jo The scope to open.
* @throws JSONException If nesting is too deep.
*/
private void push(JSONObject jo) throws JSONException {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterSelectedRegionsMemberService.java
----------------------------------------------------------------------
diff --git a/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterSelectedRegionsMemberService.java b/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterSelectedRegionsMemberService.java
index 74d6fff..f4430d5 100644
--- a/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterSelectedRegionsMemberService.java
+++ b/gemfire-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterSelectedRegionsMemberService.java
@@ -98,9 +98,6 @@ public class ClusterSelectedRegionsMemberService implements PulseService {
/**
* Create JSON for selected cluster region's all members
- *
- * @param cluster, region path
- * @return JSONObject Array List
*/
private JSONObject getSelectedRegionsMembersJson(Cluster cluster, String selectedRegionFullPath) throws JSONException {
PulseLogWriter LOGGER = PulseLogWriter.getLogger();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-rebalancer/src/main/java/com/gemstone/gemfire/cache/util/AutoBalancer.java
----------------------------------------------------------------------
diff --git a/gemfire-rebalancer/src/main/java/com/gemstone/gemfire/cache/util/AutoBalancer.java b/gemfire-rebalancer/src/main/java/com/gemstone/gemfire/cache/util/AutoBalancer.java
index 48fec09..02d0c2a 100644
--- a/gemfire-rebalancer/src/main/java/com/gemstone/gemfire/cache/util/AutoBalancer.java
+++ b/gemfire-rebalancer/src/main/java/com/gemstone/gemfire/cache/util/AutoBalancer.java
@@ -98,7 +98,7 @@ public class AutoBalancer implements Declarable {
* will be triggered if the total number of bytes rebalance operation may move
* is more than this threshold, in percentage of the total data size.
* <P>
- * Default {@value AutoBalancer#DEFAULT_SIZE_THRESHOLD_PERCENT}
+ * Default value {@link #DEFAULT_SIZE_THRESHOLD_PERCENT}
*/
public static final String SIZE_THRESHOLD_PERCENT = "size-threshold-percent";
@@ -116,7 +116,7 @@ public class AutoBalancer implements Declarable {
* the total number of bytes rebalance operation may move is more than this
* number of bytes.
* <P>
- * Default {@value AutoBalancer#DEFAULT_MINIMUM_SIZE}
+ * Default value {@link #DEFAULT_MINIMUM_SIZE}
*/
public static final String MINIMUM_SIZE = "minimum-size";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
index 9f0da9b..9da6748 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
@@ -268,7 +268,6 @@ public class GatewaySenderEventRemoteDispatcher implements
* @return the <code>Connection</code>
*
* @throws GatewaySenderException
- * @throws InterruptedException
*/
public Connection getConnection(boolean startAckReaderThread) throws GatewaySenderException{
// IF the connection is null
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
index b3d49d3..f0c01ab 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
@@ -3579,7 +3579,6 @@ public class WANTestBase extends DistributedTestCase{
/**
* To be used only for ParallelGatewaySender.
* @param senderId Id of the ParallelGatewaySender
- * @param numQueueEntries Expected number of ParallelGatewaySenderQueue entries
*/
public static int getPRQLocalSize(String senderId) {
GatewaySender sender = null;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java
index cb4907b..84eb365 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java
@@ -288,8 +288,6 @@ public class WANConfigurationJUnitTest {
/**
* Test to validate that serial gateway sender attributes are correctly set
- *
- * @throws IOException
*/
@Test
public void test_ValidateSerialGatewaySenderAttributes() {
@@ -344,8 +342,6 @@ public class WANConfigurationJUnitTest {
/**
* Test to validate that parallel gateway sender attributes are correctly set
- *
- * @throws IOException
*/
@Test
public void test_ValidateParallelGatewaySenderAttributes() {
@@ -466,10 +462,6 @@ public class WANConfigurationJUnitTest {
* "Cannot assign requested address" but gets
* "Can't assign requested address". Timout after 150s to safeguard against
* hanging on other platforms that may differ.
- *
- * @see <a
- * href="https://svn.gemstone.com/trac/gemfire/ticket/51536">https://svn
- * .gemstone.com/trac/gemfire/ticket/51536<a>
*/
@Test(timeout = 150000)
public void test_ValidateGatwayReceiverAttributes_WrongBindAddress() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
index d0ea193..2a91108 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
@@ -329,8 +329,6 @@ public class WANCommandTestBase extends CliCommandTestBase{
/**
* Enable system property gemfire.disableManagement false in each VM.
- *
- * @throws Exception
*/
public void enableManagement() {
invokeInEveryVM(new SerializableRunnable("Enable Management") {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gradle/dependency-versions.properties
----------------------------------------------------------------------
diff --git a/gradle/dependency-versions.properties b/gradle/dependency-versions.properties
index 25f297d..4f68974 100644
--- a/gradle/dependency-versions.properties
+++ b/gradle/dependency-versions.properties
@@ -23,6 +23,7 @@ awaitility.version = 1.7.0
bcel.version = 5.2
catch-exception.version = 1.4.4
catch-throwable.version = 1.4.4
+cdi-api.version = 1.2
cglib.version = 3.1
classmate.version = 0.9.0
commons-collections.version = 3.2.1
@@ -52,6 +53,7 @@ jline.version = 2.12
jmock.version = 2.8.1
jna.version = 4.0.0
json4s.version = 3.2.4
+jsr305.version = 3.0.1
junit.version = 4.12
JUnitParams.version = 1.0.4
log4j.version = 2.5
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gradle/java.gradle
----------------------------------------------------------------------
diff --git a/gradle/java.gradle b/gradle/java.gradle
index 3ec105d..d166fca 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -102,5 +102,7 @@ subprojects {
compile 'org.springframework:spring-web:' + project.'springframework.version'
compile 'org.springframework:spring-webmvc:' + project.'springframework.version'
compile 'com.github.stephenc.findbugs:findbugs-annotations:' + project.'stephenc-findbugs.version'
+ compile 'com.google.code.findbugs:jsr305:' + project.'jsr305.version'
+ compile 'javax.enterprise:cdi-api:' + project.'cdi-api.version'
}
}
[30/50] [abbrv] incubator-geode git commit: Closes #84
Posted by kl...@apache.org.
Closes #84
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/554ecaee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/554ecaee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/554ecaee
Branch: refs/heads/feature/GEODE-773-2
Commit: 554ecaee5963b460a5c9c303564811ffdf55bbc8
Parents: 41e5553
Author: William Markito <wm...@pivotal.io>
Authored: Sun Jan 31 11:17:13 2016 +0100
Committer: William Markito <wm...@pivotal.io>
Committed: Sun Jan 31 11:17:13 2016 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------