[geode] 05/13: GEODE-4876: Remove additional uses of DUnit Host and cleanup

[kl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

klund pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 34acd5cc82a7506bd6d310a7e9ef18463ec738fa
Author: Kirk Lund <kl...@apache.org>
AuthorDate: Thu Apr 12 12:45:40 2018 -0700

    GEODE-4876: Remove additional uses of DUnit Host and cleanup
---
 .../java/org/apache/geode/test/dunit/DistributedTestUtils.java     | 3 ++-
 .../org/apache/geode/test/dunit/rules/CleanupDUnitVMsRule.java     | 7 ++++---
 .../apache/geode/test/dunit/rules/DistributedExternalResource.java | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/DistributedTestUtils.java b/geode-core/src/test/java/org/apache/geode/test/dunit/DistributedTestUtils.java
index 0eb3a94..2892783 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/DistributedTestUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/DistributedTestUtils.java
@@ -15,6 +15,7 @@
 package org.apache.geode.test.dunit;
 
 import static org.apache.geode.distributed.ConfigurationProperties.DISABLE_AUTO_RECONNECT;
+import static org.apache.geode.test.dunit.VM.getHostName;
 import static org.junit.Assert.assertEquals;
 
 import java.io.File;
@@ -164,7 +165,7 @@ public class DistributedTestUtils {
    * Returns a {@link ConfigurationProperties#LOCATORS} string for the standard dunit locator.
    */
   public static String getLocators() {
-    return Host.getHost(0).getHostName() + "[" + getLocatorPort() + "]";
+    return getHostName() + "[" + getLocatorPort() + "]";
   }
 
   public static void unregisterAllDataSerializersFromAllVms() {
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/CleanupDUnitVMsRule.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/CleanupDUnitVMsRule.java
index 73ccad7..145f5b8 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/CleanupDUnitVMsRule.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/CleanupDUnitVMsRule.java
@@ -15,20 +15,21 @@
 package org.apache.geode.test.dunit.rules;
 
 import static org.apache.geode.test.dunit.Host.getHostCount;
+import static org.apache.geode.test.dunit.VM.getAllVMs;
 
 import org.apache.geode.test.dunit.VM;
 
-public class CleanupDUnitVMsRule extends ExternalResource implements Serializable {
+public class CleanupDUnitVMsRule extends AbstractDistributedTestRule {
 
   @Override
   public void before() {
     if (getHostCount() > 0) {
-      getHost(0).getAllVMs().forEach(VM::bounce);
+      getAllVMs().forEach(VM::bounce);
     }
   }
 
   @Override
   public void after() {
-    getHost(0).getAllVMs().forEach(VM::bounce);
+    getAllVMs().forEach(VM::bounce);
   }
 }
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/DistributedExternalResource.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/DistributedExternalResource.java
index 529643a..0a47a3c 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/DistributedExternalResource.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/DistributedExternalResource.java
@@ -34,6 +34,6 @@ public abstract class DistributedExternalResource extends SerializableExternalRe
   }
 
   protected RemoteInvoker invoker() {
-    return this.invoker;
+    return invoker;
   }
 }

-- 
To stop receiving notification emails like this one, please contact
klund@apache.org.