[geode] 05/15: GEODE-4876: Update RegionExpirationDistributedTest use of VM and NetworkUtil

[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 841dde9bada8467a5885777da4623dad25a75822
Author: Kirk Lund <kl...@apache.org>
AuthorDate: Mon Mar 26 17:30:02 2018 -0700

    GEODE-4876: Update RegionExpirationDistributedTest use of VM and NetworkUtil
    
    * rename RegionExpirationDUnitTest as RegionExpirationDistributedTest
---
 ...tionDUnitTest.java => RegionExpirationDistributedTest.java} | 10 +++++-----
 .../apache/geode/cache/RegionExpirationIntegrationTest.java    |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/geode-core/src/test/java/org/apache/geode/cache/RegionExpirationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/RegionExpirationDistributedTest.java
similarity index 96%
rename from geode-core/src/test/java/org/apache/geode/cache/RegionExpirationDUnitTest.java
rename to geode-core/src/test/java/org/apache/geode/cache/RegionExpirationDistributedTest.java
index 63dc650..be7f6eb 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/RegionExpirationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/RegionExpirationDistributedTest.java
@@ -16,7 +16,7 @@ package org.apache.geode.cache;
 
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static org.apache.geode.cache.RegionShortcut.REPLICATE;
-import static org.apache.geode.test.dunit.Host.getHost;
+import static org.apache.geode.test.dunit.VM.getVM;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.spy;
@@ -56,7 +56,7 @@ import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
 @Category(DistributedTest.class)
 @RunWith(JUnitParamsRunner.class)
 @SuppressWarnings("serial")
-public class RegionExpirationDUnitTest implements Serializable {
+public class RegionExpirationDistributedTest implements Serializable {
 
   private static final int TTL_SECONDS = 10;
   private static final String KEY = "key";
@@ -81,8 +81,8 @@ public class RegionExpirationDUnitTest implements Serializable {
   public void setUp() {
     regionName = getClass().getSimpleName() + "_" + testName.getMethodName();
 
-    withExpirationVM0 = getHost(0).getVM(0);
-    withoutExpirationVM1 = getHost(0).getVM(1);
+    withExpirationVM0 = getVM(0);
+    withoutExpirationVM1 = getVM(1);
   }
 
   @Test
@@ -151,7 +151,7 @@ public class RegionExpirationDUnitTest implements Serializable {
     Verification(final Consumer<CacheListener<String, String>> strategy,
         final ExpirationAction evictionAction) {
       this.strategy = strategy;
-      this.expirationAction = evictionAction;
+      expirationAction = evictionAction;
     }
 
     void verify(final CacheListener<String, String> spyCacheListener) {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/RegionExpirationIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/cache/RegionExpirationIntegrationTest.java
index 89c2114..a718b51 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/RegionExpirationIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/RegionExpirationIntegrationTest.java
@@ -41,7 +41,7 @@ import org.mockito.InOrder;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 
 /**
- * Extracted from {@link RegionExpirationDUnitTest}.
+ * Extracted from {@link RegionExpirationDistributedTest}.
  */
 @Category(IntegrationTest.class)
 public class RegionExpirationIntegrationTest {

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