http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java index 76da571..07807c8 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/partitioned/PRQueryRemoteNodeExceptionDUnitTest.java @@ -45,7 +45,7 @@ import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.DistributedTestCase; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.Invoke; -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.VM; @@ -109,7 +109,7 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT public void testPRWithLocalAndRemoteException() throws Exception { - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Querying with PR Local/Remote Exception test Started"); Host host = Host.getHost(0); @@ -120,7 +120,7 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT vmList.add(vm1); vmList.add(vm0); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Creating PR's across all VM0 , VM1"); vm0.invoke(PRQHelp @@ -128,17 +128,17 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT vm1.invoke(PRQHelp .getCacheSerializableRunnableForPRCreateLimitedBuckets(name, redundancy, numOfBuckets)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Successfully Created PR on VM0 , VM1"); // creating a local region on one of the JVM's - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Creating Local Region on VM0"); vm0.invoke(PRQHelp .getCacheSerializableRunnableForLocalRegionCreation(localName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Successfully Created Local Region on VM0"); @@ -148,29 +148,29 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT final PortfolioData[] portfolio = PRQHelp.createPortfolioData(cnt, cntDest); // Putting the data into the accessor node - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Inserting Portfolio data through the accessor node"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(name, portfolio, cnt, cntDest)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Successfully Inserted Portfolio data through the accessor node"); // Putting the same data in the local region created - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Inserting Portfolio data on local node VM0 for result Set Comparison"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(localName, portfolio, cnt, cntDest)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Successfully Inserted Portfolio data on local node VM0 for result Set Comparison"); // Execute query first time. This is to make sure all the buckets are // created // (lazy bucket creation). - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Querying on VM0 First time"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRQueryAndCompareResults( @@ -220,7 +220,7 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT gotException = true; if (ex.getMessage().contains("local node")) { // ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("PRQueryRemoteNodeExceptionDUnitTest: Test received Exception from local node successfully."); + LogWriterUtils.getLogWriter().info("PRQueryRemoteNodeExceptionDUnitTest: Test received Exception from local node successfully."); } else { Assert.fail("PRQueryRemoteNodeExceptionDUnitTest: Test did not receive Exception as expected from local node rather received", ex); } @@ -232,14 +232,14 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT } ); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRemoteNodeExceptionDUnitTest#testPRWithLocalAndRemoteException: Querying with PR Local/Remote Exception Test ENDED"); } public void testRemoteException() throws Exception { - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Querying with PR Local/Remote Exception test Started"); Host host = Host.getHost(0); @@ -250,7 +250,7 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT vmList.add(vm1); vmList.add(vm0); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Creating PR's across all VM0 , VM1"); vm0.invoke(PRQHelp @@ -258,17 +258,17 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT vm1.invoke(PRQHelp .getCacheSerializableRunnableForPRCreateLimitedBuckets(name, redundancy, numOfBuckets)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Successfully Created PR on VM0 , VM1"); // creating a local region on one of the JVM's - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Creating Local Region on VM0"); vm0.invoke(PRQHelp .getCacheSerializableRunnableForLocalRegionCreation(localName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Successfully Created Local Region on VM0"); @@ -278,22 +278,22 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT final PortfolioData[] portfolio = PRQHelp.createPortfolioData(cnt, cntDest); // Putting the data into the accessor node - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Inserting Portfolio data through the accessor node"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(name, portfolio, cnt, cntDest)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Successfully Inserted Portfolio data through the accessor node"); // Putting the same data in the local region created - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Inserting Portfolio data on local node VM0 for result Set Comparison"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(localName, portfolio, cnt, cntDest)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Successfully Inserted Portfolio data on local node VM0 for result Set Comparison"); @@ -351,7 +351,7 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT gotException = true; if (ex.getMessage().contains("remote node")) { ex.printStackTrace(); - LogWriterSupport.getLogWriter().info("PRQueryRemoteNodeExceptionDUnitTest: Test received Exception from remote node successfully."); + LogWriterUtils.getLogWriter().info("PRQueryRemoteNodeExceptionDUnitTest: Test received Exception from remote node successfully."); } else { Assert.fail("PRQueryRemoteNodeExceptionDUnitTest: Test did not receive Exception as expected from remote node rather received", ex); } @@ -363,14 +363,14 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT } ); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRemoteNodeExceptionDUnitTest#testPRWithLocalAndRemoteException: Querying with PR Local/Remote Exception Test ENDED"); } public void testCacheCloseExceptionFromLocalAndRemote() throws Exception { - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Querying with PR Local/Remote Exception test Started"); Host host = Host.getHost(0); @@ -381,7 +381,7 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT vmList.add(vm1); vmList.add(vm0); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Creating PR's across all VM0 , VM1"); vm0.invoke(PRQHelp @@ -389,17 +389,17 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT vm1.invoke(PRQHelp .getCacheSerializableRunnableForPRCreateLimitedBuckets(name, redundancy, numOfBuckets)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Successfully Created PR on VM0 , VM1"); // creating a local region on one of the JVM's - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Creating Local Region on VM0"); vm0.invoke(PRQHelp .getCacheSerializableRunnableForLocalRegionCreation(localName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Successfully Created Local Region on VM0"); @@ -409,22 +409,22 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT final PortfolioData[] portfolio = PRQHelp.createPortfolioData(cnt, cntDest); // Putting the data into the accessor node - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Inserting Portfolio data through the accessor node"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(name, portfolio, cnt, cntDest)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Successfully Inserted Portfolio data through the accessor node"); // Putting the same data in the local region created - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Inserting Portfolio data on local node VM0 for result Set Comparison"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(localName, portfolio, cnt, cntDest)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Successfully Inserted Portfolio data on local node VM0 for result Set Comparison"); @@ -440,7 +440,7 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT @Override public void afterIterationEvaluation(Object result) { - LogWriterSupport.getLogWriter().info("Calling after IterationEvaluation :" + noOfAccess); + LogWriterUtils.getLogWriter().info("Calling after IterationEvaluation :" + noOfAccess); if (noOfAccess > 2) { PRQHelp.getCache().getRegion(name).destroyRegion(); } @@ -466,7 +466,7 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT @Override public void afterIterationEvaluation(Object result) { //Object region = ((DefaultQuery)query).getRegionsInQuery(null).iterator().next(); - LogWriterSupport.getLogWriter().info("Calling after IterationEvaluation :" + noOfAccess); + LogWriterUtils.getLogWriter().info("Calling after IterationEvaluation :" + noOfAccess); if (noOfAccess > 2) { PRQHelp.getCache().close(); } @@ -483,8 +483,8 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT } catch (Exception ex) { gotException = true; if (ex instanceof CacheClosedException || ex instanceof QueryInvocationTargetException) { - LogWriterSupport.getLogWriter().info(ex.getMessage()); - LogWriterSupport.getLogWriter().info("PRQueryRemoteNodeExceptionDUnitTest: Test received Exception from local node successfully."); + LogWriterUtils.getLogWriter().info(ex.getMessage()); + LogWriterUtils.getLogWriter().info("PRQueryRemoteNodeExceptionDUnitTest: Test received Exception from local node successfully."); } else { Assert.fail("PRQueryRemoteNodeExceptionDUnitTest: Test did not receive Exception as expected from local node rather received", ex); } @@ -496,14 +496,14 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT } ); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRemoteNodeExceptionDUnitTest#testPRWithLocalAndRemoteException: Querying with PR Local/Remote Exception Test ENDED"); } public void testCacheCloseExceptionFromLocalAndRemote2() throws Exception { - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Querying with PR Local/Remote Exception test Started"); Host host = Host.getHost(0); @@ -514,7 +514,7 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT vmList.add(vm1); vmList.add(vm0); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Creating PR's across all VM0 , VM1"); vm0.invoke(PRQHelp @@ -522,17 +522,17 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT vm1.invoke(PRQHelp .getCacheSerializableRunnableForPRCreateLimitedBuckets(name, redundancy, numOfBuckets)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Successfully Created PR on VM0 , VM1"); // creating a local region on one of the JVM's - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Creating Local Region on VM0"); vm0.invoke(PRQHelp .getCacheSerializableRunnableForLocalRegionCreation(localName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Successfully Created Local Region on VM0"); @@ -542,22 +542,22 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT final PortfolioData[] portfolio = PRQHelp.createPortfolioData(cnt, cntDest); // Putting the data into the accessor node - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Inserting Portfolio data through the accessor node"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(name, portfolio, cnt, cntDest)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Successfully Inserted Portfolio data through the accessor node"); // Putting the same data in the local region created - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Inserting Portfolio data on local node VM0 for result Set Comparison"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(localName, portfolio, cnt, cntDest)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Successfully Inserted Portfolio data on local node VM0 for result Set Comparison"); @@ -573,7 +573,7 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT @Override public void afterIterationEvaluation(Object result) { - LogWriterSupport.getLogWriter().info("Calling after IterationEvaluation :" + noOfAccess); + LogWriterUtils.getLogWriter().info("Calling after IterationEvaluation :" + noOfAccess); if (noOfAccess > 1) { PRQHelp.getCache().getRegion(name).destroyRegion(); } @@ -626,8 +626,8 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT } catch (Exception ex) { gotException = true; if (ex instanceof QueryInvocationTargetException) { - LogWriterSupport.getLogWriter().info(ex.getMessage()); - LogWriterSupport.getLogWriter().info("PRQueryRemoteNodeExceptionDUnitTest: Test received Exception from remote node successfully as region.destroy happened before cache.close()."); + LogWriterUtils.getLogWriter().info(ex.getMessage()); + LogWriterUtils.getLogWriter().info("PRQueryRemoteNodeExceptionDUnitTest: Test received Exception from remote node successfully as region.destroy happened before cache.close()."); } else { Assert.fail("PRQueryRemoteNodeExceptionDUnitTest: Test did not receive Exception as expected from local node rather received", ex); } @@ -639,14 +639,14 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT } ); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRemoteNodeExceptionDUnitTest#testPRWithLocalAndRemoteException: Querying with PR Local/Remote Exception Test ENDED"); } public void testForceReattemptExceptionFromLocal() throws Exception { - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Querying with PR Local/Remote Exception test Started"); Host host = Host.getHost(0); @@ -659,7 +659,7 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT vmList.add(vm0); vmList.add(vm2); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Creating PR's across all VM0 , VM1"); vm0.invoke(PRQHelp @@ -669,17 +669,17 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT vm2.invoke(PRQHelp .getCacheSerializableRunnableForPRCreateLimitedBuckets(name, 1/*redundancy*/, numOfBuckets)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Successfully Created PR on VM0 , VM1"); // creating a local region on one of the JVM's - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Creating Local Region on VM0"); vm0.invoke(PRQHelp .getCacheSerializableRunnableForLocalRegionCreation(localName)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Successfully Created Local Region on VM0"); @@ -689,22 +689,22 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT final PortfolioData[] portfolio = PRQHelp.createPortfolioData(cnt, cntDest); // Putting the data into the accessor node - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Inserting Portfolio data through the accessor node"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(name, portfolio, cnt, cntDest)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Successfully Inserted Portfolio data through the accessor node"); // Putting the same data in the local region created - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Inserting Portfolio data on local node VM0 for result Set Comparison"); vm0.invoke(PRQHelp.getCacheSerializableRunnableForPRPuts(localName, portfolio, cnt, cntDest)); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRegionDestroyedDUnitTest#testPRWithLocalAndRemoteException: Successfully Inserted Portfolio data on local node VM0 for result Set Comparison"); @@ -721,13 +721,13 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT @Override public void startQuery(Query query) { Object region = ((DefaultQuery)query).getRegionsInQuery(null).iterator().next(); - LogWriterSupport.getLogWriter().info("Region type on VM1:"+region); + LogWriterUtils.getLogWriter().info("Region type on VM1:"+region); if (noOfAccess == 1) { PartitionedRegion pr = (PartitionedRegion)PRQHelp.getCache().getRegion(name); List buks = pr.getLocalPrimaryBucketsListTestOnly(); - LogWriterSupport.getLogWriter().info("Available buckets:"+buks); + LogWriterUtils.getLogWriter().info("Available buckets:"+buks); int bukId = ((Integer)(buks.get(0))).intValue(); - LogWriterSupport.getLogWriter().info("Destroying bucket id:"+bukId); + LogWriterUtils.getLogWriter().info("Destroying bucket id:"+bukId); pr.getDataStore().getLocalBucketById(bukId).destroyRegion(); } ++noOfAccess; @@ -752,13 +752,13 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT @Override public void startQuery(Query query) { Object region = ((DefaultQuery)query).getRegionsInQuery(null).iterator().next(); - LogWriterSupport.getLogWriter().info("Region type on VM0:"+region); + LogWriterUtils.getLogWriter().info("Region type on VM0:"+region); if (noOfAccess == 2) { PartitionedRegion pr = (PartitionedRegion)PRQHelp.getCache().getRegion(name); List buks = pr.getLocalPrimaryBucketsListTestOnly(); - LogWriterSupport.getLogWriter().info("Available buckets:"+buks); + LogWriterUtils.getLogWriter().info("Available buckets:"+buks); int bukId = ((Integer)(buks.get(0))).intValue(); - LogWriterSupport.getLogWriter().info("Destroying bucket id:"+bukId); + LogWriterUtils.getLogWriter().info("Destroying bucket id:"+bukId); pr.getDataStore().getLocalBucketById(bukId).destroyRegion(); } ++noOfAccess; @@ -770,7 +770,7 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT try { query.execute(); - LogWriterSupport.getLogWriter().info("PRQueryRemoteNodeExceptionDUnitTest: Query executed successfully with ForceReattemptException on local and remote both."); + LogWriterUtils.getLogWriter().info("PRQueryRemoteNodeExceptionDUnitTest: Query executed successfully with ForceReattemptException on local and remote both."); } catch (Exception ex) { gotException = true; Assert.fail("PRQueryRemoteNodeExceptionDUnitTest#testPRWithLocalAndRemoteException: Test received Exception", ex); @@ -779,7 +779,7 @@ public class PRQueryRemoteNodeExceptionDUnitTest extends PartitionedRegionDUnitT } ); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info( "PRQueryRemoteNodeExceptionDUnitTest#testPRWithLocalAndRemoteException: Querying with PR Local/Remote Exception Test ENDED"); }
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotByteArrayDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotByteArrayDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotByteArrayDUnitTest.java index b464f9a..43fc2e3 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotByteArrayDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotByteArrayDUnitTest.java @@ -28,7 +28,7 @@ import com.gemstone.gemfire.cache.snapshot.SnapshotOptions.SnapshotFormat; import com.gemstone.gemfire.cache.util.CacheListenerAdapter; import com.gemstone.gemfire.cache30.CacheTestCase; 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; public class SnapshotByteArrayDUnitTest extends CacheTestCase { @@ -81,13 +81,13 @@ public class SnapshotByteArrayDUnitTest extends CacheTestCase { } private void dump(EntryEvent<Integer, Object> event) { - LogWriterSupport.getLogWriter().info("op = " + event.getOperation()); + LogWriterUtils.getLogWriter().info("op = " + event.getOperation()); Object obj1 = event.getNewValue(); - LogWriterSupport.getLogWriter().info("new = " + obj1); + LogWriterUtils.getLogWriter().info("new = " + obj1); Object obj2 = event.getOldValue(); - LogWriterSupport.getLogWriter().info("old = " + obj2); + LogWriterUtils.getLogWriter().info("old = " + obj2); } }); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotPerformanceDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotPerformanceDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotPerformanceDUnitTest.java index 1c1829a..83fc231 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotPerformanceDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotPerformanceDUnitTest.java @@ -31,7 +31,7 @@ import com.gemstone.gemfire.cache.snapshot.RegionGenerator.SerializationType; import com.gemstone.gemfire.cache.snapshot.SnapshotOptions.SnapshotFormat; import com.gemstone.gemfire.cache30.CacheTestCase; 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; public class SnapshotPerformanceDUnitTest extends CacheTestCase { @@ -53,7 +53,7 @@ public class SnapshotPerformanceDUnitTest extends CacheTestCase { for (SerializationType st : sts) { for (int i = 0; i < iterations; i++) { Region<Integer, MyObject> region = createRegion(rt, st); - LogWriterSupport.getLogWriter().info("SNP: Testing region " + region.getName() + ", iteration = " + i); + LogWriterUtils.getLogWriter().info("SNP: Testing region " + region.getName() + ", iteration = " + i); loadData(region, st, dataCount); doExport(region); @@ -78,9 +78,9 @@ public class SnapshotPerformanceDUnitTest extends CacheTestCase { double eps = 1000.0 * size / elapsed; double mbps = 1000.0 * bytes / elapsed / (1024 * 1024); - LogWriterSupport.getLogWriter().info("SNP: Exported " + size + " entries (" + bytes + " bytes) in " + elapsed + " ms"); - LogWriterSupport.getLogWriter().info("SNP: Export entry rate: " + eps + " entries / sec"); - LogWriterSupport.getLogWriter().info("SNP: Export data rate: " + mbps + " MB / sec"); + LogWriterUtils.getLogWriter().info("SNP: Exported " + size + " entries (" + bytes + " bytes) in " + elapsed + " ms"); + LogWriterUtils.getLogWriter().info("SNP: Export entry rate: " + eps + " entries / sec"); + LogWriterUtils.getLogWriter().info("SNP: Export data rate: " + mbps + " MB / sec"); } private void doImport(Region<Integer, MyObject> region) throws Exception { @@ -96,9 +96,9 @@ public class SnapshotPerformanceDUnitTest extends CacheTestCase { double eps = 1000.0 * size / elapsed; double mbps = 1000.0 * bytes / elapsed / (1024 * 1024); - LogWriterSupport.getLogWriter().info("SNP: Imported " + size + " entries (" + bytes + " bytes) in " + elapsed + " ms"); - LogWriterSupport.getLogWriter().info("SNP: Import entry rate: " + eps + " entries / sec"); - LogWriterSupport.getLogWriter().info("SNP: Import data rate: " + mbps + " MB / sec"); + LogWriterUtils.getLogWriter().info("SNP: Imported " + size + " entries (" + bytes + " bytes) in " + elapsed + " ms"); + LogWriterUtils.getLogWriter().info("SNP: Import entry rate: " + eps + " entries / sec"); + LogWriterUtils.getLogWriter().info("SNP: Import data rate: " + mbps + " MB / sec"); } public void setUp() throws Exception { @@ -160,7 +160,7 @@ public class SnapshotPerformanceDUnitTest extends CacheTestCase { } long elapsed = System.currentTimeMillis() - start; - LogWriterSupport.getLogWriter().info("SNP: loaded " + count + " entries in " + elapsed + " ms"); + LogWriterUtils.getLogWriter().info("SNP: loaded " + count + " entries in " + elapsed + " ms"); assertEquals(count, region.size()); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug35214DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug35214DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug35214DUnitTest.java index 042f6ee..7f6d29a 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug35214DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug35214DUnitTest.java @@ -32,8 +32,8 @@ import com.gemstone.gemfire.internal.cache.LocalRegion; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.AsyncInvocation; import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; import com.gemstone.gemfire.test.dunit.WaitCriterion; @@ -97,7 +97,7 @@ public class Bug35214DUnitTest extends CacheTestCase { //pause(5); } else { - LogWriterSupport.getLogWriter().info("PROFILE CHECK: Found " + numProfiles + " getInitialImage Profiles (OK)"); + LogWriterUtils.getLogWriter().info("PROFILE CHECK: Found " + numProfiles + " getInitialImage Profiles (OK)"); break; } } @@ -188,7 +188,7 @@ public class Bug35214DUnitTest extends CacheTestCase { }; af.addCacheListener(cl1); final Region r1 = createRootRegion("r1", af.create()); - Threads.join(updater, 60 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(updater, 60 * 1000); WaitCriterion ev = new WaitCriterion() { public boolean done() { return r1.values().size() == 0; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java index 3f2e94c..d1a8bb4 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java @@ -52,7 +52,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID; import com.gemstone.gemfire.internal.cache.tier.sockets.ClientUpdateMessageImpl; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.NetworkSupport; +import com.gemstone.gemfire.test.dunit.NetworkUtils; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; import com.gemstone.gemfire.test.dunit.WaitCriterion; @@ -156,7 +156,7 @@ public class Bug38741DUnitTest extends ClientServerTestCase { // Setup a client which subscribes to the server region, registers (aka pulls) // interest in keys which creates an assumed HARegionQueue on the server // (in the event that the above code didn't already create a HARegion) - final String serverHostName = NetworkSupport.getServerHostName(server.getHost()); + final String serverHostName = NetworkUtils.getServerHostName(server.getHost()); client.invoke(new CacheSerializableRunnable("Assert server copy behavior from client") { public void run2() throws CacheException { getCache(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java index 72fe9db..eb2c768 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheMapTxnDUnitTest.java @@ -39,8 +39,7 @@ import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.AsyncInvocation; import com.gemstone.gemfire.test.dunit.DistributedTestCase; import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.dunit.VM; public class CacheMapTxnDUnitTest extends DistributedTestCase{ @@ -148,8 +147,8 @@ public class CacheMapTxnDUnitTest extends DistributedTestCase{ vm0.invoke(CacheMapTxnDUnitTest.class, "miscMethodsOwner"); AsyncInvocation o2 = vm0.invokeAsync(CacheMapTxnDUnitTest.class, "miscMethodsNotOwner");//invoke in same vm but in seperate thread AsyncInvocation o3 = vm1.invokeAsync(CacheMapTxnDUnitTest.class, "miscMethodsNotOwner");//invoke in another vm - Threads.join(o2, 30 * 1000, LogWriterSupport.getLogWriter()); - Threads.join(o3, 30 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(o2, 30 * 1000); + ThreadUtils.join(o3, 30 * 1000); if(o2.exceptionOccurred()){ Assert.fail("o2 failed", o2.getException()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java index cd6ea46..1efae19 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java @@ -33,7 +33,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.CachePerfStats; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; 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.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; @@ -102,7 +102,7 @@ public class CacheRegionsReliablityStatsCheckDUnitTest extends CacheTestCase { { Properties props = new Properties(); - props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterSupport.getDUnitLogLevel()); + props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); props.setProperty(DistributionConfig.ROLES_NAME, rr1); getSystem(props); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java index 6bbd810..7a372cb 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java @@ -59,7 +59,7 @@ import com.gemstone.gemfire.test.dunit.DistributedTestCase; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.IgnoredException; import com.gemstone.gemfire.test.dunit.Invoke; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; import com.gemstone.gemfire.test.dunit.WaitCriterion; @@ -426,7 +426,7 @@ public abstract class CacheTestCase extends DistributedTestCase { try { cleanDiskDirs(); } catch(Exception e) { - LogWriterSupport.getLogWriter().error("Error cleaning disk dirs", e); + LogWriterUtils.getLogWriter().error("Error cleaning disk dirs", e); } } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml30DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml30DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml30DUnitTest.java index 1d244f6..85fa8a4 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml30DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml30DUnitTest.java @@ -62,7 +62,7 @@ import com.gemstone.gemfire.internal.cache.xmlcache.Declarable2; import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation; import com.gemstone.gemfire.internal.cache.xmlcache.RegionCreation; 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.util.test.TestUtil; /** @@ -596,7 +596,7 @@ public class CacheXml30DUnitTest extends CacheXmlTestCase { assertTrue("No XML files in " + dirName, xmlFiles.length > 0); for (int i = 0; i < xmlFiles.length; i++) { File xmlFile = xmlFiles[i]; - LogWriterSupport.getLogWriter().info("Parsing " + xmlFile); + LogWriterUtils.getLogWriter().info("Parsing " + xmlFile); FileInputStream fis = new FileInputStream(xmlFile); CacheXmlParser.parse(fis); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml57DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml57DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml57DUnitTest.java index a87278b..f2eddd6 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml57DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml57DUnitTest.java @@ -54,7 +54,7 @@ import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation; import com.gemstone.gemfire.internal.cache.xmlcache.RegionCreation; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.NetworkSupport; +import com.gemstone.gemfire.test.dunit.NetworkUtils; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.SerializableCallable; import com.gemstone.gemfire.test.dunit.VM; @@ -380,7 +380,7 @@ public class CacheXml57DUnitTest extends CacheXml55DUnitTest }); CacheCreation cache = new CacheCreation(); cache.createPoolFactory() - .addServer(NetworkSupport.getServerHostName(vm0.getHost()), port) + .addServer(NetworkUtils.getServerHostName(vm0.getHost()), port) .setSubscriptionEnabled(true) .create("connectionPool"); cache.setDynamicRegionFactoryConfig(new DynamicRegionFactory.Config(null, "connectionPool", false, false)); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java index d98d752..3579210 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmCallBkDUnitTest.java @@ -37,7 +37,7 @@ import com.gemstone.gemfire.cache.util.CacheListenerAdapter; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.test.dunit.DistributedTestCase; import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.VM; /** @@ -69,7 +69,7 @@ public class ClearMultiVmCallBkDUnitTest extends DistributedTestCase{ VM vm1 = host.getVM(1); vm0.invoke(ClearMultiVmCallBkDUnitTest.class, "createCache"); vm1.invoke(ClearMultiVmCallBkDUnitTest.class, "createCache"); - LogWriterSupport.getLogWriter().fine("Cache created in successfully"); + LogWriterUtils.getLogWriter().fine("Cache created in successfully"); } public void preTearDown(){ @@ -132,10 +132,10 @@ public class ClearMultiVmCallBkDUnitTest extends DistributedTestCase{ vm0.invoke(ClearMultiVmCallBkDUnitTest.class, "putMethod", objArr); } - LogWriterSupport.getLogWriter().fine("Did all puts successfully"); + LogWriterUtils.getLogWriter().fine("Did all puts successfully"); vm0.invoke(ClearMultiVmCallBkDUnitTest.class,"clearMethod"); - LogWriterSupport.getLogWriter().fine("Did clear successfully"); + LogWriterUtils.getLogWriter().fine("Did clear successfully"); while(afterClear){ } @@ -158,10 +158,10 @@ public class ClearMultiVmCallBkDUnitTest extends DistributedTestCase{ vm0.invoke(ClearMultiVmCallBkDUnitTest.class, "putMethod", objArr); vm1.invoke(ClearMultiVmCallBkDUnitTest.class, "getMethod", objArr); } - LogWriterSupport.getLogWriter().fine("Did all puts successfully"); + LogWriterUtils.getLogWriter().fine("Did all puts successfully"); //vm0.invoke(ClearMultiVmCallBkDUnitTest.class,"putMethod"); vm1.invoke(ClearMultiVmCallBkDUnitTest.class,"clearMethod"); - LogWriterSupport.getLogWriter().fine("Did clear successfully"); + LogWriterUtils.getLogWriter().fine("Did clear successfully"); while(afterClear){ } @@ -231,7 +231,7 @@ public class ClearMultiVmCallBkDUnitTest extends DistributedTestCase{ static class ListenerCallBk extends CacheListenerAdapter { public void afterRegionClear(RegionEvent event){ - LogWriterSupport.getLogWriter().fine("In afterClear:: CacheListener Callback"); + LogWriterUtils.getLogWriter().fine("In afterClear:: CacheListener Callback"); try { int i = 7; region.put(""+i, "inAfterClear"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java index 4cfe5bf..fe8371b 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClearMultiVmDUnitTest.java @@ -41,9 +41,8 @@ import com.gemstone.gemfire.test.dunit.AsyncInvocation; import com.gemstone.gemfire.test.dunit.DistributedTestCase; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.Invoke; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; 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; /** @@ -215,8 +214,8 @@ public class ClearMultiVmDUnitTest extends DistributedTestCase{ AsyncInvocation as1 = vm0.invokeAsync(ClearMultiVmDUnitTest.class, "firstVM"); AsyncInvocation as2 = vm1.invokeAsync(ClearMultiVmDUnitTest.class, "secondVM"); - Threads.join(as1, 30 * 1000, LogWriterSupport.getLogWriter()); - Threads.join(as2, 30 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(as1, 30 * 1000); + ThreadUtils.join(as2, 30 * 1000); if(as1.exceptionOccurred()){ Assert.fail("as1 failed", as1.getException()); @@ -331,7 +330,7 @@ public class ClearMultiVmDUnitTest extends DistributedTestCase{ } }); - Threads.join(async1, 30 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(async1, 30 * 1000); if(async1.exceptionOccurred()){ Assert.fail("async1 failed", async1.getException()); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java index 221d285..074441e 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java @@ -56,7 +56,7 @@ import com.gemstone.gemfire.management.membership.ClientMembershipListener; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.NetworkSupport; +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; @@ -124,7 +124,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { public void testConnectionTimeout() throws Exception { IgnoredException.addIgnoredException("failed accepting client connection"); final Host host = Host.getHost(0); - final String hostName = NetworkSupport.getServerHostName(host); + final String hostName = NetworkUtils.getServerHostName(host); final VM vm0 = host.getVM(0); System.setProperty(AcceptorImpl.ACCEPT_TIMEOUT_PROPERTY_NAME, "1000"); try { @@ -135,7 +135,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { SerializableRunnable createMeanSocket = new CacheSerializableRunnable("Connect to server with socket") { public void run2() throws CacheException { getCache(); // create a cache so we have stats - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("connecting to cache server with socket"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("connecting to cache server with socket"); try { InetAddress addr = InetAddress.getByName(hostName); meanSocket = new Socket(addr, port); @@ -147,7 +147,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { }; SerializableRunnable closeMeanSocket = new CacheSerializableRunnable("close mean socket") { public void run2() throws CacheException { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("closing mean socket"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("closing mean socket"); try { meanSocket.close(); } @@ -158,28 +158,28 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { assertEquals(0, getAcceptsInProgress()); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("creating mean socket"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("creating mean socket"); vm0.invoke(createMeanSocket); try { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("waiting to see it connect on server"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("waiting to see it connect on server"); waitForAcceptsInProgressToBe(1); } finally { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("closing mean socket"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("closing mean socket"); vm0.invoke(closeMeanSocket); } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("waiting to see accept to go away on server"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("waiting to see accept to go away on server"); waitForAcceptsInProgressToBe(0); // now try it without a close. Server should timeout the mean connect - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("creating mean socket 2"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("creating mean socket 2"); vm0.invoke(createMeanSocket); try { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("waiting to see it connect on server 2"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("waiting to see it connect on server 2"); waitForAcceptsInProgressToBe(1); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("waiting to see accept to go away on server without us closing"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("waiting to see accept to go away on server without us closing"); waitForAcceptsInProgressToBe(0); } finally { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("closing mean socket 2"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("closing mean socket 2"); vm0.invoke(closeMeanSocket); } @@ -739,7 +739,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { // create and register ClientMembershipListener in controller vm... ClientMembershipListener listener = new ClientMembershipListener() { public synchronized void memberJoined(ClientMembershipEvent event) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] memberJoined: " + event); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInClient] memberJoined: " + event); fired[JOINED] = true; member[JOINED] = event.getMember(); memberId[JOINED] = event.getMemberId(); @@ -747,11 +747,11 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { notifyAll(); } public synchronized void memberLeft(ClientMembershipEvent event) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] memberLeft: " + event); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInClient] memberLeft: " + event); // fail("Please update testClientMembershipEventsInClient to handle memberLeft for BridgeServer."); } public synchronized void memberCrashed(ClientMembershipEvent event) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] memberCrashed: " + event); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInClient] memberCrashed: " + event); fired[CRASHED] = true; member[CRASHED] = event.getMember(); memberId[CRASHED] = event.getMemberId(); @@ -769,7 +769,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { vm0.invoke(new CacheSerializableRunnable("Create BridgeServer") { public void run2() throws CacheException { try { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] Create BridgeServer"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInClient] Create BridgeServer"); getSystem(); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -796,9 +796,9 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { String serverMemberId = (String) vm0.invoke(ClientMembershipDUnitTest.class, "getMemberId"); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] ports[0]=" + ports[0]); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] serverMember=" + serverMember); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] serverMemberId=" + serverMemberId); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInClient] ports[0]=" + ports[0]); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInClient] serverMember=" + serverMember); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInClient] serverMemberId=" + serverMemberId); assertFalse(fired[JOINED]); assertNull(member[JOINED]); @@ -814,7 +814,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { assertFalse(isClient[CRASHED]); // sanity check... - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] sanity check"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInClient] sanity check"); DistributedMember test = new TestDistributedMember("test"); InternalClientMembership.notifyJoined(test, SERVER); synchronized(listener) { @@ -838,7 +838,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { resetArraysForTesting(fired, member, memberId, isClient); // create bridge client in controller vm... - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] create bridge client"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInClient] create bridge client"); Properties config = new Properties(); config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); config.setProperty(DistributionConfig.LOCATORS_NAME, ""); @@ -848,7 +848,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { getCache(); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); - ClientServerTestCase.configureConnectionPool(factory, NetworkSupport.getServerHostName(Host.getHost(0)), ports, true, -1, -1, null); + ClientServerTestCase.configureConnectionPool(factory, NetworkUtils.getServerHostName(Host.getHost(0)), ports, true, -1, -1, null); createRegion(name, factory.create()); assertNotNull(getRootRegion().getSubregion(name)); } @@ -861,7 +861,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { } } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] assert client detected server join"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInClient] assert client detected server join"); // first check the getCurrentServers() result ClientCache clientCache = (ClientCache)getCache(); @@ -890,7 +890,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { vm0.invoke(new SerializableRunnable("Stop BridgeServer") { public void run() { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] Stop BridgeServer"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInClient] Stop BridgeServer"); stopBridgeServers(getCache()); } }); @@ -900,7 +900,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { } } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] assert client detected server departure"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInClient] assert client detected server departure"); assertFalse(fired[JOINED]); assertNull(member[JOINED]); assertNull(memberId[JOINED]); @@ -921,7 +921,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { vm0.invoke(new CacheSerializableRunnable("Recreate BridgeServer") { public void run2() throws CacheException { try { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] restarting BridgeServer"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInClient] restarting BridgeServer"); startBridgeServer(ports[0]); } catch(IOException e) { @@ -936,7 +936,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { } } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInClient] assert client detected server recovery"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInClient] assert client detected server recovery"); assertTrue(fired[JOINED]); assertNotNull(member[JOINED]); assertNotNull(memberId[JOINED]); @@ -965,7 +965,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { // create and register ClientMembershipListener in controller vm... ClientMembershipListener listener = new ClientMembershipListener() { public synchronized void memberJoined(ClientMembershipEvent event) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] memberJoined: " + event); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInServer] memberJoined: " + event); fired[JOINED] = true; member[JOINED] = event.getMember(); memberId[JOINED] = event.getMemberId(); @@ -974,7 +974,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { assertFalse(fired[LEFT] || fired[CRASHED]); } public synchronized void memberLeft(ClientMembershipEvent event) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] memberLeft: " + event); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInServer] memberLeft: " + event); fired[LEFT] = true; member[LEFT] = event.getMember(); memberId[LEFT] = event.getMemberId(); @@ -983,7 +983,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { assertFalse(fired[JOINED] || fired[CRASHED]); } public synchronized void memberCrashed(ClientMembershipEvent event) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] memberCrashed: " + event); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInServer] memberCrashed: " + event); fired[CRASHED] = true; member[CRASHED] = event.getMember(); memberId[CRASHED] = event.getMemberId(); @@ -999,7 +999,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { final int[] ports = new int[1]; // create BridgeServer in controller vm... - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] Create BridgeServer"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInServer] Create BridgeServer"); getSystem(); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -1012,9 +1012,9 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { String serverMemberId = getMemberId(); DistributedMember serverMember = getDistributedMember(); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] ports[0]=" + ports[0]); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] serverMemberId=" + serverMemberId); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] serverMember=" + serverMember); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInServer] ports[0]=" + ports[0]); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInServer] serverMemberId=" + serverMemberId); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInServer] serverMember=" + serverMember); assertFalse(fired[JOINED]); assertNull(member[JOINED]); @@ -1030,7 +1030,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { assertFalse(isClient[CRASHED]); // sanity check... - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] sanity check"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInServer] sanity check"); DistributedMember test = new TestDistributedMember("test"); InternalClientMembership.notifyJoined(test, CLIENT); synchronized(listener) { @@ -1056,14 +1056,14 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { SerializableRunnable createConnectionPool = new CacheSerializableRunnable("Create connectionPool") { public void run2() throws CacheException { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] create bridge client"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInServer] create bridge client"); Properties config = new Properties(); config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); config.setProperty(DistributionConfig.LOCATORS_NAME, ""); getSystem(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); - ClientServerTestCase.configureConnectionPool(factory, NetworkSupport.getServerHostName(host), ports, true, -1, 2, null); + ClientServerTestCase.configureConnectionPool(factory, NetworkUtils.getServerHostName(host), ports, true, -1, 2, null); createRegion(name, factory.create()); assertNotNull(getRootRegion().getSubregion(name)); } @@ -1082,7 +1082,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { } } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] assert server detected client join"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInServer] assert server detected client join"); assertTrue(fired[JOINED]); assertEquals(member[JOINED] + " should equal " + clientMember, clientMember, member[JOINED]); @@ -1103,7 +1103,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { vm0.invoke(new SerializableRunnable("Stop bridge client") { public void run() { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] Stop bridge client"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInServer] Stop bridge client"); getRootRegion().getSubregion(name).close(); Map m = PoolManager.getAll(); Iterator mit = m.values().iterator(); @@ -1120,7 +1120,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { } } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] assert server detected client left"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInServer] assert server detected client left"); assertFalse(fired[JOINED]); assertNull(member[JOINED]); assertNull(memberId[JOINED]); @@ -1146,7 +1146,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { } } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] assert server detected client re-join"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInServer] assert server detected client re-join"); assertTrue(fired[JOINED]); assertEquals(clientMember, member[JOINED]); assertEquals(clientMemberId, memberId[JOINED]); @@ -1167,7 +1167,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { try { vm0.invoke(new SerializableRunnable("Stop bridge client") { public void run() { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] Stop bridge client"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInServer] Stop bridge client"); getRootRegion().getSubregion(name).close(); Map m = PoolManager.getAll(); Iterator mit = m.values().iterator(); @@ -1184,7 +1184,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { } } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testClientMembershipEventsInServer] assert server detected client crashed"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testClientMembershipEventsInServer] assert server detected client crashed"); assertFalse(fired[JOINED]); assertNull(member[JOINED]); assertNull(memberId[JOINED]); @@ -1307,7 +1307,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { IgnoredException.addIgnoredException("ConnectException"); // create BridgeServer in controller vm... - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetConnectedClients] Create BridgeServer"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testGetConnectedClients] Create BridgeServer"); getSystem(); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -1319,14 +1319,14 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { assertTrue(ports[0] != 0); String serverMemberId = getMemberId(); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetConnectedClients] ports[0]=" + ports[0]); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetConnectedClients] serverMemberId=" + serverMemberId); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testGetConnectedClients] ports[0]=" + ports[0]); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testGetConnectedClients] serverMemberId=" + serverMemberId); final Host host = Host.getHost(0); SerializableRunnable createPool = new CacheSerializableRunnable("Create connection pool") { public void run2() throws CacheException { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetConnectedClients] create bridge client"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testGetConnectedClients] create bridge client"); Properties config = new Properties(); config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); config.setProperty(DistributionConfig.LOCATORS_NAME, ""); @@ -1336,7 +1336,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { getSystem(config); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); - Pool p = ClientServerTestCase.configureConnectionPool(factory, NetworkSupport.getServerHostName(host), ports, true, -1, -1, null); + Pool p = ClientServerTestCase.configureConnectionPool(factory, NetworkUtils.getServerHostName(host), ports, true, -1, -1, null); createRegion(name, factory.create()); assertNotNull(getRootRegion().getSubregion(name)); assertTrue(p.getServers().size() > 0); @@ -1380,10 +1380,10 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { assertEquals(clientMemberIds.size(), connectedClients.size()); for (Iterator iter = connectedClients.keySet().iterator(); iter.hasNext();) { String connectedClient = (String)iter.next(); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetConnectedClients] checking for client " + connectedClient); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testGetConnectedClients] checking for client " + connectedClient); assertTrue(clientMemberIds.contains(connectedClient)); Object[] result = (Object[])connectedClients.get(connectedClient); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetConnectedClients] result: " + + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testGetConnectedClients] result: " + (result==null? "none" : String.valueOf(result[0])+"; connections="+result[1])); } @@ -1404,7 +1404,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { vm.invoke(new CacheSerializableRunnable("Create bridge server") { public void run2() throws CacheException { // create BridgeServer in controller vm... - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetConnectedServers] Create BridgeServer"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testGetConnectedServers] Create BridgeServer"); getSystem(); AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); @@ -1417,15 +1417,15 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { testGetConnectedServers_port = startBridgeServer(0); } catch (IOException e) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().error("startBridgeServer threw IOException", e); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().error("startBridgeServer threw IOException", e); fail("startBridgeServer threw IOException " + e.getMessage()); } assertTrue(testGetConnectedServers_port != 0); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetConnectedServers] port=" + + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testGetConnectedServers] port=" + ports[whichVM]); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetConnectedServers] serverMemberId=" + + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testGetConnectedServers] serverMemberId=" + getDistributedMember()); } }); @@ -1434,7 +1434,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { assertTrue(ports[whichVM] != 0); } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetConnectedServers] create bridge client"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testGetConnectedServers] create bridge client"); Properties config = new Properties(); config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); config.setProperty(DistributionConfig.LOCATORS_NAME, ""); @@ -1445,10 +1445,10 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { factory.setScope(Scope.LOCAL); for (int i = 0; i < ports.length; i++) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetConnectedServers] creating connectionpool for " + - NetworkSupport.getServerHostName(host) + " " + ports[i]); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testGetConnectedServers] creating connectionpool for " + + NetworkUtils.getServerHostName(host) + " " + ports[i]); int[] thisServerPorts = new int[] { ports[i] }; - ClientServerTestCase.configureConnectionPoolWithName(factory, NetworkSupport.getServerHostName(host), thisServerPorts, false, -1, -1, null,"pooly"+i); + ClientServerTestCase.configureConnectionPoolWithName(factory, NetworkUtils.getServerHostName(host), thisServerPorts, false, -1, -1, null,"pooly"+i); Region region = createRegion(name+"_"+i, factory.create()); assertNotNull(getRootRegion().getSubregion(name+"_"+i)); region.get("KEY-1"); @@ -1487,7 +1487,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { assertEquals(host.getVMCount(), connectedServers.size()); for (Iterator iter = connectedServers.keySet().iterator(); iter.hasNext();) { String connectedServer = (String) iter.next(); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetConnectedServers] value for connectedServer: " + + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testGetConnectedServers] value for connectedServer: " + connectedServers.get(connectedServer)); } } @@ -1512,7 +1512,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { vm.invoke(new CacheSerializableRunnable("Create bridge server") { public void run2() throws CacheException { // create BridgeServer in controller vm... - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetNotifiedClients] Create BridgeServer"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testGetNotifiedClients] Create BridgeServer"); getSystem(); AttributesFactory factory = new AttributesFactory(); Region region = createRegion(name, factory.create()); @@ -1524,15 +1524,15 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { testGetNotifiedClients_port = startBridgeServer(0); } catch (IOException e) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().error("startBridgeServer threw IOException", e); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().error("startBridgeServer threw IOException", e); fail("startBridgeServer threw IOException " + e.getMessage()); } assertTrue(testGetNotifiedClients_port != 0); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetNotifiedClients] port=" + + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testGetNotifiedClients] port=" + ports[whichVM]); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetNotifiedClients] serverMemberId=" + + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testGetNotifiedClients] serverMemberId=" + getMemberId()); } }); @@ -1541,7 +1541,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { assertTrue(ports[whichVM] != 0); } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetNotifiedClients] create bridge client"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testGetNotifiedClients] create bridge client"); Properties config = new Properties(); config.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); config.setProperty(DistributionConfig.LOCATORS_NAME, ""); @@ -1551,8 +1551,8 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase { AttributesFactory factory = new AttributesFactory(); factory.setScope(Scope.LOCAL); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("[testGetNotifiedClients] creating connection pool"); - ClientServerTestCase.configureConnectionPool(factory, NetworkSupport.getServerHostName(host), ports, true, -1, -1, null); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testGetNotifiedClients] creating connection pool"); + ClientServerTestCase.configureConnectionPool(factory, NetworkUtils.getServerHostName(host), ports, true, -1, -1, null); Region region = createRegion(name, factory.create()); assertNotNull(getRootRegion().getSubregion(name)); region.registerInterest("KEY-1");
