http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java index 138d048..05d7559 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java @@ -51,15 +51,15 @@ import com.gemstone.gemfire.internal.logging.InternalLogWriter; import com.gemstone.gemfire.internal.logging.LocalLogWriter; import com.gemstone.gemfire.internal.tcp.Connection; 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.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.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; @@ -105,10 +105,10 @@ public class LocatorDUnitTest extends DistributedTestCase { // delete locator state files so they don't accidentally // get used by other tests if (port1 > 0) { - DistributedSystemSupport.deleteLocatorStateFile(port1); + DistributedTestUtils.deleteLocatorStateFile(port1); } if (port2 > 0) { - DistributedSystemSupport.deleteLocatorStateFile(port2); + DistributedTestUtils.deleteLocatorStateFile(port2); } } @@ -131,13 +131,13 @@ public class LocatorDUnitTest extends DistributedTestCase { VM vm3 = host.getVM(3); port1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - DistributedSystemSupport.deleteLocatorStateFile(port1); + DistributedTestUtils.deleteLocatorStateFile(port1); - final String locators = NetworkSupport.getServerHostName(host) + "[" + port1 + "]"; + final String locators = NetworkUtils.getServerHostName(host) + "[" + port1 + "]"; final Properties properties = new Properties(); properties.put("mcast-port", "0"); properties.put("start-locator", locators); - properties.put("log-level", LogWriterSupport.getDUnitLogLevel()); + properties.put("log-level", LogWriterUtils.getDUnitLogLevel()); properties.put("security-peer-auth-init","com.gemstone.gemfire.distributed.AuthInitializer.create"); properties.put("security-peer-authenticator","com.gemstone.gemfire.distributed.MyAuthenticator.create"); properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false"); @@ -148,7 +148,7 @@ public class LocatorDUnitTest extends DistributedTestCase { DistributionManager.NORMAL_DM_TYPE, system.getDistributedMember().getVmKind()); properties.remove("start-locator"); - properties.put("log-level", LogWriterSupport.getDUnitLogLevel()); + properties.put("log-level", LogWriterUtils.getDUnitLogLevel()); properties.put("locators", locators); SerializableRunnable startSystem = new SerializableRunnable("start system") { public void run() { @@ -207,13 +207,13 @@ public class LocatorDUnitTest extends DistributedTestCase { }); properties.put("start-locator", locators); - properties.put("log-level", LogWriterSupport.getDUnitLogLevel()); + properties.put("log-level", LogWriterUtils.getDUnitLogLevel()); system = (InternalDistributedSystem)DistributedSystem.connect(properties); System.out.println("done connecting distributed system"); assertEquals("should be the coordinator", system.getDistributedMember(), MembershipManagerHelper.getCoordinator(system)); NetView view = MembershipManagerHelper.getMembershipManager(system).getView(); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("view after becoming coordinator is " + view); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("view after becoming coordinator is " + view); assertNotSame("should not be the first member in the view ("+view+")", system.getDistributedMember(), view.get(0)); service = DistributedLockService.create("test service", system); @@ -261,9 +261,9 @@ public class LocatorDUnitTest extends DistributedTestCase { this.port1 = port1; final int port2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); this.port2 = port2; // for cleanup in tearDown2 - DistributedSystemSupport.deleteLocatorStateFile(port1); - DistributedSystemSupport.deleteLocatorStateFile(port2); - final String host0 = NetworkSupport.getServerHostName(host); + DistributedTestUtils.deleteLocatorStateFile(port1); + DistributedTestUtils.deleteLocatorStateFile(port2); + final String host0 = NetworkUtils.getServerHostName(host); final String locators = host0 + "[" + port1 + "]," + host0 + "[" + port2 + "]"; final Properties properties = new Properties(); @@ -272,7 +272,7 @@ public class LocatorDUnitTest extends DistributedTestCase { properties.put("enable-network-partition-detection", "false"); properties.put("disable-auto-reconnect", "true"); properties.put("member-timeout", "2000"); - properties.put("log-level", LogWriterSupport.getDUnitLogLevel()); + properties.put("log-level", LogWriterUtils.getDUnitLogLevel()); properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false"); SerializableCallable startLocator1 = new SerializableCallable("start locator1") { @@ -316,7 +316,7 @@ public class LocatorDUnitTest extends DistributedTestCase { if (async1 != null) { async1.join(45000); if (async1.isAlive()) { - Threads.dumpAllStacks(); + ThreadUtils.dumpAllStacks(); } if (async2 != null) { async2.join(); @@ -371,8 +371,8 @@ public class LocatorDUnitTest extends DistributedTestCase { VM vm3 = host.getVM(3); port1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - DistributedSystemSupport.deleteLocatorStateFile(port1); - final String locators = NetworkSupport.getServerHostName(host) + "[" + port1 + "]"; + DistributedTestUtils.deleteLocatorStateFile(port1); + final String locators = NetworkUtils.getServerHostName(host) + "[" + port1 + "]"; final Properties properties = new Properties(); properties.put("mcast-port", "0"); properties.put("locators", locators); @@ -494,8 +494,8 @@ public class LocatorDUnitTest extends DistributedTestCase { this.port1 = port1; final int port2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); this.port2 = port2; // for cleanup in tearDown2() - DistributedSystemSupport.deleteLocatorStateFile(port1, port2); - final String host0 = NetworkSupport.getServerHostName(host); + DistributedTestUtils.deleteLocatorStateFile(port1, port2); + final String host0 = NetworkUtils.getServerHostName(host); final String locators = host0 + "[" + port1 + "]," + host0 + "[" + port2 + "]"; final Properties properties = new Properties(); @@ -504,7 +504,7 @@ public class LocatorDUnitTest extends DistributedTestCase { properties.put("enable-network-partition-detection", "true"); properties.put("disable-auto-reconnect", "true"); properties.put("member-timeout", "2000"); - properties.put("log-level", LogWriterSupport.getDUnitLogLevel()); + properties.put("log-level", LogWriterUtils.getDUnitLogLevel()); // properties.put("log-level", "fine"); properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false"); @@ -553,7 +553,7 @@ public class LocatorDUnitTest extends DistributedTestCase { assertEquals(sys.getDistributedMember(), MembershipManagerHelper.getCoordinator(sys)); // crash the second vm and the locator. Should be okay - DistributedSystemSupport.crashDistributedSystem(vm2); + DistributedTestUtils.crashDistributedSystem(vm2); locvm.invoke(crashLocator); assertTrue("Distributed system should not have disconnected", @@ -566,14 +566,14 @@ public class LocatorDUnitTest extends DistributedTestCase { // disconnect the first vm and demonstrate that the third vm and the // locator notice the failure and exit - DistributedSystemSupport.crashDistributedSystem(vm1); + DistributedTestUtils.crashDistributedSystem(vm1); /* This vm is watching vm1, which is watching vm2 which is watching locvm. * It will take 3 * (3 * member-timeout) milliseconds to detect the full * failure and eject the lost members from the view. */ - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("waiting for my distributed system to disconnect due to partition detection"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("waiting for my distributed system to disconnect due to partition detection"); WaitCriterion ev = new WaitCriterion() { public boolean done() { return !sys.isConnected(); @@ -629,8 +629,8 @@ public class LocatorDUnitTest extends DistributedTestCase { this.port1 = port1; final int port2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); this.port2 = port2; - DistributedSystemSupport.deleteLocatorStateFile(port1, port2); - final String host0 = NetworkSupport.getServerHostName(host); + DistributedTestUtils.deleteLocatorStateFile(port1, port2); + final String host0 = NetworkUtils.getServerHostName(host); final String locators = host0 + "[" + port1 + "]," + host0 + "[" + port2 + "]"; final Properties properties = new Properties(); @@ -706,7 +706,7 @@ public class LocatorDUnitTest extends DistributedTestCase { if (!Locator.getLocators().isEmpty()) { // log this for debugging purposes before throwing assertion error - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().warning("found locator " + Locator.getLocators().iterator().next()); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().warning("found locator " + Locator.getLocators().iterator().next()); } assertTrue("locator is not stopped", Locator.getLocators().isEmpty()); @@ -744,7 +744,7 @@ public class LocatorDUnitTest extends DistributedTestCase { try { locvm.invoke(stopLocator); } catch (Exception e) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().severe("failed to stop locator in vm 3", e); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().severe("failed to stop locator in vm 3", e); } } } @@ -776,8 +776,8 @@ public class LocatorDUnitTest extends DistributedTestCase { this.port1 = port1; final int port2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); this.port2 = port2; - DistributedSystemSupport.deleteLocatorStateFile(port1, port2); - final String host0 = NetworkSupport.getServerHostName(host); + DistributedTestUtils.deleteLocatorStateFile(port1, port2); + final String host0 = NetworkUtils.getServerHostName(host); final String locators = host0 + "[" + port1 + "]," + host0 + "[" + port2 + "]"; final Properties properties = new Properties(); @@ -786,7 +786,7 @@ public class LocatorDUnitTest extends DistributedTestCase { properties.put("enable-network-partition-detection", "true"); properties.put("disable-auto-reconnect", "true"); properties.put("member-timeout", "2000"); - properties.put("log-level", LogWriterSupport.getDUnitLogLevel()); + properties.put("log-level", LogWriterUtils.getDUnitLogLevel()); properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false"); SerializableRunnable stopLocator = getStopLocatorRunnable(); @@ -915,8 +915,8 @@ public class LocatorDUnitTest extends DistributedTestCase { this.port1 = port1; final int port2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); this.port2 = port2; - DistributedSystemSupport.deleteLocatorStateFile(port1, port2); - final String host0 = NetworkSupport.getServerHostName(host); + DistributedTestUtils.deleteLocatorStateFile(port1, port2); + final String host0 = NetworkUtils.getServerHostName(host); final String locators = host0 + "[" + port1 + "]," + host0 + "[" + port2 + "]"; final Properties properties = new Properties(); @@ -1036,8 +1036,8 @@ public class LocatorDUnitTest extends DistributedTestCase { Host host = Host.getHost(0); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - DistributedSystemSupport.deleteLocatorStateFile(port1); - String locators = NetworkSupport.getServerHostName(host) + "[" + port + "]"; + DistributedTestUtils.deleteLocatorStateFile(port1); + String locators = NetworkUtils.getServerHostName(host) + "[" + port + "]"; Properties props = new Properties(); props.setProperty("mcast-port", "0"); props.setProperty("locators", locators); @@ -1099,8 +1099,8 @@ public class LocatorDUnitTest extends DistributedTestCase { final int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - DistributedSystemSupport.deleteLocatorStateFile(port1); - final String locators = NetworkSupport.getServerHostName(host) + "[" + port + "]"; + DistributedTestUtils.deleteLocatorStateFile(port1); + final String locators = NetworkUtils.getServerHostName(host) + "[" + port + "]"; final String uniqueName = getUniqueName(); vm0.invoke(new SerializableRunnable("Start locator " + locators) { @@ -1139,7 +1139,7 @@ public class LocatorDUnitTest extends DistributedTestCase { system = (InternalDistributedSystem)DistributedSystem.connect(props); final DistributedMember coord = MembershipManagerHelper.getCoordinator(system); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("coordinator before termination of locator is " + coord); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("coordinator before termination of locator is " + coord); vm0.invoke(getStopLocatorRunnable()); @@ -1155,7 +1155,7 @@ public class LocatorDUnitTest extends DistributedTestCase { }; Wait.waitForCriterion(ev, 15 * 1000, 200, true); DistributedMember newCoord = MembershipManagerHelper.getCoordinator(system); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("coordinator after shutdown of locator was " + + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("coordinator after shutdown of locator was " + newCoord); if (coord.equals(newCoord)) { fail("another member should have become coordinator after the locator was stopped"); @@ -1211,8 +1211,8 @@ public class LocatorDUnitTest extends DistributedTestCase { final int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - DistributedSystemSupport.deleteLocatorStateFile(port1); - final String locators = NetworkSupport.getServerHostName(host) + "[" + port + "]"; + DistributedTestUtils.deleteLocatorStateFile(port1); + final String locators = NetworkUtils.getServerHostName(host) + "[" + port + "]"; vm0.invoke(getStartSBLocatorRunnable(port, getUniqueName()+"1")); try { @@ -1236,7 +1236,7 @@ public class LocatorDUnitTest extends DistributedTestCase { system = (InternalDistributedSystem)getSystem(props); final DistributedMember coord = MembershipManagerHelper.getCoordinator(system); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("coordinator before termination of locator is " + coord); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("coordinator before termination of locator is " + coord); vm0.invoke(getStopLocatorRunnable()); @@ -1252,7 +1252,7 @@ public class LocatorDUnitTest extends DistributedTestCase { }; Wait.waitForCriterion(ev, 15000, 200, true); DistributedMember newCoord = MembershipManagerHelper.getCoordinator(system); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("coordinator after shutdown of locator was " + + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("coordinator after shutdown of locator was " + newCoord); if (newCoord == null || coord.equals(newCoord)) { fail("another member should have become coordinator after the locator was stopped: " @@ -1344,8 +1344,8 @@ public class LocatorDUnitTest extends DistributedTestCase { this.port1 = port1; final int port2 = freeTCPPorts[1]; this.port2 = port2; - DistributedSystemSupport.deleteLocatorStateFile(port1, port2); - final String host0 = NetworkSupport.getServerHostName(host); + DistributedTestUtils.deleteLocatorStateFile(port1, port2); + final String host0 = NetworkUtils.getServerHostName(host); final String locators = host0 + "[" + port1 + "]," + host0 + "[" + port2 + "]"; @@ -1460,10 +1460,10 @@ public class LocatorDUnitTest extends DistributedTestCase { this.port1 = port1; final int port2 = freeTCPPorts[1]; this.port2 = port2; - DistributedSystemSupport.deleteLocatorStateFile(port1, port2); + DistributedTestUtils.deleteLocatorStateFile(port1, port2); final int mcastport = AvailablePort.getRandomAvailablePort(AvailablePort.MULTICAST); - final String host0 = NetworkSupport.getServerHostName(host); + final String host0 = NetworkUtils.getServerHostName(host); final String locators = host0 + "[" + port1 + "]," + host0 + "[" + port2 + "]"; final String uniqueName = getUniqueName(); @@ -1475,7 +1475,7 @@ public class LocatorDUnitTest extends DistributedTestCase { Properties props = new Properties(); props.setProperty("mcast-port", String.valueOf(mcastport)); props.setProperty("locators", locators); - props.setProperty("log-level", LogWriterSupport.getDUnitLogLevel()); + props.setProperty("log-level", LogWriterUtils.getDUnitLogLevel()); props.setProperty("mcast-ttl", "0"); props.setProperty("enable-network-partition-detection", "true"); props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false"); @@ -1494,7 +1494,7 @@ public class LocatorDUnitTest extends DistributedTestCase { Properties props = new Properties(); props.setProperty("mcast-port", String.valueOf(mcastport)); props.setProperty("locators", locators); - props.setProperty("log-level", LogWriterSupport.getDUnitLogLevel()); + props.setProperty("log-level", LogWriterUtils.getDUnitLogLevel()); props.setProperty("mcast-ttl", "0"); props.setProperty("enable-network-partition-detection", "true"); props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false"); @@ -1512,7 +1512,7 @@ public class LocatorDUnitTest extends DistributedTestCase { Properties props = new Properties(); props.setProperty("mcast-port", String.valueOf(mcastport)); props.setProperty("locators", locators); - props.setProperty("log-level", LogWriterSupport.getDUnitLogLevel()); + props.setProperty("log-level", LogWriterUtils.getDUnitLogLevel()); props.setProperty("mcast-ttl", "0"); props.setProperty("enable-network-partition-detection", "true"); DistributedSystem.connect(props); @@ -1525,7 +1525,7 @@ public class LocatorDUnitTest extends DistributedTestCase { Properties props = new Properties(); props.setProperty("mcast-port", String.valueOf(mcastport)); props.setProperty("locators", locators); - props.setProperty("log-level", LogWriterSupport.getDUnitLogLevel()); + props.setProperty("log-level", LogWriterUtils.getDUnitLogLevel()); props.setProperty("mcast-ttl", "0"); props.setProperty("enable-network-partition-detection", "true"); @@ -1580,12 +1580,12 @@ public class LocatorDUnitTest extends DistributedTestCase { port1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - DistributedSystemSupport.deleteLocatorStateFile(port1); + DistributedTestUtils.deleteLocatorStateFile(port1); File logFile = new File(""); Locator locator = Locator.startLocator(port1, logFile); try { - final String locators = NetworkSupport.getServerHostName(host) + "[" + port1 + "]"; + final String locators = NetworkUtils.getServerHostName(host) + "[" + port1 + "]"; Properties props = new Properties(); props.setProperty("mcast-port", "0"); @@ -1610,8 +1610,8 @@ public class LocatorDUnitTest extends DistributedTestCase { try { port1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - DistributedSystemSupport.deleteLocatorStateFile(port1); - final String locators = NetworkSupport.getServerHostName(host) + "[" + port1 + "]"; + DistributedTestUtils.deleteLocatorStateFile(port1); + final String locators = NetworkUtils.getServerHostName(host) + "[" + port1 + "]"; final Properties properties = new Properties(); properties.put("mcast-port", "0"); properties.put("locators", locators); @@ -1687,7 +1687,7 @@ public class LocatorDUnitTest extends DistributedTestCase { port1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); File logFile1 = new File(""); - DistributedSystemSupport.deleteLocatorStateFile(port1); + DistributedTestUtils.deleteLocatorStateFile(port1); Locator locator1 = Locator.startLocator(port1, logFile1); try { @@ -1696,7 +1696,7 @@ public class LocatorDUnitTest extends DistributedTestCase { AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); File logFile2 = new File(""); - DistributedSystemSupport.deleteLocatorStateFile(port2); + DistributedTestUtils.deleteLocatorStateFile(port2); try { Locator locator2 = Locator.startLocator(port2, logFile2); @@ -1704,7 +1704,7 @@ public class LocatorDUnitTest extends DistributedTestCase { } catch (IllegalStateException expected) { } - final String host0 = NetworkSupport.getServerHostName(host); + final String host0 = NetworkUtils.getServerHostName(host); final String locators = host0 + "[" + port1 + "]," + host0 + "[" + port2 + "]"; @@ -1714,7 +1714,7 @@ public class LocatorDUnitTest extends DistributedTestCase { Properties props = new Properties(); props.setProperty("mcast-port", "0"); props.setProperty("locators", locators); - props.setProperty("log-level", LogWriterSupport.getDUnitLogLevel()); + props.setProperty("log-level", LogWriterUtils.getDUnitLogLevel()); DistributedSystem.connect(props); } }; @@ -1749,7 +1749,7 @@ public class LocatorDUnitTest extends DistributedTestCase { disconnectAllFromDS(); port1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - DistributedSystemSupport.deleteLocatorStateFile(port1); + DistributedTestUtils.deleteLocatorStateFile(port1); File logFile = new File(""); File stateFile = new File("locator"+port1+"state.dat"); VM vm0 = Host.getHost(0).getVM(0); @@ -1761,7 +1761,7 @@ public class LocatorDUnitTest extends DistributedTestCase { stateFile.delete(); } - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Starting locator"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Starting locator"); Locator locator = Locator.startLocatorAndDS(port1, logFile, p); try { @@ -1773,10 +1773,10 @@ public class LocatorDUnitTest extends DistributedTestCase { }; vm0.invoke(connect); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Stopping locator"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Stopping locator"); locator.stop(); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Starting locator"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Starting locator"); locator = Locator.startLocatorAndDS(port1, logFile, p); vm0.invoke(new SerializableRunnable("disconnect") { @@ -1835,7 +1835,7 @@ public class LocatorDUnitTest extends DistributedTestCase { System.setProperty("p2p.joinTimeout", "1000"); Properties locProps = new Properties(); locProps.put("mcast-port", "0"); - locProps.put("log-level", LogWriterSupport.getDUnitLogLevel()); + locProps.put("log-level", LogWriterUtils.getDUnitLogLevel()); Locator.startLocatorAndDS(port, logFile, locProps); } catch (IOException ex) { com.gemstone.gemfire.test.dunit.Assert.fail("While starting locator on port " + port, ex); @@ -1902,7 +1902,7 @@ public class LocatorDUnitTest extends DistributedTestCase { public void quorumLost(Set<InternalDistributedMember> failures, List<InternalDistributedMember> remaining) { quorumLostInvoked = true; - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("quorumLost invoked in test code"); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("quorumLost invoked in test code"); } }
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/SystemAdminDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/SystemAdminDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/SystemAdminDUnitTest.java index ef45acb..e80142a 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/SystemAdminDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/SystemAdminDUnitTest.java @@ -30,8 +30,8 @@ import com.gemstone.gemfire.distributed.internal.DistributionManager; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.internal.SystemAdmin; import com.gemstone.gemfire.test.dunit.DistributedTestCase; -import com.gemstone.gemfire.test.dunit.DistributedTestSupport; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.DistributedTestUtils; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; public class SystemAdminDUnitTest extends DistributedTestCase { @@ -56,7 +56,7 @@ public class SystemAdminDUnitTest extends DistributedTestCase { system = null; InternalDistributedSystem sys = InternalDistributedSystem.getAnyInstance(); if (sys != null && sys.isConnected()) { - LogWriterSupport.getLogWriter().info("disconnecting(3)"); + LogWriterUtils.getLogWriter().info("disconnecting(3)"); sys.disconnect(); } } @@ -64,7 +64,7 @@ public class SystemAdminDUnitTest extends DistributedTestCase { public void testPrintStacks() throws Exception { // create a gemfire.properties that lets SystemAdmin find the dunit locator - Properties p = DistributedTestSupport.getAllDistributedSystemProperties(getDistributedSystemProperties()); + Properties p = DistributedTestUtils.getAllDistributedSystemProperties(getDistributedSystemProperties()); try { SystemAdmin.setDistributedSystemProperties(p); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java index cfc978f..166d5ac 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java @@ -44,7 +44,7 @@ import com.gemstone.gemfire.internal.admin.StatResource; import com.gemstone.gemfire.internal.admin.remote.RemoteTransportConfig; 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.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; @@ -67,7 +67,7 @@ public class ConsoleDistributionManagerDUnitTest // private volatile Alert lastAlert = null; public void alert(Alert alert) { - LogWriterSupport.getLogWriter().info("DEBUG: alert=" + alert); + LogWriterUtils.getLogWriter().info("DEBUG: alert=" + alert); // this.lastAlert = alert; } @@ -97,7 +97,7 @@ public class ConsoleDistributionManagerDUnitTest } // create a GfManagerAgent in the master vm. this.agent = GfManagerAgentFactory. - getManagerAgent(new GfManagerAgentConfig(null, transport, LogWriterSupport.getLogWriter(), Alert.SEVERE, this, null)); + getManagerAgent(new GfManagerAgentConfig(null, transport, LogWriterUtils.getLogWriter(), Alert.SEVERE, this, null)); if (!agent.isConnected()) { WaitCriterion ev = new WaitCriterion() { public boolean done() { @@ -248,7 +248,7 @@ public class ConsoleDistributionManagerDUnitTest Region[] roots = apps[i].getRootRegions(); if (roots.length == 0) { - LogWriterSupport.getLogWriter().info("DEBUG: testApplications: apps[" + i + "]=" + apps[i] + " did not have a root region"); + LogWriterUtils.getLogWriter().info("DEBUG: testApplications: apps[" + i + "]=" + apps[i] + " did not have a root region"); } else { Region root = roots[0]; assertNotNull(root); @@ -289,7 +289,7 @@ public class ConsoleDistributionManagerDUnitTest assertTrue(!node.isPrimitiveOrString()); EntryValueNode[] fields = node.getChildren(); assertNotNull(fields); - LogWriterSupport.getLogWriter().warning("The tests use StringBuffers for values which might be implmented differently in jdk 1.5"); + LogWriterUtils.getLogWriter().warning("The tests use StringBuffers for values which might be implmented differently in jdk 1.5"); // assertTrue(fields.length > 0); /// test destruction in the last valid app @@ -366,7 +366,7 @@ public class ConsoleDistributionManagerDUnitTest region.create(entryName, value); - LogWriterSupport.getLogWriter().info("Put value " + value + " in entry " + + LogWriterUtils.getLogWriter().info("Put value " + value + " in entry " + entryName + " in region '" + region.getFullPath() +"'"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java index cdd81f3..2164fdc 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java @@ -49,7 +49,7 @@ import com.gemstone.gemfire.internal.logging.LogService; 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.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; @@ -151,7 +151,7 @@ public class DistributionManagerDUnitTest extends DistributedTestCase { mgr = MembershipManagerHelper.getMembershipManager(sys); sys.disconnect(); InternalDistributedMember idm2 = mgr.getLocalMember(); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("original ID=" + idm + + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("original ID=" + idm + " and after connecting=" + idm2); assertTrue("should not have used a different udp port", idm.getPort() == idm2.getPort()); @@ -176,7 +176,7 @@ public class DistributionManagerDUnitTest extends DistributedTestCase { try { InternalDistributedMember mbr = new InternalDistributedMember( - NetworkSupport.getIPLiteral(), 12345); + NetworkUtils.getIPLiteral(), 12345); // first make sure we can't add this as a surprise member (bug #44566) @@ -186,8 +186,8 @@ public class DistributionManagerDUnitTest extends DistributedTestCase { int oldViewId = mbr.getVmViewId(); mbr.setVmViewId((int)mgr.getView().getViewId()-1); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("current membership view is " + mgr.getView()); - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("created ID " + mbr + " with view ID " + mbr.getVmViewId()); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("current membership view is " + mgr.getView()); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("created ID " + mbr + " with view ID " + mbr.getVmViewId()); sys.getLogWriter().info("<ExpectedException action=add>attempt to add old member</ExpectedException>"); sys.getLogWriter().info("<ExpectedException action=add>Removing shunned GemFire node</ExpectedException>"); try { @@ -525,14 +525,14 @@ public class DistributionManagerDUnitTest extends DistributedTestCase { try { getSystem(props); } catch (IllegalArgumentException e) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("caught expected exception (1)", e); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("caught expected exception (1)", e); } // use an invalid address props.setProperty(DistributionConfig.BIND_ADDRESS_NAME, "bruce.schuchardt"); try { getSystem(props); } catch (IllegalArgumentException e) { - com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("caught expected exception (2_", e); + com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("caught expected exception (2_", e); } // use a valid bind address props.setProperty(DistributionConfig.BIND_ADDRESS_NAME, InetAddress.getLocalHost().getCanonicalHostName()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java index 1574ec0..bc3bee6 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/deadlock/GemFireDeadlockDetectorDUnitTest.java @@ -37,7 +37,7 @@ 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.Invoke; -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; @@ -117,7 +117,7 @@ public class GemFireDeadlockDetectorDUnitTest extends CacheTestCase { Thread.sleep(5000); GemFireDeadlockDetector detect = new GemFireDeadlockDetector(); LinkedList<Dependency> deadlock = detect.find().findCycle(); - LogWriterSupport.getLogWriter().info("Deadlock=" + DeadlockDetector.prettyFormat(deadlock)); + LogWriterUtils.getLogWriter().info("Deadlock=" + DeadlockDetector.prettyFormat(deadlock)); assertEquals(8, deadlock.size()); stopStuckThreads(); async1.getResult(30000); @@ -164,7 +164,7 @@ public class GemFireDeadlockDetectorDUnitTest extends CacheTestCase { } assertTrue(deadlock != null); - LogWriterSupport.getLogWriter().info("Deadlock=" + DeadlockDetector.prettyFormat(deadlock)); + LogWriterUtils.getLogWriter().info("Deadlock=" + DeadlockDetector.prettyFormat(deadlock)); assertEquals(4, deadlock.size()); stopStuckThreads(); disconnectAllFromDS(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/locks/CollaborationJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/locks/CollaborationJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/locks/CollaborationJUnitTest.java index c570482..6985044 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/locks/CollaborationJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/locks/CollaborationJUnitTest.java @@ -30,7 +30,7 @@ import com.gemstone.gemfire.CancelCriterion; import com.gemstone.gemfire.LogWriter; import com.gemstone.gemfire.SystemFailure; import com.gemstone.gemfire.internal.logging.LocalLogWriter; -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; @@ -154,7 +154,7 @@ public class CollaborationJUnitTest { // let threadA release so that threadB gets lock this.flagTestBlocksUntilRelease = false; - Threads.join(threadA, 30 * 1000, null); + ThreadUtils.join(threadA, 30 * 1000); // make sure threadB is doing what it's supposed to do... ev = new WaitCriterion() { @@ -171,7 +171,7 @@ public class CollaborationJUnitTest { // threadB must have lock now... let threadB release assertTrue(this.collaboration.hasCurrentTopic(threadB)); this.flagTestBlocksUntilRelease = false; - Threads.join(threadB, 30 * 1000, null); + ThreadUtils.join(threadB, 30 * 1000); // collaboration should be free now assertFalse(this.collaboration.hasCurrentTopic(threadA)); @@ -342,7 +342,7 @@ public class CollaborationJUnitTest { // release threadA this.threadAFlag_TestLateComerJoinsIn = false; - Threads.join(threadA, 30 * 1000, null); + ThreadUtils.join(threadA, 30 * 1000); assertFalse(this.collaboration.hasCurrentTopic(threadA)); assertTrue(this.collaboration.hasCurrentTopic(threadB)); assertFalse(this.collaboration.hasCurrentTopic(threadC)); @@ -352,7 +352,7 @@ public class CollaborationJUnitTest { // release threadB this.threadBFlag_TestLateComerJoinsIn = false; - Threads.join(threadB, 30 * 1000, null); + ThreadUtils.join(threadB, 30 * 1000); assertFalse(this.collaboration.hasCurrentTopic(threadB)); assertFalse(this.collaboration.hasCurrentTopic(threadC)); assertTrue(this.collaboration.hasCurrentTopic(threadD)); @@ -361,7 +361,7 @@ public class CollaborationJUnitTest { // release threadD this.threadDFlag_TestLateComerJoinsIn = false; - Threads.join(threadD, 30 * 1000, null); + ThreadUtils.join(threadD, 30 * 1000); ev = new WaitCriterion() { @Override public boolean done() { @@ -380,7 +380,7 @@ public class CollaborationJUnitTest { // release threadC this.threadCFlag_TestLateComerJoinsIn = false; - Threads.join(threadC, 30 * 1000, null); + ThreadUtils.join(threadC, 30 * 1000); assertFalse(this.collaboration.hasCurrentTopic(threadC)); assertFalse(this.collaboration.isCurrentTopic(topicA)); assertFalse(this.collaboration.isCurrentTopic(topicB)); @@ -464,7 +464,7 @@ public class CollaborationJUnitTest { } for (int t = 0; t < threads.length; t++) { - Threads.join(threads[t], 30 * 1000, null); + ThreadUtils.join(threads[t], 30 * 1000); } // assert that all topics are acquired in order @@ -579,7 +579,7 @@ public class CollaborationJUnitTest { // after starting thread, hasCurrentTopic(thread) returns true assertTrue(this.collaboration.hasCurrentTopic(thread)); this.flagTestThreadHasCurrentTopic = false; - Threads.join(thread, 30 * 1000, null); + ThreadUtils.join(thread, 30 * 1000); // after thread finishes, hasCurrentTopic(thread) returns false assertTrue(!this.collaboration.hasCurrentTopic(thread)); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistTXDebugDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistTXDebugDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistTXDebugDUnitTest.java index ece49c6..db36aac 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistTXDebugDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistTXDebugDUnitTest.java @@ -44,7 +44,7 @@ import com.gemstone.gemfire.internal.cache.control.InternalResourceManager; import com.gemstone.gemfire.internal.cache.execute.CustomerIDPartitionResolver; 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.SerializableCallable; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; @@ -127,7 +127,7 @@ public class DistTXDebugDUnitTest extends CacheTestCase { assertNotNull(cache); Region pr = cache.createRegion(partitionedRegionName, attr.create()); assertNotNull(pr); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Region " + partitionedRegionName + " created Successfully :" + pr.toString()); } @@ -148,7 +148,7 @@ public class DistTXDebugDUnitTest extends CacheTestCase { assertNotNull(cache); Region pr = cache.getRegion(partitionedRegionName); assertNotNull(pr); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Destroying Partitioned Region " + partitionedRegionName); pr.destroyRegion(); } @@ -165,7 +165,7 @@ public class DistTXDebugDUnitTest extends CacheTestCase { // af.create()); Region rr = cache.createRegion(replicatedRegionName, af.create()); assertNotNull(rr); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Replicated Region " + replicatedRegionName + " created Successfully :" + rr.toString()); } @@ -196,7 +196,7 @@ public class DistTXDebugDUnitTest extends CacheTestCase { for (int i = 1; i <= 3; i++) { DummyKeyBasedRoutingResolver dummy = new DummyKeyBasedRoutingResolver( i); - LogWriterSupport.getLogWriter().info(" calling pr.put"); + LogWriterUtils.getLogWriter().info(" calling pr.put"); pr1.put(dummy, "1_entry__" + i); } @@ -209,7 +209,7 @@ public class DistTXDebugDUnitTest extends CacheTestCase { for (int i = 1; i <= 3; i++) { DummyKeyBasedRoutingResolver dummy = new DummyKeyBasedRoutingResolver( i); - LogWriterSupport.getLogWriter().info(" calling pr.put in tx 1"); + LogWriterUtils.getLogWriter().info(" calling pr.put in tx 1"); pr1.put(dummy, "2_entry__" + i); } ctx.commit(); @@ -218,7 +218,7 @@ public class DistTXDebugDUnitTest extends CacheTestCase { for (int i = 1; i <= 3; i++) { DummyKeyBasedRoutingResolver dummy = new DummyKeyBasedRoutingResolver( i); - LogWriterSupport.getLogWriter().info(" calling pr.get"); + LogWriterUtils.getLogWriter().info(" calling pr.get"); assertEquals("2_entry__" + i, pr1.get(dummy)); } @@ -227,7 +227,7 @@ public class DistTXDebugDUnitTest extends CacheTestCase { for (int i = 1; i <= 3; i++) { DummyKeyBasedRoutingResolver dummy = new DummyKeyBasedRoutingResolver( i); - LogWriterSupport.getLogWriter().info(" calling pr.put in tx 2"); + LogWriterUtils.getLogWriter().info(" calling pr.put in tx 2"); pr1.put(dummy, "3_entry__" + i); } ctx.rollback(); @@ -236,7 +236,7 @@ public class DistTXDebugDUnitTest extends CacheTestCase { for (int i = 1; i <= 3; i++) { DummyKeyBasedRoutingResolver dummy = new DummyKeyBasedRoutingResolver( i); - LogWriterSupport.getLogWriter().info(" calling pr.get"); + LogWriterUtils.getLogWriter().info(" calling pr.get"); assertEquals("2_entry__" + i, pr1.get(dummy)); } @@ -245,7 +245,7 @@ public class DistTXDebugDUnitTest extends CacheTestCase { for (int i = 1; i <= 3; i++) { DummyKeyBasedRoutingResolver dummy = new DummyKeyBasedRoutingResolver( i); - LogWriterSupport.getLogWriter().info(" calling pr.destroy in tx 3"); + LogWriterUtils.getLogWriter().info(" calling pr.destroy in tx 3"); pr1.destroy(dummy); } ctx.commit(); @@ -254,7 +254,7 @@ public class DistTXDebugDUnitTest extends CacheTestCase { for (int i = 1; i <= 3; i++) { DummyKeyBasedRoutingResolver dummy = new DummyKeyBasedRoutingResolver( i); - LogWriterSupport.getLogWriter().info(" calling pr.get"); + LogWriterUtils.getLogWriter().info(" calling pr.get"); assertEquals(null, pr1.get(dummy)); } @@ -264,7 +264,7 @@ public class DistTXDebugDUnitTest extends CacheTestCase { public Object call() throws CacheException { PartitionedRegion pr1 = (PartitionedRegion) cache .getRegion("pregion1"); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( " calling pr.getLocalSize " + pr1.getLocalSize()); assertEquals(0, pr1.getLocalSize()); return null; @@ -303,7 +303,7 @@ public class DistTXDebugDUnitTest extends CacheTestCase { for (int i = 1; i <= 6; i++) { DummyKeyBasedRoutingResolver dummy = new DummyKeyBasedRoutingResolver( i); - LogWriterSupport.getLogWriter().info(" calling non-tx put"); + LogWriterUtils.getLogWriter().info(" calling non-tx put"); pr1.put(dummy, "1_entry__" + i); rr1.put(dummy, "1_entry__" + i); } @@ -315,19 +315,19 @@ public class DistTXDebugDUnitTest extends CacheTestCase { for (int i = 1; i <= 3; i++) { DummyKeyBasedRoutingResolver dummy = new DummyKeyBasedRoutingResolver( i); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( " calling pr1.destroy in tx key=" + dummy); pr1.destroy(dummy); - LogWriterSupport.getLogWriter().info(" calling rr1.destroy in tx key=" + i); + LogWriterUtils.getLogWriter().info(" calling rr1.destroy in tx key=" + i); rr1.destroy(dummy); } for (int i = 4; i <= 6; i++) { DummyKeyBasedRoutingResolver dummy = new DummyKeyBasedRoutingResolver( i); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( " calling pr1.invalidate in tx key=" + dummy); pr1.invalidate(dummy); - LogWriterSupport.getLogWriter().info(" calling rr1.invalidate in tx key=" + i); + LogWriterUtils.getLogWriter().info(" calling rr1.invalidate in tx key=" + i); rr1.invalidate(dummy); } ctx.commit(); @@ -336,9 +336,9 @@ public class DistTXDebugDUnitTest extends CacheTestCase { for (int i = 1; i <= 6; i++) { DummyKeyBasedRoutingResolver dummy = new DummyKeyBasedRoutingResolver( i); - LogWriterSupport.getLogWriter().info(" calling pr1.get"); + LogWriterUtils.getLogWriter().info(" calling pr1.get"); assertEquals(null, pr1.get(dummy)); - LogWriterSupport.getLogWriter().info(" calling rr1.get"); + LogWriterUtils.getLogWriter().info(" calling rr1.get"); assertEquals(null, rr1.get(i)); } return null; @@ -353,10 +353,10 @@ public class DistTXDebugDUnitTest extends CacheTestCase { public Object call() throws CacheException { PartitionedRegion pr1 = (PartitionedRegion) cache.getRegion("pregion1"); Region rr1 = cache.getRegion("rregion1"); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( " calling pr1.getLocalSize " + pr1.getLocalSize()); assertEquals(2, pr1.getLocalSize()); - LogWriterSupport.getLogWriter().info(" calling rr1.size " + rr1.size()); + LogWriterUtils.getLogWriter().info(" calling rr1.size " + rr1.size()); assertEquals(3, rr1.size()); return null; } @@ -391,9 +391,9 @@ public class DistTXDebugDUnitTest extends CacheTestCase { for (int i = 1; i <= 3; i++) { DummyKeyBasedRoutingResolver dummy = new DummyKeyBasedRoutingResolver( i); - LogWriterSupport.getLogWriter().info(" calling pr.put non-tx PR1_entry__" + i); + LogWriterUtils.getLogWriter().info(" calling pr.put non-tx PR1_entry__" + i); pr1.put(dummy, "PR1_entry__" + i); - LogWriterSupport.getLogWriter().info(" calling rr.put non-tx RR1_entry__" + i); + LogWriterUtils.getLogWriter().info(" calling rr.put non-tx RR1_entry__" + i); rr1.put(new Integer(i), "RR1_entry__" + i); } @@ -406,9 +406,9 @@ public class DistTXDebugDUnitTest extends CacheTestCase { for (int i = 1; i <= 3; i++) { DummyKeyBasedRoutingResolver dummy = new DummyKeyBasedRoutingResolver( i); - LogWriterSupport.getLogWriter().info(" calling pr.put in tx PR2_entry__" + i); + LogWriterUtils.getLogWriter().info(" calling pr.put in tx PR2_entry__" + i); pr1.put(dummy, "PR2_entry__" + i); - LogWriterSupport.getLogWriter().info(" calling rr.put in tx RR2_entry__" + i); + LogWriterUtils.getLogWriter().info(" calling rr.put in tx RR2_entry__" + i); rr1.put(new Integer(i), "RR2_entry__" + i); } ctx.commit(); @@ -417,9 +417,9 @@ public class DistTXDebugDUnitTest extends CacheTestCase { for (int i = 1; i <= 3; i++) { DummyKeyBasedRoutingResolver dummy = new DummyKeyBasedRoutingResolver( i); - LogWriterSupport.getLogWriter().info(" calling pr.get PR2_entry__" + i); + LogWriterUtils.getLogWriter().info(" calling pr.get PR2_entry__" + i); assertEquals("PR2_entry__" + i, pr1.get(dummy)); - LogWriterSupport.getLogWriter().info(" calling rr.get RR2_entry__" + i); + LogWriterUtils.getLogWriter().info(" calling rr.get RR2_entry__" + i); assertEquals("RR2_entry__" + i, rr1.get(new Integer(i))); } return null; @@ -433,12 +433,12 @@ public class DistTXDebugDUnitTest extends CacheTestCase { @Override public Object call() throws CacheException { PartitionedRegion pr1 = (PartitionedRegion) cache.getRegion("pregion1"); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( " calling pr.getLocalSize " + pr1.getLocalSize()); assertEquals(2, pr1.getLocalSize()); Region rr1 = cache.getRegion("rregion1"); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info(" calling rr.getLocalSize " + rr1.size()); assertEquals(3, rr1.size()); return null; @@ -475,7 +475,7 @@ public class DistTXDebugDUnitTest extends CacheTestCase { for (int i = 1; i <= 3; i++) { DummyKeyBasedRoutingResolver dummy = new DummyKeyBasedRoutingResolver( i); - LogWriterSupport.getLogWriter().info(" calling pr.put in tx 1"); + LogWriterUtils.getLogWriter().info(" calling pr.put in tx 1"); pr1.put(dummy, "2_entry__" + i); } ctx.commit(); @@ -484,7 +484,7 @@ public class DistTXDebugDUnitTest extends CacheTestCase { for (int i = 1; i <= 3; i++) { DummyKeyBasedRoutingResolver dummy = new DummyKeyBasedRoutingResolver( i); - LogWriterSupport.getLogWriter().info(" calling pr.get " + pr1.get(dummy)); + LogWriterUtils.getLogWriter().info(" calling pr.get " + pr1.get(dummy)); assertEquals("2_entry__" + i, pr1.get(dummy)); } return null; @@ -498,7 +498,7 @@ public class DistTXDebugDUnitTest extends CacheTestCase { public Object call() throws CacheException { PartitionedRegion pr1 = (PartitionedRegion) cache.getRegion("pregion1"); CacheTransactionManager ctx = cache.getCacheTransactionManager(); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( " calling pr.getLocalSize " + pr1.getLocalSize()); assertEquals(2, pr1.getLocalSize()); return null; @@ -526,7 +526,7 @@ public class DistTXDebugDUnitTest extends CacheTestCase { for (int i = 1; i <= 3; i++) { DummyKeyBasedRoutingResolver dummy = new DummyKeyBasedRoutingResolver( i); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( " calling pr.put in tx for rollback no_entry__" + i); pr1.put(dummy, "no_entry__" + i); } @@ -536,7 +536,7 @@ public class DistTXDebugDUnitTest extends CacheTestCase { for (int i = 1; i <= 3; i++) { DummyKeyBasedRoutingResolver dummy = new DummyKeyBasedRoutingResolver( i); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( " calling pr.get after rollback " + pr1.get(dummy)); assertEquals("2_entry__" + i, pr1.get(dummy)); } @@ -570,10 +570,10 @@ public class DistTXDebugDUnitTest extends CacheTestCase { for (int i = 1; i <= 3; i++) { DummyKeyBasedRoutingResolver dummy = new DummyKeyBasedRoutingResolver( i); - LogWriterSupport.getLogWriter().info(" calling pr.create in tx 1"); + LogWriterUtils.getLogWriter().info(" calling pr.create in tx 1"); pr1.create(dummy, "2_entry__" + i); - LogWriterSupport.getLogWriter().info(" calling rr.create " + "2_entry__" + i); + LogWriterUtils.getLogWriter().info(" calling rr.create " + "2_entry__" + i); rr1.create(new Integer(i), "2_entry__" + i); } ctx.commit(); @@ -582,10 +582,10 @@ public class DistTXDebugDUnitTest extends CacheTestCase { for (int i = 1; i <= 3; i++) { DummyKeyBasedRoutingResolver dummy = new DummyKeyBasedRoutingResolver( i); - LogWriterSupport.getLogWriter().info(" calling pr.get " + pr1.get(dummy)); + LogWriterUtils.getLogWriter().info(" calling pr.get " + pr1.get(dummy)); assertEquals("2_entry__" + i, pr1.get(dummy)); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( " calling rr.get " + rr1.get(new Integer(i))); assertEquals("2_entry__" + i, rr1.get(new Integer(i))); } @@ -600,12 +600,12 @@ public class DistTXDebugDUnitTest extends CacheTestCase { @Override public Object call() throws CacheException { Region rr1 = cache.getRegion("rregion1"); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info(" calling rr.getLocalSize " + rr1.size()); assertEquals(3, rr1.size()); PartitionedRegion pr1 = (PartitionedRegion) cache.getRegion("pregion1"); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( " calling pr.getLocalSize " + pr1.getLocalSize()); assertEquals(2, pr1.getLocalSize()); return null; @@ -650,10 +650,10 @@ public class DistTXDebugDUnitTest extends CacheTestCase { for (int i = 1; i <= 3; i++) { DummyKeyBasedRoutingResolver dummy = new DummyKeyBasedRoutingResolver( i); - LogWriterSupport.getLogWriter().info(" calling pr.get " + pr1.get(dummy)); + LogWriterUtils.getLogWriter().info(" calling pr.get " + pr1.get(dummy)); assertEquals("2_entry__" + i, pr1.get(dummy)); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( " calling rr.get " + rr1.get(new Integer(i))); assertEquals("2_entry__" + i, rr1.get(new Integer(i))); } @@ -668,12 +668,12 @@ public class DistTXDebugDUnitTest extends CacheTestCase { @Override public Object call() throws CacheException { Region rr1 = cache.getRegion("rregion1"); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info(" calling rr.getLocalSize " + rr1.size()); assertEquals(3, rr1.size()); PartitionedRegion pr1 = (PartitionedRegion) cache.getRegion("pregion1"); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( " calling pr.getLocalSize " + pr1.getLocalSize()); assertEquals(2, pr1.getLocalSize()); return null; @@ -714,7 +714,7 @@ public class DistTXDebugDUnitTest extends CacheTestCase { for (int i = 1; i <= 3; i++) { DummyKeyBasedRoutingResolver dummy = new DummyKeyBasedRoutingResolver( i); - LogWriterSupport.getLogWriter().info(" calling pr.get " + pr1.get(dummy)); + LogWriterUtils.getLogWriter().info(" calling pr.get " + pr1.get(dummy)); assertEquals("2_entry__" + i, pr1.get(dummy)); } @@ -730,7 +730,7 @@ public class DistTXDebugDUnitTest extends CacheTestCase { @Override public Object call() throws CacheException { PartitionedRegion pr1 = (PartitionedRegion) cache.getRegion("pregion1"); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( " calling pr.getLocalSize " + pr1.getLocalSize()); assertEquals(2, pr1.getLocalSize()); return null; @@ -781,7 +781,7 @@ public class DistTXDebugDUnitTest extends CacheTestCase { // verify the data for (int i = 1; i <= 3; i++) { - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( " calling rr.get " + rr1.get(new Integer(i))); assertEquals(null, rr1.get(new Integer(i))); } @@ -800,7 +800,7 @@ public class DistTXDebugDUnitTest extends CacheTestCase { @Override public Object call() throws CacheException { Region rr1 = cache.getRegion("rregion1"); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info(" calling rr.getLocalSize " + rr1.size()); assertEquals(0, rr1.size()); return null; @@ -841,7 +841,7 @@ public class DistTXDebugDUnitTest extends CacheTestCase { for (int i = 1; i <= 3; i++) { DummyKeyBasedRoutingResolver dummy = new DummyKeyBasedRoutingResolver( i); - LogWriterSupport.getLogWriter().info(" calling pr.get " + pr1.get(dummy)); + LogWriterUtils.getLogWriter().info(" calling pr.get " + pr1.get(dummy)); assertEquals(null, pr1.get(dummy)); } return null; @@ -855,7 +855,7 @@ public class DistTXDebugDUnitTest extends CacheTestCase { @Override public Object call() throws CacheException { PartitionedRegion pr1 = (PartitionedRegion) cache.getRegion("pregion1"); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( " calling pr.getLocalSize " + pr1.getLocalSize()); assertEquals(0, pr1.getLocalSize()); return null; @@ -886,14 +886,14 @@ public class DistTXDebugDUnitTest extends CacheTestCase { ctx.setDistributed(true); ctx.begin(); for (int i = 1; i <= 3; i++) { - LogWriterSupport.getLogWriter().info(" calling rr.put " + "2_entry__" + i); + LogWriterUtils.getLogWriter().info(" calling rr.put " + "2_entry__" + i); rr1.put(new Integer(i), "2_entry__" + i); } ctx.commit(); // verify the data for (int i = 1; i <= 3; i++) { - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( " calling rr.get " + rr1.get(new Integer(i))); assertEquals("2_entry__" + i, rr1.get(new Integer(i))); } @@ -912,7 +912,7 @@ public class DistTXDebugDUnitTest extends CacheTestCase { @Override public Object call() throws CacheException { Region rr1 = cache.getRegion("rregion1"); - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info(" calling rr.getLocalSize " + rr1.size()); assertEquals(3, rr1.size()); return null; @@ -930,7 +930,7 @@ public class DistTXDebugDUnitTest extends CacheTestCase { ctx.setDistributed(true); ctx.begin(); for (int i = 1; i <= 3; i++) { - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( " calling rr.put for rollback no_entry__" + i); rr1.put(new Integer(i), "no_entry__" + i); } @@ -939,7 +939,7 @@ public class DistTXDebugDUnitTest extends CacheTestCase { // verify the data for (int i = 1; i <= 3; i++) { - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( " calling rr.get after rollback " + rr1.get(new Integer(i))); assertEquals("2_entry__" + i, rr1.get(new Integer(i))); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistTXPersistentDebugDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistTXPersistentDebugDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistTXPersistentDebugDUnitTest.java index 997effa..2cfeae7 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistTXPersistentDebugDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistTXPersistentDebugDUnitTest.java @@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.cache.TXManagerImpl; import com.gemstone.gemfire.internal.cache.execute.data.CustId; import com.gemstone.gemfire.internal.cache.execute.data.Customer; 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; public class DistTXPersistentDebugDUnitTest extends DistTXDebugDUnitTest { @@ -107,21 +107,21 @@ public class DistTXPersistentDebugDUnitTest extends DistTXDebugDUnitTest { public Object call() throws Exception { CacheTransactionManager mgr = cache.getCacheTransactionManager(); mgr.setDistributed(true); - LogWriterSupport.getLogWriter().fine("SJ:TX BEGIN"); + LogWriterUtils.getLogWriter().fine("SJ:TX BEGIN"); mgr.begin(); Region<CustId, Customer> prRegion = cache.getRegion(regionName); CustId custIdOne = new CustId(1); Customer customerOne = new Customer("name1", "addr1"); - LogWriterSupport.getLogWriter().fine("SJ:TX PUT 1"); + LogWriterUtils.getLogWriter().fine("SJ:TX PUT 1"); prRegion.put(custIdOne, customerOne); CustId custIdTwo = new CustId(2); Customer customerTwo = new Customer("name2", "addr2"); - LogWriterSupport.getLogWriter().fine("SJ:TX PUT 2"); + LogWriterUtils.getLogWriter().fine("SJ:TX PUT 2"); prRegion.put(custIdTwo, customerTwo); - LogWriterSupport.getLogWriter().fine("SJ:TX COMMIT"); + LogWriterUtils.getLogWriter().fine("SJ:TX COMMIT"); mgr.commit(); return null; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java index 928a7bb..2eaef9c 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java @@ -60,7 +60,7 @@ import com.gemstone.gemfire.internal.cache.execute.data.OrderId; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.Invoke; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.SerializableCallable; import com.gemstone.gemfire.test.dunit.VM; @@ -1952,7 +1952,7 @@ public class DistributedTransactionDUnitTest extends CacheTestCase { public Exception ex = new Exception(); public void run() { - LogWriterSupport.getLogWriter().info("Inside TxConflictRunnable.TxThread after aquiring locks"); + LogWriterUtils.getLogWriter().info("Inside TxConflictRunnable.TxThread after aquiring locks"); CacheTransactionManager mgr = getGemfireCache().getTxManager(); mgr.setDistributed(true); mgr.begin(); @@ -1965,10 +1965,10 @@ public class DistributedTransactionDUnitTest extends CacheTestCase { mgr.commit(); } catch (CommitConflictException ce) { gotConflict = true; - LogWriterSupport.getLogWriter().info("Received exception ", ce); + LogWriterUtils.getLogWriter().info("Received exception ", ce); } catch (Exception e) { gotOtherException = true; - LogWriterSupport.getLogWriter().info("Received exception ", e); + LogWriterUtils.getLogWriter().info("Received exception ", e); ex.initCause(e); } } @@ -2087,7 +2087,7 @@ public class DistributedTransactionDUnitTest extends CacheTestCase { public Exception ex = new Exception(); public void run() { - LogWriterSupport.getLogWriter() + LogWriterUtils.getLogWriter() .info("Inside TxRunnable.TxThread after aquiring locks"); CacheTransactionManager mgr = getGemfireCache().getTxManager(); mgr.setDistributed(true); @@ -2101,7 +2101,7 @@ public class DistributedTransactionDUnitTest extends CacheTestCase { mgr.commit(); } catch (Exception e) { gotException = true; - LogWriterSupport.getLogWriter().info("Received exception ", e); + LogWriterUtils.getLogWriter().info("Received exception ", e); ex.initCause(e); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/ClassNotFoundExceptionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/ClassNotFoundExceptionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/ClassNotFoundExceptionDUnitTest.java index 82c45f6..8ab0b2c 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/ClassNotFoundExceptionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/ClassNotFoundExceptionDUnitTest.java @@ -40,7 +40,7 @@ import com.gemstone.gemfire.pdx.PdxSerializable; import com.gemstone.gemfire.pdx.PdxWriter; 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.SerializableCallable; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; @@ -191,7 +191,7 @@ public class ClassNotFoundExceptionDUnitTest extends CacheTestCase { public Object call() throws Exception { disconnectFromDS(); ClientCacheFactory cf = new ClientCacheFactory(); - cf.addPoolServer(NetworkSupport.getServerHostName(vm.getHost()), port); + cf.addPoolServer(NetworkUtils.getServerHostName(vm.getHost()), port); cf.setPoolSubscriptionEnabled(true); ClientCache cache = getClientCache(cf); cache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java index 6d9e357..c8927b6 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java @@ -48,7 +48,7 @@ import org.junit.rules.TestName; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.util.test.TestUtil; -import com.gemstone.gemfire.test.dunit.Threads; +import com.gemstone.gemfire.test.dunit.ThreadUtils; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; /** @@ -122,7 +122,7 @@ public class JSSESocketJUnitTest { oos.writeObject( expected ); oos.flush(); - Threads.join(serverThread, 30 * 1000, null); + ThreadUtils.join(serverThread, 30 * 1000); client.close(); if ( expected.equals( receiver[0] ) ) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldDUnitTest.java index 54f9174..f7b6529 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldDUnitTest.java @@ -39,7 +39,7 @@ import com.gemstone.gemfire.pdx.PdxWriter; import com.gemstone.gemfire.pdx.internal.PdxType; import com.gemstone.gemfire.pdx.internal.PdxUnreadData; 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; @@ -177,7 +177,7 @@ public class PdxDeleteFieldDUnitTest extends CacheTestCase{ try { FileUtil.delete(new File(path)); } catch (IOException e) { - LogWriterSupport.getLogWriter().error("Unable to delete file", e); + LogWriterUtils.getLogWriter().error("Unable to delete file", e); } } this.filesToBeDeleted.clear(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameDUnitTest.java index 7f31ae3..f10d953 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameDUnitTest.java @@ -40,7 +40,7 @@ import com.gemstone.gemfire.pdx.internal.EnumInfo; import com.gemstone.gemfire.pdx.internal.PdxInstanceImpl; import com.gemstone.gemfire.pdx.internal.PdxType; 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; @@ -184,7 +184,7 @@ public class PdxRenameDUnitTest extends CacheTestCase{ try { FileUtil.delete(new File(path)); } catch (IOException e) { - LogWriterSupport.getLogWriter().error("Unable to delete file", e); + LogWriterUtils.getLogWriter().error("Unable to delete file", e); } } this.filesToBeDeleted.clear(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupDUnitTest.java index 0b13b95..a91fb8e 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupDUnitTest.java @@ -55,7 +55,7 @@ import com.gemstone.gemfire.test.dunit.AsyncInvocation; import com.gemstone.gemfire.test.dunit.DUnitEnv; 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.SerializableCallable; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; @@ -79,7 +79,7 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase { StringBuilder failures = new StringBuilder(); FileUtil.delete(getBackupDir(), failures); if (failures.length() > 0) { - LogWriterSupport.getLogWriter().error(failures.toString()); + LogWriterUtils.getLogWriter().error(failures.toString()); } } @@ -89,9 +89,9 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase { VM vm1 = host.getVM(1); VM vm2 = host.getVM(2); - LogWriterSupport.getLogWriter().info("Creating region in VM0"); + LogWriterUtils.getLogWriter().info("Creating region in VM0"); createPersistentRegion(vm0); - LogWriterSupport.getLogWriter().info("Creating region in VM1"); + LogWriterUtils.getLogWriter().info("Creating region in VM1"); createPersistentRegion(vm1); long lm0 = setBackupFiles(vm0); @@ -133,9 +133,9 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase { restoreBackup(2); - LogWriterSupport.getLogWriter().info("Creating region in VM0"); + LogWriterUtils.getLogWriter().info("Creating region in VM0"); AsyncInvocation async0 = createPersistentRegionAsync(vm0); - LogWriterSupport.getLogWriter().info("Creating region in VM1"); + LogWriterUtils.getLogWriter().info("Creating region in VM1"); AsyncInvocation async1 = createPersistentRegionAsync(vm1); async0.getResult(MAX_WAIT); @@ -156,9 +156,9 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase { VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); - LogWriterSupport.getLogWriter().info("Creating region in VM0"); + LogWriterUtils.getLogWriter().info("Creating region in VM0"); createPersistentRegion(vm0); - LogWriterSupport.getLogWriter().info("Creating region in VM1"); + LogWriterUtils.getLogWriter().info("Creating region in VM1"); createPersistentRegion(vm1); createData(vm0, 0, 5, "A", "region1"); @@ -190,9 +190,9 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase { restoreBackup(2); - LogWriterSupport.getLogWriter().info("Creating region in VM0"); + LogWriterUtils.getLogWriter().info("Creating region in VM0"); AsyncInvocation async0 = createPersistentRegionAsync(vm0); - LogWriterSupport.getLogWriter().info("Creating region in VM1"); + LogWriterUtils.getLogWriter().info("Creating region in VM1"); AsyncInvocation async1 = createPersistentRegionAsync(vm1); async0.getResult(MAX_WAIT); @@ -221,14 +221,14 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase { final VM vm2 = host.getVM(2); - LogWriterSupport.getLogWriter().info("Creating region in VM0"); + LogWriterUtils.getLogWriter().info("Creating region in VM0"); createPersistentRegion(vm0); //create a bucket on vm0 createData(vm0, 0, 1, "A", "region1"); //create the pr on vm1, which won't have any buckets - LogWriterSupport.getLogWriter().info("Creating region in VM1"); + LogWriterUtils.getLogWriter().info("Creating region in VM1"); createPersistentRegion(vm1); @@ -280,9 +280,9 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase { restoreBackup(2); - LogWriterSupport.getLogWriter().info("Creating region in VM0"); + LogWriterUtils.getLogWriter().info("Creating region in VM0"); AsyncInvocation async0 = createPersistentRegionAsync(vm0); - LogWriterSupport.getLogWriter().info("Creating region in VM1"); + LogWriterUtils.getLogWriter().info("Creating region in VM1"); AsyncInvocation async1 = createPersistentRegionAsync(vm1); async0.getResult(MAX_WAIT); @@ -381,14 +381,14 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase { }); try { - LogWriterSupport.getLogWriter().info("Creating region in VM0"); + LogWriterUtils.getLogWriter().info("Creating region in VM0"); createPersistentRegion(vm0); //create twos bucket on vm0 createData(vm0, 0, 2, "A", "region1"); //create the pr on vm1, which won't have any buckets - LogWriterSupport.getLogWriter().info("Creating region in VM1"); + LogWriterUtils.getLogWriter().info("Creating region in VM1"); createPersistentRegion(vm1); @@ -430,9 +430,9 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase { restoreBackup(2); - LogWriterSupport.getLogWriter().info("Creating region in VM0"); + LogWriterUtils.getLogWriter().info("Creating region in VM0"); AsyncInvocation async0 = createPersistentRegionAsync(vm0); - LogWriterSupport.getLogWriter().info("Creating region in VM1"); + LogWriterUtils.getLogWriter().info("Creating region in VM1"); AsyncInvocation async1 = createPersistentRegionAsync(vm1); async0.getResult(MAX_WAIT); @@ -461,9 +461,9 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase { VM vm1 = host.getVM(1); VM vm2 = host.getVM(2); - LogWriterSupport.getLogWriter().info("Creating region in VM0"); + LogWriterUtils.getLogWriter().info("Creating region in VM0"); createPersistentRegion(vm0); - LogWriterSupport.getLogWriter().info("Creating region in VM1"); + LogWriterUtils.getLogWriter().info("Creating region in VM1"); createOverflowRegion(vm1); createData(vm0, 0, 5, "A", "region1"); @@ -486,11 +486,11 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase { VM vm2 = host.getVM(2); VM vm3 = host.getVM(3); - LogWriterSupport.getLogWriter().info("Creating region in VM0"); + LogWriterUtils.getLogWriter().info("Creating region in VM0"); createPersistentRegion(vm0); - LogWriterSupport.getLogWriter().info("Creating region in VM1"); + LogWriterUtils.getLogWriter().info("Creating region in VM1"); createPersistentRegion(vm1); - LogWriterSupport.getLogWriter().info("Creating region in VM2"); + LogWriterUtils.getLogWriter().info("Creating region in VM2"); createPersistentRegion(vm2); createData(vm0, 0, 5, "A", "region1"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33359DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33359DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33359DUnitTest.java index e5b9a23..bd0d478 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33359DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33359DUnitTest.java @@ -36,7 +36,7 @@ import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.test.dunit.DistributedTestCase; import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.VM; /** @@ -68,7 +68,7 @@ public class Bug33359DUnitTest extends DistributedTestCase { VM vm1 = host.getVM(1); vm0.invoke(Bug33359DUnitTest.class, "createCacheVM0"); vm1.invoke(Bug33359DUnitTest.class, "createCacheVM1"); - LogWriterSupport.getLogWriter().fine("Cache created in successfully"); + LogWriterUtils.getLogWriter().fine("Cache created in successfully"); } public void preTearDown(){ @@ -141,7 +141,7 @@ public class Bug33359DUnitTest extends DistributedTestCase { for(int i=0; i<10; i++){ region.put(new Integer(i), Integer.toString(i)); } - LogWriterSupport.getLogWriter().fine("Did all puts successfully"); + LogWriterUtils.getLogWriter().fine("Did all puts successfully"); } } ); @@ -149,7 +149,7 @@ public class Bug33359DUnitTest extends DistributedTestCase { vm0.invoke(new CacheSerializableRunnable("perform clear on region"){ public void run2() throws CacheException { region.clear(); - LogWriterSupport.getLogWriter().fine("region is cleared"); + LogWriterUtils.getLogWriter().fine("region is cleared"); } } ); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37241DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37241DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37241DUnitTest.java index dbaf110..f736199 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37241DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37241DUnitTest.java @@ -31,7 +31,7 @@ import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.ReplyException; 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; /* @@ -156,10 +156,10 @@ public class Bug37241DUnitTest extends DistributedTestCase .getName()); //added for not to log exepected IllegalStateExcepion. - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "<ExpectedException action=add>" + expectedReplyException + "</ExpectedException>"); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "<ExpectedException action=add>" + expectedException + "</ExpectedException>"); cache.getLogger().info( @@ -200,10 +200,10 @@ public class Bug37241DUnitTest extends DistributedTestCase cache.getLogger().info( "<ExpectedException action=remove>" + expectedReplyException + "</ExpectedException>"); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "<ExpectedException action=remove>" + expectedException + "</ExpectedException>"); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "<ExpectedException action=remove>" + expectedReplyException + "</ExpectedException>"); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37377DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37377DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37377DUnitTest.java index a0398f1..766ecd4 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37377DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37377DUnitTest.java @@ -35,9 +35,8 @@ import com.gemstone.gemfire.internal.cache.lru.EnableLRU; import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry; 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.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; @@ -315,7 +314,7 @@ public class Bug37377DUnitTest extends CacheTestCase vm0.invoke(putSomeEntries()); AsyncInvocation as1 = vm1.invokeAsync(createCacheForVM1()); Wait.pause(10000); - Threads.join(as1, 30 * 1000, LogWriterSupport.getLogWriter()); + ThreadUtils.join(as1, 30 * 1000); vm0.invoke(closeCacheForVM(0)); vm1.invoke(closeCacheForVM(1)); vm1.invoke(createCacheForVM1());
