You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2018/03/29 20:22:09 UTC

[geode] 13/15: GEODE-4876: Update DistributedDisconnectRuleDistributedTest use of VM and NetworkUtil

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 5271b6b970e2239a4e46e3bc43fb41250c7b39e4
Author: Kirk Lund <kl...@apache.org>
AuthorDate: Mon Mar 26 17:38:45 2018 -0700

    GEODE-4876: Update DistributedDisconnectRuleDistributedTest use of VM and NetworkUtil
    
    * rename DistributedDisconnectRuleTest as DistributedDisconnectRuleDistributedTest
---
 ...ava => DistributedDisconnectRuleDistributedTest.java} | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/DistributedDisconnectRuleTest.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/DistributedDisconnectRuleDistributedTest.java
similarity index 94%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/DistributedDisconnectRuleTest.java
rename to geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/DistributedDisconnectRuleDistributedTest.java
index 9363be2..01bbcee 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/DistributedDisconnectRuleTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/DistributedDisconnectRuleDistributedTest.java
@@ -14,6 +14,7 @@
  */
 package org.apache.geode.test.dunit.rules.tests;
 
+import static org.apache.geode.test.dunit.VM.getAllVMs;
 import static org.apache.geode.test.dunit.rules.DistributedDisconnectRule.disconnect;
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -28,7 +29,6 @@ import org.junit.runners.MethodSorters;
 
 import org.apache.geode.cache.CacheFactory;
 import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.test.dunit.Host;
 import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.rules.DistributedDisconnectRule;
 import org.apache.geode.test.dunit.rules.DistributedTestRule;
@@ -36,19 +36,19 @@ import org.apache.geode.test.junit.categories.DistributedTest;
 import org.apache.geode.test.junit.runners.TestRunner;
 
 @Category(DistributedTest.class)
-public class DistributedDisconnectRuleTest {
+public class DistributedDisconnectRuleDistributedTest {
+
+  private static InternalCache cache;
 
   @ClassRule
   public static DistributedTestRule distributedTestRule = new DistributedTestRule();
 
-  static InternalCache cache;
-
   @After
   public void tearDown() throws Exception {
     disconnect();
     cache = null;
 
-    for (VM vm : Host.getHost(0).getAllVMs()) {
+    for (VM vm : getAllVMs()) {
       vm.invoke(() -> {
         disconnect();
         cache = null;
@@ -93,7 +93,7 @@ public class DistributedDisconnectRuleTest {
   static void createCacheInEveryVM() throws Exception {
     cache = (InternalCache) new CacheFactory().create();
 
-    for (VM vm : Host.getHost(0).getAllVMs()) {
+    for (VM vm : getAllVMs()) {
       vm.invoke(() -> {
         cache = (InternalCache) new CacheFactory().create();
       });
@@ -104,7 +104,7 @@ public class DistributedDisconnectRuleTest {
     assertThat(cache.isClosed()).isFalse();
     assertThat(cache.getInternalDistributedSystem().isConnected()).isTrue();
 
-    for (VM vm : Host.getHost(0).getAllVMs()) {
+    for (VM vm : getAllVMs()) {
       vm.invoke(() -> {
         assertThat(cache.isClosed()).isFalse();
         assertThat(cache.getInternalDistributedSystem().isConnected()).isTrue();
@@ -116,7 +116,7 @@ public class DistributedDisconnectRuleTest {
     assertThat(cache.getInternalDistributedSystem().isConnected()).isFalse();
     assertThat(cache.isClosed()).isTrue();
 
-    for (VM vm : Host.getHost(0).getAllVMs()) {
+    for (VM vm : getAllVMs()) {
       vm.invoke(() -> {
         assertThat(cache.getInternalDistributedSystem().isConnected()).isFalse();
         assertThat(cache.isClosed()).isTrue();

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