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/01/26 01:49:35 UTC
[25/27] incubator-geode git commit: GEODE 773 rough draft
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e2f18f97/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..cd3ec5f 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,12 +68,19 @@ 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.DUnitEnv;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
+import com.gemstone.gemfire.test.dunit.Invoke;
+import com.gemstone.gemfire.test.dunit.NetworkSupport;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
/**
* Tests the Off-Heap Memory thresholds of {@link ResourceManager}
@@ -101,16 +108,16 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
@Override
public void setUp() throws Exception {
- addExpectedException(expectedEx);
- addExpectedException(expectedBelow);
+ IgnoredException.addIgnoredException(expectedEx);
+ IgnoredException.addIgnoredException(expectedBelow);
}
@Override
- public void tearDown2() throws Exception {
- invokeInEveryVM(this.resetResourceManager);
- super.tearDown2();
+ public void tearDownBeforeDisconnect() throws Exception {
+ Invoke.invokeInEveryVM(this.resetResourceManager);
+ super.tearDownBeforeDisconnect();
}
private SerializableCallable resetResourceManager = new SerializableCallable() {
@@ -495,7 +502,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
return dr.getMemoryThresholdReachedMembers().size() == 0;
}
};
- waitForCriterion(wc, 10000, 10, true);
+ Wait.waitForCriterion(wc, 10000, 10, true);
return null;
}
});
@@ -596,7 +603,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
return r.memoryThresholdReached.get();
}
};
- waitForCriterion(wc, 30*1000, 10, true);
+ Wait.waitForCriterion(wc, 30*1000, 10, true);
{
Integer k = new Integer(2);
assertEquals(k.toString(), r.get(k, new Integer(expectedInvocations++)));
@@ -611,7 +618,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
return !r.memoryThresholdReached.get();
}
};
- waitForCriterion(wc, 30*1000, 10, true);
+ Wait.waitForCriterion(wc, 30*1000, 10, true);
{
Integer k = new Integer(3);
assertEquals(k.toString(), r.get(k, new Integer(expectedInvocations++)));
@@ -660,7 +667,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
return r.memoryThresholdReached.get();
}
};
- waitForCriterion(wc, 30*1000, 10, true);
+ Wait.waitForCriterion(wc, 30*1000, 10, true);
{
Integer k = new Integer(5);
assertEquals(k.toString(), r.get(k, new Integer(expectedInvocations++)));
@@ -675,7 +682,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
return !r.memoryThresholdReached.get();
}
};
- waitForCriterion(wc, 30*1000, 10, true);
+ Wait.waitForCriterion(wc, 30*1000, 10, true);
{
Integer k = new Integer(6);
assertEquals(k.toString(), r.get(k, new Integer(expectedInvocations++)));
@@ -832,7 +839,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
return keyFoundOnSickMember && caughtException;
}
};
- waitForCriterion(wc, 10000, 10, true);
+ Wait.waitForCriterion(wc, 10000, 10, true);
return null;
}
});
@@ -906,7 +913,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
return done;
}
};
- waitForCriterion(wc, 10000, 10, true);
+ Wait.waitForCriterion(wc, 10000, 10, true);
return null;
}
});
@@ -1001,7 +1008,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
return false;
}
};
- waitForCriterion(wc, 30*1000, 10, true);
+ Wait.waitForCriterion(wc, 30*1000, 10, true);
final Integer k = new Integer(2); // reload with same key again and again
final Integer expectedInvocations3 = new Integer(expectedInvocations.getAndIncrement());
@@ -1046,7 +1053,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
return !r.memoryThresholdReached.get();
}
};
- waitForCriterion(wc, 30*1000, 10, true);
+ Wait.waitForCriterion(wc, 30*1000, 10, true);
Integer k = new Integer(3); // same key as previously used, this time is should stick
Integer expectedInvocations8 = new Integer(expectedInvocations.incrementAndGet());
@@ -1196,7 +1203,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
return r.memoryThresholdReached.get();
}
};
- waitForCriterion(wc, 30*1000, 10, true);
+ Wait.waitForCriterion(wc, 30*1000, 10, true);
{
Integer k = new Integer(2);
assertEquals(k.toString(), r.get(k));
@@ -1217,7 +1224,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
return !r.memoryThresholdReached.get();
}
};
- waitForCriterion(wc, 30*1000, 10, true);
+ Wait.waitForCriterion(wc, 30*1000, 10, true);
{
Integer k = new Integer(3);
@@ -1318,14 +1325,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 +1362,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 +1373,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));
@@ -1431,7 +1438,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
return null;
}
};
- waitForCriterion(waitForCritical, 30*1000, 9, false);
+ Wait.waitForCriterion(waitForCritical, 30*1000, 9, false);
th.validateUpdateStateAndSendEventBeforeProcess(bytesUsedAfterSmallKey + 943720 + 8, MemoryState.EVICTION_DISABLED_CRITICAL);
} finally {
ohm.testHook = null;
@@ -1472,7 +1479,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
}
};
}
- waitForCriterion(wc, 30000, 9, true);
+ Wait.waitForCriterion(wc, 30000, 9, true);
getCache().getLoggerI18n().fine(removeExpectedExString);
return bytesUsedAfterSmallKey;
}
@@ -1510,7 +1517,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
return ohm.getState().isNormal();
}
};
- waitForCriterion(wc, 30000, 9, true);
+ Wait.waitForCriterion(wc, 30000, 9, true);
getCache().getLogger().fine(MemoryThresholdsOffHeapDUnitTest.this.removeExpectedBelow);
return;
}
@@ -1648,7 +1655,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
getCache();
PoolFactory pf = PoolManager.createFactory();
- pf.addServer(getServerHostName(server.getHost()), serverPort);
+ pf.addServer(NetworkSupport.getServerHostName(server.getHost()), serverPort);
pf.create("pool1");
AttributesFactory af = new AttributesFactory();
@@ -1784,7 +1791,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
throw new IllegalStateException("Unknown memory state");
}
if (useWaitCriterion) {
- waitForCriterion(wc, 5000, 10, true);
+ Wait.waitForCriterion(wc, 5000, 10, true);
}
return null;
}
@@ -1804,7 +1811,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
return numberOfProfiles == ra.adviseGeneric().size();
}
};
- waitForCriterion(wc, 10000, 10, true);
+ Wait.waitForCriterion(wc, 10000, 10, true);
return null;
}
});
@@ -1812,7 +1819,7 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
private Properties getOffHeapProperties() {
Properties p = new Properties();
- p.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+getDUnitLocatorPort()+"]");
+ p.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+DUnitEnv.getDUnitLocatorPort()+"]");
p.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "1m");
return p;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e2f18f97/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/e2f18f97/gemfire-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/PutAllGlobalLockJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/PutAllGlobalLockJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/PutAllGlobalLockJUnitTest.java
index 48f1c56..de36eb0 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/PutAllGlobalLockJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/PutAllGlobalLockJUnitTest.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Threads;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
@@ -79,7 +79,7 @@ public class PutAllGlobalLockJUnitTest {
}
try {
testRegion.putAll(trialMap);
- DistributedTestCase.join(this.thread, 30 * 1000, null);
+ Threads.join(this.thread, 30 * 1000);
assertTrue(this.testOK);
} catch (Exception e) {
fail("Test has failed due to "+e);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e2f18f97/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/e2f18f97/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryTestListener.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryTestListener.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryTestListener.java
index 8c43e47..e402671 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryTestListener.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryTestListener.java
@@ -30,8 +30,8 @@ import com.gemstone.gemfire.cache.client.Pool;
import com.gemstone.gemfire.cache.query.CqEvent;
import com.gemstone.gemfire.cache.query.CqStatusListener;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
/**
* @author rmadduri
@@ -238,7 +238,7 @@ public class CqQueryTestListener implements CqStatusListener {
return "never got create event for CQ " + CqQueryTestListener.this.cqName + " key " + key;
}
};
- DistributedTestCase.waitForCriterion(ev, MAX_TIME, 200, true);
+ Wait.waitForCriterion(ev, MAX_TIME, 200, true);
return true;
}
@@ -253,7 +253,7 @@ public class CqQueryTestListener implements CqStatusListener {
" expected: " + total + " receieved: " + CqQueryTestListener.this.totalEventCount;
}
};
- DistributedTestCase.waitForCriterion(ev, MAX_TIME, 200, true);
+ Wait.waitForCriterion(ev, MAX_TIME, 200, true);
return true;
}
@@ -266,7 +266,7 @@ public class CqQueryTestListener implements CqStatusListener {
return "never got destroy event for key " + key + " in CQ " + CqQueryTestListener.this.cqName;
}
};
- DistributedTestCase.waitForCriterion(ev, MAX_TIME, 200, true);
+ Wait.waitForCriterion(ev, MAX_TIME, 200, true);
return true;
}
@@ -279,7 +279,7 @@ public class CqQueryTestListener implements CqStatusListener {
return "never got invalidate event for CQ " + CqQueryTestListener.this.cqName;
}
};
- DistributedTestCase.waitForCriterion(ev, MAX_TIME, 200, true);
+ Wait.waitForCriterion(ev, MAX_TIME, 200, true);
return true;
}
@@ -292,7 +292,7 @@ public class CqQueryTestListener implements CqStatusListener {
return "never got update event for CQ " + CqQueryTestListener.this.cqName;
}
};
- DistributedTestCase.waitForCriterion(ev, MAX_TIME, 200, true);
+ Wait.waitForCriterion(ev, MAX_TIME, 200, true);
return true;
}
@@ -305,7 +305,7 @@ public class CqQueryTestListener implements CqStatusListener {
return "never got close event for CQ " + CqQueryTestListener.this.cqName;
}
};
- DistributedTestCase.waitForCriterion(ev, MAX_TIME, 200, true);
+ Wait.waitForCriterion(ev, MAX_TIME, 200, true);
return true;
}
@@ -318,7 +318,7 @@ public class CqQueryTestListener implements CqStatusListener {
return "never got region clear event for CQ " + CqQueryTestListener.this.cqName;
}
};
- DistributedTestCase.waitForCriterion(ev, MAX_TIME, 200, true);
+ Wait.waitForCriterion(ev, MAX_TIME, 200, true);
return true;
}
@@ -331,7 +331,7 @@ public class CqQueryTestListener implements CqStatusListener {
return "never got region invalidate event for CQ " + CqQueryTestListener.this.cqName;
}
};
- DistributedTestCase.waitForCriterion(ev, MAX_TIME, 200, true);
+ Wait.waitForCriterion(ev, MAX_TIME, 200, true);
return true;
}
@@ -354,7 +354,7 @@ public class CqQueryTestListener implements CqStatusListener {
return "never got create error for CQ " + CqQueryTestListener.this.cqName + " messaged " + expectedMessage;
}
};
- DistributedTestCase.waitForCriterion(ev, MAX_TIME, 200, true);
+ Wait.waitForCriterion(ev, MAX_TIME, 200, true);
return true;
}
@@ -368,7 +368,7 @@ public class CqQueryTestListener implements CqStatusListener {
" expected: " + total + " received: " + CqQueryTestListener.this.cqsDisconnectedCount;
}
};
- DistributedTestCase.waitForCriterion(ev, MAX_TIME, 200, true);
+ Wait.waitForCriterion(ev, MAX_TIME, 200, true);
return true;
}
@@ -382,7 +382,7 @@ public class CqQueryTestListener implements CqStatusListener {
" expected: " + total + " receieved: " + CqQueryTestListener.this.cqsConnectedCount;
}
};
- DistributedTestCase.waitForCriterion(ev, MAX_TIME, 200, true);
+ Wait.waitForCriterion(ev, MAX_TIME, 200, true);
return true;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e2f18f97/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..a528220 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,11 +25,15 @@ 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.DUnitEnv;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
public class CompactRangeIndexDUnitTest extends DistributedTestCase{
@@ -43,7 +47,7 @@ public class CompactRangeIndexDUnitTest extends DistributedTestCase{
public void setUp() throws Exception {
super.setUp();
getSystem();
- invokeInEveryVM(new SerializableRunnable("getSystem") {
+ Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
public void run() {
getSystem();
}
@@ -51,7 +55,7 @@ public class CompactRangeIndexDUnitTest extends DistributedTestCase{
Host host = Host.getHost(0);
vm0 = host.getVM(0);
utils = new QueryTestUtils();
- utils.createServer(vm0, getAllDistributedSystemProperties(new Properties()));
+ utils.createServer(vm0, DUnitEnv.getAllDistributedSystemProperties(new Properties()));
utils.createReplicateRegion("exampleRegion", vm0);
utils.createIndex(vm0,"type", "\"type\"", "/exampleRegion");
}
@@ -145,7 +149,7 @@ public class CompactRangeIndexDUnitTest extends DistributedTestCase{
});
as0.join();
if(as0.exceptionOccurred()){
- fail("Query execution failed.", as0.getException());
+ Assert.fail("Query execution failed.", as0.getException());
}
}
@@ -164,7 +168,7 @@ public class CompactRangeIndexDUnitTest extends DistributedTestCase{
}
- public void tearDown2() throws Exception{
+ public void tearDownBeforeDisconnect() throws Exception{
Thread.sleep(5000);
removeHook();
utils.closeServer(vm0);
@@ -191,7 +195,7 @@ public class CompactRangeIndexDUnitTest extends DistributedTestCase{
@Override
public void hook(int spot) throws RuntimeException {
if(spot == 11){
- pause(10);
+ Wait.pause(10);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e2f18f97/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CqTimeTestListener.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CqTimeTestListener.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CqTimeTestListener.java
index 5f3d45d..3d3a2e4 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CqTimeTestListener.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/CqTimeTestListener.java
@@ -25,8 +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 com.gemstone.gemfire.test.dunit.DistributedTestCase;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
/**
* @author anil.
@@ -198,7 +198,7 @@ public class CqTimeTestListener implements CqListener {
return "never got create event for CQ " + CqTimeTestListener.this.cqName;
}
};
- DistributedTestCase.waitForCriterion(ev, MAX_TIME, 200, true);
+ Wait.waitForCriterion(ev, MAX_TIME, 200, true);
return true;
}
@@ -211,7 +211,7 @@ public class CqTimeTestListener implements CqListener {
return "never got destroy event for CQ " + CqTimeTestListener.this.cqName;
}
};
- DistributedTestCase.waitForCriterion(ev, MAX_TIME, 200, true);
+ Wait.waitForCriterion(ev, MAX_TIME, 200, true);
return true;
}
@@ -224,7 +224,7 @@ public class CqTimeTestListener implements CqListener {
return "never got invalidate event for CQ " + CqTimeTestListener.this.cqName;
}
};
- DistributedTestCase.waitForCriterion(ev, MAX_TIME, 200, true);
+ Wait.waitForCriterion(ev, MAX_TIME, 200, true);
return true;
}
@@ -237,7 +237,7 @@ public class CqTimeTestListener implements CqListener {
return "never got update event for CQ " + CqTimeTestListener.this.cqName;
}
};
- DistributedTestCase.waitForCriterion(ev, MAX_TIME, 200, true);
+ Wait.waitForCriterion(ev, MAX_TIME, 200, true);
return true;
}
@@ -250,7 +250,7 @@ public class CqTimeTestListener implements CqListener {
return "never got close event for CQ " + CqTimeTestListener.this.cqName;
}
};
- DistributedTestCase.waitForCriterion(ev, MAX_TIME, 200, true);
+ Wait.waitForCriterion(ev, MAX_TIME, 200, true);
return true;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e2f18f97/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java
index afd2119..a48df77 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HashIndexDUnitTest.java
@@ -21,8 +21,10 @@ import java.util.Properties;
import com.gemstone.gemfire.cache.CacheException;
import com.gemstone.gemfire.cache.query.QueryTestUtils;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.test.dunit.DUnitEnv;
import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -38,7 +40,7 @@ public class HashIndexDUnitTest extends DistributedTestCase{
public void setUp() throws Exception {
super.setUp();
getSystem();
- invokeInEveryVM(new SerializableRunnable("getSystem") {
+ Invoke.invokeInEveryVM(new SerializableRunnable("getSystem") {
public void run() {
getSystem();
}
@@ -46,7 +48,7 @@ public class HashIndexDUnitTest extends DistributedTestCase{
Host host = Host.getHost(0);
vm0 = host.getVM(0);
utils = new QueryTestUtils();
- utils.createServer(vm0, getAllDistributedSystemProperties(new Properties()));
+ utils.createServer(vm0, DUnitEnv.getAllDistributedSystemProperties(new Properties()));
utils.createReplicateRegion("exampleRegion", vm0);
utils.createHashIndex(vm0,"ID", "r.ID", "/exampleRegion r");
}
@@ -122,7 +124,7 @@ public class HashIndexDUnitTest extends DistributedTestCase{
});
}
- public void tearDown2() throws Exception{
+ public void tearDownBeforeDisconnect() throws Exception{
Thread.sleep(5000);
utils.closeServer(vm0);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e2f18f97/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HelperTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HelperTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HelperTestCase.java
index 08a4882..6461333 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HelperTestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HelperTestCase.java
@@ -46,6 +46,7 @@ import com.gemstone.gemfire.cache30.CacheTestCase;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.NetworkSupport;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -239,7 +240,7 @@ public class HelperTestCase extends CacheTestCase {
final ClientCacheFactory ccf = new ClientCacheFactory(properties);
for (int i = 0; i < servers.length; i++) {
- ccf.addPoolServer(getServerHostName(servers[i].getHost()), ports[i]);
+ ccf.addPoolServer(NetworkSupport.getServerHostName(servers[i].getHost()), ports[i]);
}
ccf.setPoolSubscriptionEnabled(true);
ccf.setPoolSubscriptionRedundancy(redundancyLevel);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e2f18f97/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..dc1fd4d 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,12 @@ 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.Invoke;
+import com.gemstone.gemfire.test.dunit.NetworkSupport;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -129,7 +133,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
@@ -165,7 +169,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
final int port1 = server1.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort");
final int port2 = server2.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = getServerHostName(server0.getHost());
+ final String host0 = NetworkSupport.getServerHostName(server0.getHost());
// Create client pool.
final String poolName = "testClientServerQueryPool";
@@ -200,7 +204,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 +223,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 +240,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 +310,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 +318,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 +340,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 +362,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 +391,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;
@@ -423,7 +427,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
final int port1 = server1.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort");
final int port2 = server2.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = getServerHostName(server0.getHost());
+ final String host0 = NetworkSupport.getServerHostName(server0.getHost());
// Create client pool.
final String poolName = "testClientServerQueryPool";
@@ -472,7 +476,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 +504,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 +533,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 +554,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 +576,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 +604,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;
@@ -635,7 +639,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
final int port0 = server0.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort");
final int port1 = server1.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort");
final int port2 = server2.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = getServerHostName(server0.getHost());
+ final String host0 = NetworkSupport.getServerHostName(server0.getHost());
// Create client pool.
final String poolName = "testClientServerQueryPool";
@@ -680,7 +684,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 +712,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 +740,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 +760,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 +780,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 +809,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;
@@ -849,7 +853,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
final int port1 = server1.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort");
final int port2 = server2.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = getServerHostName(server0.getHost());
+ final String host0 = NetworkSupport.getServerHostName(server0.getHost());
// Create client pool.
final String poolName = "testClientServerQueryPool";
@@ -884,7 +888,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 +907,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 +924,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 +994,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 +1002,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 +1024,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 +1045,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 +1074,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;
@@ -1113,7 +1117,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
final int port1 = server1.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort");
final int port2 = server2.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = getServerHostName(server0.getHost());
+ final String host0 = NetworkSupport.getServerHostName(server0.getHost());
// Create client pool.
final String poolName = "testClientServerQueryPool";
@@ -1169,7 +1173,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 +1201,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 +1228,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 +1250,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 +1272,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 +1301,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;
@@ -1340,7 +1344,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
final int port1 = server1.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort");
final int port2 = server2.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = getServerHostName(server0.getHost());
+ final String host0 = NetworkSupport.getServerHostName(server0.getHost());
// Create client pool.
final String poolName = "testClientServerQueryPool";
@@ -1393,7 +1397,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 +1427,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 +1455,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 +1477,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 +1499,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 +1528,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;
@@ -1567,7 +1571,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
final int port1 = server1.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort");
final int port2 = server2.invokeInt(PdxStringQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = getServerHostName(server0.getHost());
+ final String host0 = NetworkSupport.getServerHostName(server0.getHost());
// Create client pool.
final String poolName = "testClientServerQueryPool";
@@ -1633,7 +1637,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 +1659,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);
}
}
}
@@ -1834,8 +1838,8 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
@Override
public Object call() throws Exception {
ClientCacheFactory cf = new ClientCacheFactory();
- cf.addPoolServer(getServerHostName(vm0.getHost()), port1);
- cf.addPoolServer(getServerHostName(vm1.getHost()), port2);
+ cf.addPoolServer(NetworkSupport.getServerHostName(vm0.getHost()), port1);
+ cf.addPoolServer(NetworkSupport.getServerHostName(vm1.getHost()), port2);
ClientCache cache = getClientCache(cf);
Region region = cache.createClientRegionFactory(ClientRegionShortcut.PROXY)
.create(regionName);
@@ -1873,7 +1877,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
}
});
- invokeInEveryVM(DistributedTestCase.class, "disconnectFromDS");
+ Invoke.invokeInEveryVM(DistributedTestCase.class, "disconnectFromDS");
}
protected void configAndStartBridgeServer(boolean isPr, boolean isAccessor, boolean asyncIndex) {
@@ -1897,7 +1901,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 +1966,7 @@ public class PdxStringQueryDUnitTest extends CacheTestCase{
public void run2() throws CacheException {
// Create Cache.
getLonerSystem();
- addExpectedException("Connection refused");
+ IgnoredException.addIgnoredException("Connection refused");
getCache();
PoolFactory cpf = PoolManager.createFactory();
cpf.setSubscriptionEnabled(subscriptionEnabled);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e2f18f97/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..69abe18 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,11 +40,14 @@ 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;
+import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.Threads;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
/**
* This tests the data inconsistency during update on an index and querying the
@@ -91,10 +94,10 @@ public class QueryDataInconsistencyDUnitTest extends CacheTestCase {
}
@Override
- public void tearDown2() throws Exception {
- invokeInEveryVM(CacheTestCase.class, "disconnectFromDS");
- super.tearDown2();
- invokeInEveryVM(QueryObserverHolder.class, "reset");
+ public void tearDownBeforeDisconnect() throws Exception {
+ Invoke.invokeInEveryVM(CacheTestCase.class, "disconnectFromDS");
+ super.tearDownBeforeDisconnect();
+ Invoke.invokeInEveryVM(QueryObserverHolder.class, "reset");
}
@Override
@@ -149,7 +152,7 @@ public class QueryDataInconsistencyDUnitTest extends CacheTestCase {
@Override
public void run2() throws CacheException {
QueryService qs = CacheFactory.getAnyInstance().getQueryService();
- while (!hooked){pause(100);}
+ while (!hooked){Wait.pause(100);}
Object rs = null;
try {
rs = qs.newQuery("<trace> select * from /"+repRegionName+" where ID = 1").execute();
@@ -175,7 +178,7 @@ public class QueryDataInconsistencyDUnitTest extends CacheTestCase {
@Override
public void run2() throws CacheException {
QueryService qs = CacheFactory.getAnyInstance().getQueryService();
- while (!hooked){pause(100);}
+ while (!hooked){Wait.pause(100);}
Object rs = null;
try {
rs = qs.newQuery("<trace> select * from /"+repRegionName+" where ID = 1").execute();
@@ -197,7 +200,7 @@ public class QueryDataInconsistencyDUnitTest extends CacheTestCase {
hooked = false;//Let client put go further.
}
});
- DistributedTestCase.join(putThread, 200, this.getLogWriter());
+ Threads.join(putThread, 200);
}
public void testRangeIndex() {
@@ -252,7 +255,7 @@ public class QueryDataInconsistencyDUnitTest extends CacheTestCase {
public void run2() throws CacheException {
QueryService qs = CacheFactory.getAnyInstance().getQueryService();
Position pos1 = null;
- while (!hooked){pause(100);}
+ while (!hooked){Wait.pause(100);}
try {
Object rs = qs.newQuery("<trace> select pos from /"+repRegionName+" p, p.positions.values pos where pos.secId = 'APPL' AND p.ID = 1").execute();
CacheFactory.getAnyInstance().getLogger().fine("Shobhit: "+rs);
@@ -264,13 +267,13 @@ 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.
}
while (!hooked) {
- pause(100);
+ Wait.pause(100);
}
try {
Object rs = qs.newQuery("<trace> select pos from /"+repRegionName+" p, p.positions.values pos where pos.secId = 'APPL' AND p.ID = 1").execute();
@@ -292,7 +295,7 @@ public class QueryDataInconsistencyDUnitTest extends CacheTestCase {
}
}
});
- DistributedTestCase.join(putThread, 200, this.getLogWriter());
+ Threads.join(putThread, 200);
}
public void testRangeIndexWithIndexAndQueryFromCluaseMisMatch() {
@@ -344,7 +347,7 @@ public class QueryDataInconsistencyDUnitTest extends CacheTestCase {
public void run2() throws CacheException {
QueryService qs = CacheFactory.getAnyInstance().getQueryService();
Position pos1 = null;
- while (!hooked){pause(100);}
+ while (!hooked){Wait.pause(100);}
try {
Object rs = qs.newQuery("<trace> select pos from /"+repRegionName+" p, p.positions.values pos where pos.secId = 'APPL' AND p.ID = 1").execute();
CacheFactory.getAnyInstance().getLogger().fine("Shobhit: "+rs);
@@ -356,13 +359,13 @@ 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.
}
while (!hooked) {
- pause(100);
+ Wait.pause(100);
}
try {
Object rs = qs.newQuery("select pos from /"+repRegionName+" p, p.positions.values pos where pos.secId = 'APPL' AND p.ID = 1").execute();
@@ -383,7 +386,7 @@ public class QueryDataInconsistencyDUnitTest extends CacheTestCase {
}
}
});
- DistributedTestCase.join(putThread, 200, this.getLogWriter());
+ Threads.join(putThread, 200);
}
public void testRangeIndexWithIndexAndQueryFromCluaseMisMatch2() {
@@ -435,7 +438,7 @@ public class QueryDataInconsistencyDUnitTest extends CacheTestCase {
public void run2() throws CacheException {
QueryService qs = CacheFactory.getAnyInstance().getQueryService();
Position pos1 = null;
- while (!hooked){pause(100);}
+ while (!hooked){Wait.pause(100);}
try {
Object rs = qs.newQuery("<trace> select pos from /"+repRegionName+" p, p.collectionHolderMap.values coll, p.positions.values pos where pos.secId = 'APPL' AND p.ID = 1").execute();
CacheFactory.getAnyInstance().getLogger().fine("Shobhit: "+rs);
@@ -447,13 +450,13 @@ 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.
}
while (!hooked) {
- pause(100);
+ Wait.pause(100);
}
try {
Object rs = qs.newQuery("select pos from /"+repRegionName+" p, p.collectionHolderMap.values coll, p.positions.values pos where pos.secId = 'APPL' AND p.ID = 1").execute();
@@ -474,7 +477,7 @@ public class QueryDataInconsistencyDUnitTest extends CacheTestCase {
}
}
});
- DistributedTestCase.join(putThread, 200, this.getLogWriter());
+ Threads.join(putThread, 200);
}
public static void createProxyRegions() {
@@ -553,7 +556,7 @@ public class QueryDataInconsistencyDUnitTest extends CacheTestCase {
hooked = true;
getLogWriter().info("QueryDataInconsistency.IndexManagerTestHook is hooked in Update Index Entry.");
while(hooked) {
- pause(100);
+ Wait.pause(100);
}
assertEquals(hooked, false);
break;
@@ -561,7 +564,7 @@ public class QueryDataInconsistencyDUnitTest extends CacheTestCase {
hooked = true;
getLogWriter().info("QueryDataInconsistency.IndexManagerTestHook is hooked in Remove Index Entry.");
while(hooked) {
- pause(100);
+ Wait.pause(100);
}
assertEquals(hooked, false);
break;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e2f18f97/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..e3111cc 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,12 +61,17 @@ 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.DUnitEnv;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
+import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.Threads;
import com.gemstone.gemfire.test.dunit.VM;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.util.test.TestUtil;
public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
@@ -130,17 +135,17 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
public void setUp() throws Exception {
super.setUp();
//Workaround for #52008
- addExpectedException("Failed to create index");
+ IgnoredException.addIgnoredException("Failed to create index");
}
- public void tearDown2() throws Exception {
- super.tearDown2();
+ public void tearDownBeforeDisconnect() throws Exception {
+ super.tearDownBeforeDisconnect();
// Get the disk store name.
GemFireCacheImpl cache = (GemFireCacheImpl)getCache();
String diskStoreName = cache.getDefaultDiskStoreName();
//reset TestHook
- invokeInEveryVM(resetTestHook());
+ Invoke.invokeInEveryVM(resetTestHook());
// close the cache.
closeCache();
disconnectFromDS();
@@ -168,13 +173,13 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
AsyncInvocation asyInvk1 = vm1.invokeAsync(createIndexThrougXML("vm1testCreateIndexThroughXML", name, fileName));
- DistributedTestCase.join(asyInvk1, 30 * 1000, getLogWriter());
+ Threads.join(asyInvk1, 30 * 1000);
if (asyInvk1.exceptionOccurred()) {
- fail("asyInvk1 failed", asyInvk1.getException());
+ Assert.fail("asyInvk1 failed", asyInvk1.getException());
}
- DistributedTestCase.join(asyInvk0, 30 * 1000, getLogWriter());
+ Threads.join(asyInvk0, 30 * 1000);
if (asyInvk0.exceptionOccurred()) {
- fail("asyInvk0 failed", asyInvk0.getException());
+ Assert.fail("asyInvk0 failed", asyInvk0.getException());
}
// Check index for PR
@@ -438,9 +443,9 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
AsyncInvocation asyInvk0 = vm0.invokeAsync(createIndexThrougXML("vm0testAsyncIndexWhileDoingGII", name, fileName));
- DistributedTestCase.join(asyInvk0, 30 * 1000, getLogWriter());
+ Threads.join(asyInvk0, 30 * 1000);
if (asyInvk0.exceptionOccurred()) {
- fail("asyInvk0 failed", asyInvk0.getException());
+ Assert.fail("asyInvk0 failed", asyInvk0.getException());
}
// LoadRegion
@@ -451,16 +456,16 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
vm0.invoke(prIndexCreationCheck(name, statusIndex, 50));
- DistributedTestCase.join(asyInvk1, 30 * 1000, getLogWriter());
+ Threads.join(asyInvk1, 30 * 1000);
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());
+ Threads.join(asyInvk0, 30 * 1000);
if (asyInvk0.exceptionOccurred()) {
- fail("asyInvk0 failed", asyInvk0.getException());
+ Assert.fail("asyInvk0 failed", asyInvk0.getException());
}
vm1.invoke(resetTestHook());
@@ -546,9 +551,9 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
"Creating index using an xml file name : " + fileName);
AsyncInvocation asyInvk0 = vm0.invokeAsync(createIndexThrougXML("vm0testCreateAsyncIndexGIIAndQuery", name, fileName));
- DistributedTestCase.join(asyInvk0, 30 * 1000, getLogWriter());
+ Threads.join(asyInvk0, 30 * 1000);
if (asyInvk0.exceptionOccurred()) {
- fail("asyInvk0 failed", asyInvk0.getException());
+ Assert.fail("asyInvk0 failed", asyInvk0.getException());
}
// LoadRegion
@@ -558,13 +563,13 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
AsyncInvocation asyInvk1 = vm1.invokeAsync(createIndexThrougXML("vm1testCreateAsyncIndexGIIAndQuery", name, fileName));
- DistributedTestCase.join(asyInvk1, 30 * 1000, getLogWriter());
+ Threads.join(asyInvk1, 30 * 1000);
if (asyInvk1.exceptionOccurred()) {
- fail("asyInvk1 failed", asyInvk1.getException());
+ Assert.fail("asyInvk1 failed", asyInvk1.getException());
}
- DistributedTestCase.join(asyInvk0, 30 * 1000, getLogWriter());
+ Threads.join(asyInvk0, 30 * 1000);
if (asyInvk0.exceptionOccurred()) {
- fail("asyInvk0 failed", asyInvk0.getException());
+ Assert.fail("asyInvk0 failed", asyInvk0.getException());
}
vm0.invoke(prIndexCreationCheck(name, statusIndex, 50));
@@ -611,9 +616,9 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
vm1.invoke(setTestHook());
vm1.invoke(createIndexThrougXML("vm1testAsyncIndexAndCompareQResults", name, fileName));
- DistributedTestCase.join(asyInvk0, 30 * 1000, getLogWriter());
+ Threads.join(asyInvk0, 30 * 1000);
if (asyInvk0.exceptionOccurred()) {
- fail("asyInvk0 failed", asyInvk0.getException());
+ Assert.fail("asyInvk0 failed", asyInvk0.getException());
}
vm1.invoke(prIndexCreationCheck(persistentRegName, "secIndex", 50));
@@ -781,7 +786,7 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
return "Number of Indexed Bucket is less than the expected number. "+ bucketCount + ", " + index.getNumberOfIndexedBuckets();
}
};
- DistributedTestCase.waitForCriterion(ev, MAX_TIME, 200, true);
+ Wait.waitForCriterion(ev, MAX_TIME, 200, true);
return true;
}
@@ -942,7 +947,7 @@ public class QueryIndexUsingXMLDUnitTest extends CacheTestCase {
new Exception("TEST DEBUG###" + diskStoreId).printStackTrace();
if (system == null || !system.isConnected()) {
// Figure out our distributed system properties
- Properties p = getAllDistributedSystemProperties(getDistributedSystemProperties());
+ Properties p = DUnitEnv.getAllDistributedSystemProperties(getDistributedSystemProperties());
system = (InternalDistributedSystem)DistributedSystem.connect(p);
}
return system;
@@ -956,13 +961,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/e2f18f97/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
index 8030f09..5cb5bef 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
@@ -32,6 +32,7 @@ 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.Host;
+import com.gemstone.gemfire.test.dunit.NetworkSupport;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -83,7 +84,7 @@ public class QueryParamsAuthorizationDUnitTest extends CacheTestCase {
@Override
public Object call() throws Exception {
ClientCacheFactory ccf = new ClientCacheFactory()
- .addPoolServer(getServerHostName(server1.getHost()), port)
+ .addPoolServer(NetworkSupport.getServerHostName(server1.getHost()), port)
.set("security-client-auth-init",
"templates.security.UserPasswordAuthInit.create")
.set("security-username", "root").set("security-password", "root");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e2f18f97/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..e26f029 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,11 @@ 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.Invoke;
+import com.gemstone.gemfire.test.dunit.NetworkSupport;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -130,12 +134,12 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
}
@Override
- public void tearDown2() throws Exception {
- invokeInEveryVM(CacheTestCase.class, "disconnectFromDS");
- super.tearDown2();
- invokeInEveryVM(QueryObserverHolder.class, "reset");
+ public void tearDownBeforeDisconnect() throws Exception {
+ Invoke.invokeInEveryVM(CacheTestCase.class, "disconnectFromDS");
+ super.tearDownBeforeDisconnect();
+ Invoke.invokeInEveryVM(QueryObserverHolder.class, "reset");
cache = null;
- invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } });
+ Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } });
}
@Override
@@ -156,7 +160,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
* Test on Replicated Region.
*/
public void testQueriesWithFilterKeysOnReplicatedRegion() {
- addExpectedException("IllegalArgumentException");
+ IgnoredException.addIgnoredException("IllegalArgumentException");
Object[][] r = new Object[queriesForRR.length][2];
@@ -226,7 +230,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
public void testInvalidQueries() {
- addExpectedException("Syntax error");
+ IgnoredException.addIgnoredException("Syntax error");
client.invoke(new CacheSerializableRunnable("Test query on client and server") {
@Override
@@ -361,7 +365,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
*
*/
public void testQueriesWithFilterKeysOnPRWithBucketDestroy() {
- addExpectedException("QueryInvocationTargetException");
+ IgnoredException.addIgnoredException("QueryInvocationTargetException");
Object[][] r = new Object[queries.length][2];
Set filter = new HashSet();
@@ -433,11 +437,11 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
*
*/
public void testQueriesWithFilterKeysOnPRWithRebalancing() {
- addExpectedException("QueryInvocationTargetException");
- addExpectedException("java.net.SocketException");
- addExpectedException("ServerConnectivityException");
- addExpectedException("FunctionException");
- addExpectedException("IOException");
+ IgnoredException.addIgnoredException("QueryInvocationTargetException");
+ IgnoredException.addIgnoredException("java.net.SocketException");
+ IgnoredException.addIgnoredException("ServerConnectivityException");
+ IgnoredException.addIgnoredException("FunctionException");
+ IgnoredException.addIgnoredException("IOException");
// Close cache on server1
server1.invoke(new CacheSerializableRunnable("Set QueryObserver in cache on server1") {
@@ -512,7 +516,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
public void testNonColocatedRegionQueries() {
- addExpectedException("UnsupportedOperationException");
+ IgnoredException.addIgnoredException("UnsupportedOperationException");
client.invoke(new CacheSerializableRunnable("Test query on non-colocated regions on server") {
@Override
public void run2() throws CacheException {
@@ -527,7 +531,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);
}
}
}
@@ -725,7 +729,7 @@ public class QueryUsingFunctionContextDUnitTest extends CacheTestCase {
//Create client cache without regions
client.invoke(QueryUsingFunctionContextDUnitTest.class, "createCacheClientWithoutRegion",
- new Object[] { getServerHostName(server1.getHost()), port1, port2,
+ new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1, port2,
port3 });
//Create proxy regions on client.