http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java index 59aeac5..532b806 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java @@ -45,7 +45,7 @@ import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.cache.persistence.UninterruptibleFileChannel; 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.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; @@ -306,7 +306,7 @@ public class Bug39079DUnitTest extends CacheTestCase { Integer port = (Integer)vm0.invoke(Bug39079DUnitTest.class, "createServerCache"); //create cache client vm1.invoke(Bug39079DUnitTest.class, "createClientCache", - new Object[] { NetworkSupport.getServerHostName(vm0.getHost()), port}); + new Object[] { NetworkUtils.getServerHostName(vm0.getHost()), port}); // validate vm0.invoke(Bug39079DUnitTest.class, "validateRuningBridgeServerList");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java index 00fa760..a03f035 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java @@ -36,8 +36,8 @@ import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.cache.InitialImageOperation.RequestImageMessage; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; -import com.gemstone.gemfire.test.dunit.NetworkSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; +import com.gemstone.gemfire.test.dunit.NetworkUtils; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; @@ -98,7 +98,7 @@ public class Bug41091DUnitTest extends CacheTestCase { Properties props = new Properties(); props.setProperty(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "true"); - props.setProperty(DistributionConfig.LOCATORS_NAME, NetworkSupport.getServerHostName(host) + "[" + locatorPort + "]"); + props.setProperty(DistributionConfig.LOCATORS_NAME, NetworkUtils.getServerHostName(host) + "[" + locatorPort + "]"); getSystem(props); @@ -118,7 +118,7 @@ public class Bug41091DUnitTest extends CacheTestCase { public void run() { Properties props = new Properties(); props.setProperty(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "true"); - props.setProperty(DistributionConfig.LOCATORS_NAME, NetworkSupport.getServerHostName(host) + "[" + locatorPort + "]"); + props.setProperty(DistributionConfig.LOCATORS_NAME, NetworkUtils.getServerHostName(host) + "[" + locatorPort + "]"); getSystem(props); Cache cache = getCache(); AttributesFactory af = new AttributesFactory(); @@ -152,7 +152,7 @@ public class Bug41091DUnitTest extends CacheTestCase { disconnectFromDS(); Properties props = new Properties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, String.valueOf(0)); - props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterSupport.getDUnitLogLevel()); + props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); props.setProperty(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "true"); props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false"); try { @@ -160,7 +160,7 @@ public class Bug41091DUnitTest extends CacheTestCase { + ".log"); InetAddress bindAddr = null; try { - bindAddr = InetAddress.getByName(NetworkSupport.getServerHostName(vm.getHost())); + bindAddr = InetAddress.getByName(NetworkUtils.getServerHostName(vm.getHost())); } catch (UnknownHostException uhe) { Assert.fail("While resolving bind address ", uhe); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java index d3fc346..a16a9c3 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java @@ -35,9 +35,9 @@ import com.gemstone.gemfire.cache30.ClientServerTestCase; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.test.dunit.Assert; -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.NetworkSupport; +import com.gemstone.gemfire.test.dunit.NetworkUtils; import com.gemstone.gemfire.test.dunit.VM; /** @@ -66,7 +66,7 @@ import com.gemstone.gemfire.test.dunit.VM; final VM client = host.getVM(1); final String regionName = getUniqueName(); final int serverPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - final String serverHost = NetworkSupport.getServerHostName(server.getHost()); + final String serverHost = NetworkUtils.getServerHostName(server.getHost()); createBridgeServer(server, regionName, serverPort, false); @@ -91,7 +91,7 @@ import com.gemstone.gemfire.test.dunit.VM; public void run2() throws CacheException { // Create DS Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); getSystem(config); // Create Region http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug45164DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug45164DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug45164DUnitTest.java index c8d1ffc..371df3f 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug45164DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug45164DUnitTest.java @@ -25,7 +25,7 @@ import com.gemstone.gemfire.cache.RegionShortcut; import com.gemstone.gemfire.cache30.CacheTestCase; 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.LogWriterUtils; import com.gemstone.gemfire.test.dunit.SerializableRunnable; public class Bug45164DUnitTest extends CacheTestCase { @@ -79,7 +79,7 @@ public class Bug45164DUnitTest extends CacheTestCase { Cache cache = getCache(new CacheFactory()); Region<Integer, Object> region = cache.<Integer, Object>createRegionFactory(RegionShortcut.PARTITION).create("test"); if (region == null) { - LogWriterSupport.getLogWriter().error("oops!"); + LogWriterUtils.getLogWriter().error("oops!"); } } }; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug47667DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug47667DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug47667DUnitTest.java index 24682c1..1c0abe6 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug47667DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug47667DUnitTest.java @@ -25,7 +25,7 @@ import com.gemstone.gemfire.cache.client.PoolManager; import com.gemstone.gemfire.cache.client.internal.LocatorTestBase; import com.gemstone.gemfire.internal.AvailablePort; 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.SerializableCallable; import com.gemstone.gemfire.test.dunit.VM; @@ -57,7 +57,7 @@ public class Bug47667DUnitTest extends LocatorTestBase { VM client = host.getVM(3); final int locatorPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - final String locatorHost = NetworkSupport.getServerHostName(host); + final String locatorHost = NetworkUtils.getServerHostName(host); startLocatorInVM(locator, locatorPort, ""); String locString = getLocatorString(host, locatorPort); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java index 5b9feed..321228b 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearDAckDUnitTest.java @@ -39,7 +39,7 @@ import com.gemstone.gemfire.internal.cache.versions.VersionSource; 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; @@ -73,7 +73,7 @@ public class ClearDAckDUnitTest extends DistributedTestCase { VM vm1 = host.getVM(1); vm0ID = (DistributedMember)vm0.invoke(ClearDAckDUnitTest.class, "createCacheVM0"); vm1ID = (DistributedMember)vm1.invoke(ClearDAckDUnitTest.class, "createCacheVM1"); - LogWriterSupport.getLogWriter().info("Cache created in successfully"); + LogWriterUtils.getLogWriter().info("Cache created in successfully"); } public void preTearDown(){ @@ -104,7 +104,7 @@ public class ClearDAckDUnitTest extends DistributedTestCase { try{ // props.setProperty("mcast-port", "1234"); // ds = DistributedSystem.connect(props); - LogWriterSupport.getLogWriter().info("I am vm0"); + LogWriterUtils.getLogWriter().info("I am vm0"); ds = (new ClearDAckDUnitTest("temp")).getSystem(props); cache = CacheFactory.create(ds); @@ -118,7 +118,7 @@ public class ClearDAckDUnitTest extends DistributedTestCase { RegionAttributes attr = factory.create(); region = cache.createRegion("map", attr); - LogWriterSupport.getLogWriter().info("vm0 map region: " + region); + LogWriterUtils.getLogWriter().info("vm0 map region: " + region); paperWork = cache.createRegion("paperWork", attr); return cache.getDistributedSystem().getDistributedMember(); } catch (CacheException ex){ @@ -129,7 +129,7 @@ public class ClearDAckDUnitTest extends DistributedTestCase { try{ // props.setProperty("mcast-port", "1234"); // ds = DistributedSystem.connect(props); - LogWriterSupport.getLogWriter().info("I am vm1"); + LogWriterUtils.getLogWriter().info("I am vm1"); ds = (new ClearDAckDUnitTest("temp")).getSystem(props); //DistributedSystem.setThreadsSocketPolicy(false); CacheObserverImpl observer = new CacheObserverImpl(); @@ -145,7 +145,7 @@ public class ClearDAckDUnitTest extends DistributedTestCase { RegionAttributes attr = factory.create(); region = cache.createRegion("map", attr); - LogWriterSupport.getLogWriter().info("vm1 map region: " + region); + LogWriterUtils.getLogWriter().info("vm1 map region: " + region); paperWork = cache.createRegion("paperWork", attr); return cache.getDistributedSystem().getDistributedMember(); @@ -158,7 +158,7 @@ public class ClearDAckDUnitTest extends DistributedTestCase { try{ // props.setProperty("mcast-port", "1234"); // ds = DistributedSystem.connect(props); - LogWriterSupport.getLogWriter().info("I am vm2"); + LogWriterUtils.getLogWriter().info("I am vm2"); ds = (new ClearDAckDUnitTest("temp")).getSystem(props); //DistributedSystem.setThreadsSocketPolicy(false); CacheObserverImpl observer = new CacheObserverImpl(); @@ -174,7 +174,7 @@ public class ClearDAckDUnitTest extends DistributedTestCase { RegionAttributes attr = factory.create(); region = cache.createRegion("map", attr); - LogWriterSupport.getLogWriter().info("vm2 map region: " + region); + LogWriterUtils.getLogWriter().info("vm2 map region: " + region); paperWork = cache.createRegion("paperWork", attr); region.put("vm2Key", "vm2Value"); @@ -209,14 +209,14 @@ public class ClearDAckDUnitTest extends DistributedTestCase { vm0.invoke(ClearDAckDUnitTest.class, "putMethod", objArr); } - LogWriterSupport.getLogWriter().info("Did all puts successfully"); + LogWriterUtils.getLogWriter().info("Did all puts successfully"); long regionVersion = (Long)vm1.invoke(ClearDAckDUnitTest.class, "getRegionVersion", new Object[]{vm0ID}); vm0.invoke(ClearDAckDUnitTest.class,"clearMethod"); boolean flag = vm1.invokeBoolean(ClearDAckDUnitTest.class,"getVM1Flag"); - LogWriterSupport.getLogWriter().fine("Flag in VM1="+ flag); + LogWriterUtils.getLogWriter().fine("Flag in VM1="+ flag); assertTrue(flag); @@ -228,7 +228,7 @@ public class ClearDAckDUnitTest extends DistributedTestCase { vm2.invoke(ClearDAckDUnitTest.class, "createCacheVM2AndLocalClear"); flag = vm1.invokeBoolean(ClearDAckDUnitTest.class,"getVM1Flag"); - LogWriterSupport.getLogWriter().fine("Flag in VM1="+ flag); + LogWriterUtils.getLogWriter().fine("Flag in VM1="+ flag); assertFalse(flag); }//end of test case @@ -257,7 +257,7 @@ public class ClearDAckDUnitTest extends DistributedTestCase { long end = System.currentTimeMillis(); long diff = end - start; - LogWriterSupport.getLogWriter().info("Clear Thread proceeded before receiving the ack message in (milli seconds): "+diff); + LogWriterUtils.getLogWriter().info("Clear Thread proceeded before receiving the ack message in (milli seconds): "+diff); }catch (Exception e){ e.printStackTrace(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearGlobalDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearGlobalDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearGlobalDUnitTest.java index 6f384a2..bde9540 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearGlobalDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClearGlobalDUnitTest.java @@ -35,8 +35,8 @@ import com.gemstone.gemfire.internal.cache.CacheObserverAdapter; import com.gemstone.gemfire.internal.cache.CacheObserverHolder; 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.LogWriterUtils; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.dunit.VM; import java.util.Properties; @@ -82,7 +82,7 @@ public class ClearGlobalDUnitTest extends DistributedTestCase server1 = host.getVM(0); server1.invoke(ClearGlobalDUnitTest.class, "createCacheServer1"); createCacheServer2(); - LogWriterSupport.getLogWriter().fine("Cache created in successfully"); + LogWriterUtils.getLogWriter().fine("Cache created in successfully"); } public void preTearDown() @@ -174,7 +174,7 @@ public class ClearGlobalDUnitTest extends DistributedTestCase throw new Exception("Test Failed: " + exceptionMsg); } else{ - LogWriterSupport.getLogWriter().info("Test Passed Successfully "); + LogWriterUtils.getLogWriter().info("Test Passed Successfully "); } } @@ -184,7 +184,7 @@ public class ClearGlobalDUnitTest extends DistributedTestCase { Thread th = new PutThread(); th.start(); - Threads.join(th, 5 * 60 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(th, 5 * 60 * 1000); synchronized (lock) { testComplete = true; lock.notify(); @@ -204,7 +204,7 @@ public class ClearGlobalDUnitTest extends DistributedTestCase catch (TimeoutException ex) { //pass testFailed = false; - LogWriterSupport.getLogWriter().info("Expected TimeoutException in thread "); + LogWriterUtils.getLogWriter().info("Expected TimeoutException in thread "); } catch (Exception ex) { exceptionMsg.append(" Exception occurred while region.put(key,value)"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java index 3d001e6..f7f633c 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java @@ -42,10 +42,10 @@ import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.offheap.SimpleMemoryAllocatorImpl; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.AsyncInvocation; -import com.gemstone.gemfire.test.dunit.DistributedTestSupport; +import com.gemstone.gemfire.test.dunit.DistributedTestUtils; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.NetworkSupport; +import com.gemstone.gemfire.test.dunit.NetworkUtils; import com.gemstone.gemfire.test.dunit.VM; /** @@ -72,7 +72,7 @@ import com.gemstone.gemfire.test.dunit.VM; final String regionName = getUniqueName(); final int mcastPort = 0; /* loner is ok for this test*/ //AvailablePort.getRandomAvailablePort(AvailablePort.JGROUPS); final int serverPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - final String serverHost = NetworkSupport.getServerHostName(server.getHost()); + final String serverHost = NetworkUtils.getServerHostName(server.getHost()); createBridgeServer(server, regionName, serverPort, false, false); @@ -123,7 +123,7 @@ import com.gemstone.gemfire.test.dunit.VM; final VM client = host.getVM(1); final String regionName = getUniqueName(); final int serverPort = AvailablePortHelper.getRandomAvailableTCPPort(); - final String serverHost = NetworkSupport.getServerHostName(server.getHost()); + final String serverHost = NetworkUtils.getServerHostName(server.getHost()); createBridgeServer(server, regionName, serverPort, false, false, true/*offheap*/); @@ -175,7 +175,7 @@ import com.gemstone.gemfire.test.dunit.VM; final VM client = host.getVM(1); final String regionName = getUniqueName(); final int serverPort = AvailablePortHelper.getRandomAvailableTCPPort(); - final String serverHost = NetworkSupport.getServerHostName(server.getHost()); + final String serverHost = NetworkUtils.getServerHostName(server.getHost()); createBridgeServer(server, regionName, serverPort, false, false, true/*offheap*/); @@ -287,7 +287,7 @@ import com.gemstone.gemfire.test.dunit.VM; final String regionName = getUniqueName(); final int mcastPort = 0; /* loner is ok for this test*/ //AvailablePort.getRandomAvailablePort(AvailablePort.JGROUPS); final int serverPort = AvailablePortHelper.getRandomAvailableTCPPort(); - final String serverHost = NetworkSupport.getServerHostName(server.getHost()); + final String serverHost = NetworkUtils.getServerHostName(server.getHost()); createBridgeServer(server, regionName, serverPort, false, false); @@ -398,7 +398,7 @@ import com.gemstone.gemfire.test.dunit.VM; final VM client = host.getVM(1); final String regionName = getUniqueName(); final int serverPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - final String serverHost = NetworkSupport.getServerHostName(server.getHost()); + final String serverHost = NetworkUtils.getServerHostName(server.getHost()); createBridgeServer(server, regionName, serverPort, false, true); @@ -460,7 +460,7 @@ import com.gemstone.gemfire.test.dunit.VM; int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(2); final int server1Port = ports[0]; final int server2Port = ports[1]; - final String serverHost = NetworkSupport.getServerHostName(server1.getHost()); + final String serverHost = NetworkUtils.getServerHostName(server1.getHost()); createBridgeServer(server1, regionName, server1Port, true, false); @@ -525,7 +525,7 @@ import com.gemstone.gemfire.test.dunit.VM; final VM client = host.getVM(1); final String regionName = getUniqueName(); final int serverPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - final String serverHost = NetworkSupport.getServerHostName(server.getHost()); + final String serverHost = NetworkUtils.getServerHostName(server.getHost()); createBridgeServer(server, regionName, serverPort, false, false); @@ -588,7 +588,7 @@ import com.gemstone.gemfire.test.dunit.VM; final VM client = host.getVM(1); final String regionName = getUniqueName(); final int serverPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - final String serverHost = NetworkSupport.getServerHostName(server.getHost()); + final String serverHost = NetworkUtils.getServerHostName(server.getHost()); final int numLocalValues = 101; createBridgeServerWithoutLoader(server, regionName, serverPort, false); @@ -669,7 +669,7 @@ import com.gemstone.gemfire.test.dunit.VM; public void run2() throws CacheException { // Create DS Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); if (offheap) { config.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "350m"); } @@ -733,7 +733,7 @@ import com.gemstone.gemfire.test.dunit.VM; public void run2() throws CacheException { // Create DS Properties config = new Properties(); - config.setProperty("locators", "localhost["+DistributedTestSupport.getDUnitLocatorPort()+"]"); + config.setProperty("locators", "localhost["+DistributedTestUtils.getDUnitLocatorPort()+"]"); getSystem(config); // Create Region http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java index c14767b..e5ec301 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java @@ -41,7 +41,7 @@ import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.cache.tier.InterestType; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.SerializableCallable; import com.gemstone.gemfire.test.dunit.SerializableCallableIF; import com.gemstone.gemfire.test.dunit.SerializableRunnable; @@ -192,10 +192,10 @@ public class ClientServerInvalidAndDestroyedEntryDUnitTest extends CacheTestCase myRegion.invalidate(key2); } }); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("creating client cache"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("creating client cache"); ClientCache c = new ClientCacheFactory() .addPoolServer("localhost", serverPort) - .set(DistributionConfig.LOG_LEVEL_NAME, LogWriterSupport.getDUnitLogLevel()) + .set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()) .create(); Region myRegion = c.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY).create(regionName);; if (useTX) { @@ -206,7 +206,7 @@ public class ClientServerInvalidAndDestroyedEntryDUnitTest extends CacheTestCase assertNotNull(myRegion.get(notAffectedKey)); // get of an invalid entry should return null and create the entry in an invalid state - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("getting "+key1+" - should reach this cache and be INVALID"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("getting "+key1+" - should reach this cache and be INVALID"); assertNull(myRegion.get(key1)); assertTrue(myRegion.containsKey(key1)); @@ -263,7 +263,7 @@ public class ClientServerInvalidAndDestroyedEntryDUnitTest extends CacheTestCase // test that a listener is not invoked when there is already an invalidated // entry in the client cache UpdateListener listener = new UpdateListener(); - listener.log = com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter(); + listener.log = com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter(); myRegion.getAttributesMutator().addCacheListener(listener); myRegion.get(key1); assertEquals("expected no cache listener invocations", @@ -310,10 +310,10 @@ public class ClientServerInvalidAndDestroyedEntryDUnitTest extends CacheTestCase myRegion.destroy(key2); } }); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("creating client cache"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("creating client cache"); ClientCache c = new ClientCacheFactory() .addPoolServer("localhost", serverPort) - .set(DistributionConfig.LOG_LEVEL_NAME, LogWriterSupport.getDUnitLogLevel()) + .set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()) .create(); Region myRegion = c.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY).create(regionName);; if (useTX) { @@ -322,7 +322,7 @@ public class ClientServerInvalidAndDestroyedEntryDUnitTest extends CacheTestCase // get of a valid entry should work assertNotNull(myRegion.get(notAffectedKey)); // get of an invalid entry should return null and create the entry in an invalid state - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("getting "+key1+" - should reach this cache and be a TOMBSTONE"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("getting "+key1+" - should reach this cache and be a TOMBSTONE"); assertNull(myRegion.get(key1)); assertFalse(myRegion.containsKey(key1)); RegionEntry entry; @@ -375,7 +375,7 @@ public class ClientServerInvalidAndDestroyedEntryDUnitTest extends CacheTestCase keys.add(notAffectedKey); keys.add(key1); keys.add(key2); Map result = myRegion.getAll(keys); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("result of getAll = " + result); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("result of getAll = " + result); assertNotNull(result.get(notAffectedKey)); assertNull(result.get(key1)); assertNull(result.get(key2)); @@ -432,10 +432,10 @@ public class ClientServerInvalidAndDestroyedEntryDUnitTest extends CacheTestCase } } }); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("creating client cache"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("creating client cache"); ClientCache c = new ClientCacheFactory() .addPoolServer("localhost", serverPort) - .set(DistributionConfig.LOG_LEVEL_NAME, LogWriterSupport.getDUnitLogLevel()) + .set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()) .setPoolSubscriptionEnabled(true) .create(); @@ -458,7 +458,7 @@ public class ClientServerInvalidAndDestroyedEntryDUnitTest extends CacheTestCase BucketRegion bucket = ((PartitionedRegion)myRegion).getBucketRegion(key10); if (bucket != null) { event.setRegion(bucket); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("performing local destroy in " + bucket + " ccEnabled="+bucket.concurrencyChecksEnabled + " rvv="+bucket.getVersionVector()); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("performing local destroy in " + bucket + " ccEnabled="+bucket.concurrencyChecksEnabled + " rvv="+bucket.getVersionVector()); bucket.concurrencyChecksEnabled = false; // turn off cc so entry is removed bucket.mapDestroy(event, false, false, null); bucket.concurrencyChecksEnabled = true; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionCCEDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionCCEDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionCCEDUnitTest.java index 6a262e5..6f76fc8 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionCCEDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionCCEDUnitTest.java @@ -25,7 +25,7 @@ import com.gemstone.gemfire.cache.partition.PartitionRegionHelper; import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; import com.gemstone.gemfire.internal.cache.versions.VersionTag; 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.VM; @@ -99,7 +99,7 @@ public class ClientServerTransactionCCEDUnitTest extends for (Object key : clientTags.keySet()) { VersionTag serverTag = serverTags.get(key); serverTag.setMemberID(serverId); - LogWriterSupport.getLogWriter().fine("SWAP:key:"+key+" clientVersion:"+clientTags.get(key)+" serverVersion:"+serverTag); + LogWriterUtils.getLogWriter().fine("SWAP:key:"+key+" clientVersion:"+clientTags.get(key)+" serverVersion:"+serverTag); assertEquals(clientTags.get(key), serverTags.get(key)); serverTags.remove(key); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java index 9405509..2bee512 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java @@ -67,7 +67,7 @@ import com.gemstone.gemfire.internal.cache.execute.util.RollbackFunction; import com.gemstone.gemfire.internal.cache.tx.ClientTXStateStub; 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.VM; @@ -171,7 +171,7 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolServer("localhost"/*getServerHostName(Host.getHost(0))*/, port); ccf.setPoolSubscriptionEnabled(false); - ccf.set("log-level", LogWriterSupport.getDUnitLogLevel()); + ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); // these settings were used to manually check that tx operation stats were being updated //ccf.set(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true"); //ccf.set(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "clientStats.gfs"); @@ -231,7 +231,7 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest ccf.addPoolServer("localhost"/*getServerHostName(Host.getHost(0))*/, port1); ccf.setPoolSubscriptionEnabled(false); - ccf.set("log-level", LogWriterSupport.getDUnitLogLevel()); + ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); ClientCache cCache = getClientCache(ccf); @@ -302,7 +302,7 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolServer("localhost"/*getServerHostName(Host.getHost(0))*/, port1); ccf.setPoolSubscriptionEnabled(false); - ccf.set("log-level", LogWriterSupport.getDUnitLogLevel()); + ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); ClientCache cCache = getClientCache(ccf); ClientRegionFactory<CustId, Customer> custrf = cCache .createClientRegionFactory(cachingProxy ? ClientRegionShortcut.CACHING_PROXY : ClientRegionShortcut.PROXY); @@ -344,7 +344,7 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest Wait.waitForCriterion(new WaitCriterion() { public boolean done() { Set states = txmgr.getTransactionsForClient((InternalDistributedMember)myId); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("found " + states.size() + " tx states for " + myId); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("found " + states.size() + " tx states for " + myId); return states.isEmpty(); } public String description() { @@ -401,17 +401,17 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest assertEquals(initSize, pr.size()); assertEquals(initSize, r.size()); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Looking up transaction manager"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Looking up transaction manager"); TXManagerImpl mgr = (TXManagerImpl) getCache().getCacheTransactionManager(); Context ctx = getCache().getJNDIContext(); UserTransaction utx = (UserTransaction)ctx.lookup("java:/UserTransaction"); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("starting transaction"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("starting transaction"); if (useJTA) { utx.begin(); } else { mgr.begin(); } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("done starting transaction"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("done starting transaction"); for (int i = 0; i < MAX_ENTRIES; i++) { CustId custId = new CustId(i); Customer cust = new Customer("name"+suffix+i, "address"+suffix+i); @@ -423,10 +423,10 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest Customer cust = new Customer("name"+suffix+i, "address"+suffix+i); assertEquals(cust, r.get(custId)); assertEquals(cust, pr.get(custId)); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("SWAP:get:"+r.get(custId)); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("SWAP:get:"+pr.get(custId)); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("SWAP:get:"+r.get(custId)); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("SWAP:get:"+pr.get(custId)); } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("suspending transaction"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("suspending transaction"); if (!useJTA) { TXStateProxy tx = mgr.internalSuspend(); if (prePopulateData) { @@ -441,7 +441,7 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest assertNull(r.get(new CustId(i))); assertNull(pr.get(new CustId(i))); } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("resuming transaction"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("resuming transaction"); mgr.resume(tx); } assertEquals( @@ -450,13 +450,13 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest assertEquals( "pr sized should be " + MAX_ENTRIES + " but it is:" + pr.size(), MAX_ENTRIES, pr.size()); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("committing transaction"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("committing transaction"); if (useJTA) { utx.commit(); } else { getCache().getCacheTransactionManager().commit(); } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("done committing transaction"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("done committing transaction"); assertEquals( "r sized should be " + MAX_ENTRIES + " but it is:" + r.size(), MAX_ENTRIES, r.size()); @@ -686,7 +686,7 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest Order order = (orderRegion.getAll(keys)).get(orderId); assertNotNull(order); mgr.rollback(); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("entry for " + orderId + " = " + orderRegion.getEntry(orderId)); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("entry for " + orderId + " = " + orderRegion.getEntry(orderId)); assertNull(orderRegion.getEntry(orderId)); return null; } @@ -1337,7 +1337,7 @@ public void testClientCommitAndDataStoreGetsEvent() throws Exception { ClientCacheFactory ccf = new ClientCacheFactory(); ccf.addPoolServer("localhost"/*getServerHostName(Host.getHost(0))*/, port1); ccf.setPoolSubscriptionEnabled(false); - ccf.set("log-level", LogWriterSupport.getDUnitLogLevel()); + ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); ClientCache cCache = getClientCache(ccf); ClientRegionFactory<CustId, Customer> custrf = cCache .createClientRegionFactory(ClientRegionShortcut.PROXY); @@ -1433,7 +1433,7 @@ public void testClientCommitAndDataStoreGetsEvent() throws Exception { ccf.addPoolServer("localhost", port2); ccf.setPoolLoadConditioningInterval(1); ccf.setPoolSubscriptionEnabled(false); - ccf.set("log-level", LogWriterSupport.getDUnitLogLevel()); + ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); ClientCache cCache = getClientCache(ccf); ClientRegionFactory<CustId, Customer> custrf = cCache .createClientRegionFactory(ClientRegionShortcut.PROXY); @@ -1550,7 +1550,7 @@ public void testClientCommitAndDataStoreGetsEvent() throws Exception { if (port2 != 0) ccf.addPoolServer("localhost", port2); if (port3 != 0) ccf.addPoolServer("localhost", port3); ccf.setPoolSubscriptionEnabled(false); - ccf.set("log-level", LogWriterSupport.getDUnitLogLevel()); + ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); ClientCache cCache = getClientCache(ccf); ClientRegionFactory<CustId, Customer> custrf = cCache .createClientRegionFactory(cachingProxy ? ClientRegionShortcut.CACHING_PROXY : ClientRegionShortcut.PROXY); @@ -2062,7 +2062,7 @@ public void testClientCommitAndDataStoreGetsEvent() throws Exception { ccf.addPoolServer("localhost", port2); ccf.setPoolSubscriptionEnabled(false); ccf.setPoolLoadConditioningInterval(1); - ccf.set("log-level", LogWriterSupport.getDUnitLogLevel()); + ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); ClientCache cCache = getClientCache(ccf); ClientRegionFactory<CustId, Customer> custrf = cCache .createClientRegionFactory(ClientRegionShortcut.PROXY); @@ -2455,7 +2455,7 @@ public void testClientCommitAndDataStoreGetsEvent() throws Exception { ccf.setPoolMinConnections(5); ccf.setPoolLoadConditioningInterval(-1); ccf.setPoolSubscriptionEnabled(false); - ccf.set("log-level", LogWriterSupport.getDUnitLogLevel()); + ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); ClientCache cCache = getClientCache(ccf); Region r1 = cCache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY).create("r1"); Region r2 = cCache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY).create("r2"); @@ -2688,7 +2688,7 @@ public void testClientCommitAndDataStoreGetsEvent() throws Exception { ccf.addPoolServer("localhost"/*getServerHostName(Host.getHost(0))*/, port); ccf.addPoolServer("localhost", port2); ccf.setPoolSubscriptionEnabled(false); - ccf.set("log-level", LogWriterSupport.getDUnitLogLevel()); + ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); // these settings were used to manually check that tx operation stats were being updated //ccf.set(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true"); //ccf.set(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "clientStats.gfs"); @@ -2702,7 +2702,7 @@ public void testClientCommitAndDataStoreGetsEvent() throws Exception { ); Region cust = getCache().getRegion(CUSTOMER); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().fine("SWAP:doing first get from client"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().fine("SWAP:doing first get from client"); assertNull(cust.get(new CustId(0))); assertNull(cust.get(new CustId(1))); ArrayList args = new ArrayList(); @@ -2990,7 +2990,7 @@ public void testClientCommitAndDataStoreGetsEvent() throws Exception { ccf.addPoolServer("localhost"/*getServerHostName(Host.getHost(0))*/, port1); if (port2 != 0) ccf.addPoolServer("localhost", port2); ccf.setPoolSubscriptionEnabled(false); - ccf.set("log-level", LogWriterSupport.getDUnitLogLevel()); + ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); ClientCache cCache = getClientCache(ccf); ClientRegionFactory<CustId, Customer> custrf = cCache .createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY); @@ -3124,7 +3124,7 @@ public void testClientCommitAndDataStoreGetsEvent() throws Exception { ccf.addPoolServer("localhost", port2); ccf.setPoolMinConnections(0); ccf.setPoolSubscriptionEnabled(false); - ccf.set("log-level", LogWriterSupport.getDUnitLogLevel()); + ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); ClientCache cCache = getClientCache(ccf); ClientRegionFactory<CustId, Customer> custrf = cCache .createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY); @@ -3212,7 +3212,7 @@ public void testClientCommitAndDataStoreGetsEvent() throws Exception { ccf.addPoolServer("localhost"/*getServerHostName(Host.getHost(0))*/, port1); ccf.setPoolMinConnections(0); ccf.setPoolSubscriptionEnabled(false); - ccf.set("log-level", LogWriterSupport.getDUnitLogLevel()); + ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); ClientCache cCache = getClientCache(ccf); ClientRegionFactory<CustId, Customer> custrf = cCache .createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY); @@ -3302,7 +3302,7 @@ public void testClientCommitAndDataStoreGetsEvent() throws Exception { ccf.setPoolMinConnections(0); ccf.setPoolSubscriptionEnabled(true); ccf.setPoolSubscriptionRedundancy(0); - ccf.set("log-level", LogWriterSupport.getDUnitLogLevel()); + ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); ClientCache cCache = getClientCache(ccf); Region r = cCache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY).addCacheListener(new ClientListener()).create(regionName); r.registerInterestRegex(".*"); @@ -3318,7 +3318,7 @@ public void testClientCommitAndDataStoreGetsEvent() throws Exception { ccf.addPoolServer("localhost"/*getServerHostName(Host.getHost(0))*/, port1); ccf.setPoolMinConnections(0); ccf.setPoolSubscriptionEnabled(true); - ccf.set("log-level", LogWriterSupport.getDUnitLogLevel()); + ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); ClientCache cCache = getClientCache(ccf); Region r = cCache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY).create(regionName); getCache().getCacheTransactionManager().begin(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java index c4f04a7..44b89de 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java @@ -50,7 +50,7 @@ import com.gemstone.gemfire.distributed.internal.membership.MembershipManager; import com.gemstone.gemfire.distributed.internal.membership.gms.MembershipManagerHelper; import com.gemstone.gemfire.internal.AvailablePort; 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.Host; import com.gemstone.gemfire.test.dunit.SerializableCallable; import com.gemstone.gemfire.test.dunit.SerializableRunnable; @@ -148,7 +148,7 @@ public class ConcurrentMapOpsDUnitTest extends CacheTestCase { ccf.addPoolServer("localhost", port2); } ccf.setPoolSubscriptionEnabled(true); - ccf.set("log-level", LogWriterSupport.getDUnitLogLevel()); + ccf.set("log-level", LogWriterUtils.getDUnitLogLevel()); ClientCache cCache = getClientCache(ccf); ClientRegionFactory<Integer, String> crf = cCache .createClientRegionFactory(isEmpty ? ClientRegionShortcut.PROXY http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentRegionOperationsJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentRegionOperationsJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentRegionOperationsJUnitTest.java index 0ed0841..833ef11 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentRegionOperationsJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentRegionOperationsJUnitTest.java @@ -39,7 +39,7 @@ import org.junit.experimental.categories.Category; import com.gemstone.gemfire.cache.AttributesFactory; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; /** @@ -444,8 +444,8 @@ public class ConcurrentRegionOperationsJUnitTest extends DiskRegionTestingBase }); t1.start(); t2.start(); - Threads.join(t1, 30 * 1000, null); - Threads.join(t2, 30 * 1000, null); + ThreadUtils.join(t1, 30 * 1000); + ThreadUtils.join(t2, 30 * 1000); assertTrue(!failure); } @@ -540,19 +540,19 @@ public class ConcurrentRegionOperationsJUnitTest extends DiskRegionTestingBase this.timeToStop.set(true); } for (int i = 0; i < numberOfPutsThreads; i++) { - Threads.join(putThreads[i], 10*1000, null); + ThreadUtils.join(putThreads[i], 10*1000); } for (int i = 0; i < numberOfGetsThreads; i++) { - Threads.join(getThreads[i], 10*1000, null); + ThreadUtils.join(getThreads[i], 10*1000); } for (int i = 0; i < numberOfDestroysThreads; i++) { - Threads.join(destroyThreads[i], 10*1000, null); + ThreadUtils.join(destroyThreads[i], 10*1000); } for (int i = 0; i < numberOfClearThreads; i++) { - Threads.join(clearThreads[i], 10*1000, null); + ThreadUtils.join(clearThreads[i], 10*1000); } for (int i = 0; i < numberOfForceRollThreads; i++) { - Threads.join(forceRollThreads[i], 10*1000, null); + ThreadUtils.join(forceRollThreads[i], 10*1000); } if (this.validate) { @@ -824,7 +824,7 @@ public class ConcurrentRegionOperationsJUnitTest extends DiskRegionTestingBase ); region.clear(); - Threads.join(th, 20 * 1000, null); + ThreadUtils.join(th, 20 * 1000); LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER = false; DiskStoreImpl.DEBUG_DELAY_JOINING_WITH_COMPACTOR = 500; CacheObserverHolder.setInstance(old); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentRollingAndRegionOperationsJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentRollingAndRegionOperationsJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentRollingAndRegionOperationsJUnitTest.java index 9a58c33..b95fa4e 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentRollingAndRegionOperationsJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentRollingAndRegionOperationsJUnitTest.java @@ -41,7 +41,7 @@ import com.gemstone.gemfire.internal.cache.DiskRegionProperties; import com.gemstone.gemfire.internal.cache.DiskRegionTestingBase; import com.gemstone.gemfire.internal.cache.LocalRegion; import com.gemstone.gemfire.internal.cache.RegionEntry; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; /** @@ -866,7 +866,7 @@ public class ConcurrentRollingAndRegionOperationsJUnitTest extends for (int i = 0; i < threads.size(); ++i) { Thread th = (Thread)threads.get(i); if (th != null) { - Threads.join(th, 30 * 1000, null); + ThreadUtils.join(th, 30 * 1000); } } assertTrue( http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java index 90f0016..7a29e65 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java @@ -38,13 +38,13 @@ import com.gemstone.gemfire.distributed.internal.membership.gms.mgr.GMSMembershi import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.test.dunit.AsyncInvocation; -import com.gemstone.gemfire.test.dunit.DistributedSystemSupport; import com.gemstone.gemfire.test.dunit.DistributedTestCase; +import com.gemstone.gemfire.test.dunit.DistributedTestUtils; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; /** A test of 46438 - missing response to an update attributes message */ public class ConnectDisconnectDUnitTest extends CacheTestCase { @@ -76,7 +76,7 @@ public class ConnectDisconnectDUnitTest extends CacheTestCase { // setLocatorPorts(ports); for(int i = 0; i < 20; i++) { - LogWriterSupport.getLogWriter().info("Test run: " + i); + LogWriterUtils.getLogWriter().info("Test run: " + i); runOnce(); tearDown(); setUp(); @@ -90,7 +90,7 @@ public class ConnectDisconnectDUnitTest extends CacheTestCase { static int[] locatorPorts; public void setLocatorPorts(int[] ports) { - DistributedSystemSupport.deleteLocatorStateFile(ports); + DistributedTestUtils.deleteLocatorStateFile(ports); String locators = ""; for (int i=0; i<ports.length; i++) { if (i > 0) { @@ -114,7 +114,7 @@ public class ConnectDisconnectDUnitTest extends CacheTestCase { @Override protected final void postTearDownCacheTestCase() throws Exception { if (locatorPorts != null) { - DistributedSystemSupport.deleteLocatorStateFile(locatorPorts); + DistributedTestUtils.deleteLocatorStateFile(locatorPorts); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java index 2e848bf..af35666 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java @@ -659,7 +659,7 @@ public class DeltaPropagationDUnitTest extends DistributedTestCase { primary = (((PoolImpl)pool).getPrimaryPort() == PORT1) ? VM0 : ((((PoolImpl)pool).getPrimaryPort() == PORT2) ? VM1 : VM2); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("waiting for client to receive last_key"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("waiting for client to receive last_key"); waitForLastKey(); long fromDeltasOnClient = DeltaTestImpl.getFromDeltaInvokations() http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java index 1e35b39..bf96b18 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java @@ -44,7 +44,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy; import com.gemstone.gemfire.internal.tcp.ConnectionTable; 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; @@ -132,7 +132,7 @@ public class DeltaPropagationStatsDUnitTest extends DistributedTestCase { int port = (Integer)vm0.invoke(DeltaPropagationStatsDUnitTest.class, "createServerCache", args); - createClientCache(NetworkSupport.getServerHostName(vm0.getHost()), port); + createClientCache(NetworkUtils.getServerHostName(vm0.getHost()), port); vm0.invoke(DeltaPropagationStatsDUnitTest.class, "putCleanDelta", new Object[] {Integer.valueOf(numOfKeys), Long.valueOf(updates)}); @@ -160,7 +160,7 @@ public class DeltaPropagationStatsDUnitTest extends DistributedTestCase { int port = (Integer)vm0.invoke(DeltaPropagationStatsDUnitTest.class, "createServerCache", args); - createClientCache(NetworkSupport.getServerHostName(vm0.getHost()), port); + createClientCache(NetworkUtils.getServerHostName(vm0.getHost()), port); vm0.invoke(DeltaPropagationStatsDUnitTest.class, "putErrorDeltaForReceiver", new Object[] {Integer.valueOf(numOfKeys), @@ -281,7 +281,7 @@ public class DeltaPropagationStatsDUnitTest extends DistributedTestCase { Scope.DISTRIBUTED_ACK, Boolean.TRUE}; Integer port = (Integer)vm0.invoke(DeltaPropagationStatsDUnitTest.class, "createServerCache", args); - createClientCache(NetworkSupport.getServerHostName(vm0.getHost()), port); + createClientCache(NetworkUtils.getServerHostName(vm0.getHost()), port); putCleanDelta(numOfKeys, updates); putLastKey(); @@ -317,7 +317,7 @@ public class DeltaPropagationStatsDUnitTest extends DistributedTestCase { Scope.DISTRIBUTED_ACK, Boolean.TRUE}; Integer port = (Integer)vm0.invoke(DeltaPropagationStatsDUnitTest.class, "createServerCache", args); - createClientCache(NetworkSupport.getServerHostName(vm0.getHost()), port); + createClientCache(NetworkUtils.getServerHostName(vm0.getHost()), port); putErrorDeltaForReceiver(numOfKeys, updates, errors); putErrorDeltaForSender(numOfKeys, updates, errors2, Boolean.FALSE); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaSizingDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaSizingDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaSizingDUnitTest.java index 73a0122..4de9daf 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaSizingDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaSizingDUnitTest.java @@ -31,7 +31,7 @@ import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache30.CacheTestCase; import com.gemstone.gemfire.internal.AvailablePortHelper; 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.SerializableCallable; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; @@ -110,8 +110,8 @@ public class DeltaSizingDUnitTest extends CacheTestCase { int port2) { AttributesFactory<Integer, TestDelta> attr = new AttributesFactory<Integer, TestDelta>(); PoolFactory pf = PoolManager.createFactory(); - pf.addServer(NetworkSupport.getServerHostName(host), port1); - pf.addServer(NetworkSupport.getServerHostName(host), port2); + pf.addServer(NetworkUtils.getServerHostName(host), port1); + pf.addServer(NetworkUtils.getServerHostName(host), port2); pf.create("pool"); attr.setCloningEnabled(clone); attr.setDataPolicy(DataPolicy.EMPTY); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionClearJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionClearJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionClearJUnitTest.java index 938d741..7e58329 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionClearJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionClearJUnitTest.java @@ -44,7 +44,7 @@ import com.gemstone.gemfire.cache.RegionEvent; import com.gemstone.gemfire.cache.Scope; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.internal.cache.versions.VersionStamp; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; // @TODO: use DiskRegionTestingBase and DiskRegionHelperFactory @@ -184,7 +184,7 @@ public class DiskRegionClearJUnitTest { fail("timed out counter="+counter); } } - Threads.join(thread, 10 * 60 * 1000, null); + ThreadUtils.join(thread, 10 * 60 * 1000); Assert.assertTrue(counter == 3); if(!cleared) fail("clear not done although puts have been done"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionJUnitTest.java index 94a120f..94e6ec6 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionJUnitTest.java @@ -47,7 +47,7 @@ import com.gemstone.gemfire.cache.util.CacheListenerAdapter; import com.gemstone.gemfire.internal.cache.lru.LRUStatistics; import com.gemstone.gemfire.internal.cache.lru.NewLRUClockHand; import com.gemstone.gemfire.internal.cache.persistence.UninterruptibleFileChannel; -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; @@ -412,11 +412,11 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase } long startTime = System.currentTimeMillis(); - Threads.join(thread1, 20 * 1000, null); - Threads.join(thread2, 20 * 1000, null); - Threads.join(thread3, 20 * 1000, null); - Threads.join(thread4, 20 * 1000, null); - Threads.join(thread5, 20 * 1000, null); + ThreadUtils.join(thread1, 20 * 1000); + ThreadUtils.join(thread2, 20 * 1000); + ThreadUtils.join(thread3, 20 * 1000); + ThreadUtils.join(thread4, 20 * 1000); + ThreadUtils.join(thread5, 20 * 1000); long interval = System.currentTimeMillis() - startTime; if (interval > 100000) { @@ -522,11 +522,11 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase long startTime = System.currentTimeMillis(); finished = true; - 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); long interval = System.currentTimeMillis() - startTime; if (interval > 100000) { fail(" Test took too long in going to join, it should have exited before 100000 ms"); @@ -721,7 +721,7 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase oplogs = dsi.testHookGetAllOverflowOplogs(); int retryCount = 20; while (oplogs.size() > 1 && retryCount > 0) { - Wait.staticPause(100); + Wait.pause(100); oplogs = dsi.testHookGetAllOverflowOplogs(); retryCount--; } @@ -1153,7 +1153,7 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase public void beforeGoingToCompact() { try { - Threads.join(t1, 60 * 1000, null); + ThreadUtils.join(t1, 60 * 1000); } catch (Exception ignore) { logWriter.error("Exception occured", ignore); @@ -1193,7 +1193,7 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase }); testThread.start(); // region.clear(); - Threads.join(testThread, 40 * 1000, null); + ThreadUtils.join(testThread, 40 * 1000); assertFalse(failureCause, testFailed); assertFalse("Expected situation of max directory size violation happening and available space less than zero did not happen ", exceptionOccured); // CC jade1d failure @@ -1733,7 +1733,7 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase region.create("key1", "value1"); try { cache.getLogger().info("waiting for clear to finish"); - Threads.join(th, 30 * 1000, null); + ThreadUtils.join(th, 30 * 1000); } catch (Exception ie) { DiskRegionJUnitTest.this.exceptionOccured = true; @@ -1783,7 +1783,7 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase public void beforeDiskClear() { th.start(); - Wait.staticPause(7 * 1000); + Wait.pause(7 * 1000); System.out.println("FIXME: this thread does not terminate--EVER!"); // try { // DistributedTestCase.join(th, 7 * 1000, null); @@ -1796,7 +1796,7 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase }); try { region.clear(); - Threads.join(th, 30 * 1000, null); + ThreadUtils.join(th, 30 * 1000); assertFalse(this.failureCause, this.exceptionOccured); //We expect 1 entry to exist, because the clear was triggered before //the update @@ -1843,7 +1843,7 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER = false; th.start(); System.out.println("FIXME: this thread (2) does not terminate--EVER!"); - Wait.staticPause(10 * 1000); + Wait.pause(10 * 1000); // try { // DistributedTestCase.join(th, 10 * 1000, null); // } @@ -1855,7 +1855,7 @@ public class DiskRegionJUnitTest extends DiskRegionTestingBase }); try { region.clear(); - Threads.join(th, 30 * 1000, null); + ThreadUtils.join(th, 30 * 1000); assertFalse(this.failureCause, this.exceptionOccured); //We expect 1 entry to exist, because the clear was triggered before //the update http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java index b2bd412..309caab 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java @@ -33,7 +33,7 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.internal.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.LogWriterUtils; import com.gemstone.gemfire.test.dunit.VM; /** @@ -230,7 +230,7 @@ public abstract class DistributedCacheTestCase Region newRegion = root.createSubregion(name, factory.create()); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Created Region '" + newRegion.getFullPath() + "'"); } @@ -302,7 +302,7 @@ public abstract class DistributedCacheTestCase factory.create()); sub.create(entryName, null); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Defined Entry named '" + entryName + "' in region '" + sub.getFullPath() +"'"); } @@ -329,7 +329,7 @@ public abstract class DistributedCacheTestCase sub.put(entryName, value); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Put value " + value + " in entry " + entryName + " in region '" + region.getFullPath() +"'"); } @@ -378,7 +378,7 @@ public abstract class DistributedCacheTestCase sub.put(entryName, value); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Replaced value " + value + "in entry " + entryName + " in region '" + region.getFullPath() +"'"); } @@ -467,7 +467,7 @@ public abstract class DistributedCacheTestCase Host host = Host.getHost(0); int vmCount = host.getVMCount(); for (int i=0; i<vmCount; i++) { - LogWriterSupport.getLogWriter().info("Invoking " + methodName + "on VM#" + i); + LogWriterUtils.getLogWriter().info("Invoking " + methodName + "on VM#" + i); host.getVM(i).invoke(this.getClass(), methodName, args); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java index fb56e63..09fc882 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java @@ -42,7 +42,7 @@ import com.gemstone.gemfire.internal.cache.EventTracker.BulkOpHolder; import com.gemstone.gemfire.internal.cache.ha.ThreadIdentifier; 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.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; @@ -161,7 +161,7 @@ public class EventTrackerDUnitTest extends CacheTestCase { // Create Create Region in the client final int port = serverVM.invokeInt(EventTrackerDUnitTest.class, "getCacheServerPort"); - final String hostName = NetworkSupport.getServerHostName(host); + final String hostName = NetworkUtils.getServerHostName(host); clientVM.invoke(new CacheSerializableRunnable("Create client") { public void run2() throws CacheException { getCache(); @@ -234,7 +234,7 @@ public class EventTrackerDUnitTest extends CacheTestCase { // Create Create Region in the client final int port = serverVM.invokeInt(EventTrackerDUnitTest.class, "getCacheServerPort"); - final String hostName = NetworkSupport.getServerHostName(host); + final String hostName = NetworkUtils.getServerHostName(host); clientVM.invoke(new CacheSerializableRunnable("Create client") { public void run2() throws CacheException { getCache(); @@ -312,7 +312,7 @@ public class EventTrackerDUnitTest extends CacheTestCase { // Create Create Region in the client final int port = vm0.invokeInt(EventTrackerDUnitTest.class, "getCacheServerPort"); - final String hostName = NetworkSupport.getServerHostName(host); + final String hostName = NetworkUtils.getServerHostName(host); vm2.invoke(new CacheSerializableRunnable("Create 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/internal/cache/EvictionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionDUnitTest.java index 750b18c..2d19ba5 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionDUnitTest.java @@ -26,7 +26,7 @@ import org.junit.experimental.categories.Category; import com.gemstone.gemfire.cache.EvictionAlgorithm; import com.gemstone.gemfire.internal.cache.lru.HeapEvictor; import com.gemstone.gemfire.internal.cache.lru.MemLRUCapacityController; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.junit.categories.DistributedTest; @Category(DistributedTest.class) @@ -95,7 +95,7 @@ public class EvictionDUnitTest extends EvictionTestBase { createPartitionedRegion(true, EvictionAlgorithm.LRU_ENTRY, "PR1", 4, 1, 1000,maxEnteries); final PartitionedRegion pr = (PartitionedRegion)cache.getRegion("PR1"); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "PR- " +pr.getEvictionAttributes().getMaximum()); for (int counter = 1; counter <= maxEnteries+extraEntries; counter++) { @@ -112,7 +112,7 @@ public class EvictionDUnitTest extends EvictionTestBase { createPartitionedRegion(true, EvictionAlgorithm.LRU_ENTRY, "PR1", 4, 1, 1000,maxEnteries); final PartitionedRegion pr = (PartitionedRegion)cache.getRegion("PR1"); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "PR- " +pr.getEvictionAttributes().getMaximum()); for (int i = 0; i < 3; i++) { // assume mod-based hashing for bucket creation @@ -139,7 +139,7 @@ public class EvictionDUnitTest extends EvictionTestBase { createPartitionedRegion(true, EvictionAlgorithm.LRU_ENTRY, "PR1", 5, 1, 1000,maxEnteries); final PartitionedRegion pr = (PartitionedRegion)cache.getRegion("PR1"); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "PR- " +pr.getEvictionAttributes().getMaximum()); for (int counter = 1; counter <= maxEnteries+extraEntries; counter++) { @@ -155,7 +155,7 @@ public class EvictionDUnitTest extends EvictionTestBase { if (bucketRegion == null) { continue; } - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "FINAL bucket= " + bucketRegion.getFullPath() + "size= " + bucketRegion.size() + " count= "+bucketRegion.entryCount()); assertEquals(4,bucketRegion.size()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionObjectSizerDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionObjectSizerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionObjectSizerDUnitTest.java index 91dca8b..18346b7 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionObjectSizerDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionObjectSizerDUnitTest.java @@ -38,7 +38,7 @@ import com.gemstone.gemfire.internal.cache.lru.HeapLRUCapacityController; import com.gemstone.gemfire.internal.cache.lru.Sizeable; import com.gemstone.gemfire.internal.size.ReflectionSingleObjectSizer; import com.gemstone.gemfire.test.dunit.Assert; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; public class EvictionObjectSizerDUnitTest extends CacheTestCase { @@ -136,7 +136,7 @@ public class EvictionObjectSizerDUnitTest extends CacheTestCase { int valueSize = SharedLibrary.getObjectHeaderSize() + 4 /* array length */ + 0 /* bytes */; valueSize = (int) ReflectionSingleObjectSizer.roundUpSize(valueSize); int entrySize = keySize + valueSize + ((HeapLRUCapacityController)((PartitionedRegion)region).getEvictionController()).getPerEntryOverhead(); - LogWriterSupport.getLogWriter().info("testObjectSizerForHeapLRU_CustomizedNonSizerObject expected= " + entrySize); + LogWriterUtils.getLogWriter().info("testObjectSizerForHeapLRU_CustomizedNonSizerObject expected= " + entrySize); assertEquals(entrySize, getSizeOfCustomizedData(1)); } @@ -150,7 +150,7 @@ public class EvictionObjectSizerDUnitTest extends CacheTestCase { int valueSize = SharedLibrary.getObjectHeaderSize() + 4 /* array length */ + 4 /* bytes */; valueSize = (int) ReflectionSingleObjectSizer.roundUpSize(valueSize); int entrySize = keySize + valueSize + ((HeapLRUCapacityController)((PartitionedRegion)region).getEvictionController()).getPerEntryOverhead(); - LogWriterSupport.getLogWriter().info("testObjectSizerForHeapLRU_CustomizedNonSizerObject expected= " + entrySize); + LogWriterUtils.getLogWriter().info("testObjectSizerForHeapLRU_CustomizedNonSizerObject expected= " + entrySize); assertEquals(entrySize, getSizeOfCustomizedData(2)); } } @@ -168,7 +168,7 @@ public class EvictionObjectSizerDUnitTest extends CacheTestCase { // Total Size of entry should be= 71 putCustomizedData(1, new TestObjectSizerImpl()); int expected = (0+160+(Sizeable.PER_OBJECT_OVERHEAD*2)+((HeapLRUCapacityController)((PartitionedRegion)region).getEvictionController()).getPerEntryOverhead()); - LogWriterSupport.getLogWriter().info("testObjectSizerForHeapLRU_CustomizedSizerObject expected= " + expected); + LogWriterUtils.getLogWriter().info("testObjectSizerForHeapLRU_CustomizedSizerObject expected= " + expected); assertEquals(expected, getSizeOfCustomizedData(1)); assertEquals(expected, ((PartitionedRegion)region).getEvictionController() .getLRUHelper().getStats().getCounter()); @@ -186,7 +186,7 @@ public class EvictionObjectSizerDUnitTest extends CacheTestCase { // Total Size of entry should be= 72 putCustomizedObjects(new TestNonSizerObject("1"), new TestObjectSizerImpl()); int expected = (1+160+(Sizeable.PER_OBJECT_OVERHEAD*2)+((HeapLRUCapacityController)((PartitionedRegion)region).getEvictionController()).getPerEntryOverhead()); - LogWriterSupport.getLogWriter().info("testObjectSizerForHeapLRU_CustomizedSizerObjects expected= " + expected); + LogWriterUtils.getLogWriter().info("testObjectSizerForHeapLRU_CustomizedSizerObjects expected= " + expected); assertEquals(expected, getSizeOfCustomizedObject(new TestNonSizerObject("1"))); assertEquals(expected, ((PartitionedRegion)region).getEvictionController() .getLRUHelper().getStats().getCounter()); @@ -207,8 +207,8 @@ public class EvictionObjectSizerDUnitTest extends CacheTestCase { ds = getSystem(props); cache = CacheFactory.create(ds); assertNotNull(cache); - LogWriterSupport.getLogWriter().info("cache= " + cache); - LogWriterSupport.getLogWriter().info("cache closed= " + cache.isClosed()); + LogWriterUtils.getLogWriter().info("cache= " + cache); + LogWriterUtils.getLogWriter().info("cache closed= " + cache.isClosed()); cache.getResourceManager().setEvictionHeapPercentage(50); } catch (Exception e) { @@ -261,7 +261,7 @@ public class EvictionObjectSizerDUnitTest extends CacheTestCase { region = cache.createRegion(regionName, factory.create()); assertNotNull(region); - LogWriterSupport.getLogWriter().info("Partitioned Region created Successfully :" + region); + LogWriterUtils.getLogWriter().info("Partitioned Region created Successfully :" + region); } /** @@ -295,7 +295,7 @@ public class EvictionObjectSizerDUnitTest extends CacheTestCase { if (map == null || map.size() == 0) { continue; } - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Checking for entry in bucket region: " + bucketRegion); for (int counter = 1; counter <= noOfElememts; counter++) { assertEquals(entrySize, ((AbstractLRURegionEntry)map http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionStatsDUnitTest.java index 3ea1999..a31e1e7 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionStatsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/EvictionStatsDUnitTest.java @@ -42,7 +42,7 @@ import com.gemstone.gemfire.internal.cache.lru.HeapEvictor; import com.gemstone.gemfire.internal.cache.lru.HeapLRUCapacityController; 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; @@ -327,14 +327,14 @@ public class EvictionStatsDUnitTest extends CacheTestCase { @Override public void run2() throws CacheException { PartitionedRegion pr1 = (PartitionedRegion)cache.getRegion("PR1"); - LogWriterSupport.getLogWriter().info("dddd local"+pr1.getLocalMaxMemory()); - LogWriterSupport.getLogWriter().info("dddd local evi"+((AbstractLRURegionMap)pr1.entries)._getLruList().stats() + LogWriterUtils.getLogWriter().info("dddd local"+pr1.getLocalMaxMemory()); + LogWriterUtils.getLogWriter().info("dddd local evi"+((AbstractLRURegionMap)pr1.entries)._getLruList().stats() .getEvictions()); - LogWriterSupport.getLogWriter().info("dddd local entries"+((AbstractLRURegionMap)pr1.entries)._getLruList().stats() + LogWriterUtils.getLogWriter().info("dddd local entries"+((AbstractLRURegionMap)pr1.entries)._getLruList().stats() .getCounter()/(1024*1024)); HeapMemoryMonitor hmm = ((InternalResourceManager) cache.getResourceManager()).getHeapMonitor(); long memused=hmm.getBytesUsed()/(1024*1024); - LogWriterSupport.getLogWriter().info("dddd local memused= "+memused); + LogWriterUtils.getLogWriter().info("dddd local memused= "+memused); assertTrue(((AbstractLRURegionMap)pr1.entries)._getLruList().stats() .getEvictions() >= extraEntries / 2); assertEquals(((AbstractLRURegionMap)pr1.entries)._getLruList().stats() @@ -412,8 +412,8 @@ public class EvictionStatsDUnitTest extends CacheTestCase { ds = getSystem(props); cache = CacheFactory.create(ds); assertNotNull(cache); - LogWriterSupport.getLogWriter().info("cache= " + cache); - LogWriterSupport.getLogWriter().info("cache closed= " + cache.isClosed()); + LogWriterUtils.getLogWriter().info("cache= " + cache); + LogWriterUtils.getLogWriter().info("cache closed= " + cache.isClosed()); cache.getResourceManager().setEvictionHeapPercentage(20); } catch (Exception e) { @@ -484,7 +484,7 @@ public class EvictionStatsDUnitTest extends CacheTestCase { region = cache.createRegion(regionName, factory.create()); assertNotNull(region); - LogWriterSupport.getLogWriter().info("Partitioned Region created Successfully :" + region); + LogWriterUtils.getLogWriter().info("Partitioned Region created Successfully :" + region); } public static void putData(final String regionName, final int noOfElememts) { @@ -543,7 +543,7 @@ public class EvictionStatsDUnitTest extends CacheTestCase { if (bucketRegion == null) { continue; } - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Size of bucket " + bucketRegion.getName() + "of Pr " + prRegionName + " = " + bucketRegion.getCounter() / (1000000)); bucketSize = bucketSize + bucketRegion.getCounter();
