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/05 01:16:13 UTC
[07/33] incubator-geode git commit: Cleanup
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
index 7ba2f68..a9747f2 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
@@ -38,8 +38,8 @@ import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.Invoke;
-import com.gemstone.gemfire.test.dunit.LogWriterSupport;
-import com.gemstone.gemfire.test.dunit.NetworkSupport;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
@@ -87,7 +87,7 @@ public class CqPerfDUnitTest extends CacheTestCase {
final int port = server.invokeInt(CqQueryDUnitTest.class,
"getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
// Create client.
cqDUnitTest.createClient(client, port, host0);
@@ -95,7 +95,7 @@ public class CqPerfDUnitTest extends CacheTestCase {
client.invoke(new CacheSerializableRunnable("Create CQ :" + cqName) {
public void run2() throws CacheException {
- LogWriterSupport.getLogWriter().info("### Create CQ. ###" + cqName);
+ LogWriterUtils.getLogWriter().info("### Create CQ. ###" + cqName);
// Get CQ Service.
QueryService cqService = null;
try {
@@ -106,7 +106,7 @@ public class CqPerfDUnitTest extends CacheTestCase {
}
// Create CQ Attributes.
CqAttributesFactory cqf = new CqAttributesFactory();
- CqListener[] cqListeners = {new CqTimeTestListener(LogWriterSupport.getLogWriter())};
+ CqListener[] cqListeners = {new CqTimeTestListener(LogWriterUtils.getLogWriter())};
((CqTimeTestListener)cqListeners[0]).cqName = cqName;
cqf.initCqListeners(cqListeners);
@@ -118,7 +118,7 @@ public class CqPerfDUnitTest extends CacheTestCase {
assertTrue("newCq() state mismatch", cq1.getState().isStopped());
cq1.execute();
} catch (Exception ex){
- LogWriterSupport.getLogWriter().info("CqService is :" + cqService);
+ LogWriterUtils.getLogWriter().info("CqService is :" + cqService);
ex.printStackTrace();
AssertionError err = new AssertionError("Failed to create CQ " + cqName + " . ");
err.initCause(ex);
@@ -138,7 +138,7 @@ public class CqPerfDUnitTest extends CacheTestCase {
client.invoke(new CacheSerializableRunnable("Validate CQs") {
public void run2() throws CacheException {
- LogWriterSupport.getLogWriter().info("### Validating CQ. ### " + cqName);
+ LogWriterUtils.getLogWriter().info("### Validating CQ. ### " + cqName);
// Get CQ Service.
QueryService cqService = null;
try {
@@ -192,7 +192,7 @@ public class CqPerfDUnitTest extends CacheTestCase {
cqDUnitTest.createServer(server);
final int port = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
cqDUnitTest.createClient(client, port, host0);
@@ -218,7 +218,7 @@ public class CqPerfDUnitTest extends CacheTestCase {
try {
cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
} catch (Exception ex) {
- LogWriterSupport.getLogWriter().info("Failed to get the internal CqService.", ex);
+ LogWriterUtils.getLogWriter().info("Failed to get the internal CqService.", ex);
Assert.fail ("Failed to get the internal CqService.", ex);
}
@@ -249,7 +249,7 @@ public class CqPerfDUnitTest extends CacheTestCase {
try {
cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
} catch (Exception ex) {
- LogWriterSupport.getLogWriter().info("Failed to get the internal CqService.", ex);
+ LogWriterUtils.getLogWriter().info("Failed to get the internal CqService.", ex);
Assert.fail ("Failed to get the internal CqService.", ex);
}
Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
@@ -280,7 +280,7 @@ public class CqPerfDUnitTest extends CacheTestCase {
try {
cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
} catch (Exception ex) {
- LogWriterSupport.getLogWriter().info("Failed to get the internal CqService.", ex);
+ LogWriterUtils.getLogWriter().info("Failed to get the internal CqService.", ex);
Assert.fail ("Failed to get the internal CqService.", ex);
}
@@ -312,7 +312,7 @@ public class CqPerfDUnitTest extends CacheTestCase {
try {
cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
} catch (Exception ex) {
- LogWriterSupport.getLogWriter().info("Failed to get the internal CqService.", ex);
+ LogWriterUtils.getLogWriter().info("Failed to get the internal CqService.", ex);
Assert.fail ("Failed to get the internal CqService.", ex);
}
Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
@@ -342,7 +342,7 @@ public class CqPerfDUnitTest extends CacheTestCase {
try {
cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
} catch (Exception ex) {
- LogWriterSupport.getLogWriter().info("Failed to get the internal CqService.", ex);
+ LogWriterUtils.getLogWriter().info("Failed to get the internal CqService.", ex);
Assert.fail ("Failed to get the internal CqService.", ex);
}
@@ -374,7 +374,7 @@ public class CqPerfDUnitTest extends CacheTestCase {
try {
cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
} catch (Exception ex) {
- LogWriterSupport.getLogWriter().info("Failed to get the internal CqService.", ex);
+ LogWriterUtils.getLogWriter().info("Failed to get the internal CqService.", ex);
Assert.fail ("Failed to get the internal CqService.", ex);
}
Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
@@ -412,7 +412,7 @@ public class CqPerfDUnitTest extends CacheTestCase {
cqDUnitTest.createServer(server);
final int port = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
cqDUnitTest.createClient(client, port, host0);
// Create and Execute same kind of CQs.
@@ -527,7 +527,7 @@ public class CqPerfDUnitTest extends CacheTestCase {
cqDUnitTest.createServer(server);
final int port = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
for (int clientIndex=0; clientIndex < 3; clientIndex++){
cqDUnitTest.createClient(clients[clientIndex], port, host0);
@@ -686,7 +686,7 @@ public class CqPerfDUnitTest extends CacheTestCase {
VM clients[] = new VM[]{client1, client2};
final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server1.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server1.getHost());
// Create client.
// Create client with redundancyLevel -1
@@ -849,7 +849,7 @@ public class CqPerfDUnitTest extends CacheTestCase {
VM clients[] = new VM[]{client1, client2};
final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server1.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server1.getHost());
final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1);
cqDUnitTest.createLocalRegion(client1, new int[] {port1, ports[0]}, host0, "-1", cqDUnitTest.regions);
@@ -898,7 +898,7 @@ public class CqPerfDUnitTest extends CacheTestCase {
final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
final int port2 = server2.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server1.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server1.getHost());
// Create client.
// final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1);
@@ -973,7 +973,7 @@ public class CqPerfDUnitTest extends CacheTestCase {
try {
cqService = (CqServiceImpl) ((DefaultQueryService)getCache().getQueryService()).getCqService();
} catch (Exception ex) {
- LogWriterSupport.getLogWriter().info("Failed to get the internal CqService.", ex);
+ LogWriterUtils.getLogWriter().info("Failed to get the internal CqService.", ex);
Assert.fail ("Failed to get the internal CqService.", ex);
}
@@ -999,12 +999,12 @@ public class CqPerfDUnitTest extends CacheTestCase {
try {
cqService = (CqServiceImpl) ((DefaultQueryService)getCache().getQueryService()).getCqService();
} catch (Exception ex) {
- LogWriterSupport.getLogWriter().info("Failed to get the internal CqService.", ex);
+ LogWriterUtils.getLogWriter().info("Failed to get the internal CqService.", ex);
Assert.fail ("Failed to get the internal CqService.", ex);
}
long timeTaken = cqService.getCqServiceVsdStats().getCqQueryExecutionTime();
- LogWriterSupport.getLogWriter().info("Total Time taken to Execute CQ Query :" + timeTaken);
+ LogWriterUtils.getLogWriter().info("Total Time taken to Execute CQ Query :" + timeTaken);
//System.out.println("Total Time taken to Execute CQ Query :" + timeTaken);
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
index eb21a64..3c7e3b5 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
@@ -38,8 +38,8 @@ import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.Invoke;
-import com.gemstone.gemfire.test.dunit.LogWriterSupport;
-import com.gemstone.gemfire.test.dunit.NetworkSupport;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
@@ -87,7 +87,7 @@ public class CqPerfUsingPoolDUnitTest extends CacheTestCase {
final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class,
"getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
// Create client.
cqDUnitTest.createClient(client, port, host0);
@@ -95,7 +95,7 @@ public class CqPerfUsingPoolDUnitTest extends CacheTestCase {
client.invoke(new CacheSerializableRunnable("Create CQ :" + cqName) {
public void run2() throws CacheException {
- LogWriterSupport.getLogWriter().info("### Create CQ. ###" + cqName);
+ LogWriterUtils.getLogWriter().info("### Create CQ. ###" + cqName);
// Get CQ Service.
QueryService cqService = null;
try {
@@ -106,7 +106,7 @@ public class CqPerfUsingPoolDUnitTest extends CacheTestCase {
}
// Create CQ Attributes.
CqAttributesFactory cqf = new CqAttributesFactory();
- CqListener[] cqListeners = {new CqTimeTestListener(LogWriterSupport.getLogWriter())};
+ CqListener[] cqListeners = {new CqTimeTestListener(LogWriterUtils.getLogWriter())};
((CqTimeTestListener)cqListeners[0]).cqName = cqName;
cqf.initCqListeners(cqListeners);
@@ -118,7 +118,7 @@ public class CqPerfUsingPoolDUnitTest extends CacheTestCase {
assertTrue("newCq() state mismatch", cq1.getState().isStopped());
cq1.execute();
} catch (Exception ex){
- LogWriterSupport.getLogWriter().info("CqService is :" + cqService);
+ LogWriterUtils.getLogWriter().info("CqService is :" + cqService);
ex.printStackTrace();
AssertionError err = new AssertionError("Failed to create CQ " + cqName + " . ");
err.initCause(ex);
@@ -138,7 +138,7 @@ public class CqPerfUsingPoolDUnitTest extends CacheTestCase {
client.invoke(new CacheSerializableRunnable("Validate CQs") {
public void run2() throws CacheException {
- LogWriterSupport.getLogWriter().info("### Validating CQ. ### " + cqName);
+ LogWriterUtils.getLogWriter().info("### Validating CQ. ### " + cqName);
// Get CQ Service.
QueryService cqService = null;
try {
@@ -192,7 +192,7 @@ public class CqPerfUsingPoolDUnitTest extends CacheTestCase {
cqDUnitTest.createServer(server);
final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
// cqDUnitTest.createClient(client, port, host0);
String poolName = "testKeyMaintainance";
@@ -220,7 +220,7 @@ public class CqPerfUsingPoolDUnitTest extends CacheTestCase {
try {
cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
} catch (Exception ex) {
- LogWriterSupport.getLogWriter().info("Failed to get the internal CqService.", ex);
+ LogWriterUtils.getLogWriter().info("Failed to get the internal CqService.", ex);
Assert.fail ("Failed to get the internal CqService.", ex);
}
@@ -252,7 +252,7 @@ public class CqPerfUsingPoolDUnitTest extends CacheTestCase {
try {
cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
} catch (Exception ex) {
- LogWriterSupport.getLogWriter().info("Failed to get the internal CqService.", ex);
+ LogWriterUtils.getLogWriter().info("Failed to get the internal CqService.", ex);
Assert.fail ("Failed to get the internal CqService.", ex);
}
Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
@@ -283,7 +283,7 @@ public class CqPerfUsingPoolDUnitTest extends CacheTestCase {
try {
cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
} catch (Exception ex) {
- LogWriterSupport.getLogWriter().info("Failed to get the internal CqService.", ex);
+ LogWriterUtils.getLogWriter().info("Failed to get the internal CqService.", ex);
Assert.fail ("Failed to get the internal CqService.", ex);
}
@@ -316,7 +316,7 @@ public class CqPerfUsingPoolDUnitTest extends CacheTestCase {
try {
cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
} catch (Exception ex) {
- LogWriterSupport.getLogWriter().info("Failed to get the internal CqService.", ex);
+ LogWriterUtils.getLogWriter().info("Failed to get the internal CqService.", ex);
Assert.fail ("Failed to get the internal CqService.", ex);
}
Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
@@ -345,7 +345,7 @@ public class CqPerfUsingPoolDUnitTest extends CacheTestCase {
try {
cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
} catch (Exception ex) {
- LogWriterSupport.getLogWriter().info("Failed to get the internal CqService.", ex);
+ LogWriterUtils.getLogWriter().info("Failed to get the internal CqService.", ex);
Assert.fail ("Failed to get the internal CqService.", ex);
}
@@ -376,7 +376,7 @@ public class CqPerfUsingPoolDUnitTest extends CacheTestCase {
try {
cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
} catch (Exception ex) {
- LogWriterSupport.getLogWriter().info("Failed to get the internal CqService.", ex);
+ LogWriterUtils.getLogWriter().info("Failed to get the internal CqService.", ex);
Assert.fail ("Failed to get the internal CqService.", ex);
}
Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
@@ -412,7 +412,7 @@ public class CqPerfUsingPoolDUnitTest extends CacheTestCase {
cqDUnitTest.createServer(server);
final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
//cqDUnitTest.createClient(client, port, host0);
String poolName = "testMatchingCqs";
@@ -530,7 +530,7 @@ public class CqPerfUsingPoolDUnitTest extends CacheTestCase {
cqDUnitTest.createServer(server);
final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
String poolName = "testMatchingCQWithMultipleClients";
for (int clientIndex=0; clientIndex < 3; clientIndex++){
String cPoolName = "testMatchingCQWithMultipleClients" + clientIndex;
@@ -693,7 +693,7 @@ public class CqPerfUsingPoolDUnitTest extends CacheTestCase {
VM clients[] = new VM[]{client1, client2};
final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server1.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server1.getHost());
// Create client.
// Create client with redundancyLevel -1
@@ -858,7 +858,7 @@ public class CqPerfUsingPoolDUnitTest extends CacheTestCase {
final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
final int port2 = server2.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server1.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server1.getHost());
// Create client.
// final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1);
@@ -933,7 +933,7 @@ public class CqPerfUsingPoolDUnitTest extends CacheTestCase {
try {
cqService = (CqServiceImpl) ((DefaultQueryService)getCache().getQueryService()).getCqService();
} catch (Exception ex) {
- LogWriterSupport.getLogWriter().info("Failed to get the internal CqService.", ex);
+ LogWriterUtils.getLogWriter().info("Failed to get the internal CqService.", ex);
Assert.fail ("Failed to get the internal CqService.", ex);
}
@@ -959,12 +959,12 @@ public class CqPerfUsingPoolDUnitTest extends CacheTestCase {
try {
cqService = (CqServiceImpl) ((DefaultQueryService)getCache().getQueryService()).getCqService();
} catch (Exception ex) {
- LogWriterSupport.getLogWriter().info("Failed to get the internal CqService.", ex);
+ LogWriterUtils.getLogWriter().info("Failed to get the internal CqService.", ex);
Assert.fail ("Failed to get the internal CqService.", ex);
}
long timeTaken = cqService.getCqServiceVsdStats().getCqQueryExecutionTime();
- LogWriterSupport.getLogWriter().info("Total Time taken to Execute CQ Query :" + timeTaken);
+ LogWriterUtils.getLogWriter().info("Total Time taken to Execute CQ Query :" + timeTaken);
System.out.println("Total Time taken to Execute CQ Query :" + timeTaken);
}
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
index f811427..24187a0 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
@@ -67,8 +67,8 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
import com.gemstone.gemfire.test.dunit.Assert;
import com.gemstone.gemfire.test.dunit.Host;
import com.gemstone.gemfire.test.dunit.Invoke;
-import com.gemstone.gemfire.test.dunit.LogWriterSupport;
-import com.gemstone.gemfire.test.dunit.NetworkSupport;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
@@ -213,7 +213,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
"Create Cache Server") {
public void run2() throws CacheException
{
- LogWriterSupport.getLogWriter().info("### Create Cache Server. ###");
+ LogWriterUtils.getLogWriter().info("### Create Cache Server. ###");
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
factory.setMirrorType(mirrorType);
@@ -251,7 +251,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
"Create Cache Server") {
public void run2() throws CacheException
{
- LogWriterSupport.getLogWriter().info("### Create Cache Server. ###");
+ LogWriterUtils.getLogWriter().info("### Create Cache Server. ###");
try {
startBridgeServer(thePort, true);
}
@@ -300,7 +300,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
public void closeServer(VM server) {
server.invoke(new SerializableRunnable("Close CacheServer") {
public void run() {
- LogWriterSupport.getLogWriter().info("### Close CacheServer. ###");
+ LogWriterUtils.getLogWriter().info("### Close CacheServer. ###");
stopBridgeServer(getCache());
}
});
@@ -311,7 +311,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
server.invoke(new SerializableRunnable("Crash CacheServer") {
public void run() {
com.gemstone.gemfire.cache.client.internal.ConnectionImpl.setTEST_DURABLE_CLIENT_CRASH(true);
- LogWriterSupport.getLogWriter().info("### Crashing CacheServer. ###");
+ LogWriterUtils.getLogWriter().info("### Crashing CacheServer. ###");
stopBridgeServer(getCache());
}
});
@@ -322,7 +322,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
server.invoke(new SerializableRunnable("Close CacheServer") {
public void run() {
com.gemstone.gemfire.cache.client.internal.ConnectionImpl.setTEST_DURABLE_CLIENT_CRASH(false);
- LogWriterSupport.getLogWriter().info("### Crashing CacheServer. ###");
+ LogWriterUtils.getLogWriter().info("### Crashing CacheServer. ###");
stopBridgeServer(getCache());
}
});
@@ -340,7 +340,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
SerializableRunnable createQService =
new CacheSerializableRunnable("Create Client") {
public void run2() throws CacheException {
- LogWriterSupport.getLogWriter().info("### Create Client. ###");
+ LogWriterUtils.getLogWriter().info("### Create Client. ###");
//Region region1 = null;
// Initialize CQ Service.
try {
@@ -359,7 +359,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
}
for (int i=0; i < regions.length; i++) {
createRegion(regions[i], regionFactory.createRegionAttributes());
- LogWriterSupport.getLogWriter().info("### Successfully Created Region on Client :" + regions[i]);
+ LogWriterUtils.getLogWriter().info("### Successfully Created Region on Client :" + regions[i]);
//region1.getAttributesMutator().setCacheListener(new CqListener());
}
}
@@ -373,7 +373,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
SerializableRunnable createQService =
new CacheSerializableRunnable("Create Local Region") {
public void run2() throws CacheException {
- LogWriterSupport.getLogWriter().info("### Create Local Region. ###");
+ LogWriterUtils.getLogWriter().info("### Create Local Region. ###");
AttributesFactory af = new AttributesFactory();
af.setScope(Scope.LOCAL);
@@ -386,7 +386,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
RegionFactory rf = getCache().createRegionFactory(af.create());
for (int i = 0; i < regionNames.length; i++) {
rf.create(regionNames[i]);
- LogWriterSupport.getLogWriter().info("### Successfully Created Region on Client :" + regions[i]);
+ LogWriterUtils.getLogWriter().info("### Successfully Created Region on Client :" + regions[i]);
}
}
};
@@ -398,7 +398,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
SerializableRunnable createQService =
new CacheSerializableRunnable("Create Client") {
public void run2() throws CacheException {
- LogWriterSupport.getLogWriter().info("### Create Client. ###");
+ LogWriterUtils.getLogWriter().info("### Create Client. ###");
//Region region1 = null;
// Initialize CQ Service.
try {
@@ -421,8 +421,8 @@ public class CqQueryDUnitTest extends CacheTestCase {
}
createRegion(regions[0], regionFactory0.createRegionAttributes());
createRegion(regions[1], regionFactory1.createRegionAttributes());
- LogWriterSupport.getLogWriter().info("### Successfully Created Region on Client :" + regions[0]);
- LogWriterSupport.getLogWriter().info("### Successfully Created Region on Client :" + regions[1]);
+ LogWriterUtils.getLogWriter().info("### Successfully Created Region on Client :" + regions[0]);
+ LogWriterUtils.getLogWriter().info("### Successfully Created Region on Client :" + regions[1]);
}
};
@@ -436,11 +436,11 @@ public class CqQueryDUnitTest extends CacheTestCase {
SerializableRunnable closeCQService =
new CacheSerializableRunnable("Close Client") {
public void run2() throws CacheException {
- LogWriterSupport.getLogWriter().info("### Close Client. ###");
+ LogWriterUtils.getLogWriter().info("### Close Client. ###");
try {
((DefaultQueryService)getCache().getQueryService()).closeCqService();
} catch (Exception ex) {
- LogWriterSupport.getLogWriter().info("### Failed to get CqService during ClientClose() ###");
+ LogWriterUtils.getLogWriter().info("### Failed to get CqService during ClientClose() ###");
}
}
@@ -459,7 +459,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
for (int i = 1; i <= size; i++) {
region1.put(KEY+i, new Portfolio(i));
}
- LogWriterSupport.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
+ LogWriterUtils.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
}
});
}
@@ -474,7 +474,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
portfolio.createTime = System.currentTimeMillis();
region1.put(KEY+i, portfolio);
}
- LogWriterSupport.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
+ LogWriterUtils.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
}
});
}
@@ -488,7 +488,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
portfolio.shortID = new Short(""+i);
region1.put(KEY+i, portfolio);
}
- LogWriterSupport.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
+ LogWriterUtils.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
}
});
}
@@ -520,7 +520,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
}
}
- LogWriterSupport.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
+ LogWriterUtils.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
}
});
}
@@ -552,7 +552,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
}
}
- LogWriterSupport.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
+ LogWriterUtils.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
}
});
}
@@ -564,7 +564,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
for (int i = 1; i <= size; i++) {
region1.put("key" + i, new Portfolio(i));
}
- LogWriterSupport.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
+ LogWriterUtils.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
}
});
}
@@ -592,7 +592,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
for (int i = 1; i <= size; i++) {
region1.destroy(KEY+i);
}
- LogWriterSupport.getLogWriter().info("### Number of Entries In Region after Delete :" + region1.keys().size());
+ LogWriterUtils.getLogWriter().info("### Number of Entries In Region after Delete :" + region1.keys().size());
}
});
@@ -608,7 +608,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
for (int i = 1; i <= size; i++) {
region1.invalidate(KEY+i);
}
- LogWriterSupport.getLogWriter().info("### Number of Entries In Region after Delete :" + region1.keys().size());
+ LogWriterUtils.getLogWriter().info("### Number of Entries In Region after Delete :" + region1.keys().size());
}
});
@@ -626,7 +626,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
//getLogWriter().info("### DEBUG CREATE CQ START ####");
//pause(20 * 1000);
- LogWriterSupport.getLogWriter().info("### Create CQ. ###" + cqName);
+ LogWriterUtils.getLogWriter().info("### Create CQ. ###" + cqName);
// Get CQ Service.
QueryService cqService = null;
try {
@@ -637,7 +637,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
}
// Create CQ Attributes.
CqAttributesFactory cqf = new CqAttributesFactory();
- CqListener[] cqListeners = {new CqQueryTestListener(LogWriterSupport.getLogWriter())};
+ CqListener[] cqListeners = {new CqQueryTestListener(LogWriterUtils.getLogWriter())};
// ((CqQueryTestListener)cqListeners[0]).cqName = cqName;
// if (isBridgeMemberTest) {
// testListenerForBridgeMembershipTest = (CqQueryTestListener)cqListeners[0];
@@ -653,7 +653,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
} catch (Exception ex){
AssertionError err = new AssertionError("Failed to create CQ " + cqName + " . ");
err.initCause(ex);
- LogWriterSupport.getLogWriter().info("CqService is :" + cqService, err);
+ LogWriterUtils.getLogWriter().info("CqService is :" + cqService, err);
throw err;
}
}
@@ -665,10 +665,10 @@ public class CqQueryDUnitTest extends CacheTestCase {
vm.invoke(new CacheSerializableRunnable("Create CQ with no name:" ) {
public void run2() throws CacheException {
//pause(60 * 1000);
- LogWriterSupport.getLogWriter().info("### DEBUG CREATE CQ START ####");
+ LogWriterUtils.getLogWriter().info("### DEBUG CREATE CQ START ####");
//pause(20 * 1000);
- LogWriterSupport.getLogWriter().info("### Create CQ with no name. ###");
+ LogWriterUtils.getLogWriter().info("### Create CQ with no name. ###");
// Get CQ Service.
QueryService cqService = null;
CqQuery cq1 = null;
@@ -684,7 +684,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
for (int i = 0; i < 20; ++i) {
// Create CQ Attributes.
CqAttributesFactory cqf = new CqAttributesFactory();
- CqListener[] cqListeners = {new CqQueryTestListener(LogWriterSupport.getLogWriter())};
+ CqListener[] cqListeners = {new CqQueryTestListener(LogWriterUtils.getLogWriter())};
cqf.initCqListeners(cqListeners);
CqAttributes cqa = cqf.create();
@@ -694,40 +694,40 @@ public class CqQueryDUnitTest extends CacheTestCase {
cq1 = cqService.newCq(queryStr, cqa);
((CqQueryTestListener)cqListeners[0]).cqName = cq1.getName();
} catch (Exception ex){
- LogWriterSupport.getLogWriter().info("CQService is :" + cqService);
+ LogWriterUtils.getLogWriter().info("CQService is :" + cqService);
ex.printStackTrace();
fail("Failed to create CQ with no name" + " . " + ex.getMessage());
}
if (cq1 == null) {
- LogWriterSupport.getLogWriter().info("Failed to get CqQuery object for CQ with no name.");
+ LogWriterUtils.getLogWriter().info("Failed to get CqQuery object for CQ with no name.");
}
else {
cqName = cq1.getName();
- LogWriterSupport.getLogWriter().info("Created CQ with no name, generated CQ name: " + cqName + " CQ state:" + cq1.getState());
+ LogWriterUtils.getLogWriter().info("Created CQ with no name, generated CQ name: " + cqName + " CQ state:" + cq1.getState());
assertTrue("Create CQ with no name illegal state", cq1.getState().isStopped());
}
if ( i%2 == 0) {
try {
cqResults = cq1.executeWithInitialResults();
} catch (Exception ex){
- LogWriterSupport.getLogWriter().info("CqService is :" + cqService);
+ LogWriterUtils.getLogWriter().info("CqService is :" + cqService);
ex.printStackTrace();
fail("Failed to execute CQ with initial results, cq name: " + cqName + " . " + ex.getMessage());
}
- LogWriterSupport.getLogWriter().info("initial result size = " + cqResults.size());
- LogWriterSupport.getLogWriter().info("CQ state after execute with initial results = " + cq1.getState());
+ LogWriterUtils.getLogWriter().info("initial result size = " + cqResults.size());
+ LogWriterUtils.getLogWriter().info("CQ state after execute with initial results = " + cq1.getState());
assertTrue("executeWithInitialResults() state mismatch", cq1.getState().isRunning());
}
else {
try {
cq1.execute();
} catch (Exception ex){
- LogWriterSupport.getLogWriter().info("CQService is :" + cqService);
+ LogWriterUtils.getLogWriter().info("CQService is :" + cqService);
ex.printStackTrace();
fail("Failed to execute CQ " + cqName + " . " + ex.getMessage());
}
- LogWriterSupport.getLogWriter().info("CQ state after execute = " + cq1.getState());
+ LogWriterUtils.getLogWriter().info("CQ state after execute = " + cq1.getState());
assertTrue("execute() state mismatch", cq1.getState().isRunning());
}
@@ -735,7 +735,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
try {
cq1.close();
} catch (Exception ex){
- LogWriterSupport.getLogWriter().info("CqService is :" + cqService, ex);
+ LogWriterUtils.getLogWriter().info("CqService is :" + cqService, ex);
fail("Failed to close CQ " + cqName + " . " + ex.getMessage());
}
assertTrue("closeCq() state mismatch", cq1.getState().isClosed());
@@ -763,7 +763,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
private void work() throws CacheException {
//pause(60 * 1000);
- LogWriterSupport.getLogWriter().info("### DEBUG EXECUTE CQ START ####");
+ LogWriterUtils.getLogWriter().info("### DEBUG EXECUTE CQ START ####");
//pause(20 * 1000);
// Get CQ Service.
@@ -783,16 +783,16 @@ public class CqQueryDUnitTest extends CacheTestCase {
try {
cq1 = cqService.getCq(cqName);
if (cq1 == null) {
- LogWriterSupport.getLogWriter().info("Failed to get CqQuery object for CQ name: " + cqName);
+ LogWriterUtils.getLogWriter().info("Failed to get CqQuery object for CQ name: " + cqName);
fail("Failed to get CQ " + cqName);
}
else {
- LogWriterSupport.getLogWriter().info("Obtained CQ, CQ name: " + cq1.getName());
+ LogWriterUtils.getLogWriter().info("Obtained CQ, CQ name: " + cq1.getName());
assertTrue("newCq() state mismatch", cq1.getState().isStopped());
}
} catch (Exception ex){
- LogWriterSupport.getLogWriter().info("CqService is :" + cqService);
- LogWriterSupport.getLogWriter().error(ex);
+ LogWriterUtils.getLogWriter().info("CqService is :" + cqService);
+ LogWriterUtils.getLogWriter().error(ex);
AssertionError err = new AssertionError("Failed to execute CQ " + cqName);
err.initCause(ex);
throw err;
@@ -804,13 +804,13 @@ public class CqQueryDUnitTest extends CacheTestCase {
try {
cqResults = cq1.executeWithInitialResults();
} catch (Exception ex){
- LogWriterSupport.getLogWriter().info("CqService is :" + cqService);
+ LogWriterUtils.getLogWriter().info("CqService is :" + cqService);
ex.printStackTrace();
AssertionError err = new AssertionError("Failed to execute CQ " + cqName);
err.initCause(ex);
throw err;
}
- LogWriterSupport.getLogWriter().info("initial result size = " + cqResults.size());
+ LogWriterUtils.getLogWriter().info("initial result size = " + cqResults.size());
assertTrue("executeWithInitialResults() state mismatch", cq1.getState().isRunning());
if (expectedResultsSize >= 0) {
assertEquals("unexpected results size", expectedResultsSize, cqResults.size());
@@ -823,7 +823,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
AssertionError err = new AssertionError("Failed to execute CQ " + cqName);
err.initCause(ex);
if (expectedErr == null) {
- LogWriterSupport.getLogWriter().info("CqService is :" + cqService, err);
+ LogWriterUtils.getLogWriter().info("CqService is :" + cqService, err);
}
throw err;
}
@@ -853,7 +853,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
public void stopCQ(VM vm, final String cqName) throws Exception {
vm.invoke(new CacheSerializableRunnable("Stop CQ :" + cqName) {
public void run2() throws CacheException {
- LogWriterSupport.getLogWriter().info("### Stop CQ. ###" + cqName);
+ LogWriterUtils.getLogWriter().info("### Stop CQ. ###" + cqName);
// Get CQ Service.
QueryService cqService = null;
try {
@@ -883,7 +883,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
vm.invoke(new CacheSerializableRunnable("Stop CQ :" + cqName) {
public void run2() throws CacheException {
CqQuery cq1 = null;
- LogWriterSupport.getLogWriter().info("### Stop and Exec CQ. ###" + cqName);
+ LogWriterUtils.getLogWriter().info("### Stop and Exec CQ. ###" + cqName);
// Get CQ Service.
QueryService cqService = null;
try {
@@ -910,8 +910,8 @@ public class CqQueryDUnitTest extends CacheTestCase {
fail("Count = " + i + "Failed to stop CQ " + cqName + " . " + ex.getMessage());
}
assertTrue("Stop CQ state mismatch, count = " + i, cq1.getState().isStopped());
- LogWriterSupport.getLogWriter().info("After stop in Stop and Execute loop, ran successfully, loop count: " + i);
- LogWriterSupport.getLogWriter().info("CQ state: " + cq1.getState());
+ LogWriterUtils.getLogWriter().info("After stop in Stop and Execute loop, ran successfully, loop count: " + i);
+ LogWriterUtils.getLogWriter().info("CQ state: " + cq1.getState());
// Re-execute CQ
try {
@@ -921,8 +921,8 @@ public class CqQueryDUnitTest extends CacheTestCase {
fail("Count = " + i + "Failed to execute CQ " + cqName + " . " + ex.getMessage());
}
assertTrue("Execute CQ state mismatch, count = " + i, cq1.getState().isRunning());
- LogWriterSupport.getLogWriter().info("After execute in Stop and Execute loop, ran successfully, loop count: " + i);
- LogWriterSupport.getLogWriter().info("CQ state: " + cq1.getState());
+ LogWriterUtils.getLogWriter().info("After execute in Stop and Execute loop, ran successfully, loop count: " + i);
+ LogWriterUtils.getLogWriter().info("CQ state: " + cq1.getState());
}
}
});
@@ -933,7 +933,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
public void closeCQ(VM vm, final String cqName) throws Exception {
vm.invoke(new CacheSerializableRunnable("Close CQ :" + cqName) {
public void run2() throws CacheException {
- LogWriterSupport.getLogWriter().info("### Close CQ. ###" + cqName);
+ LogWriterUtils.getLogWriter().info("### Close CQ. ###" + cqName);
// Get CQ Service.
QueryService cqService = null;
try {
@@ -966,7 +966,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
Region region = null;
try {
region = getRootRegion().getSubregion(regionName);
- region.getAttributesMutator().setCacheListener(new CertifiableTestCacheListener(LogWriterSupport.getLogWriter()));
+ region.getAttributesMutator().setCacheListener(new CertifiableTestCacheListener(LogWriterUtils.getLogWriter()));
} catch (Exception cqe) {
AssertionError err = new AssertionError("Failed to get Region.");
err.initCause(cqe);
@@ -993,7 +993,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
public void executeAndCloseAndExecuteIRMultipleTimes(VM vm, final String cqName, final String queryStr) {
vm.invoke(new CacheSerializableRunnable("Create CQ :" + cqName) {
public void run2() throws CacheException {
- LogWriterSupport.getLogWriter().info("### Create CQ. ###" + cqName);
+ LogWriterUtils.getLogWriter().info("### Create CQ. ###" + cqName);
// Get CQ Service.
QueryService cqService = null;
try {
@@ -1004,7 +1004,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
}
// Create CQ Attributes.
CqAttributesFactory cqf = new CqAttributesFactory();
- CqListener[] cqListeners = {new CqQueryTestListener(LogWriterSupport.getLogWriter())};
+ CqListener[] cqListeners = {new CqQueryTestListener(LogWriterUtils.getLogWriter())};
cqf.initCqListeners(cqListeners);
CqAttributes cqa = cqf.create();
@@ -1017,7 +1017,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
} catch (Exception ex){
AssertionError err = new AssertionError("Failed to create CQ " + cqName + " . ");
err.initCause(ex);
- LogWriterSupport.getLogWriter().info("CqService is :" + cqService, err);
+ LogWriterUtils.getLogWriter().info("CqService is :" + cqService, err);
throw err;
}
@@ -1082,7 +1082,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
private void failIfCQExists(VM vm, final String cqName) {
vm.invoke(new CacheSerializableRunnable("Fail if CQ exists") {
public void run2() throws CacheException {
- LogWriterSupport.getLogWriter().info("### Fail if CQ Exists. ### " + cqName);
+ LogWriterUtils.getLogWriter().info("### Fail if CQ Exists. ### " + cqName);
// Get CQ Service.
QueryService cqService = null;
try {
@@ -1105,7 +1105,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
vm.invoke(new CacheSerializableRunnable("Validate CQs") {
public void run2() throws CacheException {
- LogWriterSupport.getLogWriter().info("### Validating CQ. ### " + cqName);
+ LogWriterUtils.getLogWriter().info("### Validating CQ. ### " + cqName);
// Get CQ Service.
QueryService cqService = null;
try {
@@ -1155,7 +1155,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
final int totalEvents) {
vm.invoke(new CacheSerializableRunnable("Validate CQs") {
public void run2() throws CacheException {
- LogWriterSupport.getLogWriter().info("### Validating CQ. ### " + cqName);
+ LogWriterUtils.getLogWriter().info("### Validating CQ. ### " + cqName);
// Get CQ Service.
QueryService cqService = null;
try {
@@ -1459,7 +1459,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
private void validateQuery(VM vm, final String query, final int resultSize) {
vm.invoke(new CacheSerializableRunnable("Validate Query") {
public void run2() throws CacheException {
- LogWriterSupport.getLogWriter().info("### Validating Query. ###");
+ LogWriterUtils.getLogWriter().info("### Validating Query. ###");
QueryService qs = getCache().getQueryService();
Query q = qs.newQuery(query);
@@ -1467,7 +1467,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
Object r = q.execute();
if(r instanceof Collection){
int rSize = ((Collection)r).size();
- LogWriterSupport.getLogWriter().info("### Result Size is :" + rSize);
+ LogWriterUtils.getLogWriter().info("### Result Size is :" + rSize);
assertEquals(rSize, rSize);
}
}
@@ -1518,7 +1518,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
vm.invoke(new CacheSerializableRunnable("Stop CQ :" + cqName) {
public void run2() throws CacheException {
CqQuery cq1 = null;
- LogWriterSupport.getLogWriter().info("### CQ attributes mutator for ###" + cqName);
+ LogWriterUtils.getLogWriter().info("### CQ attributes mutator for ###" + cqName);
// Get CQ Service.
QueryService cqService = null;
try {
@@ -1619,7 +1619,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
createServer(server2);
final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
// Create client.
createClient(client, thePort, host0);
@@ -1662,7 +1662,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
/* Init Server and Client */
createServer(server);
final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
createClient(client, thePort, host0);
@@ -1832,7 +1832,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
/* Init Server and Client */
createServer(server);
final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
createClient(client, thePort, host0);
/* Create CQs. */
@@ -1915,7 +1915,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
/* Init Server and Client */
createServer(server);
final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
createClient(client, thePort, host0);
/* Create CQs. */
@@ -2011,7 +2011,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
/* Init Server and Client */
createServer(server);
final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
createClient(client, thePort, host0);
/* debug */
@@ -2102,12 +2102,12 @@ public class CqQueryDUnitTest extends CacheTestCase {
} catch (com.gemstone.gemfire.test.dunit.RMIException rmiExc) {
Throwable cause = rmiExc.getCause();
if (!(cause instanceof AssertionError)) {
- LogWriterSupport.getLogWriter().severe("Expected to see an AssertionError.", cause);
+ LogWriterUtils.getLogWriter().severe("Expected to see an AssertionError.", cause);
fail("wrong error");
}
Throwable causeCause = cause.getCause(); // should be a RegionNotFoundException
if (!(causeCause instanceof RegionNotFoundException)) {
- LogWriterSupport.getLogWriter().severe("Expected cause to be RegionNotFoundException", cause);
+ LogWriterUtils.getLogWriter().severe("Expected cause to be RegionNotFoundException", cause);
fail("wrong cause");
}
}
@@ -2123,14 +2123,14 @@ public class CqQueryDUnitTest extends CacheTestCase {
client.invoke(new CacheSerializableRunnable("CloseAll CQ :") {
public void run2() throws CacheException {
- LogWriterSupport.getLogWriter().info("### Close All CQ. ###");
+ LogWriterUtils.getLogWriter().info("### Close All CQ. ###");
// Get CQ Service.
QueryService cqService = null;
try {
cqService = getCache().getQueryService();
} catch (Exception cqe) {
cqe.printStackTrace();
- LogWriterSupport.getLogWriter().info("Failed to getCQService.", cqe);
+ LogWriterUtils.getLogWriter().info("Failed to getCQService.", cqe);
fail("Failed to getCQService.");
}
@@ -2139,7 +2139,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
cqService.closeCqs();
} catch (Exception ex){
ex.printStackTrace();
- LogWriterSupport.getLogWriter().info("Failed to close All CQ.", ex);
+ LogWriterUtils.getLogWriter().info("Failed to close All CQ.", ex);
fail("Failed to close All CQ. " + ex.getMessage());
}
}
@@ -2159,7 +2159,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
// Call close all CQ.
client.invoke(new CacheSerializableRunnable("CloseAll CQ 2 :") {
public void run2() throws CacheException {
- LogWriterSupport.getLogWriter().info("### Close All CQ 2. ###");
+ LogWriterUtils.getLogWriter().info("### Close All CQ 2. ###");
// Get CQ Service.
QueryService cqService = null;
try {
@@ -2197,7 +2197,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
/* Init Server and Client */
createServer(server);
final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
createClient(client, thePort, host0);
@@ -2281,7 +2281,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
/* Create Server and Client */
createServer(server);
final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
createClient(client1, thePort, host0);
createClient(client2, thePort, host0);
@@ -2431,7 +2431,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
createServer(server);
final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
// Create client.
createClient(client, thePort, host0);
@@ -2502,7 +2502,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
createServer(server);
final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
// Create client.
createClient(client, thePort, host0);
@@ -2605,7 +2605,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
final int thePort = server.invokeInt(CqQueryDUnitTest.class,
"getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
// Create client.
createClient(client, thePort, host0);
@@ -2670,7 +2670,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
value.put("field2", "key" + i);
exampleRegion.put(KEY + i, value);
}
- LogWriterSupport.getLogWriter().info(
+ LogWriterUtils.getLogWriter().info(
"### Number of Entries in Region :" + exampleRegion.keys().size());
}
});
@@ -2689,7 +2689,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
createServer(server);
final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
// Create client.
createClient(client, thePort, host0);
@@ -2831,7 +2831,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
createServer(server);
final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
// Create client.
createClient(client, thePort, host0);
@@ -2873,7 +2873,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
createServer(server1);
final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server1.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server1.getHost());
// Create client.
// Properties props = new Properties();
// Create client with redundancyLevel -1
@@ -2961,7 +2961,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
createServer(server1);
final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server1.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server1.getHost());
final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(2);
@@ -3059,7 +3059,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
createServer(server2);
final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server1.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server1.getHost());
final int thePort2 = server2.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
@@ -3119,7 +3119,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
createServer(server);
final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
// Create client.
createClient(client, thePort, host0);
@@ -3188,7 +3188,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
// Create client.
createLocalRegion(client, new int[] {thePort}, host0, "-1", new String[]{regions[0]});
@@ -3224,7 +3224,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
final int thePort = server.invokeInt(CqQueryDUnitTest.class,
"getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
// Create client.
createClient(client, thePort, host0);
@@ -3275,7 +3275,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
"Create Cache Server") {
public void run2() throws CacheException
{
- LogWriterSupport.getLogWriter().info("### Create Cache Server. ###");
+ LogWriterUtils.getLogWriter().info("### Create Cache Server. ###");
// Create region with Global scope
AttributesFactory factory1 = new AttributesFactory();
@@ -3309,7 +3309,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
final int port1 = server1.invokeInt(CqQueryDUnitTest.class,
"getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server1.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server1.getHost());
final int thePort2 = server2.invokeInt(CqQueryDUnitTest.class,
"getCacheServerPort");
@@ -3376,7 +3376,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
createServer(server);
final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
// Create client.
createClient(client, thePort, host0);
@@ -3408,7 +3408,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
createServer(server);
final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
// Create client.
createClient(client, thePort, host0);
@@ -3460,7 +3460,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
createServer(server);
final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
// Create client.
createClient(client, thePort, host0);
@@ -3512,7 +3512,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
final int port1 = server1.invokeInt(CqQueryDUnitTest.class,
"getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server1.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server1.getHost());
final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1);
createClient(client, new int[] { port1, ports[0] }, host0, "-1");
@@ -3560,7 +3560,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
createServer(server1);
final int port1 = server1.invokeInt(CqQueryDUnitTest.class,
"getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server1.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server1.getHost());
final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1);
createClient(client, new int[] { port1, ports[0] }, host0, "-1");
@@ -3607,7 +3607,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
createServer(server1);
final int port1 = server1.invokeInt(CqQueryDUnitTest.class,
"getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server1.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server1.getHost());
final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1);
@@ -3669,7 +3669,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
createServer(server1);
final int port1 = server1.invokeInt(CqQueryDUnitTest.class,
"getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server1.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server1.getHost());
final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1);
createClient(client, new int[] { port1, ports[0] }, host0, "-1");
@@ -3718,7 +3718,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
final int port1 = server1.invokeInt(CqQueryDUnitTest.class,
"getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server1.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server1.getHost());
final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1);
createServer(server2, ports[0]);
@@ -3771,7 +3771,7 @@ public void testCqCloseAndExecuteWithInitialResults() throws Exception {
createServer(server);
final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
// Create client.
createClient(client, thePort, host0);
@@ -3800,7 +3800,7 @@ public void testCQEventsWithNotEqualsUndefined() throws Exception {
createServer(server);
final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
// Create client.
createClient(client, thePort, host0);
@@ -3899,14 +3899,14 @@ public void testCQEventsWithNotEqualsUndefined() throws Exception {
server.invoke(new CacheSerializableRunnable("Server Region Entries") {
public void run2() throws CacheException {
Region region = getRootRegion().getSubregion(regionName);
- LogWriterSupport.getLogWriter().info("### Entries in Server :" + region.keys().size());
+ LogWriterUtils.getLogWriter().info("### Entries in Server :" + region.keys().size());
}
});
client.invoke(new CacheSerializableRunnable("Client Region Entries") {
public void run2() throws CacheException {
Region region = getRootRegion().getSubregion(regionName);
- LogWriterSupport.getLogWriter().info("### Entries in Client :" + region.keys().size());
+ LogWriterUtils.getLogWriter().info("### Entries in Client :" + region.keys().size());
}
});
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
index 32b9f94..6be233a 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
@@ -26,8 +26,8 @@ import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
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.NetworkSupport;
+import com.gemstone.gemfire.test.dunit.LogWriterUtils;
+import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.Wait;
@@ -74,7 +74,7 @@ public class CqQueryOptimizedExecuteDUnitTest extends CqQueryDUnitTest{
final int thePort = server.invokeInt(CqQueryDUnitTest.class,
"getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
// Create client.
createClient(client, thePort, host0);
@@ -101,7 +101,7 @@ public class CqQueryOptimizedExecuteDUnitTest extends CqQueryDUnitTest{
for (int i = numOfEntries+1; i <= numOfEntries*2; i++) {
region1.put(KEY+i, new Portfolio(i));
}
- LogWriterSupport.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
+ LogWriterUtils.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
}
});
@@ -173,7 +173,7 @@ public class CqQueryOptimizedExecuteDUnitTest extends CqQueryDUnitTest{
final int thePort = server.invokeInt(CqQueryDUnitTest.class,
"getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server.getHost());
// Create client.
createClient(client, thePort, host0);
@@ -201,7 +201,7 @@ public class CqQueryOptimizedExecuteDUnitTest extends CqQueryDUnitTest{
for (int i = numOfEntries+1; i <= numOfEntries*2; i++) {
region1.put(KEY+i, new Portfolio(i));
}
- LogWriterSupport.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
+ LogWriterUtils.getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
}
});
@@ -268,7 +268,7 @@ public class CqQueryOptimizedExecuteDUnitTest extends CqQueryDUnitTest{
final int port1 = server1.invokeInt(CqQueryDUnitTest.class,
"getCacheServerPort");
- final String host0 = NetworkSupport.getServerHostName(server1.getHost());
+ final String host0 = NetworkUtils.getServerHostName(server1.getHost());
final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1);
createServer(server2, ports[0]);