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/09 19:44:34 UTC
[24/51] [partial] incubator-geode git commit: GEODE-773: Extract
static methods from DistributedTestCase
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/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..236076a 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,9 +36,14 @@ 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.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
/**
* Tests behaviour of transactions in client server model
@@ -111,10 +116,10 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
{
Integer port1 = initServerCache(server1);
client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { getServerHostName(server1.getHost()), port1 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 });
client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { getServerHostName(server1.getHost()), port1 });
- pause(PAUSE);
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 });
+ Wait.pause(PAUSE);
server1.invoke(resetFlags());
client1.invoke(resetFlags());
@@ -122,14 +127,14 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
server1.invoke(CacheServerTransactionsDUnitTest.class, "putInTransaction",
new Object[] { "server1" });
- pause(PAUSE);
+ Wait.pause(PAUSE);
client1.invoke(CacheServerTransactionsDUnitTest.class, "verifyNotUpdated");
client2.invoke(CacheServerTransactionsDUnitTest.class, "verifyNotUpdated");
server1.invoke(CacheServerTransactionsDUnitTest.class,
"commitTransactionOnServer1");
- pause(PAUSE);
+ Wait.pause(PAUSE);
server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdates");
client1.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdates");
@@ -148,10 +153,10 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
Integer port1 = initServerCache(server1);
Integer port2 = initServerCache(server2);
client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { getServerHostName(server1.getHost()), port1, port2 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2 });
client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { getServerHostName(server1.getHost()), port1, port2 });
- pause(PAUSE);
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2 });
+ Wait.pause(PAUSE);
server1.invoke(resetFlags());
server2.invoke(resetFlags());
@@ -160,7 +165,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
server1.invoke(CacheServerTransactionsDUnitTest.class, "putInTransaction",
new Object[] { "server1" });
- pause(PAUSE);
+ Wait.pause(PAUSE);
server2.invoke(CacheServerTransactionsDUnitTest.class, "verifyNotUpdated");
client1.invoke(CacheServerTransactionsDUnitTest.class, "verifyNotUpdated");
@@ -168,7 +173,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
server1.invoke(CacheServerTransactionsDUnitTest.class,
"commitTransactionOnServer1");
- pause(PAUSE);
+ Wait.pause(PAUSE);
server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdates");
server2.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdates");
@@ -186,10 +191,10 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
Integer port1 = initServerCache(server1);
Integer port2 = initServerCache(server2);
client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { getServerHostName(server1.getHost()), port1 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 });
client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { getServerHostName(server1.getHost()), port2 });
- pause(PAUSE);
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port2 });
+ Wait.pause(PAUSE);
server1.invoke(resetFlags());
server2.invoke(resetFlags());
@@ -198,7 +203,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
server1.invoke(CacheServerTransactionsDUnitTest.class, "putInTransaction",
new Object[] { "server1" });
- pause(PAUSE);
+ Wait.pause(PAUSE);
server2.invoke(CacheServerTransactionsDUnitTest.class, "verifyNotUpdated");
client1.invoke(CacheServerTransactionsDUnitTest.class, "verifyNotUpdated");
@@ -206,7 +211,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
server1.invoke(CacheServerTransactionsDUnitTest.class,
"commitTransactionOnServer1");
- pause(PAUSE);
+ Wait.pause(PAUSE);
server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdates");
server2.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdates");
@@ -222,10 +227,10 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
{
Integer port1 = initServerCache(server1);
client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { getServerHostName(server1.getHost()), port1 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 });
client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { getServerHostName(server1.getHost()), port1 });
- pause(PAUSE);
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 });
+ Wait.pause(PAUSE);
server1.invoke(resetFlags());
client1.invoke(resetFlags());
@@ -235,7 +240,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
new Object[] { "server1" });
server1.invoke(CacheServerTransactionsDUnitTest.class,
"commitTransactionOnServer1");
- pause(PAUSE);
+ Wait.pause(PAUSE);
server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyInvalidates");
client1.invoke(CacheServerTransactionsDUnitTest.class, "verifyInvalidates");
@@ -251,10 +256,10 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
Integer port1 = initServerCache(server1);
Integer port2 = initServerCache(server2);
client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { getServerHostName(server1.getHost()), port1, port2 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2 });
client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { getServerHostName(server1.getHost()), port1, port2 });
- pause(PAUSE);
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2 });
+ Wait.pause(PAUSE);
server1.invoke(resetFlags());
server2.invoke(resetFlags());
@@ -265,7 +270,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
new Object[] { "server1" });
server1.invoke(CacheServerTransactionsDUnitTest.class,
"commitTransactionOnServer1");
- pause(PAUSE);
+ Wait.pause(PAUSE);
server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyInvalidates");
server2.invoke(CacheServerTransactionsDUnitTest.class, "verifyInvalidates");
@@ -283,10 +288,10 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
Integer port1 = initServerCache(server1);
Integer port2 = initServerCache(server2);
client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { getServerHostName(server1.getHost()), port1 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 });
client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { getServerHostName(server1.getHost()), port2 });
- pause(PAUSE);
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port2 });
+ Wait.pause(PAUSE);
server1.invoke(resetFlags());
server2.invoke(resetFlags());
@@ -297,7 +302,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
new Object[] { "server1" });
server1.invoke(CacheServerTransactionsDUnitTest.class,
"commitTransactionOnServer1");
- pause(PAUSE);
+ Wait.pause(PAUSE);
server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyInvalidates");
server2.invoke(CacheServerTransactionsDUnitTest.class, "verifyInvalidates");
@@ -315,10 +320,10 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
{
Integer port1 = initServerCache(server1);
client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { getServerHostName(server1.getHost()), port1 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 });
client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { getServerHostName(server1.getHost()), port1 });
- pause(PAUSE);
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 });
+ Wait.pause(PAUSE);
server1.invoke(resetFlags());
client1.invoke(resetFlags());
@@ -328,7 +333,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
new Object[] { "server1" });
server1.invoke(CacheServerTransactionsDUnitTest.class,
"commitTransactionOnServer1");
- pause(PAUSE);
+ Wait.pause(PAUSE);
server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyDestroys");
client1.invoke(CacheServerTransactionsDUnitTest.class, "verifyDestroys");
@@ -344,10 +349,10 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
Integer port1 = initServerCache(server1);
Integer port2 = initServerCache(server2);
client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { getServerHostName(server1.getHost()), port1, port2 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2 });
client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { getServerHostName(server1.getHost()), port1, port2 });
- pause(PAUSE);
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2 });
+ Wait.pause(PAUSE);
server1.invoke(resetFlags());
server2.invoke(resetFlags());
@@ -358,7 +363,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
new Object[] { "server1" });
server1.invoke(CacheServerTransactionsDUnitTest.class,
"commitTransactionOnServer1");
- pause(PAUSE);
+ Wait.pause(PAUSE);
server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyDestroys");
server2.invoke(CacheServerTransactionsDUnitTest.class, "verifyDestroys");
@@ -376,10 +381,10 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
Integer port1 = initServerCache(server1);
Integer port2 = initServerCache(server2);
client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { getServerHostName(server1.getHost()), port1 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 });
client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { getServerHostName(server1.getHost()), port2 });
- pause(PAUSE);
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port2 });
+ Wait.pause(PAUSE);
server1.invoke(resetFlags());
server2.invoke(resetFlags());
@@ -390,7 +395,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
new Object[] { "server1" });
server1.invoke(CacheServerTransactionsDUnitTest.class,
"commitTransactionOnServer1");
- pause(PAUSE);
+ Wait.pause(PAUSE);
server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyDestroys");
server2.invoke(CacheServerTransactionsDUnitTest.class, "verifyDestroys");
@@ -409,11 +414,11 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
Integer port2 = ((Integer)server2.invoke(
CacheServerTransactionsDUnitTest.class, "createServerCache"));
client1.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { getServerHostName(server1.getHost()), port1 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1 });
client2.invoke(CacheServerTransactionsDUnitTest.class, "createClientCache",
- new Object[] { getServerHostName(server1.getHost()), port2 });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port2 });
client1.invoke(CacheServerTransactionsDUnitTest.class, "commitTransactionOnClient");
- pause(PAUSE);
+ Wait.pause(PAUSE);
server1.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdatesOnServer");
server2.invoke(CacheServerTransactionsDUnitTest.class, "verifyUpdatesOnServer");
@@ -455,7 +460,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
final Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME);
assertNotNull(r1);
try {
- getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"vlaue for the key k1" + r1.getEntry(k1).getValue());
WaitCriterion ev = new WaitCriterion() {
public boolean done() {
@@ -466,7 +471,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
return null;
}
};
- DistributedTestCase.waitForCriterion(ev, 120 * 1000, 200, true);
+ Wait.waitForCriterion(ev, 120 * 1000, 200, true);
ev = new WaitCriterion() {
public boolean done() {
@@ -477,7 +482,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
return null;
}
};
- DistributedTestCase.waitForCriterion(ev, 120 * 1000, 200, true);
+ Wait.waitForCriterion(ev, 120 * 1000, 200, true);
}
catch (Exception e) {
fail("Exception in trying to get due to " + e);
@@ -565,7 +570,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
final Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME);
assertNotNull(r1);
try {
- getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"vlaue for the key k1" + r1.getEntry(k1).getValue());
// wait until
// condition is
@@ -579,7 +584,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
return null;
}
};
- DistributedTestCase.waitForCriterion(ev, 120 * 1000, 200, true);
+ Wait.waitForCriterion(ev, 120 * 1000, 200, true);
ev = new WaitCriterion() {
public boolean done() {
@@ -590,7 +595,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
return null;
}
};
- DistributedTestCase.waitForCriterion(ev, 120 * 1000, 200, true);
+ Wait.waitForCriterion(ev, 120 * 1000, 200, true);
}
catch (Exception e) {
fail("Exception in trying to get due to " + e);
@@ -613,7 +618,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
+ "; it is still " + r1.getEntry(k1).getValue();
}
};
- DistributedTestCase.waitForCriterion(ev, 120 * 1000, 200, true);
+ Wait.waitForCriterion(ev, 120 * 1000, 200, true);
ev = new WaitCriterion() {
public boolean done() {
@@ -624,7 +629,7 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
return null;
}
};
- DistributedTestCase.waitForCriterion(ev, 120 * 1000, 200, true);
+ Wait.waitForCriterion(ev, 120 * 1000, 200, true);
}
catch (Exception e) {
fail("Exception in trying to get due to " + e);
@@ -810,7 +815,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 +831,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);
}
}
@@ -838,9 +843,8 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
}
}
- public void tearDown2() throws Exception
- {
- super.tearDown2();
+ @Override
+ protected final void preTearDown() throws Exception {
// close the clients first
client1.invoke(CacheServerTransactionsDUnitTest.class, "closeCache");
client2.invoke(CacheServerTransactionsDUnitTest.class, "closeCache");
@@ -848,5 +852,4 @@ public class CacheServerTransactionsDUnitTest extends DistributedTestCase
server1.invoke(CacheServerTransactionsDUnitTest.class, "closeCache");
server2.invoke(CacheServerTransactionsDUnitTest.class, "closeCache");
}
-
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/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 404d977..15beecd 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,8 +36,11 @@ 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.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.cache.client.*;
import com.gemstone.gemfire.cache.client.internal.PoolImpl;
@@ -103,9 +106,9 @@ public class ClearPropagationDUnitTest extends DistributedTestCase
"createServerCache")).intValue();
client1.invoke(ClearPropagationDUnitTest.class, "createClientCache",
- new Object[] { getServerHostName(server1.getHost()), new Integer(PORT1), new Integer(PORT2) });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1), new Integer(PORT2) });
client2.invoke(ClearPropagationDUnitTest.class, "createClientCache",
- new Object[] { getServerHostName(server1.getHost()), new Integer(PORT1), new Integer(PORT2) });
+ new Object[] { NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1), new Integer(PORT2) });
CacheObserverHolder.setInstance(new CacheObserverAdapter());
@@ -160,7 +163,7 @@ public class ClearPropagationDUnitTest extends DistributedTestCase
client1.invoke(ClearPropagationDUnitTest.class,
"acquireConnectionsAndClear",
- new Object[] { getServerHostName(client1.getHost())});
+ new Object[] { NetworkUtils.getServerHostName(client1.getHost())});
client1.invoke(checkSizeRegion(2, false/*Do not Block*/));
client2.invoke(checkSizeRegion(0, true /* block*/));
@@ -211,7 +214,7 @@ public class ClearPropagationDUnitTest extends DistributedTestCase
client1.invoke(ClearPropagationDUnitTest.class,
"acquireConnectionsAndDestroyRegion",
- new Object[] { getServerHostName(client1.getHost())});
+ new Object[] { NetworkUtils.getServerHostName(client1.getHost())});
client1.invoke(checkSizeRegion(2, false/*Do not Block*/));
client2.invoke(checkDestroyRegion(true /* block*/));
@@ -263,7 +266,7 @@ public class ClearPropagationDUnitTest extends DistributedTestCase
{
Region region = cache.getRegion(Region.SEPARATOR + REGION_NAME);
assertNotNull(region);
- getLogWriter().info("Size of the region " + region.size());
+ LogWriterUtils.getLogWriter().info("Size of the region " + region.size());
if (toBlock) {
synchronized (ClearPropagationDUnitTest.class) {
@@ -348,7 +351,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);
}
}
@@ -431,7 +434,7 @@ public class ClearPropagationDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
- fail("failed while registering interest", ex);
+ Assert.fail("failed while registering interest", ex);
}
}
@@ -445,7 +448,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);
}
}
@@ -461,7 +464,7 @@ public class ClearPropagationDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
- fail("failed while region", ex);
+ Assert.fail("failed while region", ex);
}
}
@@ -473,14 +476,13 @@ public class ClearPropagationDUnitTest extends DistributedTestCase
}
}
- public void tearDown2() throws Exception
- {
+ @Override
+ protected final void preTearDown() throws Exception {
//close client
client1.invoke(ClearPropagationDUnitTest.class, "closeCache");
client2.invoke(ClearPropagationDUnitTest.class, "closeCache");
//close server
server1.invoke(ClearPropagationDUnitTest.class, "closeCache");
server2.invoke(ClearPropagationDUnitTest.class, "closeCache");
-
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/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..3a7c246 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,9 +39,14 @@ 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.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.internal.cache.CacheServerImpl;
/**
@@ -105,7 +110,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 +119,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,13 +128,13 @@ 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);
}
}
private void performSteps(String conflation) throws Exception {
- createClientCacheFeeder(getServerHostName(Host.getHost(0)), new Integer(PORT));
- vm1.invoke(ClientConflationDUnitTest.class, "createClientCache", new Object[] { getServerHostName(vm1.getHost()), new Integer(PORT),
+ createClientCacheFeeder(NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT));
+ vm1.invoke(ClientConflationDUnitTest.class, "createClientCache", new Object[] { NetworkUtils.getServerHostName(vm1.getHost()), new Integer(PORT),
conflation});
vm1.invoke(ClientConflationDUnitTest.class, "setClientServerObserverForBeforeInterestRecovery");
vm1.invoke(ClientConflationDUnitTest.class, "setAllCountersZero");
@@ -334,7 +339,7 @@ public class ClientConflationDUnitTest extends DistributedTestCase
return null;
}
};
- DistributedTestCase.waitForCriterion(ev, 60 * 1000, 200, true);
+ Wait.waitForCriterion(ev, 60 * 1000, 200, true);
final int u1 = update1;
ev = new WaitCriterion() {
@@ -346,7 +351,7 @@ public class ClientConflationDUnitTest extends DistributedTestCase
return null;
}
};
- DistributedTestCase.waitForCriterion(ev, 60 * 1000, 200, true);
+ Wait.waitForCriterion(ev, 60 * 1000, 200, true);
ev = new WaitCriterion() {
public boolean done() {
@@ -357,7 +362,7 @@ public class ClientConflationDUnitTest extends DistributedTestCase
return null;
}
};
- DistributedTestCase.waitForCriterion(ev, 60 * 1000, 200, true);
+ Wait.waitForCriterion(ev, 60 * 1000, 200, true);
final int u2 = update2;
ev = new WaitCriterion() {
@@ -369,7 +374,7 @@ public class ClientConflationDUnitTest extends DistributedTestCase
return null;
}
};
- DistributedTestCase.waitForCriterion(ev, 60 * 1000, 200, true);
+ Wait.waitForCriterion(ev, 60 * 1000, 200, true);
}
/**
@@ -500,7 +505,7 @@ public class ClientConflationDUnitTest extends DistributedTestCase
public static void putEntries()
{
try {
- getLogWriter().info("Putting entries...");
+ LogWriterUtils.getLogWriter().info("Putting entries...");
Region r1 = cacheFeeder.getRegion(Region.SEPARATOR +REGION_NAME1);
Region r2 = cacheFeeder.getRegion(Region.SEPARATOR +REGION_NAME2);
r1.put("key-1", "11");
@@ -516,15 +521,15 @@ public class ClientConflationDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
ex.printStackTrace();
- fail("failed while region.put()", ex);
+ Assert.fail("failed while region.put()", ex);
}
}
/**
* close the cache in tearDown
*/
- public void tearDown2() throws Exception
- {
+ @Override
+ protected final void preTearDown() throws Exception {
// close client
closeCacheFeeder();
vm1.invoke(ClientConflationDUnitTest.class, "closeCacheClient");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/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 0a8a45a..1a6b038 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
@@ -41,8 +41,8 @@ import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.EventID;
-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;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
/**
@@ -176,7 +176,7 @@ public class ClientHealthMonitorJUnitTest
return null;
}
};
- DistributedTestCase.waitForCriterion(ev, 20 * 1000, 200, true);
+ Wait.waitForCriterion(ev, 20 * 1000, 200, true);
assertEquals(1, s.getInt("currentClients"));
assertEquals(1, s.getInt("currentClientConnections"));
@@ -193,7 +193,7 @@ public class ClientHealthMonitorJUnitTest
return null;
}
};
- DistributedTestCase.waitForCriterion(ev, TIME_BETWEEN_PINGS * 5, 200, true);
+ Wait.waitForCriterion(ev, TIME_BETWEEN_PINGS * 5, 200, true);
{
this.system.getLogWriter().info("currentClients="
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/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..22f36cd 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,9 +39,14 @@ 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.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
/**
* This test verifies the per-client notify-by-subscription (NBS) override
@@ -170,7 +175,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);
}
}
@@ -181,14 +186,14 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
// Create a feeder.
vm0.invoke(ClientInterestNotifyDUnitTest.class, "createClientCacheFeeder",
- new Object[] {getServerHostName(Host.getHost(0)), new Integer(PORT)});
+ new Object[] {NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)});
// Client 1 overrides NBS to true.
// Client 2 "overrides" NSB to false.
// Client 3 uses the default NBS which is false on the server.
vm1.invoke(ClientInterestNotifyDUnitTest.class, "createClientCache",
- new Object[] { getServerHostName(Host.getHost(0)), new Integer(PORT), "ClientOn"});
+ new Object[] { NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT), "ClientOn"});
/*
vm2.invoke(ClientInterestNotifyDUnitTest.class, "createClientCache",
new Object[] { getServerHostName(Host.getHost(0)), new Integer(PORT),
@@ -460,7 +465,7 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
return excuse;
}
};
- DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+ Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
}
/**
@@ -567,7 +572,7 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
public static void doEntryOps()
{
try {
- getLogWriter().info("Putting entries...");
+ LogWriterUtils.getLogWriter().info("Putting entries...");
Cache cacheClient = GemFireCacheImpl.getInstance();
Region r1 = cacheClient.getRegion(Region.SEPARATOR +REGION_NAME1);
Region r2 = cacheClient.getRegion(Region.SEPARATOR +REGION_NAME2);
@@ -587,7 +592,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);
}
}
@@ -597,7 +602,7 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
public static void doFeed()
{
try {
- getLogWriter().info("Putting entries...");
+ LogWriterUtils.getLogWriter().info("Putting entries...");
Cache cacheClient = GemFireCacheImpl.getInstance();
Region r1 = cacheClient.getRegion(Region.SEPARATOR +REGION_NAME1);
Region r2 = cacheClient.getRegion(Region.SEPARATOR +REGION_NAME2);
@@ -608,7 +613,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);
}
}
@@ -618,22 +623,22 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
public static void getEntries()
{
try {
- getLogWriter().info("Getting entries...");
+ LogWriterUtils.getLogWriter().info("Getting entries...");
Cache cacheClient = GemFireCacheImpl.getInstance();
Region r3 = cacheClient.getRegion(Region.SEPARATOR +REGION_NAME3);
r3.get("key-1");
}
catch (Exception ex) {
ex.printStackTrace();
- fail("failed while region doing ops", ex);
+ Assert.fail("failed while region doing ops", ex);
}
}
/**
* close the caches in tearDown
*/
- public void tearDown2() throws Exception
- {
+ @Override
+ protected final void preTearDown() throws Exception {
vm0.invoke(ClientInterestNotifyDUnitTest.class, "closeCache");
vm1.invoke(ClientInterestNotifyDUnitTest.class, "closeCache");
/*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/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..0f40428 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,11 +41,16 @@ 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.DistributedTestCase;
+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.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
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;
import java.util.Iterator;
import java.util.Properties;
@@ -142,13 +147,13 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
public void testConcurrentOperationsWithDRandPR() throws Exception {
int port1 = initServerCache(true); // vm0
int port2 = initServerCache2(true); // vm1
- String serverName = getServerHostName(Host.getHost(0));
+ String serverName = NetworkUtils.getServerHostName(Host.getHost(0));
host.getVM(2).invoke(this.getClass(), "createClientCacheV", new Object[]{serverName, port1});
host.getVM(3).invoke(this.getClass(), "createClientCacheV", new Object[]{serverName, port2});
- getLogWriter().info("Testing concurrent map operations from a client with a distributed region");
+ LogWriterUtils.getLogWriter().info("Testing concurrent map operations from a client with a distributed region");
concurrentMapTest(host.getVM(2), "/" + REGION_NAME1);
// TODO add verification in vm3
- getLogWriter().info("Testing concurrent map operations from a client with a partitioned region");
+ LogWriterUtils.getLogWriter().info("Testing concurrent map operations from a client with a partitioned region");
concurrentMapTest(host.getVM(2), "/" + PR_REGION_NAME);
// TODO add verification in vm3
}
@@ -156,13 +161,13 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
public void testConcurrentOperationsWithDRandPRandEmptyClient() throws Exception {
int port1 = initServerCache(true); // vm0
int port2 = initServerCache2(true); // vm1
- String serverName = getServerHostName(Host.getHost(0));
+ String serverName = NetworkUtils.getServerHostName(Host.getHost(0));
host.getVM(2).invoke(this.getClass(), "createEmptyClientCache", new Object[]{serverName, port1});
host.getVM(3).invoke(this.getClass(), "createClientCacheV", new Object[]{serverName, port2});
- getLogWriter().info("Testing concurrent map operations from a client with a distributed region");
+ LogWriterUtils.getLogWriter().info("Testing concurrent map operations from a client with a distributed region");
concurrentMapTest(host.getVM(2), "/" + REGION_NAME1);
// TODO add verification in vm3
- getLogWriter().info("Testing concurrent map operations from a client with a partitioned region");
+ LogWriterUtils.getLogWriter().info("Testing concurrent map operations from a client with a partitioned region");
concurrentMapTest(host.getVM(2), "/" + PR_REGION_NAME);
// TODO add verification in vm3
}
@@ -374,7 +379,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
{
// start server first
PORT1 = initServerCache(true);
- createClientCache(getServerHostName(Host.getHost(0)), PORT1);
+ createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1);
populateCache();
registerInterest();
server1.invoke(ClientServerMiscDUnitTest.class, "put");
@@ -407,11 +412,11 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
{
// start server first
PORT1 = initServerCache(true);
- createClientCache(getServerHostName(Host.getHost(0)), PORT1);
+ createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1);
populateCache();
registerInterestInBothTheRegions();
closeRegion1();
- pause(6000);
+ Wait.pause(6000);
server1.invoke(ClientServerMiscDUnitTest.class,
"verifyInterestListOnServer");
server1.invoke(ClientServerMiscDUnitTest.class, "put");
@@ -430,7 +435,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
{
// start server first
PORT1 = initServerCache(true);
- pool = (PoolImpl)createClientCache(getServerHostName(Host.getHost(0)),PORT1);
+ pool = (PoolImpl)createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)),PORT1);
populateCache();
registerInterestInBothTheRegions();
closeBothRegions();
@@ -457,7 +462,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
public void testCCPDestroyOnLastDestroyRegion() throws Exception
{
PORT1 = initServerCache(true);
- PoolImpl pool = (PoolImpl)createClientCache(getServerHostName(Host.getHost(0)),PORT1);
+ PoolImpl pool = (PoolImpl)createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)),PORT1);
destroyRegion1();
// pause(5000);
server1.invoke(ClientServerMiscDUnitTest.class,
@@ -494,7 +499,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
{
// start server first
PORT1 = initServerCache(false);
- createClientCache(getServerHostName(Host.getHost(0)), PORT1);
+ createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1);
registerInterestForInvalidatesInBothTheRegions();
populateCache();
server1.invoke(ClientServerMiscDUnitTest.class, "put");
@@ -515,7 +520,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
{
// start server first
PORT1 = initServerCache(false);
- createClientCache(getServerHostName(Host.getHost(0)), PORT1);
+ createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), PORT1);
registerInterestForInvalidatesInBothTheRegions();
Region region = static_cache.getRegion(REGION_NAME1);
populateCache();
@@ -561,7 +566,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
props.setProperty(DistributionConfig.LOCATORS_NAME, "");
new ClientServerMiscDUnitTest("temp").createCache(props);
- String host = getServerHostName(server1.getHost());
+ String host = NetworkUtils.getServerHostName(server1.getHost());
PoolImpl p = (PoolImpl)PoolManager.createFactory()
.addServer(host, PORT1)
.setSubscriptionEnabled(true)
@@ -601,7 +606,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
return excuse;
}
};
- DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+ Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
// assertEquals(region1.getEntry(k1).getValue(), k1);
wc = new WaitCriterion() {
@@ -614,7 +619,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
return excuse;
}
};
- DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+ Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
wc = new WaitCriterion() {
String excuse;
@@ -626,7 +631,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
return excuse;
}
};
- DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+ Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
// assertEquals(region1.getEntry(k2).getValue(), k2);
// assertEquals(region2.getEntry(k1).getValue(), k1);
@@ -640,7 +645,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
return excuse;
}
};
- DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+ Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
// assertEquals(region2.getEntry(k2).getValue(), k2);
}
@@ -664,7 +669,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
ds.disconnect();
ds = getSystem(props);
PORT1 = initServerCache(true);
- String host = getServerHostName(server1.getHost());
+ String host = NetworkUtils.getServerHostName(server1.getHost());
Pool p = PoolManager.createFactory()
.addServer(host, PORT1)
.setSubscriptionEnabled(true)
@@ -686,7 +691,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
assertNotNull(region2);
//region1.registerInterest(CacheClientProxy.ALL_KEYS);
region2.registerInterest("ALL_KEYS");
- pause(6000);
+ Wait.pause(6000);
server1.invoke(ClientServerMiscDUnitTest.class,
"verifyInterestListOnServer");
@@ -707,7 +712,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
public void testBug35380() throws Exception
{
//work around GEODE-477
- addExpectedException("Connection reset");
+ IgnoredException.addIgnoredException("Connection reset");
Properties props = new Properties();
props.setProperty("mcast-port", "0");
props.setProperty("locators", "");
@@ -715,7 +720,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
assertNotNull(ds);
PORT1 = initServerCache(true);
- String host = getServerHostName(server1.getHost());
+ String host = NetworkUtils.getServerHostName(server1.getHost());
Pool p = PoolManager.createFactory()
.addServer(host, PORT1)
.setSubscriptionEnabled(true)
@@ -849,7 +854,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
return excuse;
}
};
- DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+ Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
return p;
}
@@ -900,7 +905,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 +922,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
}
catch (CacheWriterException e) {
e.printStackTrace();
- fail(
+ Assert.fail(
"Test failed due to CacheWriterException during registerInterestnBothRegions",
e);
}
@@ -936,7 +941,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
}
catch (CacheWriterException e) {
e.printStackTrace();
- fail(
+ Assert.fail(
"Test failed due to CacheWriterException during registerInterestnBothRegions",
e);
}
@@ -952,7 +957,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 +977,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 +991,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 +1005,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 +1017,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);
}
}
@@ -1068,7 +1073,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
return excuse;
}
};
- DistributedTestCase.waitForCriterion(wc, 40 * 1000, 1000, true);
+ Wait.waitForCriterion(wc, 40 * 1000, 1000, true);
}
catch (Exception ex) {
ex.printStackTrace();
@@ -1113,7 +1118,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
return excuse;
}
};
- DistributedTestCase.waitForCriterion(wc, 40 * 1000, 1000, true);
+ Wait.waitForCriterion(wc, 40 * 1000, 1000, true);
}
catch (Exception ex) {
ex.printStackTrace();
@@ -1145,7 +1150,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 +1175,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);
}
}
@@ -1193,7 +1198,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
return excuse;
}
};
- DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+ Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
// assertEquals(k1, r1.getEntry(k1).getValue());
wc = new WaitCriterion() {
@@ -1206,7 +1211,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
return excuse;
}
};
- DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+ Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
// assertEquals(k2, r1.getEntry(k2).getValue());
wc = new WaitCriterion() {
@@ -1219,7 +1224,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
return excuse;
}
};
- DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+ Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
// assertEquals(server_k1, r2.getEntry(k1).getValue());
wc = new WaitCriterion() {
@@ -1232,12 +1237,12 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
return excuse;
}
};
- DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+ Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
// assertEquals(server_k2, r2.getEntry(k2).getValue());
}
catch (Exception ex) {
- fail("failed while verifyUpdates()", ex);
+ Assert.fail("failed while verifyUpdates()", ex);
}
}
@@ -1260,7 +1265,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
return excuse;
}
};
- DistributedTestCase.waitForCriterion(wc, 90 * 1000, 1000, true);
+ Wait.waitForCriterion(wc, 90 * 1000, 1000, true);
// assertNull(r1.getEntry(k1).getValue());
wc = new WaitCriterion() {
@@ -1273,7 +1278,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
return excuse;
}
};
- DistributedTestCase.waitForCriterion(wc, 90 * 1000, 1000, true);
+ Wait.waitForCriterion(wc, 90 * 1000, 1000, true);
// assertNull(r1.getEntry(k2).getValue());
wc = new WaitCriterion() {
@@ -1286,7 +1291,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
return excuse;
}
};
- DistributedTestCase.waitForCriterion(wc, 90 * 1000, 1000, true);
+ Wait.waitForCriterion(wc, 90 * 1000, 1000, true);
// assertNull(r2.getEntry(k1).getValue());
@@ -1300,7 +1305,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
return excuse;
}
};
- DistributedTestCase.waitForCriterion(wc, 90 * 1000, 1000, true);
+ Wait.waitForCriterion(wc, 90 * 1000, 1000, true);
// assertNull(r2.getEntry(k2).getValue());
wc = new WaitCriterion() {
@@ -1313,10 +1318,10 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
return excuse;
}
};
- DistributedTestCase.waitForCriterion(wc, 90 * 1000, 1000, true);
+ Wait.waitForCriterion(wc, 90 * 1000, 1000, true);
}
catch (Exception ex) {
- fail("failed while verifyInvalidatesOnBothRegions()", ex);
+ Assert.fail("failed while verifyInvalidatesOnBothRegions()", ex);
}
}
@@ -1336,7 +1341,7 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
return excuse;
}
};
- DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+ Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
// assertEquals(server_k1, r2.getEntry(k1).getValue());
wc = new WaitCriterion() {
@@ -1349,23 +1354,21 @@ public class ClientServerMiscDUnitTest extends CacheTestCase
return excuse;
}
};
- DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+ Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
// assertEquals(server_k2, r2.getEntry(k2).getValue());
}
catch (Exception ex) {
- fail("failed while verifyUpdatesOnRegion2()", ex);
+ Assert.fail("failed while verifyUpdatesOnRegion2()", ex);
}
}
- public void tearDown2() throws Exception
- {
- super.tearDown2();
+ @Override
+ protected final void postTearDownCacheTestCase() throws Exception {
// close the clients first
closeCache();
// then close the servers
server1.invoke(ClientServerMiscDUnitTest.class, "closeCache");
-
}
public static void closeCache()
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/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..88bdb20 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,9 +40,14 @@ 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.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.cache.client.*;
import com.gemstone.gemfire.cache.client.internal.PoolImpl;
@@ -136,9 +141,9 @@ public class ConflationDUnitTest extends DistributedTestCase
{
try {
vm0.invoke(ConflationDUnitTest.class, "setIsSlowStart");
- createClientCache1UniqueWriter ( getServerHostName(Host.getHost(0)), new Integer(PORT));
+ createClientCache1UniqueWriter ( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT));
vm2.invoke(ConflationDUnitTest.class, "createClientCache2UniqueWriter",
- new Object[] { getServerHostName(Host.getHost(0)), new Integer(PORT)});
+ new Object[] { NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)});
vm2.invoke(ConflationDUnitTest.class, "setClientServerObserverForBeforeInterestRecovery");
vm2.invoke(ConflationDUnitTest.class, "setAllCountersZero");
vm2.invoke(ConflationDUnitTest.class, "assertAllCountersZero");
@@ -155,7 +160,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);
}
}
@@ -167,9 +172,9 @@ public class ConflationDUnitTest extends DistributedTestCase
{
try {
vm0.invoke(ConflationDUnitTest.class, "setIsSlowStart");
- createClientCache1CommonWriter( getServerHostName(Host.getHost(0)), new Integer(PORT));
+ createClientCache1CommonWriter( NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT));
vm2.invoke(ConflationDUnitTest.class, "createClientCache2CommonWriter",
- new Object[] { getServerHostName(Host.getHost(0)), new Integer(PORT)});
+ new Object[] { NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT)});
vm2.invoke(ConflationDUnitTest.class, "setClientServerObserverForBeforeInterestRecovery");
vm2.invoke(ConflationDUnitTest.class, "setAllCountersZero");
vm2.invoke(ConflationDUnitTest.class, "assertAllCountersZero");
@@ -186,7 +191,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);
}
}
@@ -199,10 +204,10 @@ public class ConflationDUnitTest extends DistributedTestCase
{
try {
vm0.invoke(ConflationDUnitTest.class, "setIsSlowStart");
- createClientCache1CommonWriterTest3(getServerHostName(Host.getHost(0)), new Integer(PORT));
+ createClientCache1CommonWriterTest3(NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT));
vm2.invoke(ConflationDUnitTest.class,
"createClientCache2CommonWriterTest3", new Object[] {
- getServerHostName(Host.getHost(0)), new Integer(PORT) });
+ NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT) });
vm2.invoke(ConflationDUnitTest.class, "setClientServerObserverForBeforeInterestRecovery");
vm2.invoke(ConflationDUnitTest.class, "setAllCountersZero");
vm2.invoke(ConflationDUnitTest.class, "assertAllCountersZero");
@@ -221,7 +226,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);
}
}
/**
@@ -301,7 +306,7 @@ public class ConflationDUnitTest extends DistributedTestCase
factory.setPoolName(createPool(host,"p1", port, true).getName());
factory.addCacheListener(new CacheListenerAdapter() {
public void afterCreate(EntryEvent event) {
- getLogWriter().info("Listener received event " + event);
+ LogWriterUtils.getLogWriter().info("Listener received event " + event);
String val = (String) event.getNewValue();
synchronized (ConflationDUnitTest.class) {
if (val.equals(MARKER)) {
@@ -317,7 +322,7 @@ public class ConflationDUnitTest extends DistributedTestCase
}
public void afterUpdate(EntryEvent event) {
- getLogWriter().info("Listener received event " + event);
+ LogWriterUtils.getLogWriter().info("Listener received event " + event);
synchronized (this) {
counterUpdate++;
}
@@ -325,7 +330,7 @@ public class ConflationDUnitTest extends DistributedTestCase
public void afterDestroy(EntryEvent event)
{
- getLogWriter().info("Listener received event " + event);
+ LogWriterUtils.getLogWriter().info("Listener received event " + event);
synchronized (this) {
if(!event.getKey().equals(MARKER)) {
counterDestroy++;
@@ -348,7 +353,7 @@ public class ConflationDUnitTest extends DistributedTestCase
factory.setPoolName(createPool(host,"p1", port, true).getName());
factory.addCacheListener(new CacheListenerAdapter() {
public void afterCreate(EntryEvent event) {
- getLogWriter().info("Listener received event " + event);
+ LogWriterUtils.getLogWriter().info("Listener received event " + event);
String val = (String)event.getNewValue();
synchronized (ConflationDUnitTest.class) {
if (val.equals(MARKER)) {
@@ -364,14 +369,14 @@ public class ConflationDUnitTest extends DistributedTestCase
}
public void afterUpdate(EntryEvent event) {
- getLogWriter().info("Listener received event " + event);
+ LogWriterUtils.getLogWriter().info("Listener received event " + event);
synchronized (this) {
counterUpdate++;
}
}
public void afterDestroy(EntryEvent event) {
- getLogWriter().info("Listener received event " + event);
+ LogWriterUtils.getLogWriter().info("Listener received event " + event);
synchronized (this) {
if (!event.getKey().equals(MARKER)) {
counterDestroy++;
@@ -421,7 +426,7 @@ public class ConflationDUnitTest extends DistributedTestCase
public void afterCreate(EntryEvent event)
{
String val = (String) event.getNewValue();
- getLogWriter().info("Listener received event " + event);
+ LogWriterUtils.getLogWriter().info("Listener received event " + event);
synchronized (ConflationDUnitTest.class) {
if (val.equals(MARKER)) {
count++;
@@ -518,7 +523,7 @@ public class ConflationDUnitTest extends DistributedTestCase
return null;
}
};
- DistributedTestCase.waitForCriterion(ev, 60 * 1000, 200, true);
+ Wait.waitForCriterion(ev, 60 * 1000, 200, true);
ev = new WaitCriterion() {
public boolean done() {
@@ -529,7 +534,7 @@ public class ConflationDUnitTest extends DistributedTestCase
return null;
}
};
- DistributedTestCase.waitForCriterion(ev, 60 * 1000, 200, true);
+ Wait.waitForCriterion(ev, 60 * 1000, 200, true);
ev = new WaitCriterion() {
public boolean done() {
@@ -540,7 +545,7 @@ public class ConflationDUnitTest extends DistributedTestCase
return null;
}
};
- DistributedTestCase.waitForCriterion(ev, 60 * 1000, 200, true);
+ Wait.waitForCriterion(ev, 60 * 1000, 200, true);
}
@@ -559,7 +564,7 @@ public class ConflationDUnitTest extends DistributedTestCase
return null;
}
};
- DistributedTestCase.waitForCriterion(ev, 60 * 1000, 200, true);
+ Wait.waitForCriterion(ev, 60 * 1000, 200, true);
// assertEquals("creates", 2, counterCreate);
ev = new WaitCriterion() {
@@ -571,7 +576,7 @@ public class ConflationDUnitTest extends DistributedTestCase
return null;
}
};
- DistributedTestCase.waitForCriterion(ev, 60 * 1000, 200, true);
+ Wait.waitForCriterion(ev, 60 * 1000, 200, true);
// assertEquals("destroys", 2, counterDestroy);
// assertTrue("updates", 20000 >= counterUpdate);
@@ -584,7 +589,7 @@ public class ConflationDUnitTest extends DistributedTestCase
return null;
}
};
- DistributedTestCase.waitForCriterion(ev, 60 * 1000, 200, true);
+ Wait.waitForCriterion(ev, 60 * 1000, 200, true);
}
public static void waitForMarker()
@@ -729,7 +734,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 +756,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 +770,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 +793,7 @@ public class ConflationDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
ex.printStackTrace();
- fail("failed while region.put()", ex);
+ Assert.fail("failed while region.put()", ex);
}
}
@@ -815,7 +820,7 @@ public class ConflationDUnitTest extends DistributedTestCase
HARegionQueue haRegionQueue = HAHelper.getRegionQueue(region);
statMap.put("eventsConflated", new Long(HAHelper.getRegionQueueStats(
haRegionQueue).getEventsConflated()));
- getLogWriter().info("new Stats Map : " + statMap.toString());
+ LogWriterUtils.getLogWriter().info("new Stats Map : " + statMap.toString());
}
}
@@ -835,7 +840,7 @@ public class ConflationDUnitTest extends DistributedTestCase
}
catch (Exception ex) {
ex.printStackTrace();
- fail("failed while region.get()", ex);
+ Assert.fail("failed while region.get()", ex);
}
}
@@ -903,8 +908,8 @@ public class ConflationDUnitTest extends DistributedTestCase
/**
* close the cache in tearDown
*/
- public void tearDown2() throws Exception
- {
+ @Override
+ protected final void preTearDown() throws Exception {
// close client
closeCache();
vm2.invoke(ConflationDUnitTest.class, "closeCache");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
index ae73ed4..4ef6e2f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
@@ -54,8 +54,8 @@ 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.ha.ThreadIdentifier;
-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;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
/**
@@ -260,7 +260,7 @@ public class ConnectionProxyJUnitTest
return null;
}
};
- DistributedTestCase.waitForCriterion(ev, 90 * 1000, 200, true);
+ Wait.waitForCriterion(ev, 90 * 1000, 200, true);
}
finally {
if (server != null) {
@@ -321,7 +321,7 @@ public class ConnectionProxyJUnitTest
return null;
}
};
- DistributedTestCase.waitForCriterion(ev, 90 * 1000, 200, true);
+ Wait.waitForCriterion(ev, 90 * 1000, 200, true);
}
finally {
if (server != null) {
@@ -462,7 +462,7 @@ public class ConnectionProxyJUnitTest
return null;
}
};
- DistributedTestCase.waitForCriterion(ev, 20 * 1000, 200, true);
+ Wait.waitForCriterion(ev, 20 * 1000, 200, true);
}
catch (Exception ex) {
ex.printStackTrace();
@@ -838,7 +838,7 @@ public class ConnectionProxyJUnitTest
return "ack flag never became " + expectedAckSend;
}
};
- DistributedTestCase.waitForCriterion(wc, timeToWait, 1000, true);
+ Wait.waitForCriterion(wc, timeToWait, 1000, true);
}
private void verifyExpiry(long timeToWait)
@@ -851,7 +851,7 @@ public class ConnectionProxyJUnitTest
return "Entry never expired";
}
};
- DistributedTestCase.waitForCriterion(wc, timeToWait * 2, 200, true);
+ Wait.waitForCriterion(wc, timeToWait * 2, 200, true);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/820cfd63/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..06abd14 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,9 +47,16 @@ 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.DistributedTestUtils;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
+import com.gemstone.gemfire.test.dunit.StoppableWaitCriterion;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
@@ -149,7 +156,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
}
@Override
- public void tearDown2() throws Exception {
+ protected final void preTearDown() throws Exception {
try {
// close the clients first
client1.invoke(DataSerializerPropogationDUnitTest.class, "closeCache");
@@ -159,15 +166,14 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
server1.invoke(DataSerializerPropogationDUnitTest.class, "closeCache");
server2.invoke(DataSerializerPropogationDUnitTest.class, "closeCache");
- super.tearDown2();
-
client1 = null;
client2 = null;
server1 = null;
}
finally {
- unregisterAllDataSerializersFromAllVms();
+ DataSerializerPropogationDUnitTest.successfullyLoadedTestDataSerializer = false;
+ DistributedTestUtils.unregisterAllDataSerializersFromAllVms();
}
}
@@ -182,7 +188,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
verifyDataSerializers(numOfDataSerializers, false);
}
public static void verifyDataSerializers(final int numOfDataSerializers, final boolean allowNonLocal) {
- WaitCriterion wc = new WaitCriterion2() {
+ WaitCriterion wc = new StoppableWaitCriterion() {
String excuse;
private DataSerializer[] getSerializers() {
@@ -206,7 +212,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
return getSerializers().length > numOfDataSerializers;
}
};
- DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+ Wait.waitForCriterion(wc, 60 * 1000, 1000, true);
}
public static final ThreadLocal<Boolean> allowNonLocalTL = new ThreadLocal<Boolean>();
@@ -217,7 +223,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 +233,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 +243,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 +253,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 +263,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 +273,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 +283,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 +293,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 +303,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 +313,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 +323,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 +333,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 +343,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 +353,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 +361,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);
}
}
@@ -396,7 +402,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
public void testServerUpFirstClientLater() throws Exception {
PORT1 = initServerCache(server1);
- pause(3000);
+ Wait.pause(3000);
server1.invoke(DataSerializerPropogationDUnitTest.class,
"registerDSObject1");
@@ -408,10 +414,10 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
client1.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- getServerHostName(server1.getHost()), new Integer(PORT1) });
+ NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) });
// wait for client2 to come online
- pause(3000);
+ Wait.pause(3000);
client1.invoke(DataSerializerPropogationDUnitTest.class,
"verifyDataSerializers", new Object[] { new Integer(2) });
@@ -447,7 +453,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
}
});
- pause(3000);
+ Wait.pause(3000);
// Run getAll
client1.invoke(new CacheSerializableRunnable("Get entry from client") {
@Override
@@ -466,17 +472,17 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
client1.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- getServerHostName(server1.getHost()), new Integer(PORT1) });
+ NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) });
client2.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- getServerHostName(server2.getHost()), new Integer(PORT2) });
+ NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2) });
// wait for client2 to come online
- pause(2000);
+ Wait.pause(2000);
client1.invoke(DataSerializerPropogationDUnitTest.class,
"registerDSObject3");
- pause(4000);
+ Wait.pause(4000);
client1.invoke(DataSerializerPropogationDUnitTest.class,
"verifyDataSerializers", new Object[] { new Integer(1) });
@@ -498,18 +504,18 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
client1.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- getServerHostName(server1.getHost()), new Integer(PORT1) });
+ NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) });
client2.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- getServerHostName(server2.getHost()), new Integer(PORT2) });
+ NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2) });
// wait for client2 to come online
- pause(2000);
+ Wait.pause(2000);
server1.invoke(DataSerializerPropogationDUnitTest.class,
"registerDSObjectLocalOnly", new Object[] { });
- pause(4000);
+ Wait.pause(4000);
server1.invoke(DataSerializerPropogationDUnitTest.class,
"verifyDataSerializers", new Object[] { new Integer(1) });
@@ -530,13 +536,13 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
client1.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- getServerHostName(server1.getHost()), new Integer(PORT1) });
+ NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) });
client2.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- getServerHostName(server2.getHost()), new Integer(PORT2) });
+ NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2) });
// wait for client2 to come online
- pause(2000);
+ Wait.pause(2000);
client1.invoke(DataSerializerPropogationDUnitTest.class,
"registerDSObject4");
@@ -553,7 +559,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.addIgnoredException(
"Server unreachable", client1);
// stop the cache server
@@ -587,20 +593,20 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
client1.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- getServerHostName(server1.getHost()), new Integer(PORT1) });
+ NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) });
client2.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- getServerHostName(server2.getHost()), new Integer(PORT2) });
+ NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2) });
// wait for client2 to come online
- pause(2000);
+ Wait.pause(2000);
client1.invoke(DataSerializerPropogationDUnitTest.class,
"registerDSObject10");
server1.invoke(DataSerializerPropogationDUnitTest.class,
"registerDSObject11");
- pause(4000);
+ Wait.pause(4000);
server2.invoke(DataSerializerPropogationDUnitTest.class,
"verifyDataSerializers", new Object[] { new Integer(2) });
@@ -620,10 +626,10 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
PORT2 = initServerCache(server2);
client1.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- getServerHostName(server1.getHost()), new Integer(PORT1) });
+ NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) });
client2.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- getServerHostName(server2.getHost()), new Integer(PORT2) });
+ NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2) });
client1.invoke(DataSerializerPropogationDUnitTest.class,
"registerDSObject7");
@@ -644,7 +650,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
instanceCountWithOnePut) });
// can get server connectivity exception
- final ExpectedException expectedEx = addExpectedException(
+ final IgnoredException expectedEx = IgnoredException.addIgnoredException(
"Server unreachable", client1);
server1.invoke(DataSerializerPropogationDUnitTest.class, "stopServer");
@@ -690,18 +696,18 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
client1.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- getServerHostName(server1.getHost()), new Integer(PORT1) });
+ NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) });
client2.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- getServerHostName(server1.getHost()), new Integer(PORT1) });
- createClientCache(getServerHostName(server2.getHost()), new Integer(PORT2));
+ NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) });
+ createClientCache(NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2));
// wait for client2 to come online
- pause(2000);
+ Wait.pause(2000);
client1.invoke(DataSerializerPropogationDUnitTest.class,
"registerDSObject12");
- pause(4000);
+ Wait.pause(4000);
client1.invoke(DataSerializerPropogationDUnitTest.class,
"verifyDataSerializers", new Object[] { new Integer(1) });
@@ -728,19 +734,19 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
PORT1 = initServerCache(server1, 1);
PORT2 = initServerCache(server2, 2);
- createClientCache(getServerHostName(server1.getHost()),
+ createClientCache(NetworkUtils.getServerHostName(server1.getHost()),
new Integer(PORT1));
client2.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- getServerHostName(server2.getHost()), new Integer(PORT2) });
+ NetworkUtils.getServerHostName(server2.getHost()), new Integer(PORT2) });
setClientServerObserver1();
client2
.invoke(DataSerializerPropogationDUnitTest.class, "setClientServerObserver2");
registerDSObject13();
- pause(10000);
+ Wait.pause(10000);
Boolean pass = (Boolean)client2.invoke(
DataSerializerPropogationDUnitTest.class, "verifyResult");
@@ -756,17 +762,17 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
client1.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- getServerHostName(server1.getHost()), new Integer(PORT1) });
+ NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) });
client2.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
- getServerHostName(server1.getHost()), new Integer(PORT2) });
+ NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT2) });
// wait for client2 to come online
- pause(2000);
+ Wait.pause(2000);
client1.invoke(DataSerializerPropogationDUnitTest.class,
"registerTestDataSerializer");
- pause(4000);
+ Wait.pause(4000);
client1.invoke(DataSerializerPropogationDUnitTest.class,
"verifyDataSerializers", new Object[] { new Integer(1) });