http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java index 9fbab8c..1f3ed17 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java @@ -50,7 +50,7 @@ import com.gemstone.gemfire.internal.cache.functions.TestFunction; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.SerializableCallable; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; @@ -168,7 +168,7 @@ public class MemberFunctionExecutionDUnitTest extends CacheTestCase { resultCollector.getResult(); fail("Should have received FunctionException due to class not found"); } catch (FunctionException expected) { - LogWriterSupport.getLogWriter().warning("received wrong exception cause", expected.getCause()); + LogWriterUtils.getLogWriter().warning("received wrong exception cause", expected.getCause()); assertTrue((expected.getCause() instanceof ClassNotFoundException)); } } @@ -387,7 +387,7 @@ public class MemberFunctionExecutionDUnitTest extends CacheTestCase { } }); List li = (ArrayList)rc.getResult(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "MemberFunctionExecutionDUnitTest#excuteOnMembers: Result : " + li); assertEquals(li.size(), 1); for (Object obj : li) { @@ -396,7 +396,7 @@ public class MemberFunctionExecutionDUnitTest extends CacheTestCase { ds.disconnect(); } catch (Exception e) { - LogWriterSupport.getLogWriter().info("Exception Occured : "+ e.getMessage()); + LogWriterUtils.getLogWriter().info("Exception Occured : "+ e.getMessage()); e.printStackTrace(); Assert.fail("Test failed",e); } @@ -444,7 +444,7 @@ public class MemberFunctionExecutionDUnitTest extends CacheTestCase { try { ResultCollector rc = executor.execute(function.getId()); List li = (ArrayList)rc.getResult(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "MemberFunctionExecutionDUnitTest#excuteOnMembers: Result : " + li); assertEquals(li.size(), noOfMembers.intValue()); for (Object obj : li) { @@ -452,7 +452,7 @@ public class MemberFunctionExecutionDUnitTest extends CacheTestCase { } } catch (Exception e) { - LogWriterSupport.getLogWriter().info("Exception Occured : "+ e.getMessage()); + LogWriterUtils.getLogWriter().info("Exception Occured : "+ e.getMessage()); e.printStackTrace(); Assert.fail("Test failed",e); } @@ -484,7 +484,7 @@ public class MemberFunctionExecutionDUnitTest extends CacheTestCase { try { ResultCollector rc = memberExcution.withArgs(Boolean.TRUE).execute(function); List li = (ArrayList)rc.getResult(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "MemberFunctionExecutionDUnitTest#excuteOnMembers: Result : " + li); assertEquals(noOfMembers.intValue(), li.size()); for (Object obj : li) { @@ -492,7 +492,7 @@ public class MemberFunctionExecutionDUnitTest extends CacheTestCase { } } catch (Exception e) { - LogWriterSupport.getLogWriter().info("Exception Occured : "+ e.getMessage()); + LogWriterUtils.getLogWriter().info("Exception Occured : "+ e.getMessage()); e.printStackTrace(); Assert.fail("Test failed",e); } @@ -586,7 +586,7 @@ public class MemberFunctionExecutionDUnitTest extends CacheTestCase { } }); List li = (ArrayList)rc.getResult(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "MemberFunctionExecutionDUnitTest#excuteOnMembers: Result : " + li); assertEquals(li.size(), noOfMembers.intValue()); for (Object obj : li) { @@ -594,7 +594,7 @@ public class MemberFunctionExecutionDUnitTest extends CacheTestCase { } } catch (Exception e) { - LogWriterSupport.getLogWriter().info("Exception Occured : "+ e.getMessage()); + LogWriterUtils.getLogWriter().info("Exception Occured : "+ e.getMessage()); e.printStackTrace(); Assert.fail("Test failed",e); } @@ -614,7 +614,7 @@ public class MemberFunctionExecutionDUnitTest extends CacheTestCase { fail("Test Failed"); } catch (Exception expected) { - LogWriterSupport.getLogWriter().info("Exception Occured : "+ expected.getMessage()); + LogWriterUtils.getLogWriter().info("Exception Occured : "+ expected.getMessage()); // boolean check = expected.getMessage().equals("Cannot return any result, as Function.hasResult() is false"); assertTrue(expected.getMessage().equals(LocalizedStrings.ExecuteFunction_CANNOT_0_RESULTS_HASRESULT_FALSE .toLocalizedString("return any")));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java index 9e748d9..5feec25 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java @@ -46,7 +46,7 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.test.dunit.DistributedTestCase; import com.gemstone.gemfire.test.dunit.IgnoredException; import com.gemstone.gemfire.test.dunit.Invoke; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.SerializableCallable; import com.gemstone.gemfire.test.dunit.VM; @@ -88,7 +88,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { @Override public void execute(FunctionContext context) { - LogWriterSupport.getLogWriter().fine("SWAP:1:executing OnGroupsFunction:"+invocationCount); + LogWriterUtils.getLogWriter().fine("SWAP:1:executing OnGroupsFunction:"+invocationCount); InternalDistributedSystem ds = InternalDistributedSystem.getConnectedInstance(); synchronized (OnGroupsFunction.class) { invocationCount++; @@ -233,7 +233,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { vm0.invoke(new SerializableCallable() { @Override public Object call() throws Exception { - LogWriterSupport.getLogWriter().fine("SWAP:invoking on gm"); + LogWriterUtils.getLogWriter().fine("SWAP:invoking on gm"); DistributedSystem ds = getSystem(); try { FunctionService.onMember("no such group"); @@ -260,7 +260,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { @Override public Object call() throws Exception { DistributedSystem ds = getSystem(); - LogWriterSupport.getLogWriter().fine("SWAP:invoking on g0"); + LogWriterUtils.getLogWriter().fine("SWAP:invoking on g0"); Execution e = FunctionService.onMembers("g0"); ArrayList<String> args = new ArrayList<String>(); args.add("g0"); @@ -300,7 +300,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { vm0.invoke(new SerializableCallable() { @Override public Object call() throws Exception { - LogWriterSupport.getLogWriter().fine("SWAP:invoking on g0 g1"); + LogWriterUtils.getLogWriter().fine("SWAP:invoking on g0 g1"); InternalDistributedSystem ds = InternalDistributedSystem.getConnectedInstance(); Execution e = FunctionService.onMembers("g0", "g1"); ArrayList<String> args = new ArrayList<String>(); @@ -685,11 +685,11 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { } catch (CacheClosedException cce) { } disconnectFromDS(); - LogWriterSupport.getLogWriter().fine("SWAP:creating client cache"); + LogWriterUtils.getLogWriter().fine("SWAP:creating client cache"); ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolLocator(hostName, locatorPort); ccf.setPoolServerGroup("mg"); - ccf.set("log-level", LogWriterSupport.getDUnitLogLevel()); + ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); ClientCache c = ccf.create(); c.getLogger().info("SWAP:invoking function from client on g0"); @@ -783,11 +783,11 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { } catch (CacheClosedException cce) { } disconnectFromDS(); - LogWriterSupport.getLogWriter().fine("SWAP:creating client cache"); + LogWriterUtils.getLogWriter().fine("SWAP:creating client cache"); ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolLocator(hostName, locatorPort); ccf.setPoolServerGroup("mg"); - ccf.set("log-level", LogWriterSupport.getDUnitLogLevel()); + ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); ClientCache c = ccf.create(); c.getLogger().info("SWAP:invoking function from client on g0"); @@ -860,11 +860,11 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { } catch (CacheClosedException cce) { } disconnectFromDS(); - LogWriterSupport.getLogWriter().fine("SWAP:creating client cache"); + LogWriterUtils.getLogWriter().fine("SWAP:creating client cache"); ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolLocator(hostName, locatorPort); ccf.setPoolServerGroup("mg"); - ccf.set("log-level", LogWriterSupport.getDUnitLogLevel()); + ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); ClientCache c = ccf.create(); IgnoredException ex = IgnoredException.addIgnoredException("No member found"); @@ -940,11 +940,11 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { } catch (CacheClosedException cce) { } disconnectFromDS(); - LogWriterSupport.getLogWriter().fine("SWAP:creating client cache"); + LogWriterUtils.getLogWriter().fine("SWAP:creating client cache"); ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolLocator(hostName, locatorPort); ccf.setPoolServerGroup("mg"); - ccf.set("log-level", LogWriterSupport.getDUnitLogLevel()); + ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); ClientCache c = ccf.create(); IgnoredException expected = IgnoredException.addIgnoredException("No member found"); @@ -1017,11 +1017,11 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { } catch (CacheClosedException cce) { } disconnectFromDS(); - LogWriterSupport.getLogWriter().fine("SWAP:creating client cache"); + LogWriterUtils.getLogWriter().fine("SWAP:creating client cache"); ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolLocator(hostName, locatorPort); ccf.setPoolServerGroup("mg"); - ccf.set("log-level", LogWriterSupport.getDUnitLogLevel()); + ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); ClientCache c = ccf.create(); Execution e = InternalFunctionService.onServers(c, "g1"); @@ -1066,11 +1066,11 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { } catch (CacheClosedException cce) { } disconnectFromDS(); - LogWriterSupport.getLogWriter().fine("SWAP:creating client cache"); + LogWriterUtils.getLogWriter().fine("SWAP:creating client cache"); ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolLocator(hostName, locatorPort); ccf.setPoolServerGroup("mg"); - ccf.set("log-level", LogWriterSupport.getDUnitLogLevel()); + ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); ClientCache c = ccf.create(); Execution e = InternalFunctionService.onServers(c, "g1"); @@ -1115,11 +1115,11 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { } catch (CacheClosedException cce) { } disconnectFromDS(); - LogWriterSupport.getLogWriter().fine("SWAP:creating client cache"); + LogWriterUtils.getLogWriter().fine("SWAP:creating client cache"); ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolLocator(hostName, locatorPort); ccf.setPoolServerGroup("mg"); - ccf.set("log-level", LogWriterSupport.getDUnitLogLevel()); + ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); ClientCache c = ccf.create(); Execution e = InternalFunctionService.onServers(c, "g1"); @@ -1129,7 +1129,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { e = e.withArgs(args); ((AbstractExecution)e).setIgnoreDepartedMembers(true); ArrayList l = (ArrayList) e.execute(new OnGroupsExceptionFunction()).getResult(); - LogWriterSupport.getLogWriter().info("SWAP:result:"+l); + LogWriterUtils.getLogWriter().info("SWAP:result:"+l); assertEquals(2, l.size()); if (l.get(0) instanceof Throwable) { assertTrue((Boolean) l.get(1)); @@ -1182,11 +1182,11 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { } catch (CacheClosedException cce) { } disconnectFromDS(); - LogWriterSupport.getLogWriter().fine("SWAP:creating client cache"); + LogWriterUtils.getLogWriter().fine("SWAP:creating client cache"); ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolLocator(hostName, locatorPort); ccf.setPoolServerGroup("mg"); - ccf.set("log-level", LogWriterSupport.getDUnitLogLevel()); + ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); ClientCache c = ccf.create(); c.getLogger().info("SWAP:invoking function from client on g0"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java index 0b3d95a..d33dc47 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java @@ -31,7 +31,7 @@ import com.gemstone.gemfire.cache.execute.ResultCollector; import com.gemstone.gemfire.distributed.DistributedMember; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.internal.cache.functions.TestFunction; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; public class PRClientServerFunctionExecutionNoAckDUnitTest extends PRClientServerTestBase{ /** @@ -67,7 +67,7 @@ public class PRClientServerFunctionExecutionNoAckDUnitTest extends PRClientServe isByName = new Boolean(true); toRegister = new Boolean(true); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRClientServerFunctionExecutionNoAckDUnitTest#testServerFunctionExecution_NoAck : Starting test"); client.invoke(PRClientServerFunctionExecutionNoAckDUnitTest.class, @@ -85,7 +85,7 @@ public class PRClientServerFunctionExecutionNoAckDUnitTest extends PRClientServe registerFunctionAtServer(functionAck); toRegister = new Boolean(false); isByName = new Boolean(true); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRClientServerFunctionExecutionNoAckDUnitTest#testServerFunctionExecution_NoAck : Starting test"); client.invoke(PRClientServerFunctionExecutionNoAckDUnitTest.class, @@ -95,7 +95,7 @@ public class PRClientServerFunctionExecutionNoAckDUnitTest extends PRClientServe } private void createScenario() { - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRClientServerFFunctionExecutionDUnitTest#createScenario : creating scenario"); createClientServerScenarionWithoutRegion(); @@ -118,11 +118,11 @@ public class PRClientServerFunctionExecutionNoAckDUnitTest extends PRClientServe for(int i=0;i< NUM_ITERATION;i++) execute(member, Boolean.TRUE, functionNoAck, isByName, toRegister); t.stop(); - LogWriterSupport.getLogWriter().info("Time taken to execute boolean based" + NUM_ITERATION + "NoAck functions :" + t.getTimeInMs()); + LogWriterUtils.getLogWriter().info("Time taken to execute boolean based" + NUM_ITERATION + "NoAck functions :" + t.getTimeInMs()); } catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : ", ex); + LogWriterUtils.getLogWriter().info("Exception : ", ex); fail("Test failed after the execute operation"); } @@ -136,11 +136,11 @@ public class PRClientServerFunctionExecutionNoAckDUnitTest extends PRClientServe for(int i=0;i< NUM_ITERATION;i++) execute(member, testKeysSet, functionNoAck, isByName, toRegister); t.stop(); - LogWriterSupport.getLogWriter().info("Time taken to execute setbased" + NUM_ITERATION + "NoAck functions :" + t.getTimeInMs()); + LogWriterUtils.getLogWriter().info("Time taken to execute setbased" + NUM_ITERATION + "NoAck functions :" + t.getTimeInMs()); } catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : ", ex); + LogWriterUtils.getLogWriter().info("Exception : ", ex); fail("Test failed after the execute operationssssss"); } if(toRegister.booleanValue()){ @@ -159,11 +159,11 @@ public class PRClientServerFunctionExecutionNoAckDUnitTest extends PRClientServe timeinms += t.getTimeInMs(); assertEquals(Boolean.TRUE, ((List)rc.getResult()).get(0)); } - LogWriterSupport.getLogWriter().info("Time taken to execute boolean based" + NUM_ITERATION + "haveResults functions :" + timeinms); + LogWriterUtils.getLogWriter().info("Time taken to execute boolean based" + NUM_ITERATION + "haveResults functions :" + timeinms); } catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : ", ex); + LogWriterUtils.getLogWriter().info("Exception : ", ex); fail("Test failed after the execute operation"); } @@ -185,11 +185,11 @@ public class PRClientServerFunctionExecutionNoAckDUnitTest extends PRClientServe } } - LogWriterSupport.getLogWriter().info("Time taken to execute setbased" + NUM_ITERATION + "haveResults functions :" + timeinms); + LogWriterUtils.getLogWriter().info("Time taken to execute setbased" + NUM_ITERATION + "haveResults functions :" + timeinms); } catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : ", ex); + LogWriterUtils.getLogWriter().info("Exception : ", ex); fail("Test failed after the execute operationssssss"); } } @@ -212,7 +212,7 @@ public class PRClientServerFunctionExecutionNoAckDUnitTest extends PRClientServe } catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : ", ex); + LogWriterUtils.getLogWriter().info("Exception : ", ex); fail("Test failed after the execute operation allserver "); } @@ -225,7 +225,7 @@ public class PRClientServerFunctionExecutionNoAckDUnitTest extends PRClientServe } catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : ", ex); + LogWriterUtils.getLogWriter().info("Exception : ", ex); fail("Test failed after the execute operation"); } } @@ -235,15 +235,15 @@ public class PRClientServerFunctionExecutionNoAckDUnitTest extends PRClientServe throws Exception { if (isByName.booleanValue()) {// by name if(toRegister.booleanValue()){ - LogWriterSupport.getLogWriter().info("The function name to execute : " + function.getId()); + LogWriterUtils.getLogWriter().info("The function name to execute : " + function.getId()); Execution me = member.withArgs(args); - LogWriterSupport.getLogWriter().info("The args passed : " + args); + LogWriterUtils.getLogWriter().info("The args passed : " + args); return me.execute(function.getId()); } else { - LogWriterSupport.getLogWriter().info("The function name to execute : (without Register) " + function.getId()); + LogWriterUtils.getLogWriter().info("The function name to execute : (without Register) " + function.getId()); Execution me = member.withArgs(args); - LogWriterSupport.getLogWriter().info("The args passed : " + args); + LogWriterUtils.getLogWriter().info("The args passed : " + args); return me.execute(function.getId(), function.hasResult(),function.isHA(),function.optimizeForWrite()); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java index 375d755..be5b082 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java @@ -59,7 +59,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.AsyncInvocation; import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.Wait; import com.gemstone.gemfire.test.dunit.WaitCriterion; @@ -489,7 +489,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ if (!(ex.getCause() instanceof ServerConnectivityException) && !(ex.getCause() instanceof FunctionInvocationTargetException)) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : ", ex); + LogWriterUtils.getLogWriter().info("Exception : ", ex); fail("Test failed after the execute operation"); } } @@ -525,7 +525,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ assertEquals(1, ((List)rs.getResult()).size()); } catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : ", ex); + LogWriterUtils.getLogWriter().info("Exception : ", ex); Assert.fail("Test failed after the execute operation", ex); } } @@ -560,7 +560,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ assertEquals(1, ((List)rs.getResult()).size()); } catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : ", ex); + LogWriterUtils.getLogWriter().info("Exception : ", ex); fail("Test failed after the execute operation"); } } @@ -672,7 +672,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ String excuse; public boolean done() { int sz = pool.getConnectedServerCount(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Checking for the Live Servers : Expected : " + expectedLiveServers + " Available :" + sz); if (sz == expectedLiveServers.intValue()) { @@ -705,7 +705,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ ResultCollector rc1 = dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute( function.getId()); List l = ((List)rc1.getResult()); - LogWriterSupport.getLogWriter().info("Result size : " + l.size()); + LogWriterUtils.getLogWriter().info("Result size : " + l.size()); assertEquals(3, l.size()); for (Iterator i = l.iterator(); i.hasNext();) { @@ -713,7 +713,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ } } catch (Exception e) { - LogWriterSupport.getLogWriter().info("Got an exception : " + e.getMessage()); + LogWriterUtils.getLogWriter().info("Got an exception : " + e.getMessage()); assertTrue(e instanceof EOFException || e instanceof SocketException || e instanceof SocketTimeoutException || e instanceof ServerException || e instanceof IOException @@ -734,7 +734,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ ResultCollector rc1 = dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute( function.getId()); List l = ((List)rc1.getResult()); - LogWriterSupport.getLogWriter().info("Result size : " + l.size()); + LogWriterUtils.getLogWriter().info("Result size : " + l.size()); return l; } @@ -782,7 +782,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ PartitionedRegion region = (PartitionedRegion)cache.getRegion(PartitionedRegionName); HashMap localBucket2RegionMap = (HashMap)region .getDataStore().getSizeLocally(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Size of the " + PartitionedRegionName + " in this VM :- " + localBucket2RegionMap.size()); Set entrySet = localBucket2RegionMap.entrySet(); @@ -825,7 +825,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ .iterator().next()); } catch (Exception expected) { - LogWriterSupport.getLogWriter().info("Exception : " + expected.getMessage()); + LogWriterUtils.getLogWriter().info("Exception : " + expected.getMessage()); expected.printStackTrace(); fail("Test failed after the put operation"); } @@ -854,7 +854,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ List l = null; ResultCollector rc1 = execute(dataSet, testKeysSet, Boolean.TRUE, function, isByName); l = ((List)rc1.getResult()); - LogWriterSupport.getLogWriter().info("Result size : " + l.size()); + LogWriterUtils.getLogWriter().info("Result size : " + l.size()); assertEquals(3, l.size()); for (Iterator i = l.iterator(); i.hasNext();) { assertEquals(Boolean.TRUE, i.next()); @@ -906,7 +906,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ ResultCollector rc1 = execute(dataSet, testKeysSet, Boolean.TRUE, function, isByName); l = ((List)rc1.getResult()); - LogWriterSupport.getLogWriter().info("Result size : " + l.size()); + LogWriterUtils.getLogWriter().info("Result size : " + l.size()); assertEquals(3, l.size()); for (Iterator i = l.iterator(); i.hasNext();) { assertTrue(i.next() instanceof MyFunctionExecutionException); @@ -991,7 +991,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ ResultCollector rc1 = execute(dataSet, testKeysSet, Boolean.TRUE, function, isByName); l = ((List)rc1.getResult()); - LogWriterSupport.getLogWriter().info("Result size : " + l.size()); + LogWriterUtils.getLogWriter().info("Result size : " + l.size()); assertEquals(3, l.size()); for (Iterator i = l.iterator(); i.hasNext();) { assertEquals(Boolean.TRUE, i.next()); @@ -1027,7 +1027,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ }catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : " , ex); + LogWriterUtils.getLogWriter().info("Exception : " , ex); Assert.fail("Test failed after the put operation",ex); } } @@ -1071,13 +1071,13 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ } }); l = ((List)rc1.getResult()); - LogWriterSupport.getLogWriter().info("Result size : " + l.size()); + LogWriterUtils.getLogWriter().info("Result size : " + l.size()); assertEquals(3, l.size()); for (Iterator i = l.iterator(); i.hasNext();) { assertEquals(Boolean.TRUE, i.next()); } }catch(Exception e){ - LogWriterSupport.getLogWriter().info("Exception : " + e.getMessage()); + LogWriterUtils.getLogWriter().info("Exception : " + e.getMessage()); e.printStackTrace(); fail("Test failed after the put operation"); @@ -1249,7 +1249,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ }catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : " , ex); + LogWriterUtils.getLogWriter().info("Exception : " , ex); Assert.fail("Test failed after the put operation",ex); } } @@ -1304,7 +1304,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ } catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : ", ex); + LogWriterUtils.getLogWriter().info("Exception : ", ex); Assert.fail("Test failed after the put operation", ex); } @@ -1324,7 +1324,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ } catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : ", ex); + LogWriterUtils.getLogWriter().info("Exception : ", ex); Assert.fail("Test failed after the put operation", ex); } } @@ -1386,7 +1386,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ }catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : " , ex); + LogWriterUtils.getLogWriter().info("Exception : " , ex); Assert.fail("Test failed after the put operation",ex); } @@ -1498,7 +1498,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ }); } catch (Exception expected) { - LogWriterSupport.getLogWriter().fine("Exception occured : " + expected.getMessage()); + LogWriterUtils.getLogWriter().fine("Exception occured : " + expected.getMessage()); assertTrue(expected.getMessage().contains( "No target node found for KEY = " + testKey) || expected.getMessage() @@ -1560,7 +1560,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ }catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : " , ex); + LogWriterUtils.getLogWriter().info("Exception : " , ex); Assert.fail("Test failed after the put operation",ex); } } @@ -1616,7 +1616,7 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ }); } catch (Exception expected) { - LogWriterSupport.getLogWriter().fine("Exception occured : " + expected.getMessage()); + LogWriterUtils.getLogWriter().fine("Exception occured : " + expected.getMessage()); assertTrue(expected.getCause().getMessage().contains( "Could not create an instance of com.gemstone.gemfire.internal.cache.execute.PRClientServerRegionFunctionExecutionDUnitTest$UnDeserializable")); } finally { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java index e97716d..3615ce4 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java @@ -46,13 +46,13 @@ import com.gemstone.gemfire.internal.cache.functions.TestFunction; import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.AsyncInvocation; -import com.gemstone.gemfire.test.dunit.DistributedTestSupport; +import com.gemstone.gemfire.test.dunit.DistributedTestUtils; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.IgnoredException; -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.Threads; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.dunit.VM; public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends @@ -116,7 +116,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, "verifyDeadAndLiveServers", new Object[] { new Integer(1), new Integer(2) }); - Threads.join(async[0], 6 * 60 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(async[0], 6 * 60 * 1000); if (async[0].getException() != null) { Assert.fail("UnExpected Exception Occured : ", async[0].getException()); } @@ -156,7 +156,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, "verifyDeadAndLiveServers", new Object[] { new Integer(1), new Integer(2) }); - Threads.join(async[0], 5 * 60 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(async[0], 5 * 60 * 1000); if (async[0].getException() != null) { Assert.fail("UnExpected Exception Occured : ", async[0].getException()); } @@ -194,7 +194,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, "createProxyRegion", - new Object[] { NetworkSupport.getServerHostName(server1.getHost()) }); + new Object[] { NetworkUtils.getServerHostName(server1.getHost()) }); Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_HA_REGION); @@ -225,7 +225,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, "createProxyRegion", - new Object[] { NetworkSupport.getServerHostName(server1.getHost()) }); + new Object[] { NetworkUtils.getServerHostName(server1.getHost()) }); Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_HA_REGION); @@ -257,7 +257,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, "createProxyRegion", - new Object[] { NetworkSupport.getServerHostName(server1.getHost()) }); + new Object[] { NetworkUtils.getServerHostName(server1.getHost()) }); Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_NONHA_REGION); @@ -290,7 +290,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, "createProxyRegion", - new Object[] { NetworkSupport.getServerHostName(server1.getHost()) }); + new Object[] { NetworkUtils.getServerHostName(server1.getHost()) }); //Make sure the buckets are created. client.invoke(new SerializableRunnable() { @@ -355,7 +355,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends final int portLocator = AvailablePort .getRandomAvailablePort(AvailablePort.SOCKET); - final String hostLocator = NetworkSupport.getServerHostName(server1.getHost()); + final String hostLocator = NetworkUtils.getServerHostName(server1.getHost()); final String locator = hostLocator + "[" + portLocator + "]"; startLocatorInVM(portLocator); @@ -413,7 +413,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends final int portLocator = AvailablePort .getRandomAvailablePort(AvailablePort.SOCKET); - final String hostLocator = NetworkSupport.getServerHostName(server1.getHost()); + final String hostLocator = NetworkUtils.getServerHostName(server1.getHost()); final String locator = hostLocator + "[" + portLocator + "]"; startLocatorInVM(portLocator); @@ -460,7 +460,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends File logFile = new File("locator-" + locatorPort + ".log"); Properties props = new Properties(); - props = DistributedTestSupport.getAllDistributedSystemProperties(props); + props = DistributedTestUtils.getAllDistributedSystemProperties(props); props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false"); try { @@ -505,7 +505,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends attr.setPartitionAttributes(paf.create()); region = cache.createRegion(regionName, attr.create()); assertNotNull(region); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Region " + regionName + " created Successfully :" + region.toString()); return port; @@ -538,7 +538,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends RegionAttributes attrs = factory.create(); region = cache.createRegion(regionName, attrs); assertNotNull(region); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Distributed Region " + regionName + " created Successfully :" + region.toString()); } @@ -547,7 +547,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends for(int i = 0 ; i < 113; i++){ region.put(i, "KB_"+i); } - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Distributed Region " + regionName + " Have size :" + region.size()); } @@ -556,7 +556,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends Execution execute = FunctionService.onRegion(region); ResultCollector rc = execute.withArgs(Boolean.TRUE).execute( new TestFunction(true, TestFunction.TEST_FUNCTION_LASTRESULT)); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Exeuction Result :" + rc.getResult()); List l = ((List)rc.getResult()); @@ -564,7 +564,7 @@ public class PRClientServerRegionFunctionExecutionFailoverDUnitTest extends } public static void checkSize(){ - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Region " + regionName + " Have size :" + region.size()); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java index 728d1fd..f1d354b 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.java @@ -50,8 +50,8 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.AsyncInvocation; import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.dunit.Wait; import com.gemstone.gemfire.test.dunit.WaitCriterion; @@ -367,7 +367,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, "verifyDeadAndLiveServers", new Object[] { new Integer(1), new Integer(2) }); - Threads.join(async[0], 6 * 60 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(async[0], 6 * 60 * 1000); if (async[0].getException() != null) { Assert.fail("UnExpected Exception Occured : ", async[0].getException()); } @@ -415,7 +415,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest.class, "verifyDeadAndLiveServers", new Object[] { new Integer(1), new Integer(2) }); - Threads.join(async[0], 5 * 60 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(async[0], 5 * 60 * 1000); if (async[0].getException() != null) { Assert.fail("UnExpected Exception Occured : ", async[0].getException()); } @@ -520,7 +520,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends public boolean done() { int sz = pool.getConnectedServerCount(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Checking for the Live Servers : Expected : " + expectedLiveServers + " Available :" + sz); if (sz == expectedLiveServers.intValue()) { @@ -574,7 +574,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends } } catch (Exception e) { - LogWriterSupport.getLogWriter().info("Got an exception : " + e.getMessage()); + LogWriterUtils.getLogWriter().info("Got an exception : " + e.getMessage()); assertTrue(e instanceof EOFException || e instanceof SocketException || e instanceof SocketTimeoutException || e instanceof ServerException || e instanceof IOException @@ -595,7 +595,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends ResultCollector rc1 = dataSet.withFilter(testKeysSet) .withArgs(Boolean.TRUE).execute(function.getId()); List l = ((List)rc1.getResult()); - LogWriterSupport.getLogWriter().info("Result size : " + l.size()); + LogWriterUtils.getLogWriter().info("Result size : " + l.size()); return l; } @@ -632,7 +632,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends .getRegion(PartitionedRegionName); HashMap localBucket2RegionMap = (HashMap)region.getDataStore() .getSizeLocally(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Size of the " + PartitionedRegionName + " in this VM :- " + localBucket2RegionMap.size()); Set entrySet = localBucket2RegionMap.entrySet(); @@ -661,8 +661,8 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends ResultCollector rc1 = executeOnAll(dataSet, Boolean.TRUE, function, isByName); List resultList = (List)((List)rc1.getResult()); - LogWriterSupport.getLogWriter().info("Result size : " + resultList.size()); - LogWriterSupport.getLogWriter().info("Result are SSSS : " + resultList); + LogWriterUtils.getLogWriter().info("Result size : " + resultList.size()); + LogWriterUtils.getLogWriter().info("Result are SSSS : " + resultList); assertEquals(3, resultList.size()); Iterator resultIterator = resultList.iterator(); @@ -799,7 +799,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends .iterator().next()); } catch (Exception expected) { - LogWriterSupport.getLogWriter().info("Exception : " + expected.getMessage()); + LogWriterUtils.getLogWriter().info("Exception : " + expected.getMessage()); expected.printStackTrace(); fail("Test failed after the put operation"); } @@ -829,7 +829,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends ResultCollector rc1 = execute(dataSet, testKeysSet, Boolean.TRUE, function, isByName); l = ((List)rc1.getResult()); - LogWriterSupport.getLogWriter().info("Result size : " + l.size()); + LogWriterUtils.getLogWriter().info("Result size : " + l.size()); assertEquals(3, l.size()); for (Iterator i = l.iterator(); i.hasNext();) { assertEquals(Boolean.TRUE, i.next()); @@ -882,7 +882,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends ResultCollector rc1 = execute(dataSet, testKeysSet, Boolean.TRUE, function, isByName); l = ((List)rc1.getResult()); - LogWriterSupport.getLogWriter().info("Result size : " + l.size()); + LogWriterUtils.getLogWriter().info("Result size : " + l.size()); assertEquals(3, l.size()); for (Iterator i = l.iterator(); i.hasNext();) { assertEquals(Boolean.TRUE, i.next()); @@ -921,7 +921,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends } catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : ", ex); + LogWriterUtils.getLogWriter().info("Exception : ", ex); Assert.fail("Test failed after the put operation", ex); } } @@ -964,14 +964,14 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends } }); l = ((List)rc1.getResult()); - LogWriterSupport.getLogWriter().info("Result size : " + l.size()); + LogWriterUtils.getLogWriter().info("Result size : " + l.size()); assertEquals(3, l.size()); for (Iterator i = l.iterator(); i.hasNext();) { assertEquals(Boolean.TRUE, i.next()); } } catch (Exception e) { - LogWriterSupport.getLogWriter().info("Exception : " + e.getMessage()); + LogWriterUtils.getLogWriter().info("Exception : " + e.getMessage()); e.printStackTrace(); fail("Test failed after the put operation"); @@ -1058,7 +1058,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends } catch (FunctionException expected) { expected.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : " + expected.getMessage()); + LogWriterUtils.getLogWriter().info("Exception : " + expected.getMessage()); assertTrue(expected.getMessage().startsWith( (LocalizedStrings.ExecuteFunction_CANNOT_0_RESULTS_HASRESULT_FALSE .toLocalizedString("return any")))); @@ -1119,7 +1119,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends } catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : ", ex); + LogWriterUtils.getLogWriter().info("Exception : ", ex); Assert.fail("Test failed after the put operation", ex); } } @@ -1183,7 +1183,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends }); } catch (Exception expected) { - LogWriterSupport.getLogWriter().fine("Exception occured : " + expected.getMessage()); + LogWriterUtils.getLogWriter().fine("Exception occured : " + expected.getMessage()); assertTrue(expected.getMessage().contains( "No target node found for KEY = " + testKey) || expected.getMessage() @@ -1245,7 +1245,7 @@ public class PRClientServerRegionFunctionExecutionNoSingleHopDUnitTest extends } catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : ", ex); + LogWriterUtils.getLogWriter().info("Exception : ", ex); Assert.fail("Test failed after the put operation", ex); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java index 79ff701..8e2d2d4 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.java @@ -50,8 +50,8 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.AsyncInvocation; import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.dunit.Wait; import com.gemstone.gemfire.test.dunit.WaitCriterion; @@ -328,7 +328,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, "verifyDeadAndLiveServers", new Object[] { new Integer(1), new Integer(2) }); - Threads.join(async[0], 6 * 60 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(async[0], 6 * 60 * 1000); if (async[0].getException() != null) { Assert.fail("UnExpected Exception Occured : ", async[0].getException()); } @@ -380,7 +380,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest.class, "verifyDeadAndLiveServers", new Object[] { new Integer(1), new Integer(2) }); - Threads.join(async[0], 5 * 60 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(async[0], 5 * 60 * 1000); if (async[0].getException() != null) { Assert.fail("UnExpected Exception Occured : ", async[0].getException()); } @@ -485,7 +485,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e public boolean done() { int sz = pool.getConnectedServerCount(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Checking for the Live Servers : Expected : " + expectedLiveServers + " Available :" + sz); if (sz == expectedLiveServers.intValue()) { @@ -539,7 +539,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e } } catch (Exception e) { - LogWriterSupport.getLogWriter().info("Got an exception : " + e.getMessage()); + LogWriterUtils.getLogWriter().info("Got an exception : " + e.getMessage()); assertTrue(e instanceof EOFException || e instanceof SocketException || e instanceof SocketTimeoutException || e instanceof ServerException || e instanceof IOException @@ -560,7 +560,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e ResultCollector rc1 = dataSet.withFilter(testKeysSet) .withArgs(Boolean.TRUE).execute(function.getId()); List l = ((List)rc1.getResult()); - LogWriterSupport.getLogWriter().info("Result size : " + l.size()); + LogWriterUtils.getLogWriter().info("Result size : " + l.size()); return l; } @@ -591,7 +591,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e .getRegion(PartitionedRegionName); HashMap localBucket2RegionMap = (HashMap)region.getDataStore() .getSizeLocally(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Size of the " + PartitionedRegionName + " in this VM :- " + localBucket2RegionMap.size()); Set entrySet = localBucket2RegionMap.entrySet(); @@ -620,8 +620,8 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e ResultCollector rc1 = executeOnAll(dataSet, Boolean.TRUE, function, isByName); List resultList = (List)((List)rc1.getResult()); - LogWriterSupport.getLogWriter().info("Result size : " + resultList.size()); - LogWriterSupport.getLogWriter().info("Result are SSSS : " + resultList); + LogWriterUtils.getLogWriter().info("Result size : " + resultList.size()); + LogWriterUtils.getLogWriter().info("Result are SSSS : " + resultList); assertEquals(3, resultList.size()); Iterator resultIterator = resultList.iterator(); @@ -758,7 +758,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e .iterator().next()); } catch (Exception expected) { - LogWriterSupport.getLogWriter().info("Exception : " + expected.getMessage()); + LogWriterUtils.getLogWriter().info("Exception : " + expected.getMessage()); expected.printStackTrace(); fail("Test failed after the put operation"); } @@ -788,7 +788,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e ResultCollector rc1 = execute(dataSet, testKeysSet, Boolean.TRUE, function, isByName); l = ((List)rc1.getResult()); - LogWriterSupport.getLogWriter().info("Result size : " + l.size()); + LogWriterUtils.getLogWriter().info("Result size : " + l.size()); assertEquals(3, l.size()); for (Iterator i = l.iterator(); i.hasNext();) { assertEquals(Boolean.TRUE, i.next()); @@ -840,7 +840,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e ResultCollector rc1 = execute(dataSet, testKeysSet, Boolean.TRUE, function, isByName); l = ((List)rc1.getResult()); - LogWriterSupport.getLogWriter().info("Result size : " + l.size()); + LogWriterUtils.getLogWriter().info("Result size : " + l.size()); assertEquals(3, l.size()); for (Iterator i = l.iterator(); i.hasNext();) { assertEquals(Boolean.TRUE, i.next()); @@ -879,7 +879,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e } catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : ", ex); + LogWriterUtils.getLogWriter().info("Exception : ", ex); Assert.fail("Test failed after the put operation", ex); } } @@ -922,14 +922,14 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e } }); l = ((List)rc1.getResult()); - LogWriterSupport.getLogWriter().info("Result size : " + l.size()); + LogWriterUtils.getLogWriter().info("Result size : " + l.size()); assertEquals(3, l.size()); for (Iterator i = l.iterator(); i.hasNext();) { assertEquals(Boolean.TRUE, i.next()); } } catch (Exception e) { - LogWriterSupport.getLogWriter().info("Exception : " + e.getMessage()); + LogWriterUtils.getLogWriter().info("Exception : " + e.getMessage()); e.printStackTrace(); fail("Test failed after the put operation"); @@ -1016,7 +1016,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e } catch (FunctionException expected) { expected.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : " + expected.getMessage()); + LogWriterUtils.getLogWriter().info("Exception : " + expected.getMessage()); assertTrue(expected.getMessage().startsWith( (LocalizedStrings.ExecuteFunction_CANNOT_0_RESULTS_HASRESULT_FALSE .toLocalizedString("return any")))); @@ -1077,7 +1077,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e } catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : ", ex); + LogWriterUtils.getLogWriter().info("Exception : ", ex); Assert.fail("Test failed after the put operation", ex); } } @@ -1141,7 +1141,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e }); } catch (Exception expected) { - LogWriterSupport.getLogWriter().fine("Exception occured : " + expected.getMessage()); + LogWriterUtils.getLogWriter().fine("Exception occured : " + expected.getMessage()); assertTrue(expected.getMessage().contains( "No target node found for KEY = " + testKey) || expected.getMessage() @@ -1203,7 +1203,7 @@ public class PRClientServerRegionFunctionExecutionSelectorNoSingleHopDUnitTest e } catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : ", ex); + LogWriterUtils.getLogWriter().info("Exception : ", ex); Assert.fail("Test failed after the put operation", ex); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java index 50fa452..1afd8f5 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionSingleHopDUnitTest.java @@ -50,8 +50,8 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.AsyncInvocation; import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.dunit.Wait; import com.gemstone.gemfire.test.dunit.WaitCriterion; public class PRClientServerRegionFunctionExecutionSingleHopDUnitTest extends PRClientServerTestBase { @@ -353,7 +353,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion; client.invoke(PRClientServerRegionFunctionExecutionDUnitTest.class, "verifyDeadAndLiveServers", new Object[] { new Integer(1), new Integer(2) }); - Threads.join(async[0], 6 * 60 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(async[0], 6 * 60 * 1000); if (async[0].getException() != null) { Assert.fail("UnExpected Exception Occured : ", async[0].getException()); } @@ -382,7 +382,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion; server3.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, "startServerHA"); server1.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, "closeCacheHA"); client.invoke(PRClientServerRegionFunctionExecutionSingleHopDUnitTest.class, "verifyDeadAndLiveServers",new Object[]{new Integer(1),new Integer(2)}); - Threads.join(async[0], 5 * 60 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(async[0], 5 * 60 * 1000); if(async[0].getException() != null){ Assert.fail("UnExpected Exception Occured : ", async[0].getException()); } @@ -486,7 +486,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion; String excuse; public boolean done() { int sz = pool.getConnectedServerCount(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Checking for the Live Servers : Expected : " + expectedLiveServers + " Available :" + sz); if (sz == expectedLiveServers.intValue()) { @@ -536,7 +536,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion; } } catch (Exception e) { - LogWriterSupport.getLogWriter().info("Got an exception : " + e.getMessage()); + LogWriterUtils.getLogWriter().info("Got an exception : " + e.getMessage()); assertTrue(e instanceof EOFException || e instanceof SocketException || e instanceof SocketTimeoutException || e instanceof ServerException || e instanceof IOException @@ -557,7 +557,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion; ResultCollector rc1 = dataSet.withFilter(testKeysSet).withArgs(Boolean.TRUE).execute( function.getId()); List l = ((List)rc1.getResult()); - LogWriterSupport.getLogWriter().info("Result size : " + l.size()); + LogWriterUtils.getLogWriter().info("Result size : " + l.size()); return l; } @@ -592,7 +592,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion; PartitionedRegion region = (PartitionedRegion)cache.getRegion(PartitionedRegionName); HashMap localBucket2RegionMap = (HashMap)region .getDataStore().getSizeLocally(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Size of the " + PartitionedRegionName + " in this VM :- " + localBucket2RegionMap.size()); Set entrySet = localBucket2RegionMap.entrySet(); @@ -620,8 +620,8 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion; } ResultCollector rc1 = executeOnAll(dataSet, Boolean.TRUE, function, isByName); List resultList = ((List)rc1.getResult()); - LogWriterSupport.getLogWriter().info("Result size : " + resultList.size()); - LogWriterSupport.getLogWriter().info("Result are SSSS : " + resultList); + LogWriterUtils.getLogWriter().info("Result size : " + resultList.size()); + LogWriterUtils.getLogWriter().info("Result are SSSS : " + resultList); assertEquals(3, resultList.size()); // while (resultIterator.hasNext()) { @@ -751,7 +751,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion; .iterator().next()); } catch (Exception expected) { - LogWriterSupport.getLogWriter().info("Exception : " + expected.getMessage()); + LogWriterUtils.getLogWriter().info("Exception : " + expected.getMessage()); expected.printStackTrace(); fail("Test failed after the put operation"); } @@ -780,7 +780,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion; List l = null; ResultCollector rc1 = execute(dataSet, testKeysSet, Boolean.TRUE, function, isByName); l = ((List)rc1.getResult()); - LogWriterSupport.getLogWriter().info("Result size : " + l.size()); + LogWriterUtils.getLogWriter().info("Result size : " + l.size()); assertEquals(3, l.size()); for (Iterator i = l.iterator(); i.hasNext();) { assertEquals(Boolean.TRUE, i.next()); @@ -830,7 +830,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion; ResultCollector rc1 = execute(dataSet, testKeysSet, Boolean.TRUE, function, isByName); l = ((List)rc1.getResult()); - LogWriterSupport.getLogWriter().info("Result size : " + l.size()); + LogWriterUtils.getLogWriter().info("Result size : " + l.size()); assertEquals(3, l.size()); for (Iterator i = l.iterator(); i.hasNext();) { assertEquals(Boolean.TRUE, i.next()); @@ -866,7 +866,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion; }catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : " , ex); + LogWriterUtils.getLogWriter().info("Exception : " , ex); Assert.fail("Test failed after the put operation",ex); } } @@ -910,13 +910,13 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion; } }); l = ((List)rc1.getResult()); - LogWriterSupport.getLogWriter().info("Result size : " + l.size()); + LogWriterUtils.getLogWriter().info("Result size : " + l.size()); assertEquals(3, l.size()); for (Iterator i = l.iterator(); i.hasNext();) { assertEquals(Boolean.TRUE, i.next()); } }catch(Exception e){ - LogWriterSupport.getLogWriter().info("Exception : " + e.getMessage()); + LogWriterUtils.getLogWriter().info("Exception : " + e.getMessage()); e.printStackTrace(); fail("Test failed after the put operation"); @@ -1003,7 +1003,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion; fail("Test failed after the put operation"); } catch(FunctionException expected) { expected.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : " + expected.getMessage()); + LogWriterUtils.getLogWriter().info("Exception : " + expected.getMessage()); assertTrue(expected.getMessage().startsWith((LocalizedStrings.ExecuteFunction_CANNOT_0_RESULTS_HASRESULT_FALSE .toLocalizedString("return any")))); } @@ -1061,7 +1061,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion; }catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : " , ex); + LogWriterUtils.getLogWriter().info("Exception : " , ex); Assert.fail("Test failed after the put operation",ex); } } @@ -1128,7 +1128,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion; }); } catch (Exception expected) { - LogWriterSupport.getLogWriter().fine("Exception occured : " + expected.getMessage()); + LogWriterUtils.getLogWriter().fine("Exception occured : " + expected.getMessage()); assertTrue(expected.getMessage().contains( "No target node found for KEY = " + testKey) || expected.getMessage() @@ -1190,7 +1190,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion; }catch (Exception ex) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("Exception : " , ex); + LogWriterUtils.getLogWriter().info("Exception : " , ex); Assert.fail("Test failed after the put operation",ex); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java index 79d8bbb..4bee088 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java @@ -53,8 +53,8 @@ import com.gemstone.gemfire.internal.cache.functions.TestFunction; import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.Host; -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; @@ -412,7 +412,7 @@ public class PRClientServerTestBase extends CacheTestCase { public static void createCacheClientWithoutRegion(String host, Integer port1, Integer port2, Integer port3) throws Exception { CacheServerTestUtil.disableShufflingOfEndpoints(); - LogWriterSupport.getLogWriter().info("PRClientServerTestBase#createCacheClientWithoutRegion : creating pool"); + LogWriterUtils.getLogWriter().info("PRClientServerTestBase#createCacheClientWithoutRegion : creating pool"); serverPort1 = port1; serverPort2 = port2; serverPort3 = port3; @@ -435,7 +435,7 @@ public class PRClientServerTestBase extends CacheTestCase { public static void createCacheClientWithDistributedRegion(String host, Integer port1, Integer port2, Integer port3) throws Exception { CacheServerTestUtil.disableShufflingOfEndpoints(); - LogWriterSupport.getLogWriter().info("PRClientServerTestBase#createCacheClientWithoutRegion : creating pool"); + LogWriterUtils.getLogWriter().info("PRClientServerTestBase#createCacheClientWithoutRegion : creating pool"); serverPort1 = port1; serverPort2 = port2; serverPort3 = port3; @@ -477,7 +477,7 @@ public class PRClientServerTestBase extends CacheTestCase { serverPort2 = port2; serverPort3 = port3; client.invoke(PRClientServerTestBase.class, "createCacheClient", - new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1, port2, + new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2, port3 }); } @@ -492,7 +492,7 @@ public class PRClientServerTestBase extends CacheTestCase { new Object[] {commonAttributes ,new Integer(localMaxMemoryServer2) }); serverPort1 = port1; client.invoke(PRClientServerTestBase.class, "createCacheClient_SingleConnection", - new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1}); + new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1}); } @@ -513,7 +513,7 @@ public class PRClientServerTestBase extends CacheTestCase { serverPort2 = port2; serverPort3 = port3; client.invoke(PRClientServerTestBase.class, "createCacheClientWith2Regions", - new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1, port2, + new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2, port3 }); } @@ -562,7 +562,7 @@ public class PRClientServerTestBase extends CacheTestCase { serverPort2 = port2; serverPort3 = port3; client.invoke(PRClientServerTestBase.class, "createNoSingleHopCacheClient", - new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1, port2, + new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2, port3 }); } @@ -582,13 +582,13 @@ public class PRClientServerTestBase extends CacheTestCase { serverPort2 = port2; serverPort3 = port3; client.invoke(PRClientServerTestBase.class, "createNoSingleHopCacheClient", - new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1, port2, + new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2, port3 }); } protected void createClientServerScenarionWithoutRegion () { - LogWriterSupport.getLogWriter().info("PRClientServerTestBase#createClientServerScenarionWithoutRegion : creating client server"); + LogWriterUtils.getLogWriter().info("PRClientServerTestBase#createClientServerScenarionWithoutRegion : creating client server"); createCacheInClientServer(); Integer port1 = (Integer)server1.invoke(PRClientServerTestBase.class, "createCacheServer"); @@ -601,12 +601,12 @@ public class PRClientServerTestBase extends CacheTestCase { serverPort3 = port3; client.invoke(PRClientServerTestBase.class, "createCacheClientWithoutRegion", - new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1, port2, + new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2, port3 }); } protected void createClientServerScenarionWithDistributedtRegion () { - LogWriterSupport.getLogWriter().info("PRClientServerTestBase#createClientServerScenarionWithoutRegion : creating client server"); + LogWriterUtils.getLogWriter().info("PRClientServerTestBase#createClientServerScenarionWithoutRegion : creating client server"); createCacheInClientServer(); Integer port1 = (Integer)server1.invoke(PRClientServerTestBase.class, "createCacheServerWithDR"); @@ -620,7 +620,7 @@ public class PRClientServerTestBase extends CacheTestCase { client.invoke(PRClientServerTestBase.class, "createCacheClientWithDistributedRegion", - new Object[] { NetworkSupport.getServerHostName(server1.getHost()), port1, port2, + new Object[] { NetworkUtils.getServerHostName(server1.getHost()), port1, port2, port3 }); } @@ -696,11 +696,11 @@ public class PRClientServerTestBase extends CacheTestCase { }; Wait.waitForCriterion(wc, 2000, 500, false); Collection bridgeServers = cache.getCacheServers(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Start Server Bridge Servers list : " + bridgeServers.size()); Iterator bridgeIterator = bridgeServers.iterator(); CacheServer bridgeServer = (CacheServer)bridgeIterator.next(); - LogWriterSupport.getLogWriter().info("start Server Bridge Server" + bridgeServer); + LogWriterUtils.getLogWriter().info("start Server Bridge Server" + bridgeServer); try { bridgeServer.start(); }
