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/02 21:21:43 UTC
[36/44] incubator-geode git commit: Refactor dunit
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
index 6cd8bb1..0619547 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
@@ -54,12 +54,13 @@ import com.gemstone.gemfire.management.membership.ClientMembership;
import com.gemstone.gemfire.management.membership.ClientMembershipEvent;
import com.gemstone.gemfire.management.membership.ClientMembershipListener;
import com.gemstone.gemfire.test.dunit.Assert;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.IgnoredException;
+import com.gemstone.gemfire.test.dunit.NetworkSupport;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
/**
* Tests the ClientMembership API including ClientMembershipListener.
@@ -106,7 +107,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
return excuse;
}
};
- DistributedTestCase.waitForCriterion(ev, 60 * 1000, 200, true);
+ Wait.waitForCriterion(ev, 60 * 1000, 200, true);
}
protected int getAcceptsInProgress() {
@@ -121,9 +122,9 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
never arrives.
*/
public void testConnectionTimeout() throws Exception {
- IgnoredException.addExpectedException("failed accepting client connection");
+ IgnoredException.addIgnoredException("failed accepting client connection");
final Host host = Host.getHost(0);
- final String hostName = getServerHostName(host);
+ final String hostName = NetworkSupport.getServerHostName(host);
final VM vm0 = host.getVM(0);
System.setProperty(AcceptorImpl.ACCEPT_TIMEOUT_PROPERTY_NAME, "1000");
try {
@@ -134,7 +135,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
SerializableRunnable createMeanSocket = new CacheSerializableRunnable("Connect to server with socket") {
public void run2() throws CacheException {
getCache(); // create a cache so we have stats
- getLogWriter().info("connecting to cache server with socket");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("connecting to cache server with socket");
try {
InetAddress addr = InetAddress.getByName(hostName);
meanSocket = new Socket(addr, port);
@@ -146,7 +147,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
};
SerializableRunnable closeMeanSocket = new CacheSerializableRunnable("close mean socket") {
public void run2() throws CacheException {
- getLogWriter().info("closing mean socket");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("closing mean socket");
try {
meanSocket.close();
}
@@ -157,28 +158,28 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
assertEquals(0, getAcceptsInProgress());
- getLogWriter().info("creating mean socket");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("creating mean socket");
vm0.invoke(createMeanSocket);
try {
- getLogWriter().info("waiting to see it connect on server");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("waiting to see it connect on server");
waitForAcceptsInProgressToBe(1);
} finally {
- getLogWriter().info("closing mean socket");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("closing mean socket");
vm0.invoke(closeMeanSocket);
}
- getLogWriter().info("waiting to see accept to go away on server");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("waiting to see accept to go away on server");
waitForAcceptsInProgressToBe(0);
// now try it without a close. Server should timeout the mean connect
- getLogWriter().info("creating mean socket 2");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("creating mean socket 2");
vm0.invoke(createMeanSocket);
try {
- getLogWriter().info("waiting to see it connect on server 2");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("waiting to see it connect on server 2");
waitForAcceptsInProgressToBe(1);
- getLogWriter().info("waiting to see accept to go away on server without us closing");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("waiting to see accept to go away on server without us closing");
waitForAcceptsInProgressToBe(0);
} finally {
- getLogWriter().info("closing mean socket 2");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("closing mean socket 2");
vm0.invoke(closeMeanSocket);
}
@@ -729,7 +730,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
* crashes or departs gracefully, the client will detect this as a crash.
*/
public void testClientMembershipEventsInClient() throws Exception {
- IgnoredException.addExpectedException("IOException");
+ IgnoredException.addIgnoredException("IOException");
final boolean[] fired = new boolean[3];
final DistributedMember[] member = new DistributedMember[3];
final String[] memberId = new String[3];
@@ -738,7 +739,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
// create and register ClientMembershipListener in controller vm...
ClientMembershipListener listener = new ClientMembershipListener() {
public synchronized void memberJoined(ClientMembershipEvent event) {
- getLogWriter().info("[testClientMembershipEventsInClient] memberJoined: " + event);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] memberJoined: " + event);
fired[JOINED] = true;
member[JOINED] = event.getMember();
memberId[JOINED] = event.getMemberId();
@@ -746,11 +747,11 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
notifyAll();
}
public synchronized void memberLeft(ClientMembershipEvent event) {
- getLogWriter().info("[testClientMembershipEventsInClient] memberLeft: " + event);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] memberLeft: " + event);
// fail("Please update testClientMembershipEventsInClient to handle memberLeft for BridgeServer.");
}
public synchronized void memberCrashed(ClientMembershipEvent event) {
- getLogWriter().info("[testClientMembershipEventsInClient] memberCrashed: " + event);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] memberCrashed: " + event);
fired[CRASHED] = true;
member[CRASHED] = event.getMember();
memberId[CRASHED] = event.getMemberId();
@@ -768,7 +769,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
vm0.invoke(new CacheSerializableRunnable("Create BridgeServer") {
public void run2() throws CacheException {
try {
- getLogWriter().info("[testClientMembershipEventsInClient] Create BridgeServer");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] Create BridgeServer");
getSystem();
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
@@ -795,9 +796,9 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
String serverMemberId = (String) vm0.invoke(ClientMembershipDUnitTest.class,
"getMemberId");
- getLogWriter().info("[testClientMembershipEventsInClient] ports[0]=" + ports[0]);
- getLogWriter().info("[testClientMembershipEventsInClient] serverMember=" + serverMember);
- getLogWriter().info("[testClientMembershipEventsInClient] serverMemberId=" + serverMemberId);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] ports[0]=" + ports[0]);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] serverMember=" + serverMember);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] serverMemberId=" + serverMemberId);
assertFalse(fired[JOINED]);
assertNull(member[JOINED]);
@@ -813,7 +814,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
assertFalse(isClient[CRASHED]);
// sanity check...
- getLogWriter().info("[testClientMembershipEventsInClient] sanity check");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] sanity check");
DistributedMember test = new TestDistributedMember("test");
InternalClientMembership.notifyJoined(test, SERVER);
synchronized(listener) {
@@ -837,7 +838,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
resetArraysForTesting(fired, member, memberId, isClient);
// create bridge client in controller vm...
- getLogWriter().info("[testClientMembershipEventsInClient] create bridge client");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] create bridge client");
Properties config = new Properties();
config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
config.setProperty(DistributionConfig.LOCATORS_NAME, "");
@@ -847,7 +848,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
getCache();
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- ClientServerTestCase.configureConnectionPool(factory, getServerHostName(Host.getHost(0)), ports, true, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, NetworkSupport.getServerHostName(Host.getHost(0)), ports, true, -1, -1, null);
createRegion(name, factory.create());
assertNotNull(getRootRegion().getSubregion(name));
}
@@ -860,7 +861,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
}
}
- getLogWriter().info("[testClientMembershipEventsInClient] assert client detected server join");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] assert client detected server join");
// first check the getCurrentServers() result
ClientCache clientCache = (ClientCache)getCache();
@@ -889,7 +890,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
vm0.invoke(new SerializableRunnable("Stop BridgeServer") {
public void run() {
- getLogWriter().info("[testClientMembershipEventsInClient] Stop BridgeServer");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] Stop BridgeServer");
stopBridgeServers(getCache());
}
});
@@ -899,7 +900,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
}
}
- getLogWriter().info("[testClientMembershipEventsInClient] assert client detected server departure");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] assert client detected server departure");
assertFalse(fired[JOINED]);
assertNull(member[JOINED]);
assertNull(memberId[JOINED]);
@@ -920,7 +921,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
vm0.invoke(new CacheSerializableRunnable("Recreate BridgeServer") {
public void run2() throws CacheException {
try {
- getLogWriter().info("[testClientMembershipEventsInClient] restarting BridgeServer");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] restarting BridgeServer");
startBridgeServer(ports[0]);
}
catch(IOException e) {
@@ -935,7 +936,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
}
}
- getLogWriter().info("[testClientMembershipEventsInClient] assert client detected server recovery");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] assert client detected server recovery");
assertTrue(fired[JOINED]);
assertNotNull(member[JOINED]);
assertNotNull(memberId[JOINED]);
@@ -964,7 +965,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
// create and register ClientMembershipListener in controller vm...
ClientMembershipListener listener = new ClientMembershipListener() {
public synchronized void memberJoined(ClientMembershipEvent event) {
- getLogWriter().info("[testClientMembershipEventsInServer] memberJoined: " + event);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] memberJoined: " + event);
fired[JOINED] = true;
member[JOINED] = event.getMember();
memberId[JOINED] = event.getMemberId();
@@ -973,7 +974,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
assertFalse(fired[LEFT] || fired[CRASHED]);
}
public synchronized void memberLeft(ClientMembershipEvent event) {
- getLogWriter().info("[testClientMembershipEventsInServer] memberLeft: " + event);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] memberLeft: " + event);
fired[LEFT] = true;
member[LEFT] = event.getMember();
memberId[LEFT] = event.getMemberId();
@@ -982,7 +983,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
assertFalse(fired[JOINED] || fired[CRASHED]);
}
public synchronized void memberCrashed(ClientMembershipEvent event) {
- getLogWriter().info("[testClientMembershipEventsInServer] memberCrashed: " + event);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] memberCrashed: " + event);
fired[CRASHED] = true;
member[CRASHED] = event.getMember();
memberId[CRASHED] = event.getMemberId();
@@ -998,7 +999,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
final int[] ports = new int[1];
// create BridgeServer in controller vm...
- getLogWriter().info("[testClientMembershipEventsInServer] Create BridgeServer");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] Create BridgeServer");
getSystem();
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
@@ -1011,9 +1012,9 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
String serverMemberId = getMemberId();
DistributedMember serverMember = getDistributedMember();
- getLogWriter().info("[testClientMembershipEventsInServer] ports[0]=" + ports[0]);
- getLogWriter().info("[testClientMembershipEventsInServer] serverMemberId=" + serverMemberId);
- getLogWriter().info("[testClientMembershipEventsInServer] serverMember=" + serverMember);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] ports[0]=" + ports[0]);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] serverMemberId=" + serverMemberId);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] serverMember=" + serverMember);
assertFalse(fired[JOINED]);
assertNull(member[JOINED]);
@@ -1029,7 +1030,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
assertFalse(isClient[CRASHED]);
// sanity check...
- getLogWriter().info("[testClientMembershipEventsInServer] sanity check");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] sanity check");
DistributedMember test = new TestDistributedMember("test");
InternalClientMembership.notifyJoined(test, CLIENT);
synchronized(listener) {
@@ -1055,14 +1056,14 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
SerializableRunnable createConnectionPool =
new CacheSerializableRunnable("Create connectionPool") {
public void run2() throws CacheException {
- getLogWriter().info("[testClientMembershipEventsInServer] create bridge client");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] create bridge client");
Properties config = new Properties();
config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
config.setProperty(DistributionConfig.LOCATORS_NAME, "");
getSystem(config);
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- ClientServerTestCase.configureConnectionPool(factory, getServerHostName(host), ports, true, -1, 2, null);
+ ClientServerTestCase.configureConnectionPool(factory, NetworkSupport.getServerHostName(host), ports, true, -1, 2, null);
createRegion(name, factory.create());
assertNotNull(getRootRegion().getSubregion(name));
}
@@ -1081,7 +1082,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
}
}
- getLogWriter().info("[testClientMembershipEventsInServer] assert server detected client join");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] assert server detected client join");
assertTrue(fired[JOINED]);
assertEquals(member[JOINED] + " should equal " + clientMember,
clientMember, member[JOINED]);
@@ -1102,7 +1103,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
vm0.invoke(new SerializableRunnable("Stop bridge client") {
public void run() {
- getLogWriter().info("[testClientMembershipEventsInServer] Stop bridge client");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] Stop bridge client");
getRootRegion().getSubregion(name).close();
Map m = PoolManager.getAll();
Iterator mit = m.values().iterator();
@@ -1119,7 +1120,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
}
}
- getLogWriter().info("[testClientMembershipEventsInServer] assert server detected client left");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] assert server detected client left");
assertFalse(fired[JOINED]);
assertNull(member[JOINED]);
assertNull(memberId[JOINED]);
@@ -1145,7 +1146,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
}
}
- getLogWriter().info("[testClientMembershipEventsInServer] assert server detected client re-join");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] assert server detected client re-join");
assertTrue(fired[JOINED]);
assertEquals(clientMember, member[JOINED]);
assertEquals(clientMemberId, memberId[JOINED]);
@@ -1166,7 +1167,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
try {
vm0.invoke(new SerializableRunnable("Stop bridge client") {
public void run() {
- getLogWriter().info("[testClientMembershipEventsInServer] Stop bridge client");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] Stop bridge client");
getRootRegion().getSubregion(name).close();
Map m = PoolManager.getAll();
Iterator mit = m.values().iterator();
@@ -1183,7 +1184,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
}
}
- getLogWriter().info("[testClientMembershipEventsInServer] assert server detected client crashed");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] assert server detected client crashed");
assertFalse(fired[JOINED]);
assertNull(member[JOINED]);
assertNull(memberId[JOINED]);
@@ -1212,7 +1213,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
* timeout.
*/
private void pauseForClientToJoin() {
- pause(2000);
+ Wait.pause(2000);
}
/**
@@ -1303,10 +1304,10 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
final String name = this.getUniqueName();
final int[] ports = new int[1];
- IgnoredException.addExpectedException("ConnectException");
+ IgnoredException.addIgnoredException("ConnectException");
// create BridgeServer in controller vm...
- getLogWriter().info("[testGetConnectedClients] Create BridgeServer");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetConnectedClients] Create BridgeServer");
getSystem();
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
@@ -1318,14 +1319,14 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
assertTrue(ports[0] != 0);
String serverMemberId = getMemberId();
- getLogWriter().info("[testGetConnectedClients] ports[0]=" + ports[0]);
- getLogWriter().info("[testGetConnectedClients] serverMemberId=" + serverMemberId);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetConnectedClients] ports[0]=" + ports[0]);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetConnectedClients] serverMemberId=" + serverMemberId);
final Host host = Host.getHost(0);
SerializableRunnable createPool =
new CacheSerializableRunnable("Create connection pool") {
public void run2() throws CacheException {
- getLogWriter().info("[testGetConnectedClients] create bridge client");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetConnectedClients] create bridge client");
Properties config = new Properties();
config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
config.setProperty(DistributionConfig.LOCATORS_NAME, "");
@@ -1335,7 +1336,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
getSystem(config);
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- Pool p = ClientServerTestCase.configureConnectionPool(factory, getServerHostName(host), ports, true, -1, -1, null);
+ Pool p = ClientServerTestCase.configureConnectionPool(factory, NetworkSupport.getServerHostName(host), ports, true, -1, -1, null);
createRegion(name, factory.create());
assertNotNull(getRootRegion().getSubregion(name));
assertTrue(p.getServers().size() > 0);
@@ -1371,7 +1372,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
return true;
}
};
- waitForCriterion(wc, 30000, 100, false);
+ Wait.waitForCriterion(wc, 30000, 100, false);
}
Map connectedClients = InternalClientMembership.getConnectedClients(false);
@@ -1379,10 +1380,10 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
assertEquals(clientMemberIds.size(), connectedClients.size());
for (Iterator iter = connectedClients.keySet().iterator(); iter.hasNext();) {
String connectedClient = (String)iter.next();
- getLogWriter().info("[testGetConnectedClients] checking for client " + connectedClient);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetConnectedClients] checking for client " + connectedClient);
assertTrue(clientMemberIds.contains(connectedClient));
Object[] result = (Object[])connectedClients.get(connectedClient);
- getLogWriter().info("[testGetConnectedClients] result: " +
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetConnectedClients] result: " +
(result==null? "none"
: String.valueOf(result[0])+"; connections="+result[1]));
}
@@ -1403,7 +1404,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
vm.invoke(new CacheSerializableRunnable("Create bridge server") {
public void run2() throws CacheException {
// create BridgeServer in controller vm...
- getLogWriter().info("[testGetConnectedServers] Create BridgeServer");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetConnectedServers] Create BridgeServer");
getSystem();
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
@@ -1416,15 +1417,15 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
testGetConnectedServers_port = startBridgeServer(0);
}
catch (IOException e) {
- getLogWriter().error("startBridgeServer threw IOException", e);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().error("startBridgeServer threw IOException", e);
fail("startBridgeServer threw IOException " + e.getMessage());
}
assertTrue(testGetConnectedServers_port != 0);
- getLogWriter().info("[testGetConnectedServers] port=" +
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetConnectedServers] port=" +
ports[whichVM]);
- getLogWriter().info("[testGetConnectedServers] serverMemberId=" +
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetConnectedServers] serverMemberId=" +
getDistributedMember());
}
});
@@ -1433,7 +1434,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
assertTrue(ports[whichVM] != 0);
}
- getLogWriter().info("[testGetConnectedServers] create bridge client");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetConnectedServers] create bridge client");
Properties config = new Properties();
config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
config.setProperty(DistributionConfig.LOCATORS_NAME, "");
@@ -1444,10 +1445,10 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
factory.setScope(Scope.LOCAL);
for (int i = 0; i < ports.length; i++) {
- getLogWriter().info("[testGetConnectedServers] creating connectionpool for " +
- getServerHostName(host) + " " + ports[i]);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetConnectedServers] creating connectionpool for " +
+ NetworkSupport.getServerHostName(host) + " " + ports[i]);
int[] thisServerPorts = new int[] { ports[i] };
- ClientServerTestCase.configureConnectionPoolWithName(factory, getServerHostName(host), thisServerPorts, false, -1, -1, null,"pooly"+i);
+ ClientServerTestCase.configureConnectionPoolWithName(factory, NetworkSupport.getServerHostName(host), thisServerPorts, false, -1, -1, null,"pooly"+i);
Region region = createRegion(name+"_"+i, factory.create());
assertNotNull(getRootRegion().getSubregion(name+"_"+i));
region.get("KEY-1");
@@ -1473,7 +1474,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
return true;
}
};
- waitForCriterion(wc, 60000, 100, false);
+ Wait.waitForCriterion(wc, 60000, 100, false);
}
{
@@ -1486,7 +1487,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
assertEquals(host.getVMCount(), connectedServers.size());
for (Iterator iter = connectedServers.keySet().iterator(); iter.hasNext();) {
String connectedServer = (String) iter.next();
- getLogWriter().info("[testGetConnectedServers] value for connectedServer: " +
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetConnectedServers] value for connectedServer: " +
connectedServers.get(connectedServer));
}
}
@@ -1511,7 +1512,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
vm.invoke(new CacheSerializableRunnable("Create bridge server") {
public void run2() throws CacheException {
// create BridgeServer in controller vm...
- getLogWriter().info("[testGetNotifiedClients] Create BridgeServer");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetNotifiedClients] Create BridgeServer");
getSystem();
AttributesFactory factory = new AttributesFactory();
Region region = createRegion(name, factory.create());
@@ -1523,15 +1524,15 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
testGetNotifiedClients_port = startBridgeServer(0);
}
catch (IOException e) {
- getLogWriter().error("startBridgeServer threw IOException", e);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().error("startBridgeServer threw IOException", e);
fail("startBridgeServer threw IOException " + e.getMessage());
}
assertTrue(testGetNotifiedClients_port != 0);
- getLogWriter().info("[testGetNotifiedClients] port=" +
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetNotifiedClients] port=" +
ports[whichVM]);
- getLogWriter().info("[testGetNotifiedClients] serverMemberId=" +
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetNotifiedClients] serverMemberId=" +
getMemberId());
}
});
@@ -1540,7 +1541,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
assertTrue(ports[whichVM] != 0);
}
- getLogWriter().info("[testGetNotifiedClients] create bridge client");
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetNotifiedClients] create bridge client");
Properties config = new Properties();
config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
config.setProperty(DistributionConfig.LOCATORS_NAME, "");
@@ -1550,8 +1551,8 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- getLogWriter().info("[testGetNotifiedClients] creating connection pool");
- ClientServerTestCase.configureConnectionPool(factory, getServerHostName(host), ports, true, -1, -1, null);
+ com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetNotifiedClients] creating connection pool");
+ ClientServerTestCase.configureConnectionPool(factory, NetworkSupport.getServerHostName(host), ports, true, -1, -1, null);
Region region = createRegion(name, factory.create());
assertNotNull(getRootRegion().getSubregion(name));
region.registerInterest("KEY-1");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
index 958b863..021c2f1 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
@@ -25,9 +25,12 @@ import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.client.internal.PoolImpl;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.LogWriterSupport;
+import com.gemstone.gemfire.test.dunit.NetworkSupport;
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.SubscriptionNotEnabledException;
/**
@@ -60,7 +63,7 @@ public class ClientRegisterInterestDUnitTest extends ClientServerTestCase {
final VM vm = Host.getHost(0).getVM(whichVM);
vm.invoke(new CacheSerializableRunnable("Create bridge server") {
public void run2() throws CacheException {
- getLogWriter().info("[testBug35381] Create BridgeServer");
+ LogWriterSupport.getLogWriter().info("[testBug35381] Create BridgeServer");
getSystem();
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
@@ -73,21 +76,21 @@ public class ClientRegisterInterestDUnitTest extends ClientServerTestCase {
bridgeServerPort = startBridgeServer(0);
}
catch (IOException e) {
- getLogWriter().error("startBridgeServer threw IOException", e);
+ LogWriterSupport.getLogWriter().error("startBridgeServer threw IOException", e);
fail("startBridgeServer threw IOException " + e.getMessage());
}
assertTrue(bridgeServerPort != 0);
- getLogWriter().info("[testBug35381] port=" + bridgeServerPort);
- getLogWriter().info("[testBug35381] serverMemberId=" + getMemberId());
+ LogWriterSupport.getLogWriter().info("[testBug35381] port=" + bridgeServerPort);
+ LogWriterSupport.getLogWriter().info("[testBug35381] serverMemberId=" + getMemberId());
}
});
ports[whichVM] = vm.invokeInt(ClientRegisterInterestDUnitTest.class,
"getBridgeServerPort");
assertTrue(ports[whichVM] != 0);
- getLogWriter().info("[testBug35381] create bridge client");
+ LogWriterSupport.getLogWriter().info("[testBug35381] create bridge client");
Properties config = new Properties();
config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
config.setProperty(DistributionConfig.LOCATORS_NAME, "");
@@ -97,9 +100,9 @@ public class ClientRegisterInterestDUnitTest extends ClientServerTestCase {
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- getLogWriter().info("[testBug35381] creating connection pool");
+ LogWriterSupport.getLogWriter().info("[testBug35381] creating connection pool");
boolean establishCallbackConnection = false; // SOURCE OF BUG 35381
- ClientServerTestCase.configureConnectionPool(factory, getServerHostName(host), ports, establishCallbackConnection, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, NetworkSupport.getServerHostName(host), ports, establishCallbackConnection, -1, -1, null);
Region region = createRegion(name, factory.create());
assertNotNull(getRootRegion().getSubregion(name));
try {
@@ -145,7 +148,7 @@ public class ClientRegisterInterestDUnitTest extends ClientServerTestCase {
final VM firstServerVM = Host.getHost(0).getVM(firstServerIdx);
firstServerVM.invoke(new CacheSerializableRunnable("Create first bridge server") {
public void run2() throws CacheException {
- getLogWriter().info("[testRegisterInterestFailover] Create first bridge server");
+ LogWriterSupport.getLogWriter().info("[testRegisterInterestFailover] Create first bridge server");
getSystem();
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
@@ -160,15 +163,15 @@ public class ClientRegisterInterestDUnitTest extends ClientServerTestCase {
bridgeServerPort = startBridgeServer(0);
}
catch (IOException e) {
- getLogWriter().error("startBridgeServer threw IOException", e);
+ LogWriterSupport.getLogWriter().error("startBridgeServer threw IOException", e);
fail("startBridgeServer threw IOException " + e.getMessage());
}
assertTrue(bridgeServerPort != 0);
- getLogWriter().info("[testRegisterInterestFailover] " +
+ LogWriterSupport.getLogWriter().info("[testRegisterInterestFailover] " +
"firstServer port=" + bridgeServerPort);
- getLogWriter().info("[testRegisterInterestFailover] " +
+ LogWriterSupport.getLogWriter().info("[testRegisterInterestFailover] " +
"firstServer memberId=" + getMemberId());
}
});
@@ -178,7 +181,7 @@ public class ClientRegisterInterestDUnitTest extends ClientServerTestCase {
final VM secondServerVM = Host.getHost(0).getVM(secondServerIdx);
secondServerVM.invoke(new CacheSerializableRunnable("Create second bridge server") {
public void run2() throws CacheException {
- getLogWriter().info("[testRegisterInterestFailover] Create second bridge server");
+ LogWriterSupport.getLogWriter().info("[testRegisterInterestFailover] Create second bridge server");
getSystem();
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
@@ -191,15 +194,15 @@ public class ClientRegisterInterestDUnitTest extends ClientServerTestCase {
bridgeServerPort = startBridgeServer(0);
}
catch (IOException e) {
- getLogWriter().error("startBridgeServer threw IOException", e);
+ LogWriterSupport.getLogWriter().error("startBridgeServer threw IOException", e);
fail("startBridgeServer threw IOException " + e.getMessage());
}
assertTrue(bridgeServerPort != 0);
- getLogWriter().info("[testRegisterInterestFailover] " +
+ LogWriterSupport.getLogWriter().info("[testRegisterInterestFailover] " +
"secondServer port=" + bridgeServerPort);
- getLogWriter().info("[testRegisterInterestFailover] " +
+ LogWriterSupport.getLogWriter().info("[testRegisterInterestFailover] " +
"secondServer memberId=" + getMemberId());
}
});
@@ -221,7 +224,7 @@ public class ClientRegisterInterestDUnitTest extends ClientServerTestCase {
});
// create the bridge client
- getLogWriter().info("[testBug35654] create bridge client");
+ LogWriterSupport.getLogWriter().info("[testBug35654] create bridge client");
Properties config = new Properties();
config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
config.setProperty(DistributionConfig.LOCATORS_NAME, "");
@@ -231,9 +234,9 @@ public class ClientRegisterInterestDUnitTest extends ClientServerTestCase {
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- getLogWriter().info("[testRegisterInterestFailover] creating connection pool");
+ LogWriterSupport.getLogWriter().info("[testRegisterInterestFailover] creating connection pool");
boolean establishCallbackConnection = true;
- final PoolImpl p = (PoolImpl)ClientServerTestCase.configureConnectionPool(factory, getServerHostName(host), ports, establishCallbackConnection, -1, -1, null);
+ final PoolImpl p = (PoolImpl)ClientServerTestCase.configureConnectionPool(factory, NetworkSupport.getServerHostName(host), ports, establishCallbackConnection, -1, -1, null);
final Region region1 = createRootRegion(regionName1, factory.create());
final Region region2 = createRootRegion(regionName2, factory.create());
@@ -264,7 +267,7 @@ public class ClientRegisterInterestDUnitTest extends ClientServerTestCase {
return "primary port remained invalid";
}
};
- DistributedTestCase.waitForCriterion(ev, 10 * 1000, 200, true);
+ Wait.waitForCriterion(ev, 10 * 1000, 200, true);
assertEquals(ports[firstServerIdx], p.getPrimaryPort());
// assert intial values
@@ -296,7 +299,7 @@ public class ClientRegisterInterestDUnitTest extends ClientServerTestCase {
return null;
}
};
- DistributedTestCase.waitForCriterion(ev, 10 * 1000, 200, true);
+ Wait.waitForCriterion(ev, 10 * 1000, 200, true);
assertEquals("VAL-1-1", region1.get(key1));
assertEquals("VAL-1-1", region2.get(key2));
assertEquals("VAL-1-1", region3.get(key3));
@@ -308,7 +311,7 @@ public class ClientRegisterInterestDUnitTest extends ClientServerTestCase {
startBridgeServer(ports[secondServerIdx]);
}
catch (IOException e) {
- getLogWriter().error("startBridgeServer threw IOException", e);
+ LogWriterSupport.getLogWriter().error("startBridgeServer threw IOException", e);
fail("startBridgeServer threw IOException " + e.getMessage());
}
}
@@ -329,7 +332,7 @@ public class ClientRegisterInterestDUnitTest extends ClientServerTestCase {
return "primary port never became " + ports[secondServerIdx];
}
};
- DistributedTestCase.waitForCriterion(ev, 100 * 1000, 200, true);
+ Wait.waitForCriterion(ev, 100 * 1000, 200, true);
try {
assertEquals(null, region2.get(key2));
@@ -377,7 +380,7 @@ public class ClientRegisterInterestDUnitTest extends ClientServerTestCase {
return null;
}
};
- DistributedTestCase.waitForCriterion(ev, 100 * 1000, 200, true);
+ Wait.waitForCriterion(ev, 100 * 1000, 200, true);
assertEquals("VAL-2-2", region1.get(key1));
assertEquals("VAL-0", region2.get(key2));
assertEquals("VAL-2-2", region3.get(key3));
@@ -413,7 +416,7 @@ public class ClientRegisterInterestDUnitTest extends ClientServerTestCase {
return null;
}
};
- DistributedTestCase.waitForCriterion(ev, 100 * 1000, 200, true);
+ Wait.waitForCriterion(ev, 100 * 1000, 200, true);
assertEquals("VAL-2-3", region1.get(key1));
assertEquals("VAL-2-2", region2.get(key2));
assertEquals("VAL-2-3", region3.get(key3));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
index 59c2388..3c20498 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
@@ -46,9 +46,13 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy;
import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.LogWriterSupport;
+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;
/**
* concurrency-control tests for client/server
@@ -151,19 +155,19 @@ public class ClientServerCCEDUnitTest extends CacheTestCase {
createEntries(vm0);
destroyEntries(vm0);
- getLogWriter().info("***************** register interest on all keys");
+ LogWriterSupport.getLogWriter().info("***************** register interest on all keys");
createClientRegion(vm2, name, port, true);
registerInterest(vm2);
ensureAllTombstonesPresent(vm2);
- getLogWriter().info("***************** clear cache and register interest on one key, Object0");
+ LogWriterSupport.getLogWriter().info("***************** clear cache and register interest on one key, Object0");
clearLocalCache(vm2);
registerInterestOneKey(vm2, "Object0");
List<String> keys = new ArrayList(1);
keys.add("Object0");
ensureAllTombstonesPresent(vm2, keys);
- getLogWriter().info("***************** clear cache and register interest on four keys");
+ LogWriterSupport.getLogWriter().info("***************** clear cache and register interest on four keys");
clearLocalCache(vm2);
keys = new ArrayList(4);
for (int i=0; i<4; i++) {
@@ -172,12 +176,12 @@ public class ClientServerCCEDUnitTest extends CacheTestCase {
registerInterest(vm2, keys);
ensureAllTombstonesPresent(vm2, keys);
- getLogWriter().info("***************** clear cache and register interest with regex on four keys");
+ LogWriterSupport.getLogWriter().info("***************** clear cache and register interest with regex on four keys");
clearLocalCache(vm2);
registerInterestRegex(vm2, "Object[0-3]");
ensureAllTombstonesPresent(vm2, keys);
- getLogWriter().info("***************** fetch entries with getAll()");
+ LogWriterSupport.getLogWriter().info("***************** fetch entries with getAll()");
clearLocalCache(vm2);
getAll(vm2);
ensureAllTombstonesPresent(vm2);
@@ -204,19 +208,19 @@ public class ClientServerCCEDUnitTest extends CacheTestCase {
createEntries(vm0);
invalidateEntries(vm0);
- getLogWriter().info("***************** register interest on all keys");
+ LogWriterSupport.getLogWriter().info("***************** register interest on all keys");
createClientRegion(vm2, name, port, true);
registerInterest(vm2);
ensureAllInvalidsPresent(vm2);
- getLogWriter().info("***************** clear cache and register interest on one key, Object0");
+ LogWriterSupport.getLogWriter().info("***************** clear cache and register interest on one key, Object0");
clearLocalCache(vm2);
registerInterestOneKey(vm2, "Object0");
List<String> keys = new ArrayList(1);
keys.add("Object0");
ensureAllInvalidsPresent(vm2, keys);
- getLogWriter().info("***************** clear cache and register interest on four keys");
+ LogWriterSupport.getLogWriter().info("***************** clear cache and register interest on four keys");
clearLocalCache(vm2);
keys = new ArrayList(4);
for (int i=0; i<4; i++) {
@@ -225,12 +229,12 @@ public class ClientServerCCEDUnitTest extends CacheTestCase {
registerInterest(vm2, keys);
ensureAllInvalidsPresent(vm2, keys);
- getLogWriter().info("***************** clear cache and register interest with regex on four keys");
+ LogWriterSupport.getLogWriter().info("***************** clear cache and register interest with regex on four keys");
clearLocalCache(vm2);
registerInterestRegex(vm2, "Object[0-3]");
ensureAllInvalidsPresent(vm2, keys);
- getLogWriter().info("***************** fetch entries with getAll()");
+ LogWriterSupport.getLogWriter().info("***************** fetch entries with getAll()");
clearLocalCache(vm2);
getAll(vm2);
ensureAllInvalidsPresent(vm2);
@@ -384,7 +388,7 @@ public class ClientServerCCEDUnitTest extends CacheTestCase {
//other bucket might be in vm1
forceGC(vm1);
}
- pause(5000); // better chance that WaitCriteria will succeed 1st time if we pause a bit
+ Wait.pause(5000); // better chance that WaitCriteria will succeed 1st time if we pause a bit
checkClientReceivedGC(vm2);
checkClientReceivedGC(vm3);
checkServerQueuesEmpty(vm0);
@@ -477,8 +481,8 @@ public class ClientServerCCEDUnitTest extends CacheTestCase {
@Override
public boolean done() {
- getLogWriter().info("tombstone count = " + TestRegion.getTombstoneCount());
- getLogWriter().info("region size = " + TestRegion.size());
+ LogWriterSupport.getLogWriter().info("tombstone count = " + TestRegion.getTombstoneCount());
+ LogWriterSupport.getLogWriter().info("region size = " + TestRegion.size());
return TestRegion.getTombstoneCount() == 0 && TestRegion.size() == 0;
}
@@ -487,7 +491,7 @@ public class ClientServerCCEDUnitTest extends CacheTestCase {
return "waiting for garbage collection to occur";
}
};
- waitForCriterion(wc, 60000, 2000, true);
+ Wait.waitForCriterion(wc, 60000, 2000, true);
return null;
}
});
@@ -513,7 +517,7 @@ public class ClientServerCCEDUnitTest extends CacheTestCase {
// if (first) {
// ((LocalRegion)proxy.getHARegion()).dumpBackingMap();
// }
- getLogWriter().info("queue size ("+size+") is still > 0 for " + proxy.getProxyID());
+ LogWriterSupport.getLogWriter().info("queue size ("+size+") is still > 0 for " + proxy.getProxyID());
return false;
}
}
@@ -521,7 +525,7 @@ public class ClientServerCCEDUnitTest extends CacheTestCase {
// also ensure that server regions have been cleaned up
int regionEntryCount = TestRegion.getRegionMap().size();
if (regionEntryCount > 0) {
- getLogWriter().info("TestRegion has unexpected entries - all should have been GC'd but we have " + regionEntryCount);
+ LogWriterSupport.getLogWriter().info("TestRegion has unexpected entries - all should have been GC'd but we have " + regionEntryCount);
TestRegion.dumpBackingMap();
return false;
}
@@ -533,7 +537,7 @@ public class ClientServerCCEDUnitTest extends CacheTestCase {
return "waiting for queue removal messages to clear client queues";
}
};
- waitForCriterion(wc, 60000, 2000, true);
+ Wait.waitForCriterion(wc, 60000, 2000, true);
return null;
}
});
@@ -544,7 +548,7 @@ public class ClientServerCCEDUnitTest extends CacheTestCase {
vm.invoke(new SerializableCallable("check that GC did not happen") {
public Object call() throws Exception {
if (TestRegion.getTombstoneCount() == 0) {
- getLogWriter().warning("region has no tombstones");
+ LogWriterSupport.getLogWriter().warning("region has no tombstones");
// TestRegion.dumpBackingMap();
throw new AssertionFailedError("expected to find tombstones but region is empty");
}
@@ -585,9 +589,9 @@ public class ClientServerCCEDUnitTest extends CacheTestCase {
SerializableCallable createRegion = new SerializableCallable() {
public Object call() throws Exception {
ClientCacheFactory cf = new ClientCacheFactory();
- cf.addPoolServer(getServerHostName(vm.getHost()), port);
+ cf.addPoolServer(NetworkSupport.getServerHostName(vm.getHost()), port);
cf.setPoolSubscriptionEnabled(true);
- cf.set("log-level", getDUnitLogLevel());
+ cf.set("log-level", LogWriterSupport.getDUnitLogLevel());
ClientCache cache = getClientCache(cf);
ClientRegionFactory crf = cache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY);
crf.setConcurrencyChecksEnabled(ccEnabled);
@@ -606,14 +610,14 @@ public class ClientServerCCEDUnitTest extends CacheTestCase {
SerializableCallable createRegion = new SerializableCallable() {
public Object call() throws Exception {
ClientCacheFactory cf = new ClientCacheFactory();
- cf.addPoolServer(getServerHostName(vm.getHost()), port1);
- cf.addPoolServer(getServerHostName(vm.getHost()), port2);
+ cf.addPoolServer(NetworkSupport.getServerHostName(vm.getHost()), port1);
+ cf.addPoolServer(NetworkSupport.getServerHostName(vm.getHost()), port2);
cf.setPoolSubscriptionEnabled(true);
cf.setPoolSubscriptionRedundancy(1);
// bug #50683 - secondary durable queue retains all GC messages
cf.set("durable-client-id", ""+vm.getPid());
cf.set("durable-client-timeout", "" + 200);
- cf.set("log-level", getDUnitLogLevel());
+ cf.set("log-level", LogWriterSupport.getDUnitLogLevel());
ClientCache cache = getClientCache(cf);
ClientRegionFactory crf = cache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY);
crf.setConcurrencyChecksEnabled(ccEnabled);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
index 6a3c5e0..27c00fb 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
@@ -35,7 +35,10 @@ import com.gemstone.gemfire.distributed.DistributedMember;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.AvailablePortHelper;
+import com.gemstone.gemfire.test.dunit.DistributedTestSupport;
import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
/**
* Provides helper methods for testing clients and servers. This
@@ -201,7 +204,7 @@ public class ClientServerTestCase extends CacheTestCase {
boolean threadLocalCnxs, int lifetimeTimeout, int statisticInterval) {
if(AUTO_LOAD_BALANCE) {
- pf.addLocator(host,getDUnitLocatorPort());
+ pf.addLocator(host,DistributedTestSupport.getDUnitLocatorPort());
} else {
for(int z=0;z<ports.length;z++) {
pf.addServer(host,ports[z]);
@@ -299,7 +302,7 @@ public class ClientServerTestCase extends CacheTestCase {
int waitMillis = 10000;
int interval = 100;
boolean throwException = true;
- waitForCriterion(w, waitMillis, interval, throwException);
+ Wait.waitForCriterion(w, waitMillis, interval, throwException);
return system.getMemberId();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ConcurrentLeaveDuringGIIDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ConcurrentLeaveDuringGIIDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ConcurrentLeaveDuringGIIDUnitTest.java
index 9ec99a2..f283bb8 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ConcurrentLeaveDuringGIIDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ConcurrentLeaveDuringGIIDUnitTest.java
@@ -26,9 +26,12 @@ import com.gemstone.gemfire.internal.cache.InitialImageOperation;
import com.gemstone.gemfire.internal.cache.InitialImageOperation.GIITestHook;
import com.gemstone.gemfire.internal.cache.InitialImageOperation.GIITestHookType;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.LogWriterSupport;
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 com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.cache.RegionMap;
@@ -101,7 +104,7 @@ public class ConcurrentLeaveDuringGIIDUnitTest extends CacheTestCase {
return "waiting for GII test hook to be invoked";
}
};
- waitForCriterion(wc, 20000, 500, true);
+ Wait.waitForCriterion(wc, 20000, 500, true);
return getCache().getDistributedSystem().getDistributedMember();
}
};
@@ -128,7 +131,7 @@ public class ConcurrentLeaveDuringGIIDUnitTest extends CacheTestCase {
return "waiting for region " + regionName + " to contain keyFromX";
}
};
- waitForCriterion(wc, 20000, 1000, true);
+ Wait.waitForCriterion(wc, 20000, 1000, true);
}
});
@@ -150,11 +153,11 @@ public class ConcurrentLeaveDuringGIIDUnitTest extends CacheTestCase {
return "waiting for region " + regionName + " to initialize";
}
};
- waitForCriterion(wc, 20000, 1000, true);
+ Wait.waitForCriterion(wc, 20000, 1000, true);
// ensure that the RVV has recorded the event
DistributedRegion r = (DistributedRegion)getCache().getRegion(regionName);
if (!r.getVersionVector().contains(Xid, 1)) {
- getLogWriter().info("r's version vector is " + r.getVersionVector().fullToString());
+ LogWriterSupport.getLogWriter().info("r's version vector is " + r.getVersionVector().fullToString());
((LocalRegion)r).dumpBackingMap();
}
assertTrue(r.containsKey("keyFromX"));
@@ -177,7 +180,7 @@ public class ConcurrentLeaveDuringGIIDUnitTest extends CacheTestCase {
}
};
// if the test fails here then a sync from B to A was not performed
- waitForCriterion(wc, 20000, 500, true);
+ Wait.waitForCriterion(wc, 20000, 500, true);
// if the test fails here something is odd because the sync was done
// but the RVV doesn't know about it
assertTrue(((LocalRegion)r).getVersionVector().contains(Xid, 1));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DiskRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DiskRegionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DiskRegionDUnitTest.java
index 6247ee1..84b9385 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DiskRegionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DiskRegionDUnitTest.java
@@ -47,11 +47,13 @@ import com.gemstone.gemfire.internal.cache.DiskRegionStats;
import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.cache.lru.LRUCapacityController;
import com.gemstone.gemfire.internal.cache.lru.LRUStatistics;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.LogWriterSupport;
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 functionality of cache regions whose contents may be
@@ -141,7 +143,7 @@ public class DiskRegionDUnitTest extends CacheTestCase {
flush(region);
- getLogWriter().info("DEBUG: writes=" + diskStats.getWrites()
+ LogWriterSupport.getLogWriter().info("DEBUG: writes=" + diskStats.getWrites()
+ " reads=" + diskStats.getReads()
+ " evictions=" + lruStats.getEvictions()
+ " total=" + total
@@ -160,7 +162,7 @@ public class DiskRegionDUnitTest extends CacheTestCase {
assertNotNull(value);
assertEquals(0, ((int[]) value)[0]);
- getLogWriter().info("DEBUG: writes=" + diskStats.getWrites()
+ LogWriterSupport.getLogWriter().info("DEBUG: writes=" + diskStats.getWrites()
+ " reads=" + diskStats.getReads()
+ " evictions=" + lruStats.getEvictions()
+ " total=" + total
@@ -249,7 +251,7 @@ public class DiskRegionDUnitTest extends CacheTestCase {
return "waiting for evictions to exceed 6";
}
};
- DistributedTestCase.waitForCriterion(ev, 5 * 1000, 200, true);
+ Wait.waitForCriterion(ev, 5 * 1000, 200, true);
//DiskRegionStats diskStats = dr.getStats();
//assertTrue(diskStats.getWrites() > 6);
}
@@ -372,7 +374,7 @@ public class DiskRegionDUnitTest extends CacheTestCase {
// DiskRegion dr = region.getDiskRegion();
LRUStatistics lruStats = getLRUStats(region);
for (int i = 0; lruStats.getEvictions() < 10; i++) {
- getLogWriter().info("Put " + i);
+ LogWriterSupport.getLogWriter().info("Put " + i);
region.put(new Integer(i), new byte[1]);
}
@@ -433,7 +435,7 @@ public class DiskRegionDUnitTest extends CacheTestCase {
long evictions = lruStats.getEvictions();
- getLogWriter().info("Destroying memory resident entries");
+ LogWriterSupport.getLogWriter().info("Destroying memory resident entries");
// Destroying each of these guys should have no effect on the disk
for (int i = total - 1; i >= evictions; i--) {
region.destroy(new Integer(i));
@@ -444,7 +446,7 @@ public class DiskRegionDUnitTest extends CacheTestCase {
// long startRemoves = diskStats.getRemoves();
- getLogWriter().info("Destroying disk-resident entries. evictions=" + evictions);
+ LogWriterSupport.getLogWriter().info("Destroying disk-resident entries. evictions=" + evictions);
// Destroying each of these guys should cause a removal from disk
for (int i = ((int) evictions) - 1; i >= 0; i--) {
@@ -456,7 +458,7 @@ public class DiskRegionDUnitTest extends CacheTestCase {
assertEquals(evictions, lruStats.getEvictions());
- getLogWriter().info("keys remaining in region: " + region.keys().size());
+ LogWriterSupport.getLogWriter().info("keys remaining in region: " + region.keys().size());
assertEquals(0, region.keys().size());
}
@@ -968,7 +970,7 @@ public class DiskRegionDUnitTest extends CacheTestCase {
// DiskRegion dr = region.getDiskRegion();
LRUStatistics lruStats = getLRUStats(region);
for (int i = 0; lruStats.getEvictions() < 10; i++) {
- getLogWriter().info("Put " + i);
+ LogWriterSupport.getLogWriter().info("Put " + i);
region.put(new Integer(i), new byte[1]);
}
@@ -997,7 +999,7 @@ public class DiskRegionDUnitTest extends CacheTestCase {
return "value for key remains: " + key;
}
};
- DistributedTestCase.waitForCriterion(ev, 500, 200, true);
+ Wait.waitForCriterion(ev, 500, 200, true);
}
});
@@ -1021,7 +1023,7 @@ public class DiskRegionDUnitTest extends CacheTestCase {
return "verify update";
}
};
- DistributedTestCase.waitForCriterion(ev, 500, 200, true);
+ Wait.waitForCriterion(ev, 500, 200, true);
}
});
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java
index 216cdb8..91f3ccb 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistAckMapMethodsDUnitTest.java
@@ -43,6 +43,8 @@ import com.gemstone.gemfire.cache.util.CacheWriterAdapter;
import com.gemstone.gemfire.distributed.DistributedSystem;
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.LogWriterSupport;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -85,7 +87,7 @@ public class DistAckMapMethodsDUnitTest extends DistributedTestCase{
vm0.invoke(DistAckMapMethodsDUnitTest.class, "closeCache");
vm1.invoke(DistAckMapMethodsDUnitTest.class, "closeCache");
cache = null;
- invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } });
+ Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { cache = null; } });
}
public static void createCache(){
@@ -197,8 +199,8 @@ public class DistAckMapMethodsDUnitTest extends DistributedTestCase{
vm0.invoke(DistAckMapMethodsDUnitTest.class, "putMethod", objArr);
obj1 = vm1.invoke(DistAckMapMethodsDUnitTest.class, "getMethod", objArr);//to make sure that vm1 region has the entry
obj2 = vm1.invoke(DistAckMapMethodsDUnitTest.class, "removeMethod", objArr);
- getLogWriter().fine("111111111"+obj1);
- getLogWriter().fine("2222222222"+obj2);
+ LogWriterSupport.getLogWriter().fine("111111111"+obj1);
+ LogWriterSupport.getLogWriter().fine("2222222222"+obj2);
if (obj1 == null)
fail("region1.getMethod returned null");
if(!(obj1.equals(obj2))){
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
index 5971d5c..8d25245 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
@@ -22,6 +22,7 @@ import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.OffHeapTestUtil;
+import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
/**
@@ -49,7 +50,7 @@ public class DistributedAckOverflowRegionCCEOffHeapDUnitTest extends Distributed
}
};
checkOrphans.run();
- invokeInEveryVM(checkOrphans);
+ Invoke.invokeInEveryVM(checkOrphans);
super.tearDown2();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEDUnitTest.java
index aec7c8b..aaae52b 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEDUnitTest.java
@@ -41,7 +41,6 @@ import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
-import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
import java.io.IOException;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
index 24c386a..b7cf2aa 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
@@ -22,6 +22,7 @@ import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.OffHeapTestUtil;
+import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
/**
@@ -48,7 +49,7 @@ public class DistributedAckPersistentRegionCCEOffHeapDUnitTest extends Distribut
}
}
};
- invokeInEveryVM(checkOrphans);
+ Invoke.invokeInEveryVM(checkOrphans);
try {
checkOrphans.run();
} finally {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
index c7c90a7..a29a569 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
@@ -66,7 +66,9 @@ import com.gemstone.gemfire.test.dunit.DistributedTestCase;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
-import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
/**
* @author Bruce Schuchardt
@@ -401,8 +403,8 @@ public class DistributedAckRegionCCEDUnitTest extends DistributedAckRegionDUnitT
return "waiting for GC to occur";
}
};
- waitForCriterion(waitForGC, 20000, 1000, true);
- pause(5000);
+ Wait.waitForCriterion(waitForGC, 20000, 1000, true);
+ Wait.pause(5000);
long gcCount = CCRegion.getCachePerfStats().getTombstoneGCCount();
assertTrue("expected a few GCs, but not " + (gcCount - initialCount), gcCount < (initialCount + 20));
} catch (CacheException ex) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
index 4b7e49d..4f4a5ec 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
@@ -22,6 +22,7 @@ import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.OffHeapTestUtil;
+import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
/**
@@ -48,7 +49,7 @@ public class DistributedAckRegionCCEOffHeapDUnitTest extends DistributedAckRegio
}
}
};
- invokeInEveryVM(checkOrphans);
+ Invoke.invokeInEveryVM(checkOrphans);
try {
checkOrphans.run();
} finally {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
index c1ca077..93ffa43 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
@@ -27,6 +27,7 @@ import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.LogWriterSupport;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -61,7 +62,7 @@ public class DistributedAckRegionDUnitTest extends MultiVMRegionTestCase {
public Properties getDistributedSystemProperties() {
Properties p = new Properties();
p.put(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
- p.put(DistributionConfig.LOG_LEVEL_NAME, getDUnitLogLevel());
+ p.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterSupport.getDUnitLogLevel());
return p;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
index 5d7f8f6..ef0a7d2 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
@@ -22,6 +22,7 @@ import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.OffHeapTestUtil;
+import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
/**
@@ -48,7 +49,7 @@ public class DistributedAckRegionOffHeapDUnitTest extends DistributedAckRegionDU
}
}
};
- invokeInEveryVM(checkOrphans);
+ Invoke.invokeInEveryVM(checkOrphans);
try {
checkOrphans.run();
} finally {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
index 3728cf6..a61b84f 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
@@ -37,6 +37,7 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.OffHeapTestUtil;
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.SerializableCallable;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
@@ -72,7 +73,7 @@ public class DistributedMulticastRegionDUnitTest extends CacheTestCase {
disconnectFromDS();
}
};
- invokeInEveryVM(cleanVM);
+ Invoke.invokeInEveryVM(cleanVM);
}
public void testMulticastEnabled() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
index dae0c05..0036cf3 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
@@ -36,8 +36,10 @@ import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.AsyncInvocation;
import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.LogWriterSupport;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
-import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
public class DistributedNoAckRegionCCEDUnitTest extends
DistributedNoAckRegionDUnitTest {
@@ -127,7 +129,7 @@ public class DistributedNoAckRegionCCEDUnitTest extends
AsyncInvocation vm1Ops = vm1.invokeAsync(DistributedNoAckRegionCCEDUnitTest.class, "doManyOps");
AsyncInvocation vm2Ops = vm2.invokeAsync(DistributedNoAckRegionCCEDUnitTest.class, "doManyOps");
// pause to let a bunch of operations build up
- pause(5000);
+ Wait.pause(5000);
AsyncInvocation a0 = vm3.invokeAsync(DistributedNoAckRegionCCEDUnitTest.class, "clearRegion");
vm0.invoke(DistributedNoAckRegionCCEDUnitTest.class, "unblockListener");
vm1.invoke(DistributedNoAckRegionCCEDUnitTest.class, "unblockListener");
@@ -140,7 +142,7 @@ public class DistributedNoAckRegionCCEDUnitTest extends
// if (a0failed && a1failed) {
// fail("neither member saw event conflation - check stats for " + name);
// }
- pause(2000);//this test has with noack, thus we should wait before validating entries
+ Wait.pause(2000);//this test has with noack, thus we should wait before validating entries
// check consistency of the regions
Map r0Contents = (Map)vm0.invoke(this.getClass(), "getCCRegionContents");
Map r1Contents = (Map)vm1.invoke(this.getClass(), "getCCRegionContents");
@@ -172,25 +174,25 @@ public class DistributedNoAckRegionCCEDUnitTest extends
if (event.isOriginRemote()) {
synchronized(this) {
while (ListenerBlocking) {
- getLogWriter().info("blocking cache operations for " + event.getDistributedMember());
+ LogWriterSupport.getLogWriter().info("blocking cache operations for " + event.getDistributedMember());
blocked = true;
try {
wait();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
- getLogWriter().info("blocking cache listener interrupted");
+ LogWriterSupport.getLogWriter().info("blocking cache listener interrupted");
return;
}
}
}
if (blocked) {
- getLogWriter().info("allowing cache operations for " + event.getDistributedMember());
+ LogWriterSupport.getLogWriter().info("allowing cache operations for " + event.getDistributedMember());
}
}
}
@Override
public void close() {
- getLogWriter().info("closing blocking listener");
+ LogWriterSupport.getLogWriter().info("closing blocking listener");
ListenerBlocking = false;
synchronized(this) {
notifyAll();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
index 4d3bb80..48929ca 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
@@ -22,6 +22,7 @@ import com.gemstone.gemfire.cache.AttributesFactory;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.OffHeapTestUtil;
+import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
/**
@@ -48,7 +49,7 @@ public class DistributedNoAckRegionCCEOffHeapDUnitTest extends DistributedNoAckR
}
}
};
- invokeInEveryVM(checkOrphans);
+ Invoke.invokeInEveryVM(checkOrphans);
try {
checkOrphans.run();
} finally {