http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRColocationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRColocationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRColocationDUnitTest.java index 82e7d3c..5ce60f3 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRColocationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRColocationDUnitTest.java @@ -64,7 +64,7 @@ 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.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.SerializableRunnable; @@ -717,7 +717,7 @@ public class PRColocationDUnitTest extends CacheTestCase { assertNotNull(basicGetCache()); Region pr = basicGetCache().createRegion(partitionedRegionName, attr.create()); assertNotNull(pr); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Region " + partitionedRegionName + " created Successfully :" + pr.toString()); } @@ -754,7 +754,7 @@ public class PRColocationDUnitTest extends CacheTestCase { } catch (Exception Expected) { Expected.printStackTrace(); - LogWriterSupport.getLogWriter().info("Expected Message : " + Expected.getMessage()); + LogWriterUtils.getLogWriter().info("Expected Message : " + Expected.getMessage()); assertTrue(Expected.getMessage().startsWith( "Colocated regions should have accessors at the same node")); } @@ -789,7 +789,7 @@ public class PRColocationDUnitTest extends CacheTestCase { assertNotNull(basicGetCache()); Region pr = basicGetCache().createRegion(partitionedRegionName, attr.create()); assertNotNull(pr); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Region " + partitionedRegionName + " created Successfully :" + pr.toString()); } @@ -825,7 +825,7 @@ public class PRColocationDUnitTest extends CacheTestCase { + "should have accessors at the same node"); } catch (Exception Expected) { - LogWriterSupport.getLogWriter().info("Expected Message : " + Expected.getMessage()); + LogWriterUtils.getLogWriter().info("Expected Message : " + Expected.getMessage()); assertTrue(Expected.getMessage().startsWith( "Colocated regions should have accessors at the same node")); } @@ -860,7 +860,7 @@ public class PRColocationDUnitTest extends CacheTestCase { assertNotNull(basicGetCache()); Region pr = basicGetCache().createRegion(partitionedRegionName, attr.create()); assertNotNull(pr); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Region " + partitionedRegionName + " created Successfully :" + pr.toString()); } @@ -888,7 +888,7 @@ public class PRColocationDUnitTest extends CacheTestCase { assertNotNull(basicGetCache()); Region pr = basicGetCache().createRegion(partitionedRegionName, attr.create()); assertNotNull(pr); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Region " + partitionedRegionName + " created Successfully :" + pr.toString()); } @@ -927,7 +927,7 @@ public class PRColocationDUnitTest extends CacheTestCase { + "as colocated regions are not configured to be at the same nodes."); } catch (Exception Expected) { - LogWriterSupport.getLogWriter().info("Expected Message : " + Expected.getMessage()); + LogWriterUtils.getLogWriter().info("Expected Message : " + Expected.getMessage()); assertTrue(Expected.getMessage().contains("Cannot create buckets, as " + "colocated regions are not configured to be at the same nodes.")); } @@ -963,7 +963,7 @@ public class PRColocationDUnitTest extends CacheTestCase { } catch (Exception NotExpected) { NotExpected.printStackTrace(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Unexpected Exception Message : " + NotExpected.getMessage()); Assert.fail("Unpexpected Exception" , NotExpected); } @@ -1018,7 +1018,7 @@ public class PRColocationDUnitTest extends CacheTestCase { + expectedExMessage); } catch (Exception Expected) { - LogWriterSupport.getLogWriter().info("Expected Messageee : " + Expected.getMessage()); + LogWriterUtils.getLogWriter().info("Expected Messageee : " + Expected.getMessage()); assertTrue(Expected.getMessage().contains(expectedExMessage)); } } @@ -1036,7 +1036,7 @@ public class PRColocationDUnitTest extends CacheTestCase { + expectedExMessage); } catch (Exception Expected) { - LogWriterSupport.getLogWriter().info("Expected Messageee : " + Expected.getMessage()); + LogWriterUtils.getLogWriter().info("Expected Messageee : " + Expected.getMessage()); assertTrue(Expected.getMessage().contains(expectedExMessage)); } } @@ -1096,7 +1096,7 @@ public class PRColocationDUnitTest extends CacheTestCase { + expectedExMessage); } catch (IllegalStateException expected) { - LogWriterSupport.getLogWriter().info("Got message: " + expected.getMessage()); + LogWriterUtils.getLogWriter().info("Got message: " + expected.getMessage()); assertTrue(expected.getMessage().contains(expectedExMessage)); } } @@ -1114,7 +1114,7 @@ public class PRColocationDUnitTest extends CacheTestCase { } catch (Exception unexpected) { unexpected.printStackTrace(); - LogWriterSupport.getLogWriter().info("Unexpected Message: " + unexpected.getMessage()); + LogWriterUtils.getLogWriter().info("Unexpected Message: " + unexpected.getMessage()); fail("Could not destroy the child region."); } } @@ -1131,7 +1131,7 @@ public class PRColocationDUnitTest extends CacheTestCase { } catch (Exception unexpected) { unexpected.printStackTrace(); - LogWriterSupport.getLogWriter().info("Unexpected Message: " + unexpected.getMessage()); + LogWriterUtils.getLogWriter().info("Unexpected Message: " + unexpected.getMessage()); fail("Could not destroy the parent region."); } } @@ -1226,7 +1226,7 @@ public class PRColocationDUnitTest extends CacheTestCase { DummyKeyBasedRoutingResolver dummy = new DummyKeyBasedRoutingResolver(1); prForCustomer.put(dummy, new Integer(100)); assertEquals(prForCustomer.get(dummy), new Integer(100)); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Key :" + dummy.dummyID + " Value :" + prForCustomer.get(dummy)); @@ -1235,14 +1235,14 @@ public class PRColocationDUnitTest extends CacheTestCase { assertNotNull(prForOrder); prForOrder.put(dummy, new Integer(200)); assertEquals(prForOrder.get(dummy), new Integer(200)); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Key :" + dummy.dummyID + " Value :" + prForOrder.get(dummy)); return null; } }); } catch (Exception unexpected) { unexpected.printStackTrace(); - LogWriterSupport.getLogWriter().info("Unexpected Message: " + unexpected.getMessage()); + LogWriterUtils.getLogWriter().info("Unexpected Message: " + unexpected.getMessage()); fail("Test failed"); } } @@ -2072,13 +2072,13 @@ public class PRColocationDUnitTest extends CacheTestCase { } Iterator primaryBucketIterator = primaryBucketListForCustomer.iterator(); while (primaryBucketIterator.hasNext()) { - LogWriterSupport.getLogWriter().info("Primary Bucket : " + primaryBucketIterator.next()); + LogWriterUtils.getLogWriter().info("Primary Bucket : " + primaryBucketIterator.next()); } Iterator SecondaryBucketIterator = secondaryBucketListForCustomer .iterator(); while (SecondaryBucketIterator.hasNext()) { - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Secondary Bucket : " + SecondaryBucketIterator.next()); } } @@ -2119,12 +2119,12 @@ public class PRColocationDUnitTest extends CacheTestCase { } Iterator primaryBucketIterator = primaryBucketListForOrder.iterator(); while (primaryBucketIterator.hasNext()) { - LogWriterSupport.getLogWriter().info("Primary Bucket : " + primaryBucketIterator.next()); + LogWriterUtils.getLogWriter().info("Primary Bucket : " + primaryBucketIterator.next()); } Iterator SecondaryBucketIterator = secondaryBucketListForOrder.iterator(); while (SecondaryBucketIterator.hasNext()) { - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Secondary Bucket : " + SecondaryBucketIterator.next()); } } @@ -2165,13 +2165,13 @@ public class PRColocationDUnitTest extends CacheTestCase { } Iterator primaryBucketIterator = primaryBucketListForShipment.iterator(); while (primaryBucketIterator.hasNext()) { - LogWriterSupport.getLogWriter().info("Primary Bucket : " + primaryBucketIterator.next()); + LogWriterUtils.getLogWriter().info("Primary Bucket : " + primaryBucketIterator.next()); } Iterator SecondaryBucketIterator = secondaryBucketListForShipment .iterator(); while (SecondaryBucketIterator.hasNext()) { - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Secondary Bucket : " + SecondaryBucketIterator.next()); } } @@ -2211,10 +2211,10 @@ public class PRColocationDUnitTest extends CacheTestCase { HashMap localBucket2RegionMap = (HashMap)customerPartitionedregion .getDataStore().getSizeLocally(); int customerBucketSize = localBucket2RegionMap.size(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Size of the " + customerPartitionedRegionName + " in this VM :- " + localBucket2RegionMap.size()); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Size of primary buckets the " + customerPartitionedRegionName + " in this VM :- " + customerPartitionedregion.getDataStore().getNumberOfPrimaryBucketsManaged()); Set customerEntrySet = localBucket2RegionMap.entrySet(); @@ -2224,7 +2224,7 @@ public class PRColocationDUnitTest extends CacheTestCase { Map.Entry me = (Map.Entry)customerIterator.next(); Integer size = (Integer)me.getValue(); assertEquals(1, size.intValue()); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Size of the Bucket " + me.getKey() + ": - " + size.toString()); } @@ -2232,10 +2232,10 @@ public class PRColocationDUnitTest extends CacheTestCase { localBucket2RegionMap = (HashMap)orderPartitionedregion.getDataStore() .getSizeLocally(); int orderBucketSize = localBucket2RegionMap.size(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Size of the " + orderPartitionedRegionName + " in this VM :- " + localBucket2RegionMap.size()); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Size of primary buckets the " + orderPartitionedRegionName + " in this VM :- " + orderPartitionedregion.getDataStore().getNumberOfPrimaryBucketsManaged()); @@ -2246,16 +2246,16 @@ public class PRColocationDUnitTest extends CacheTestCase { Map.Entry me = (Map.Entry)orderIterator.next(); Integer size = (Integer)me.getValue(); assertEquals(10, size.intValue()); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Size of the Bucket " + me.getKey() + ": - " + size.toString()); } localBucket2RegionMap = (HashMap)shipmentPartitionedregion.getDataStore() .getSizeLocally(); int shipmentBucketSize = localBucket2RegionMap.size(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Size of the " + shipmentPartitionedRegionName + " in this VM :- " + localBucket2RegionMap.size()); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Size of primary buckets the " + shipmentPartitionedRegionName + " in this VM :- " + shipmentPartitionedregion.getDataStore().getNumberOfPrimaryBucketsManaged()); Set shipmentEntrySet = localBucket2RegionMap.entrySet(); @@ -2265,7 +2265,7 @@ public class PRColocationDUnitTest extends CacheTestCase { Map.Entry me = (Map.Entry)shipmentIterator.next(); Integer size = (Integer)me.getValue(); assertEquals(100, size.intValue()); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Size of the Bucket " + me.getKey() + ": - " + size.toString()); } @@ -2363,7 +2363,7 @@ public class PRColocationDUnitTest extends CacheTestCase { // assertNotNull(orderPartitionedregion.get(orderId)); if (custId.equals(orderId.getCustId())) { - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( orderId + "belongs to node " + idmForCustomer + " " + idmForOrder); assertEquals(idmForCustomer, idmForOrder); @@ -2375,7 +2375,7 @@ public class PRColocationDUnitTest extends CacheTestCase { ShipmentId shipmentId = (ShipmentId)shipmentIterator.next(); // assertNotNull(shipmentPartitionedregion.get(shipmentId)); if (orderId.equals(shipmentId.getOrderId())) { - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( shipmentId + "belongs to node " + idmForOrder + " " + idmForShipment); } @@ -2460,7 +2460,7 @@ public class PRColocationDUnitTest extends CacheTestCase { "putCustomerPartitionedRegion : failed while doing put operation in CustomerPartitionedRegion ", e); } - LogWriterSupport.getLogWriter().info("Customer :- { " + custid + " : " + customer + " }"); + LogWriterUtils.getLogWriter().info("Customer :- { " + custid + " : " + customer + " }"); } } @@ -2486,7 +2486,7 @@ public class PRColocationDUnitTest extends CacheTestCase { "putOrderPartitionedRegion : failed while doing put operation in OrderPartitionedRegion ", e); } - LogWriterSupport.getLogWriter().info("Order :- { " + orderId + " : " + order + " }"); + LogWriterUtils.getLogWriter().info("Order :- { " + orderId + " : " + order + " }"); } } } @@ -2513,7 +2513,7 @@ public class PRColocationDUnitTest extends CacheTestCase { "putOrderPartitionedRegion : failed while doing put operation in OrderPartitionedRegion ", e); } - LogWriterSupport.getLogWriter().info("Order :- { " + orderId + " : " + order + " }"); + LogWriterUtils.getLogWriter().info("Order :- { " + orderId + " : " + order + " }"); } } } @@ -2542,7 +2542,7 @@ public class PRColocationDUnitTest extends CacheTestCase { "putShipmentPartitionedRegion : failed while doing put operation in ShipmentPartitionedRegion ", e); } - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Shipment :- { " + shipmentId + " : " + shipment + " }"); } } @@ -2576,7 +2576,7 @@ public class PRColocationDUnitTest extends CacheTestCase { Region pr = basicGetCache().getRegion(partitionedRegionName); assertNotNull(pr); try { - LogWriterSupport.getLogWriter().info("Destroying Partitioned Region " + partitionedRegionName); + LogWriterUtils.getLogWriter().info("Destroying Partitioned Region " + partitionedRegionName); pr.destroyRegion(); fail("Did not get the expected ISE"); } catch (Exception e) { @@ -2607,7 +2607,7 @@ public class PRColocationDUnitTest extends CacheTestCase { assertNotNull(basicGetCache()); Region pr = basicGetCache().createRegion(partitionedRegionName, attr.create()); assertNotNull(pr); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Region " + partitionedRegionName + " created Successfully :" + pr.toString()); } @@ -2628,7 +2628,7 @@ public class PRColocationDUnitTest extends CacheTestCase { attr.setPartitionAttributes(prAttr); Region pr = root.createSubregion(partitionedRegionName, attr.create()); assertNotNull(pr); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned sub region " + pr.getName() + " created Successfully :" + pr.toString()); if(localMaxMemory == 0){
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRCustomPartitioningDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRCustomPartitioningDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRCustomPartitioningDUnitTest.java index 45eae3c..981db10 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRCustomPartitioningDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRCustomPartitioningDUnitTest.java @@ -53,7 +53,7 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegionDataStore.BucketVisi import com.gemstone.gemfire.internal.cache.xmlcache.Declarable2; 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.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; @@ -155,12 +155,12 @@ public class PRCustomPartitioningDUnitTest extends for (int b = 0; b < numBucks; b++) { if (par.getBucketKeys(b).contains(key)) { foundIt = true; - LogWriterSupport.getLogWriter().info("Key " + key + " found in bucket " + b); + LogWriterUtils.getLogWriter().info("Key " + key + " found in bucket " + b); break; } } if (!foundIt) { - LogWriterSupport.getLogWriter().severe("Key " + key + " not found in any bucket"); + LogWriterUtils.getLogWriter().severe("Key " + key + " not found in any bucket"); } return foundIt; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java index e35e4fe..0c4b7a9 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java @@ -70,10 +70,10 @@ 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.IgnoredException; -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.Threads; +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; @@ -995,7 +995,7 @@ public class PRFunctionExecutionDUnitTest extends }); assertEquals(Boolean.TRUE, o); - Threads.join(async[0], 60 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(async[0], 60 * 1000); if (async[0].getException() != null) { Assert.fail("UnExpected Exception Occured : ", async[0].getException()); @@ -1093,7 +1093,7 @@ public class PRFunctionExecutionDUnitTest extends }); assertEquals(Boolean.TRUE, o); - Threads.join(async[0], 60 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(async[0], 60 * 1000); if (async[0].getException() != null) { Assert.fail("UnExpected Exception Occured : ", async[0].getException()); @@ -1590,7 +1590,7 @@ public class PRFunctionExecutionDUnitTest extends } catch (Exception expected) { // No data should cause exec to throw - LogWriterSupport.getLogWriter().warning("Exception Occured : "+ expected.getMessage()); + LogWriterUtils.getLogWriter().warning("Exception Occured : "+ expected.getMessage()); // boolean expectedStr = expected.getMessage().startsWith("No target // node was found for routingKey"); // assertTrue("Unexpected exception: " + expected, expectedStr); @@ -2247,7 +2247,7 @@ public class PRFunctionExecutionDUnitTest extends ResultCollector rc1 = dataSet.withArgs(Boolean.TRUE) .execute(function.getId()); List l = ((List)rc1.getResult()); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "PRFunctionExecutionDUnitTest#testExecutionOnAllNodes_byName : Result size :" + l.size() + " Result : " + l); assertEquals(4, l.size()); @@ -2432,7 +2432,7 @@ public class PRFunctionExecutionDUnitTest extends } }); List l = ((List)rc1.getResult()); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "PRFunctionExecutionDUnitTest#testExecutionOnAllNodes_byName : Result size :" + l.size() + " Result : " + l); assertEquals(4, l.size()); @@ -2537,7 +2537,7 @@ public class PRFunctionExecutionDUnitTest extends } }); List l = ((List)rc1.getResult()); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "PRFunctionExecutionDUnitTest#testExecutionOnAllNodes_byName : Result size :" + l.size() + " Result : " + l); assertEquals(4, l.size()); @@ -2612,7 +2612,7 @@ public class PRFunctionExecutionDUnitTest extends "putCustomerPartitionedRegion : failed while doing put operation in CustomerPartitionedRegion ", e); } - LogWriterSupport.getLogWriter().fine("Customer :- { " + custid + " : " + customer + " }"); + LogWriterUtils.getLogWriter().fine("Customer :- { " + custid + " : " + customer + " }"); } Function function = new TestFunction(true,TestFunction.TEST_FUNCTION3); @@ -2723,7 +2723,7 @@ public class PRFunctionExecutionDUnitTest extends "putCustomerPartitionedRegion : failed while doing put operation in CustomerPartitionedRegion ", e); } - LogWriterSupport.getLogWriter().fine("Customer :- { " + custid + " : " + customer + " }"); + LogWriterUtils.getLogWriter().fine("Customer :- { " + custid + " : " + customer + " }"); } PartitionedRegion partitionedregion = (PartitionedRegion)getCache().getRegion(rName2); @@ -2745,7 +2745,7 @@ public class PRFunctionExecutionDUnitTest extends "putOrderPartitionedRegion : failed while doing put operation in OrderPartitionedRegion ", e); } - LogWriterSupport.getLogWriter().fine("Order :- { " + orderId + " : " + order + " }"); + LogWriterUtils.getLogWriter().fine("Order :- { " + orderId + " : " + order + " }"); } } @@ -3054,7 +3054,7 @@ public class PRFunctionExecutionDUnitTest extends 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); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java index 6848345..458ac5d 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionWithResultSenderDUnitTest.java @@ -48,7 +48,7 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegionDUnitTestCase; import com.gemstone.gemfire.internal.cache.PartitionedRegionTestHelper; import com.gemstone.gemfire.internal.cache.functions.TestFunction; 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.VM; @@ -585,7 +585,7 @@ public class PRFunctionExecutionWithResultSenderDUnitTest extends ResultCollector rc1 = dataSet.withArgs(Boolean.TRUE).execute( function.getId()); List l = ((List)rc1.getResult()); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "PRFunctionExecutionDUnitTest#testExecutionOnAllNodes_byName : Result size :" + l.size() + " Result : " + l); assertEquals(4, l.size()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRPerformanceTestDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRPerformanceTestDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRPerformanceTestDUnitTest.java index 53b6257..cd35f50 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRPerformanceTestDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRPerformanceTestDUnitTest.java @@ -54,7 +54,7 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegion; import com.gemstone.gemfire.internal.cache.PartitionedRegionDUnitTestCase; 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.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; @@ -159,7 +159,7 @@ public class PRPerformanceTestDUnitTest extends } } if (!foundIt) { - LogWriterSupport.getLogWriter().severe("Key " + key + " not found in any bucket"); + LogWriterUtils.getLogWriter().severe("Key " + key + " not found in any bucket"); } return foundIt; } @@ -253,7 +253,7 @@ public class PRPerformanceTestDUnitTest extends list = (ArrayList)rc.getResult(); } catch (Exception ex) { - LogWriterSupport.getLogWriter().info("Exception Occured :" + ex.getMessage()); + LogWriterUtils.getLogWriter().info("Exception Occured :" + ex.getMessage()); Assert.fail("Test failed",ex); } Object val = list.get(0); @@ -279,7 +279,7 @@ public class PRPerformanceTestDUnitTest extends } t.stop(); - LogWriterSupport.getLogWriter().info("Time taken to iterate over " + vals.size()+ " no. of keys: " + t.getTimeInMs() + " ms"); + LogWriterUtils.getLogWriter().info("Time taken to iterate over " + vals.size()+ " no. of keys: " + t.getTimeInMs() + " ms"); // Call the execute method for each key and see if this takes more time @@ -306,7 +306,7 @@ public class PRPerformanceTestDUnitTest extends } t.stop(); assertEquals(vals.size(),listOfKeys.size()); - LogWriterSupport.getLogWriter().info("Time taken to iterate over " + vals.size()+ " no. of keys using FunctionExecution: " + t.getTimeInMs() + " ms"); + LogWriterUtils.getLogWriter().info("Time taken to iterate over " + vals.size()+ " no. of keys using FunctionExecution: " + t.getTimeInMs() + " ms"); } }); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java index d8c3f3a..b253dc0 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRTransactionDUnitTest.java @@ -45,7 +45,7 @@ import com.gemstone.gemfire.internal.cache.execute.data.Shipment; import com.gemstone.gemfire.internal.cache.execute.data.ShipmentId; import com.gemstone.gemfire.test.dunit.Assert; 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.SerializableCallable; /** @@ -155,7 +155,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest { filter.clear(); args.clear(); args.add(new Integer(VERIFY_NON_COLOCATION)); - LogWriterSupport.getLogWriter().info("VERIFY_NON_COLOCATION"); + LogWriterUtils.getLogWriter().info("VERIFY_NON_COLOCATION"); args.add(custId); args.add(newCus); args.add(orderId); @@ -167,7 +167,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest { fail("Expected exception was not thrown"); } catch (FunctionException fe) { - LogWriterSupport.getLogWriter().info("Caught Expected exception"); + LogWriterUtils.getLogWriter().info("Caught Expected exception"); if(fe.getCause() instanceof TransactionDataNotColocatedException) { } else { @@ -178,7 +178,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest { } // verify that the transaction modifications are applied args.set(0, new Integer(VERIFY_TX)); - LogWriterSupport.getLogWriter().info("VERIFY_TX"); + LogWriterUtils.getLogWriter().info("VERIFY_TX"); orderpr.put(orderId, order); assertNotNull(orderpr.get(orderId)); e.withFilter(filter).withArgs(args).execute(txFunction.getId()) @@ -194,17 +194,17 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest { .getResult(); // verify that the transaction is rolled back args.set(0, new Integer(VERIFY_ROLLBACK)); - LogWriterSupport.getLogWriter().info("VERIFY_ROLLBACK"); + LogWriterUtils.getLogWriter().info("VERIFY_ROLLBACK"); e.withFilter(filter).withArgs(args).execute(txFunction.getId()) .getResult(); // verify destroy args.set(0, new Integer(VERIFY_DESTROY)); - LogWriterSupport.getLogWriter().info("VERIFY_DESTROY"); + LogWriterUtils.getLogWriter().info("VERIFY_DESTROY"); e.withFilter(filter).withArgs(args).execute(txFunction.getId()) .getResult(); // verify invalidate args.set(0, new Integer(VERIFY_INVALIDATE)); - LogWriterSupport.getLogWriter().info("VERIFY_INVALIDATE"); + LogWriterUtils.getLogWriter().info("VERIFY_INVALIDATE"); e.withFilter(filter).withArgs(args).execute(txFunction.getId()) .getResult(); return Boolean.TRUE; @@ -403,7 +403,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest { orderPartitionedregion.getDataStore().dumpEntries(false); Iterator custIterator = customerPartitionedregion.getDataStore() .getEntries().iterator(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Found " + customerPartitionedregion.getDataStore().getEntries().size() + " Customer entries in the partition"); Region.Entry custEntry = null; @@ -413,7 +413,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest { Customer cust = (Customer)custEntry.getValue(); Iterator orderIterator = orderPartitionedregion.getDataStore() .getEntries().iterator(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Found " + orderPartitionedregion.getDataStore().getEntries().size() + " Order entries in the partition"); int orderPerCustomer = 0; @@ -468,7 +468,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest { filter.clear(); args.clear(); args.add(new Integer(VERIFY_LISTENER_CALLBACK)); - LogWriterSupport.getLogWriter().info("VERIFY_LISTENER_CALLBACK"); + LogWriterUtils.getLogWriter().info("VERIFY_LISTENER_CALLBACK"); args.add(custId); args.add(newCus); args.add(orderId); @@ -516,7 +516,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest { filter.clear(); args.clear(); args.add(new Integer(VERIFY_REP_READ)); - LogWriterSupport.getLogWriter().info("VERIFY_REP_READ"); + LogWriterUtils.getLogWriter().info("VERIFY_REP_READ"); args.add(custId); args.add(newCus); args.add(orderId); @@ -561,7 +561,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest { Execution e = FunctionService.onRegion(customerPR); // for each customer, update order and shipment for (int iterations = 1; iterations <= totalIterations; iterations++) { - LogWriterSupport.getLogWriter().info("running perfFunction"); + LogWriterUtils.getLogWriter().info("running perfFunction"); long startTime = 0; ArrayList args = new ArrayList(); CustId custId = new CustId(iterations % 10); @@ -602,7 +602,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest { Execution e = FunctionService.onRegion(customerPR); // for each customer, update order and shipment for (int iterations = 1; iterations <= totalIterations; iterations++) { - LogWriterSupport.getLogWriter().info("Running perfFunction"); + LogWriterUtils.getLogWriter().info("Running perfFunction"); long startTime = 0; ArrayList args = new ArrayList(); CustId custId = new CustId(iterations % 10); @@ -638,7 +638,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest { double diff = (perfTime.longValue() - perfTxTime.longValue()) * 1.0; double percentDiff = (diff / perfTime.longValue()) * 100; - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( (totalIterations - warmupIterations) + " iterations of function took:" + +perfTime.longValue() + " Nanos, and transaction function took:" + perfTxTime.longValue() + " Nanos, difference :" + diff @@ -719,7 +719,7 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest { } } mgr.commit(); - LogWriterSupport.getLogWriter().info("COMMIT completed"); + LogWriterUtils.getLogWriter().info("COMMIT completed"); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARQAddOperationJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARQAddOperationJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARQAddOperationJUnitTest.java index 6e3efcf..f299391 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARQAddOperationJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARQAddOperationJUnitTest.java @@ -31,7 +31,7 @@ import org.junit.experimental.categories.Category; import com.gemstone.gemfire.cache.CacheException; import com.gemstone.gemfire.internal.cache.Conflatable; import com.gemstone.gemfire.internal.cache.EventID; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.dunit.Wait; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; @@ -153,7 +153,7 @@ public class BlockingHARQAddOperationJUnitTest extends }; takeThread.start(); - Wait.staticPause(20 * 1000); + Wait.pause(20 * 1000); if (!takeThread.isAlive()) { fail("take() thread died "); } @@ -161,7 +161,7 @@ public class BlockingHARQAddOperationJUnitTest extends ConflatableObject c1 = new ConflatableObject(KEY1, VALUE1, id1, conflationEnabled, "region1"); rq.put(c1); - Threads.join(takeThread, 20 * 1000, null); + ThreadUtils.join(takeThread, 20 * 1000); assertEquals(1, takenObjects.size()); Conflatable obj = (Conflatable)takenObjects.get(0); assertNotNull(obj); @@ -221,7 +221,7 @@ public class BlockingHARQAddOperationJUnitTest extends rq.put(c); } for (int i = 0; i < totalTakeThreads; i++) { - Threads.join(takeThreads[i], 20 * 1000, null); + ThreadUtils.join(takeThreads[i], 20 * 1000); } assertEquals(totalTakeThreads, takenObjects.size()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARegionJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARegionJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARegionJUnitTest.java index db5874c..9e79239 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARegionJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARegionJUnitTest.java @@ -32,7 +32,7 @@ import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.internal.cache.EventID; import com.gemstone.gemfire.internal.AvailablePort; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.dunit.Wait; import com.gemstone.gemfire.test.dunit.WaitCriterion; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; @@ -77,8 +77,8 @@ public class BlockingHARegionJUnitTest thread1.start(); thread2.start(); - Threads.join(thread1, 30 * 1000, null); - Threads.join(thread2, 30 * 1000, null); + ThreadUtils.join(thread1, 30 * 1000); + ThreadUtils.join(thread2, 30 * 1000); if (exceptionOccured) { fail(" Test failed due to " + exceptionString); @@ -152,8 +152,8 @@ public class BlockingHARegionJUnitTest }; Wait.waitForCriterion(ev, 30 * 1000, 1000, true); - Threads.join(thread1, 30 * 1000, null); // for completeness - Threads.join(thread2, 30 * 1000, null); + ThreadUtils.join(thread1, 30 * 1000); // for completeness + ThreadUtils.join(thread2, 30 * 1000); if (exceptionOccured) { fail(" Test failed due to " + exceptionString); } @@ -226,11 +226,11 @@ public class BlockingHARegionJUnitTest Thread.sleep(2000); - Threads.join(thread1, 5 * 60 * 1000, null); - Threads.join(thread2, 5 * 60 * 1000, null); - Threads.join(thread3, 5 * 60 * 1000, null); - Threads.join(thread4, 5 * 60 * 1000, null); - Threads.join(thread5, 5 * 60 * 1000, null); + ThreadUtils.join(thread1, 5 * 60 * 1000); + ThreadUtils.join(thread2, 5 * 60 * 1000); + ThreadUtils.join(thread3, 5 * 60 * 1000); + ThreadUtils.join(thread4, 5 * 60 * 1000); + ThreadUtils.join(thread5, 5 * 60 * 1000); cache.close(); } @@ -283,11 +283,11 @@ public class BlockingHARegionJUnitTest thread9.start(); thread10.start(); - Threads.join(thread6, 30 * 1000, null); - Threads.join(thread7, 30 * 1000, null); - Threads.join(thread8, 30 * 1000, null); - Threads.join(thread9, 30 * 1000, null); - Threads.join(thread10, 30 * 1000, null); + ThreadUtils.join(thread6, 30 * 1000); + ThreadUtils.join(thread7, 30 * 1000); + ThreadUtils.join(thread8, 30 * 1000); + ThreadUtils.join(thread9, 30 * 1000); + ThreadUtils.join(thread10, 30 * 1000); WaitCriterion ev = new WaitCriterion() { public boolean done() { @@ -320,11 +320,11 @@ public class BlockingHARegionJUnitTest Thread.sleep(2000); - Threads.join(thread1, 30 * 1000, null); - Threads.join(thread2, 30 * 1000, null); - Threads.join(thread3, 30 * 1000, null); - Threads.join(thread4, 30 * 1000, null); - Threads.join(thread5, 30 * 1000, null); + ThreadUtils.join(thread1, 30 * 1000); + ThreadUtils.join(thread2, 30 * 1000); + ThreadUtils.join(thread3, 30 * 1000); + ThreadUtils.join(thread4, 30 * 1000); + ThreadUtils.join(thread5, 30 * 1000); cache.close(); } @@ -378,7 +378,7 @@ public class BlockingHARegionJUnitTest } }; t1.start(); - Threads.join(t1, 20 * 1000, null); + ThreadUtils.join(t1, 20 * 1000); if (exceptionOccured) { fail(" Test failed due to " + exceptionString); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java index 757b02a..09e0fbf 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java @@ -37,8 +37,8 @@ import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.cache.tier.sockets.ConflationDUnitTest; 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.VM; /** @@ -114,7 +114,7 @@ public class Bug36853EventsExpiryDUnitTest extends CacheTestCase "createServerCache")).intValue(); client.invoke(Bug36853EventsExpiryDUnitTest.class, "createClientCache", - new Object[] { NetworkSupport.getServerHostName(host), new Integer(PORT2) }); + new Object[] { NetworkUtils.getServerHostName(host), new Integer(PORT2) }); } @@ -180,11 +180,11 @@ public class Bug36853EventsExpiryDUnitTest extends CacheTestCase public void afterCreate(EntryEvent event) { String key = (String)event.getKey(); - LogWriterSupport.getLogWriter().info("client2 : afterCreate : key =" + key); + LogWriterUtils.getLogWriter().info("client2 : afterCreate : key =" + key); if (key.equals(LAST_KEY)) { synchronized (Bug36853EventsExpiryDUnitTest.class) { - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Notifying client2 to proceed for validation"); proceedForValidation = true; Bug36853EventsExpiryDUnitTest.class.notify(); @@ -259,7 +259,7 @@ public class Bug36853EventsExpiryDUnitTest extends CacheTestCase synchronized (Bug36853EventsExpiryDUnitTest.class) { if (!proceedForValidation) try { - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Client2 going in wait before starting validation"); Bug36853EventsExpiryDUnitTest.class.wait(5000); } @@ -268,13 +268,13 @@ public class Bug36853EventsExpiryDUnitTest extends CacheTestCase } } } - LogWriterSupport.getLogWriter().info("Starting validation on client2"); + LogWriterUtils.getLogWriter().info("Starting validation on client2"); Assert.assertEquals( "Puts recieved by client not equal to the puts done at server.", TOTAL_PUTS, putsRecievedByClient); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info("putsRecievedByClient = " + putsRecievedByClient); - LogWriterSupport.getLogWriter().info("Validation complete on client2"); + LogWriterUtils.getLogWriter().info("Validation complete on client2"); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java index 7e72f7f..ccea0f8 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java @@ -39,7 +39,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier; import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.test.dunit.DistributedTestCase; -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.VM; @@ -109,7 +109,7 @@ public class Bug48571DUnitTest extends DistributedTestCase { public static int createServerCache() throws Exception { Properties props = new Properties(); - props.setProperty("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + props.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); props.setProperty("log-file", "server_" + OSProcess.getId() + ".log"); props.setProperty("log-level", "info"); props.setProperty("statistic-archive-file", "server_" + OSProcess.getId() http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java index 49faa64..77459b3 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java @@ -43,8 +43,8 @@ import com.gemstone.gemfire.internal.cache.EntryEventImpl; import com.gemstone.gemfire.internal.cache.EventID; import com.gemstone.gemfire.test.dunit.DistributedTestCase; import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; -import com.gemstone.gemfire.test.dunit.NetworkSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; +import com.gemstone.gemfire.test.dunit.NetworkUtils; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.cache.client.internal.ServerRegionProxy; import com.gemstone.gemfire.cache.client.internal.Connection; @@ -175,9 +175,9 @@ public class EventIdOptimizationDUnitTest extends DistributedTestCase "createServerCache")).intValue(); client1.invoke(EventIdOptimizationDUnitTest.class, "createClientCache1", - new Object[] { NetworkSupport.getServerHostName(host), new Integer(PORT1) }); + new Object[] { NetworkUtils.getServerHostName(host), new Integer(PORT1) }); client2.invoke(EventIdOptimizationDUnitTest.class, "createClientCache2", - new Object[] { NetworkSupport.getServerHostName(host), new Integer(PORT2) }); + new Object[] { NetworkUtils.getServerHostName(host), new Integer(PORT2) }); } @@ -454,7 +454,7 @@ public class EventIdOptimizationDUnitTest extends DistributedTestCase synchronized (EventIdOptimizationDUnitTest.class) { if (!proceedForValidation) try { - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Client2 going in wait before starting validation"); EventIdOptimizationDUnitTest.class.wait(); } @@ -463,12 +463,12 @@ public class EventIdOptimizationDUnitTest extends DistributedTestCase } } } - LogWriterSupport.getLogWriter().info("Starting validation on client2"); + LogWriterUtils.getLogWriter().info("Starting validation on client2"); if (validationFailed) { fail("\n The following eventIds recieved by client2 were not present in the eventId array sent by client1 \n" + failureMsg); } - LogWriterSupport.getLogWriter().info("Validation complete on client2, goin to unregister listeners"); + LogWriterUtils.getLogWriter().info("Validation complete on client2, goin to unregister listeners"); Region region = cache.getRegion(Region.SEPARATOR + REGION_NAME); if (region != null && !region.isDestroyed()) { @@ -492,7 +492,7 @@ public class EventIdOptimizationDUnitTest extends DistributedTestCase } } - LogWriterSupport.getLogWriter().info("Test completed, Unregistered the listeners"); + LogWriterUtils.getLogWriter().info("Test completed, Unregistered the listeners"); } /** @@ -572,7 +572,7 @@ public class EventIdOptimizationDUnitTest extends DistributedTestCase && (eventIdAtClient2.getSequenceID() == eventIdForLastKey .getSequenceID())) { synchronized (EventIdOptimizationDUnitTest.class) { - LogWriterSupport.getLogWriter().info("Notifying client2 to proceed for validation"); + LogWriterUtils.getLogWriter().info("Notifying client2 to proceed for validation"); proceedForValidation = true; EventIdOptimizationDUnitTest.class.notify(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java index d08f3d5..8d365c3 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java @@ -42,7 +42,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.ConflationDUnitTest; 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.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; @@ -90,7 +90,7 @@ public class FailoverDUnitTest extends DistributedTestCase PORT2 = ((Integer)vm1.invoke(FailoverDUnitTest.class, "createServerCache" )).intValue(); CacheServerTestUtil.disableShufflingOfEndpoints(); - createClientCache(NetworkSupport.getServerHostName(host), new Integer(PORT1),new Integer(PORT2)); + createClientCache(NetworkUtils.getServerHostName(host), new Integer(PORT1),new Integer(PORT2)); { // calculate the primary vm waitForPrimaryAndBackups(1); PoolImpl pool = (PoolImpl)PoolManager.find("FailoverPool"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java index e9c8c86..7fbbdcf 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java @@ -36,7 +36,7 @@ import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.test.dunit.DistributedTestCase; 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; /** @@ -97,9 +97,9 @@ public class HABugInPutDUnitTest extends DistributedTestCase .intValue(); client1.invoke(HABugInPutDUnitTest.class, "createClientCache", new Object[] { - NetworkSupport.getServerHostName(host), new Integer(PORT1), new Integer(PORT2) }); + NetworkUtils.getServerHostName(host), new Integer(PORT1), new Integer(PORT2) }); client2.invoke(HABugInPutDUnitTest.class, "createClientCache", new Object[] { - NetworkSupport.getServerHostName(host), new Integer(PORT1), new Integer(PORT2) }); + NetworkUtils.getServerHostName(host), new Integer(PORT1), new Integer(PORT2) }); //Boolean.getBoolean("") } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java index 0806bbf..3eeed6b 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java @@ -39,8 +39,8 @@ import com.gemstone.gemfire.internal.cache.LocalRegion; import com.gemstone.gemfire.internal.cache.tier.sockets.ConflationDUnitTest; import com.gemstone.gemfire.test.dunit.DistributedTestCase; import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; -import com.gemstone.gemfire.test.dunit.NetworkSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; +import com.gemstone.gemfire.test.dunit.NetworkUtils; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.cache.Region; @@ -529,7 +529,7 @@ public class HAClearDUnitTest extends DistributedTestCase { Region region = cache.getRegion(Region.SEPARATOR + REGION_NAME); assertNotNull(region); - LogWriterSupport.getLogWriter().info("Size of the region " + region.size()); + LogWriterUtils.getLogWriter().info("Size of the region " + region.size()); assertEquals(size, region.size()); } }; @@ -544,7 +544,7 @@ public class HAClearDUnitTest extends DistributedTestCase public void run2() throws CacheException { Region region = cache.getRegion(Region.SEPARATOR + REGION_NAME); - LogWriterSupport.getLogWriter().warning("Found region " + region); + LogWriterUtils.getLogWriter().warning("Found region " + region); assertNull(region); } }; @@ -561,14 +561,14 @@ public class HAClearDUnitTest extends DistributedTestCase PORT2 = ((Integer)server2.invoke(HAClearDUnitTest.class, "createServerCache")).intValue(); client1.invoke(HAClearDUnitTest.class, "createClientCache", new Object[] { - NetworkSupport.getServerHostName(Host.getHost(0)), + NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1), new Integer(PORT2), new Boolean(true), new Boolean(true) }); client2.invoke(HAClearDUnitTest.class, "createClientCache", new Object[] { - NetworkSupport.getServerHostName(Host.getHost(0)), + NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1), new Integer(PORT2), new Boolean(true), new Boolean(true) }); - createClientCache(NetworkSupport.getServerHostName(Host.getHost(0)), + createClientCache(NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1), new Integer(PORT2), new Boolean(true), new Boolean(true)); } @@ -618,7 +618,7 @@ public class HAClearDUnitTest extends DistributedTestCase factory.setCacheListener(new CacheListenerAdapter() { public void afterRegionClear(RegionEvent event) { - LogWriterSupport.getLogWriter().info("-------> afterRegionClear received"); + LogWriterUtils.getLogWriter().info("-------> afterRegionClear received"); synchronized (HAClearDUnitTest.class) { gotClearCallback = true; HAClearDUnitTest.class.notifyAll(); @@ -628,7 +628,7 @@ public class HAClearDUnitTest extends DistributedTestCase public void afterRegionDestroy(RegionEvent event) { synchronized (HAClearDUnitTest.class) { - LogWriterSupport.getLogWriter().info("-------> afterRegionDestroy received"); + LogWriterUtils.getLogWriter().info("-------> afterRegionDestroy received"); gotDestroyRegionCallback = true; HAClearDUnitTest.class.notifyAll(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java index 39acb7c..241ac39 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java @@ -39,7 +39,7 @@ import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.tier.sockets.ConflationDUnitTest; 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; @@ -114,7 +114,7 @@ public class HAConflationDUnitTest extends CacheTestCase server1.invoke(ConflationDUnitTest.class, "setIsSlowStart"); server1.invoke(HAConflationDUnitTest.class, "makeDispatcherSlow"); client1.invoke(HAConflationDUnitTest.class, "createClientCache", - new Object[] { NetworkSupport.getServerHostName(host), new Integer(PORT1), new Boolean(true) }); + new Object[] { NetworkUtils.getServerHostName(host), new Integer(PORT1), new Boolean(true) }); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java index 3bd7076..22310cf 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java @@ -41,7 +41,7 @@ import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.test.dunit.DistributedTestCase; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.NetworkSupport; +import com.gemstone.gemfire.test.dunit.NetworkUtils; import com.gemstone.gemfire.test.dunit.VM; /** @@ -227,7 +227,7 @@ public class HADuplicateDUnitTest extends DistributedTestCase PORT2 = ((Integer)server2.invoke(HADuplicateDUnitTest.class, "createServerCache")).intValue(); client1.invoke(HADuplicateDUnitTest.class, "createClientCache", - new Object[] { NetworkSupport.getServerHostName(Host.getHost(0)), new Integer(PORT1), new Integer(PORT2) }); + new Object[] { NetworkUtils.getServerHostName(Host.getHost(0)), new Integer(PORT1), new Integer(PORT2) }); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java index 2059d01..b77af55 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java @@ -49,8 +49,8 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.ConflationDUnitTest; 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.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.VM; import com.gemstone.gemfire.test.dunit.Wait; import com.gemstone.gemfire.test.dunit.WaitCriterion; @@ -128,7 +128,7 @@ public class HAEventIdPropagationDUnitTest extends DistributedTestCase int PORT1 = ((Integer)server1.invoke(HAEventIdPropagationDUnitTest.class, "createServerCache")).intValue(); client1.invoke(HAEventIdPropagationDUnitTest.class, "createClientCache", - new Object[] { NetworkSupport.getServerHostName(server1.getHost()), new Integer(PORT1) }); + new Object[] { NetworkUtils.getServerHostName(server1.getHost()), new Integer(PORT1) }); } /** create the server * */ @@ -219,7 +219,7 @@ public class HAEventIdPropagationDUnitTest extends DistributedTestCase }; Wait.waitForCriterion(ev, 10 * 1000, 200, true); synchronized(map) { - LogWriterSupport.getLogWriter().info("assertThreadIdToSequenceIdMapisNotNullButEmpty: map size is " + map.size()); + LogWriterUtils.getLogWriter().info("assertThreadIdToSequenceIdMapisNotNullButEmpty: map size is " + map.size()); assertTrue(map.size() == 1); } @@ -688,7 +688,7 @@ public class HAEventIdPropagationDUnitTest extends DistributedTestCase public void afterCreate(EntryEvent event) { - LogWriterSupport.getLogWriter().fine(" entered after created with " + event.getKey()); + LogWriterUtils.getLogWriter().fine(" entered after created with " + event.getKey()); boolean shouldNotify = false; Object key = event.getKey(); if (key.equals(PUTALL_KEY1)) { @@ -781,7 +781,7 @@ public class HAEventIdPropagationDUnitTest extends DistributedTestCase public void afterCreate(EntryEvent event) { - LogWriterSupport.getLogWriter().fine(" entered after created with " + event.getKey()); + LogWriterUtils.getLogWriter().fine(" entered after created with " + event.getKey()); boolean shouldNotify = false; Object key = event.getKey(); if (key.equals(PUTALL_KEY1)) { @@ -857,14 +857,14 @@ public class HAEventIdPropagationDUnitTest extends DistributedTestCase public void afterRegionDestroy(RegionEvent event) { - LogWriterSupport.getLogWriter().info("Before Regionestroy in Server"); + LogWriterUtils.getLogWriter().info("Before Regionestroy in Server"); eventId = ((RegionEventImpl)event).getEventId(); assertNotNull(eventId); synchronized (lockObject) { receivedOperation = true; lockObject.notify(); } - LogWriterSupport.getLogWriter().info("After RegionDestroy in Server"); + LogWriterUtils.getLogWriter().info("After RegionDestroy in Server"); } public void afterRegionClear(RegionEvent event) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java index d98c8f4..cfcb074 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIBugDUnitTest.java @@ -42,9 +42,9 @@ 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.LogWriterUtils; 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; /** @@ -140,7 +140,7 @@ public class HAGIIBugDUnitTest extends DistributedTestCase public void testDummy() throws Exception { - LogWriterSupport.getLogWriter().info("This is Dummy test for the GII"); + LogWriterUtils.getLogWriter().info("This is Dummy test for the GII"); } @@ -162,7 +162,7 @@ public class HAGIIBugDUnitTest extends DistributedTestCase factory.setCacheListener(regionListener); RegionAttributes attrs = factory.create(); Region region = cache.createRegion(REGION_NAME, attrs); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Name of the region is : " + region.getFullPath()); HARegionQueueAttributes hattr = new HARegionQueueAttributes(); @@ -187,12 +187,12 @@ public class HAGIIBugDUnitTest extends DistributedTestCase AsyncInvocation[] async = new AsyncInvocation[4]; async[0] = vm0.invokeAsync(putFrmVm("vm0_2")); t1.start(); - Threads.join(t1, 30 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(t1, 30 * 1000); if (isTestFailed) fail("HARegionQueue can not be created"); for (int count = 0; count < 1; count++) { - Threads.join(async[count], 30 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(async[count], 30 * 1000); if (async[count].exceptionOccurred()) { Assert.fail("Got exception on " + count, async[count].getException()); } @@ -208,7 +208,7 @@ public class HAGIIBugDUnitTest extends DistributedTestCase validationFlag = true; validateResults(validationFlag); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "No. of keys that are missed by HARegion Queue during GII " + keys_set_after_gii.size()); @@ -222,7 +222,7 @@ public class HAGIIBugDUnitTest extends DistributedTestCase // int k = 0; for (int i = 0; i < 1; i++) { long totalPuts = ((Long)total_no_puts[i]).longValue() - 3 * NO_OF_PUTS; - LogWriterSupport.getLogWriter().info("Total no of puts expectesd " + totalPuts); + LogWriterUtils.getLogWriter().info("Total no of puts expectesd " + totalPuts); for (int j = 0; j < totalPuts; j++) { keys_set_after_gii.add("vm" + i + "_2" + j); @@ -243,7 +243,7 @@ public class HAGIIBugDUnitTest extends DistributedTestCase { HARegion regionForQueue = (HARegion)cache.getRegion(Region.SEPARATOR + HARegionQueue.createRegionName(HAExpiryDUnitTest.regionQueueName)); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Region Queue size : " + regionForQueue.keys().size()); Iterator itr = regionForQueue.entries(false).iterator(); while (itr.hasNext()) { @@ -319,7 +319,7 @@ public class HAGIIBugDUnitTest extends DistributedTestCase } TOTAL_NO_OF_PUTS = TOTAL_NO_OF_PUTS + NO_OF_PUTS; } - LogWriterSupport.getLogWriter().info("Total no of puts : " + TOTAL_NO_OF_PUTS); + LogWriterUtils.getLogWriter().info("Total no of puts : " + TOTAL_NO_OF_PUTS); } }; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java index 8d56211..74ac4de 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java @@ -51,7 +51,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.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; @@ -151,7 +151,7 @@ public class HAGIIDUnitTest extends DistributedTestCase PORT2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); //Start the client client0.invoke(HAGIIDUnitTest.class, "createClientCache", - new Object[] { NetworkSupport.getServerHostName(host), new Integer(PORT1),new Integer(PORT2)}); + new Object[] { NetworkUtils.getServerHostName(host), new Integer(PORT1),new Integer(PORT2)}); } public void testGIIRegionQueue() http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQAddOperationJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQAddOperationJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQAddOperationJUnitTest.java index 88dbd54..ad649d3 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQAddOperationJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQAddOperationJUnitTest.java @@ -47,7 +47,7 @@ import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.internal.cache.Conflatable; import com.gemstone.gemfire.internal.cache.EventID; import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; /** @@ -470,8 +470,8 @@ public class HARQAddOperationJUnitTest t1.start(); t2.start(); - Threads.join(t1, 180 * 1000, null); - Threads.join(t2, 180 * 1000, null); + ThreadUtils.join(t1, 180 * 1000); + ThreadUtils.join(t2, 180 * 1000); if (testFailed) fail("Test failed due to " + message); @@ -528,8 +528,8 @@ public class HARQAddOperationJUnitTest t2.start(); t1.start(); - Threads.join(t1, 180 * 1000, null); - Threads.join(t2, 180 * 1000, null); + ThreadUtils.join(t1, 180 * 1000); + ThreadUtils.join(t2, 180 * 1000); if (testFailed) fail("Test failed due to " + message); @@ -628,7 +628,7 @@ public class HARQAddOperationJUnitTest } for (int k = 0; k < numOfThreads; k++) { - Threads.join(threads[k], 180 * 1000, null); + ThreadUtils.join(threads[k], 180 * 1000); } this.logWriter @@ -711,7 +711,7 @@ public class HARQAddOperationJUnitTest } for (int k = 0; k < numOfThreads; k++) { - Threads.join(threads[k], 180 * 1000, null); + ThreadUtils.join(threads[k], 180 * 1000); } if (testFailed) @@ -779,7 +779,7 @@ public class HARQAddOperationJUnitTest } for (int k = 0; k < numOfThreads; k++) { - Threads.join(threads[k], 180 * 1000, null); + ThreadUtils.join(threads[k], 180 * 1000); } if (testFailed) @@ -853,7 +853,7 @@ public class HARQAddOperationJUnitTest } for (int k = 0; k < numOfThreads; k++) { - Threads.join(threads[k], 180 * 1000, null); + ThreadUtils.join(threads[k], 180 * 1000); } if (testFailed) @@ -902,7 +902,7 @@ public class HARQAddOperationJUnitTest } for (int k = 0; k < numOfPuts; k++) { - Threads.join(threads_peek_remove[k], 180 * 1000, null); + ThreadUtils.join(threads_peek_remove[k], 180 * 1000); } if (testFailed) @@ -965,7 +965,7 @@ public class HARQAddOperationJUnitTest } for (int k = 0; k < numOfThreads; k++) { - Threads.join(threads[k], 180 * 1000, null); + ThreadUtils.join(threads[k], 180 * 1000); } if (testFailed) @@ -1013,7 +1013,7 @@ public class HARQAddOperationJUnitTest } for (int k = 0; k < numOfPuts - 1; k++) { - Threads.join(threads_peek_remove[k], 180 * 1000, null); + ThreadUtils.join(threads_peek_remove[k], 180 * 1000); } if (testFailed)
