geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [01/44] incubator-geode git commit: Refactor dunit
Date Tue, 02 Feb 2016 20:21:08 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-773-2 18401aa66 -> 76e324b52


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
index da31a5c..25eca2e 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
@@ -28,6 +28,7 @@ import com.gemstone.gemfire.management.internal.cli.json.GfJsonException;
 import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
 import com.gemstone.gemfire.management.internal.cli.result.CompositeResultData;
 import com.gemstone.gemfire.management.internal.cli.result.TabularResultData;
+import com.gemstone.gemfire.test.dunit.Wait;
 
 public class WanCommandListDUnitTest extends WANCommandTestBase {
 
@@ -62,7 +63,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
     vm5.invoke(WANCommandTestBase.class, "createCache",
         new Object[] { punePort });
     
-    pause(10000);
+    Wait.pause(10000);
     String command = CliStrings.LIST_GATEWAY;
     CommandResult cmdResult = executeCommand(command);
     if (cmdResult != null) {
@@ -111,7 +112,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
     vm5.invoke(WANCommandTestBase.class, "createSender", new Object[] {
         "ln_Serial", 2, false, 100, 400, false, false, null, false });
 
-    pause(10000);
+    Wait.pause(10000);
     String command = CliStrings.LIST_GATEWAY;
     CommandResult cmdResult = executeCommand(command);
     if (cmdResult != null) {
@@ -162,7 +163,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
     vm6.invoke(WANCommandTestBase.class, "createSender", new Object[] {
         "ln_Parallel", 1, true, 100, 400, false, false, null, false });
 
-    pause(10000);
+    Wait.pause(10000);
     String command = CliStrings.LIST_GATEWAY;
     CommandResult cmdResult = executeCommand(command);
     if (cmdResult != null) {
@@ -224,7 +225,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
     vm7.invoke(WANCommandTestBase.class, "createSender", new Object[] {
         "ln_Parallel", 1, true, 100, 400, false, false, null, false });
 
-    pause(10000);
+    Wait.pause(10000);
     String command = CliStrings.LIST_GATEWAY;
     CommandResult cmdResult = executeCommand(command);
     
@@ -293,7 +294,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase {
     vm7.invoke(WANCommandTestBase.class, "createSender", new Object[] {
         "ln_Parallel", 1, true, 100, 400, false, false, null, false });
 
-    pause(10000);
+    Wait.pause(10000);
     String command = CliStrings.LIST_GATEWAY + " --" + CliStrings.LIST_GATEWAY__GROUP + "=Serial_Sender";
     CommandResult cmdResult = executeCommand(command);
     if (cmdResult != null) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
index 54b43a1..10d1148 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
@@ -27,6 +27,7 @@ import com.gemstone.gemfire.management.cli.Result;
 import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
 import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
 import com.gemstone.gemfire.management.internal.cli.result.TabularResultData;
+import com.gemstone.gemfire.test.dunit.Wait;
 
 public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase {
 
@@ -116,7 +117,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase
{
     vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
         "ln", true, false });
 
-    pause(10000);
+    Wait.pause(10000);
     String command = CliStrings.PAUSE_GATEWAYSENDER + " --"
         + CliStrings.PAUSE_GATEWAYSENDER__ID + "=ln";
     CommandResult cmdResult = executeCommand(command);
@@ -174,7 +175,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase
{
 
     final DistributedMember vm1Member = (DistributedMember) vm3.invoke(
         WANCommandTestBase.class, "getMember");
-    pause(10000);
+    Wait.pause(10000);
     String command = CliStrings.PAUSE_GATEWAYSENDER + " --"
         + CliStrings.PAUSE_GATEWAYSENDER__ID + "=ln --"
         + CliStrings.PAUSE_GATEWAYSENDER__MEMBER + "=" + vm1Member.getId();
@@ -235,7 +236,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase
{
     vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
         "ln", true, false });
 
-    pause(10000);
+    Wait.pause(10000);
     String command = CliStrings.PAUSE_GATEWAYSENDER + " --"
         + CliStrings.PAUSE_GATEWAYSENDER__ID + "=ln --"
         + CliStrings.PAUSE_GATEWAYSENDER__GROUP + "=SenderGroup1";
@@ -322,7 +323,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase
{
     vm7.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
         "ln", true, false });
 
-    pause(10000);
+    Wait.pause(10000);
     String command = CliStrings.PAUSE_GATEWAYSENDER + " --"
         + CliStrings.PAUSE_GATEWAYSENDER__ID + "=ln --"
         + CliStrings.PAUSE_GATEWAYSENDER__GROUP + "=SenderGroup1,SenderGroup2";
@@ -443,7 +444,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase
{
     vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
         "ln", true, true });
 
-    pause(10000);
+    Wait.pause(10000);
     String command = CliStrings.RESUME_GATEWAYSENDER + " --"
         + CliStrings.RESUME_GATEWAYSENDER__ID + "=ln";
     CommandResult cmdResult = executeCommand(command);
@@ -506,7 +507,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase
{
 
     final DistributedMember vm1Member = (DistributedMember) vm3.invoke(
         WANCommandTestBase.class, "getMember");
-    pause(10000);
+    Wait.pause(10000);
     String command = CliStrings.RESUME_GATEWAYSENDER + " --"
         + CliStrings.RESUME_GATEWAYSENDER__ID + "=ln --"
         + CliStrings.RESUME_GATEWAYSENDER__MEMBER + "=" + vm1Member.getId();
@@ -578,7 +579,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase
{
     vm5.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
         "ln", true, true });
 
-    pause(10000);
+    Wait.pause(10000);
     String command = CliStrings.RESUME_GATEWAYSENDER + " --"
         + CliStrings.RESUME_GATEWAYSENDER__ID + "=ln --"
         + CliStrings.RESUME_GATEWAYSENDER__GROUP + "=SenderGroup1";
@@ -681,7 +682,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase
{
     vm7.invoke(WANCommandTestBase.class, "verifySenderState", new Object[] {
         "ln", true, true });
 
-    pause(10000);
+    Wait.pause(10000);
     String command = CliStrings.RESUME_GATEWAYSENDER + " --"
         + CliStrings.RESUME_GATEWAYSENDER__ID + "=ln --"
         + CliStrings.RESUME_GATEWAYSENDER__GROUP

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
index 346e6e8..bc2c28f 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
@@ -28,6 +28,7 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
 import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
 import com.gemstone.gemfire.management.internal.cli.result.CompositeResultData;
 import com.gemstone.gemfire.management.internal.cli.result.TabularResultData;
+import com.gemstone.gemfire.test.dunit.Wait;
 
 public class WanCommandStatusDUnitTest extends WANCommandTestBase{
   
@@ -77,7 +78,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
     vm5.invoke(WANCommandTestBase.class, "createSender", new Object[] {
         "ln_Parallel", 2, true, 100, 400, false, false, null, true});
 
-    pause(10000);
+    Wait.pause(10000);
     String command = CliStrings.STATUS_GATEWAYSENDER + " --"
     + CliStrings.STATUS_GATEWAYSENDER__ID + "=ln_Serial";
     CommandResult cmdResult = executeCommand(command);
@@ -116,7 +117,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
     vm5.invoke(WANCommandTestBase.class, "startSender",
         new Object[] { "ln_Parallel" });
 
-    pause(10000);
+    Wait.pause(10000);
     command = CliStrings.STATUS_GATEWAYSENDER + " --"
     + CliStrings.STATUS_GATEWAYSENDER__ID + "=ln_Serial";
     cmdResult = executeCommand(command);
@@ -177,7 +178,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
     final DistributedMember vm1Member = (DistributedMember) vm3.invoke(
         WANCommandTestBase.class, "getMember");
     
-    pause(10000);
+    Wait.pause(10000);
     String command = CliStrings.STATUS_GATEWAYSENDER + " --"
     + CliStrings.STATUS_GATEWAYSENDER__ID + "=ln_Serial --"
         + CliStrings.STATUS_GATEWAYSENDER__MEMBER + "=" + vm1Member.getId();
@@ -208,7 +209,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
     vm4.invoke(WANCommandTestBase.class, "startSender",
         new Object[] { "ln_Parallel" });
 
-    pause(10000);
+    Wait.pause(10000);
     command = CliStrings.STATUS_GATEWAYSENDER + " --"
     + CliStrings.STATUS_GATEWAYSENDER__ID + "=ln_Serial --"
         + CliStrings.STATUS_GATEWAYSENDER__MEMBER + "=" + vm1Member.getId();
@@ -295,7 +296,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
     final DistributedMember vm1Member = (DistributedMember) vm3.invoke(
         WANCommandTestBase.class, "getMember");
     
-    pause(10000);
+    Wait.pause(10000);
     String command = CliStrings.STATUS_GATEWAYSENDER + " --"
     + CliStrings.STATUS_GATEWAYSENDER__ID + "=ln_Serial --" + CliStrings.STATUS_GATEWAYSENDER__GROUP
+ "=Serial_Sender";
     
@@ -331,7 +332,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
     vm4.invoke(WANCommandTestBase.class, "startSender",
         new Object[] { "ln_Parallel" });
 
-    pause(10000);
+    Wait.pause(10000);
     command = CliStrings.STATUS_GATEWAYSENDER + " --"
     + CliStrings.STATUS_GATEWAYSENDER__ID + "=ln_Serial --" + CliStrings.STATUS_GATEWAYSENDER__GROUP
+ "=Serial_Sender";
     
@@ -376,7 +377,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
     vm4.invoke(WANCommandTestBase.class, "createAndStartReceiver", new Object[] { lnPort
});
     vm5.invoke(WANCommandTestBase.class, "createAndStartReceiver", new Object[] { lnPort
});
     
-    pause(10000);
+    Wait.pause(10000);
     String command = CliStrings.STATUS_GATEWAYRECEIVER; 
     CommandResult cmdResult = executeCommand(command);
     
@@ -407,7 +408,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
     vm4.invoke(WANCommandTestBase.class, "stopReceiver");
     vm5.invoke(WANCommandTestBase.class, "stopReceiver");
     
-    pause(10000);
+    Wait.pause(10000);
     
     command = CliStrings.STATUS_GATEWAYRECEIVER; 
     cmdResult = executeCommand(command);
@@ -457,7 +458,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
     final DistributedMember vm3Member = (DistributedMember) vm3.invoke(
         WANCommandTestBase.class, "getMember");
     
-    pause(10000);
+    Wait.pause(10000);
     String command = CliStrings.STATUS_GATEWAYRECEIVER+ " --"
     + CliStrings.STATUS_GATEWAYRECEIVER__MEMBER + "=" + vm3Member.getId();
     
@@ -484,7 +485,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
     vm4.invoke(WANCommandTestBase.class, "stopReceiver");
     vm5.invoke(WANCommandTestBase.class, "stopReceiver");
     
-    pause(10000);
+    Wait.pause(10000);
     
     command = CliStrings.STATUS_GATEWAYRECEIVER+ " --"
     + CliStrings.STATUS_GATEWAYRECEIVER__MEMBER + "=" + vm3Member.getId();
@@ -531,7 +532,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
     vm5.invoke(WANCommandTestBase.class, "createAndStartReceiverWithGroup", new Object[]
{ lnPort, "RG1"  });
     vm6.invoke(WANCommandTestBase.class, "createAndStartReceiverWithGroup", new Object[]
{ lnPort, "RG2"  });
     
-    pause(10000);
+    Wait.pause(10000);
     String command = CliStrings.STATUS_GATEWAYRECEIVER + " --"
         + CliStrings.STATUS_GATEWAYRECEIVER__GROUP + "=RG1";
     
@@ -558,7 +559,7 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{
     vm4.invoke(WANCommandTestBase.class, "stopReceiver");
     vm5.invoke(WANCommandTestBase.class, "stopReceiver");
 
-    pause(10000);
+    Wait.pause(10000);
     command = CliStrings.STATUS_GATEWAYRECEIVER + " --"+ CliStrings.STATUS_GATEWAYRECEIVER__GROUP
+ "=RG1";
     
     cmdResult = executeCommand(command);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java
b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java
index 08f6cac..caf8fdb 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java
@@ -28,6 +28,7 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
 import com.gemstone.gemfire.management.internal.MBeanJMXAdapter;
 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.VM;
 
@@ -322,7 +323,7 @@ public class WANManagementDUnitTest extends ManagementTestBase {
           DistributedSystemMXBean dsBean = service.getDistributedSystemMXBean();
           Map<String, Boolean> dsMap = dsBean.viewRemoteClusterStatus();
           
-          getLogWriter().info(
+          LogWriterSupport.getLogWriter().info(
               "<ExpectedString> Ds Map is: " + dsMap
                   + "</ExpectedString> ");
           

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
index 79d5aa2..b076db7 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
@@ -53,10 +53,12 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
 import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
 import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
 import com.gemstone.gemfire.management.internal.configuration.domain.XmlEntity;
-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.SerializableCallable;
 import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
 
 import org.apache.commons.io.FileUtils;
 
@@ -104,10 +106,10 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase
{
   
   
   public void testConfigDistribution() throws IOException {
-    addExpectedException("could not get remote locator");
+    IgnoredException.addIgnoredException("could not get remote locator");
     try {
       Object[] result = setup();
-      addExpectedException("EntryDestroyedException");
+      IgnoredException.addIgnoredException("EntryDestroyedException");
       final int locatorPort = (Integer) result[0];
       final String jmxHost = (String) result[1];
       final int jmxPort = (Integer) result[2];
@@ -592,7 +594,7 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase
{
         try {
           final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locator1Port,
locatorLogFile, null,
               locatorProps);
-          DistributedTestCase.WaitCriterion wc = new DistributedTestCase.WaitCriterion()
{
+          WaitCriterion wc = new WaitCriterion() {
             @Override
             public boolean done() {
               return locator.isSharedConfigurationRunning();
@@ -603,7 +605,7 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase
{
               return "Waiting for shared configuration to be started";
             }
           };
-          DistributedTestCase.waitForCriterion(wc, TIMEOUT, INTERVAL, true);
+          Wait.waitForCriterion(wc, TIMEOUT, INTERVAL, true);
         } catch (IOException ioex) {
           fail("Unable to create a locator with a shared configuration");
         }
@@ -663,7 +665,7 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase
{
         try {
           final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locator1Port,
locatorLogFile, null,
               locatorProps);
-          DistributedTestCase.WaitCriterion wc = new DistributedTestCase.WaitCriterion()
{
+          WaitCriterion wc = new WaitCriterion() {
             @Override
             public boolean done() {
               return locator.isSharedConfigurationRunning();
@@ -674,7 +676,7 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase
{
               return "Waiting for shared configuration to be started";
             }
           };
-          DistributedTestCase.waitForCriterion(wc, TIMEOUT, INTERVAL, true);
+          Wait.waitForCriterion(wc, TIMEOUT, INTERVAL, true);
         } catch (IOException ioex) {
           fail("Unable to create a locator with a shared configuration");
         }
@@ -836,8 +838,8 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase
{
   }
   protected void executeAndVerifyCommand(String commandString) {
     CommandResult cmdResult = executeCommand(commandString);
-    getLogWriter().info("Command : " + commandString);
-    getLogWriter().info("Command Result : " + commandResultToString(cmdResult));
+    com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Command : " + commandString);
+    com.gemstone.gemfire.test.dunit.LogWriterSupport.getLogWriter().info("Command Result
: " + commandResultToString(cmdResult));
     assertEquals(Status.OK, cmdResult.getStatus());
     assertFalse(cmdResult.failedToPersist());
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/76e324b5/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java
b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java
index 46e2d3f..891486c 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java
@@ -36,8 +36,11 @@ import com.gemstone.gemfire.management.RegionMXBean;
 
 import com.gemstone.gemfire.management.internal.MBeanJMXAdapter;
 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.VM;
+import com.gemstone.gemfire.test.dunit.Wait;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
 
 /**
  * This is for testing remote Cluster
@@ -159,14 +162,14 @@ public class TestRemoteClusterDUnitTest extends ManagementTestBase {
               return "wait for getDistributedSystemMXBean to complete and get results";
             }
           };
-          waitForCriterion(waitCriteria2, 2 * 60 * 1000, 5000, true);
+          Wait.waitForCriterion(waitCriteria2, 2 * 60 * 1000, 5000, true);
           ManagementService service = ManagementService
               .getManagementService(cache);
           final DistributedSystemMXBean dsBean = service
               .getDistributedSystemMXBean();
           assertNotNull(dsBean);
           Map<String, Boolean> dsMap = dsBean.viewRemoteClusterStatus();
-          getLogWriter().info(
+          LogWriterSupport.getLogWriter().info(
               "Ds Map is: " + dsMap.size());
           assertNotNull(dsMap);
           assertEquals(true, dsMap.size() > 0 ? true : false);


Mime
View raw message