You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by on...@apache.org on 2019/05/13 16:25:25 UTC

[geode] branch develop updated: GEODE-6764: Fix tests for Windows

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

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


The following commit(s) were added to refs/heads/develop by this push:
     new 9d3436b  GEODE-6764: Fix tests for Windows
     new d0b1241  Merge pull request #3582 from jdeppe-pivotal/feature/GEODE-6764
9d3436b is described below

commit 9d3436bf0a179c0173274f30cb242b294dd72285
Author: Jens Deppe <jd...@pivotal.io>
AuthorDate: Mon May 13 06:21:41 2019 -0700

    GEODE-6764: Fix tests for Windows
    
    Authored-by: Jens Deppe <jd...@pivotal.io>
---
 .../apache/geode/internal/cache/RegionListenerJUnitTest.java | 12 +++++++++++-
 .../geode/internal/cache/ServerBuilderIntegrationTest.java   |  2 ++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/RegionListenerJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/RegionListenerJUnitTest.java
index 698f017..3b2bacf 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/RegionListenerJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/RegionListenerJUnitTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.junit.After;
 import org.junit.Test;
 
 import org.apache.geode.cache.AttributesFactory;
@@ -31,6 +32,15 @@ import org.apache.geode.cache.RegionShortcut;
 
 public class RegionListenerJUnitTest {
 
+  private GemFireCacheImpl cache;
+
+  @After
+  public void after() {
+    if (cache != null) {
+      cache.close();
+    }
+  }
+
   @Test
   public void test() {
     final AtomicBoolean afterCreateInvoked = new AtomicBoolean();
@@ -56,7 +66,7 @@ public class RegionListenerJUnitTest {
       }
     };
 
-    GemFireCacheImpl cache = (GemFireCacheImpl) new CacheFactory().set(MCAST_PORT, "0").create();
+    cache = (GemFireCacheImpl) new CacheFactory().set(MCAST_PORT, "0").create();
     cache.addRegionListener(listener);
     Region region = cache.createRegionFactory(RegionShortcut.REPLICATE).create("region");
     assertEquals(DataPolicy.EMPTY, region.getAttributes().getDataPolicy());
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ServerBuilderIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ServerBuilderIntegrationTest.java
index c4eced5..deec2ff 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ServerBuilderIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/ServerBuilderIntegrationTest.java
@@ -66,6 +66,7 @@ public class ServerBuilderIntegrationTest {
   public void byDefaultCreatesServerWithCacheServerAcceptor() throws IOException {
     server = new ServerBuilder(cache, cache.getSecurityService())
         .createServer();
+    server.setPort(0);
 
     server.start();
 
@@ -80,6 +81,7 @@ public class ServerBuilderIntegrationTest {
     server = new ServerBuilder(cache, cache.getSecurityService())
         .forGatewayReceiver(gatewayReceiver)
         .createServer();
+    server.setPort(0);
 
     server.start();