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

upthewaterspout 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 666b2b7  GEODE-3441: Use random port in 
Tomcat8SessionsClientServerDUnitTest
666b2b7 is described below

commit 666b2b73ede8a3706ca6e8b459fa408ca0cd68a6
Author: Dan Smith <[email protected]>
AuthorDate: Mon Oct 2 14:19:06 2017 -0700

    GEODE-3441: Use random port in Tomcat8SessionsClientServerDUnitTest
    
    Changing this test to use a random port for the geode server.
---
 .../session/Tomcat8SessionsClientServerDUnitTest.java      | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git 
a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
 
b/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
index 21f0aaa..325dc8e 100644
--- 
a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
+++ 
b/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
@@ -23,6 +23,7 @@ import org.junit.experimental.categories.Category;
 
 import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.client.ClientCacheFactory;
 import org.apache.geode.cache.client.PoolFactory;
 import org.apache.geode.cache.client.PoolManager;
 import org.apache.geode.cache.server.CacheServer;
@@ -41,7 +42,7 @@ public class Tomcat8SessionsClientServerDUnitTest extends 
TestSessionsTomcat8Bas
   // Set up the session manager we need
   @Override
   public void postSetUp() throws Exception {
-    setupServer(new Tomcat8DeltaSessionManager());
+    setupServer();
   }
 
   @Override
@@ -53,7 +54,7 @@ public class Tomcat8SessionsClientServerDUnitTest extends 
TestSessionsTomcat8Bas
   }
 
   // Set up the servers we need
-  public void setupServer(DeltaSessionManager manager) throws Exception {
+  public void setupServer() throws Exception {
     Host host = Host.getHost(0);
     vm0 = host.getVM(1);
     String hostName = vm0.getHost().getHostName();
@@ -62,6 +63,7 @@ public class Tomcat8SessionsClientServerDUnitTest extends 
TestSessionsTomcat8Bas
       CacheFactory cf = new CacheFactory(props);
       Cache cache = cf.create();
       CacheServer server = cache.addCacheServer();
+      server.setPort(0);
       server.start();
       return server.getPort();
     });
@@ -69,6 +71,11 @@ public class Tomcat8SessionsClientServerDUnitTest extends 
TestSessionsTomcat8Bas
     port = AvailablePortHelper.getRandomAvailableTCPPort();
     server = new EmbeddedTomcat8("/test", port, "JVM-1");
 
+    ClientCacheFactory cacheFactory = new ClientCacheFactory();
+    cacheFactory.addPoolServer(hostName, cacheServerPort);
+    cacheFactory.create();
+    DeltaSessionManager manager = new Tomcat8DeltaSessionManager();
+
     ClientServerCacheLifecycleListener listener = new 
ClientServerCacheLifecycleListener();
     listener.setProperty(MCAST_PORT, "0");
     listener.setProperty(LOG_LEVEL, "config");
@@ -80,9 +87,6 @@ public class Tomcat8SessionsClientServerDUnitTest extends 
TestSessionsTomcat8Bas
     servlet = server.addServlet("/test/*", "default", 
CommandServlet.class.getName());
     server.startContainer();
 
-    PoolFactory pf = PoolManager.createFactory();
-    pf.addServer(hostName, cacheServerPort);
-    pf.create("Pool Connecting to Cache Server");
 
     /*
      * Can only retrieve the region once the container has started up (and the 
cache has started

-- 
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].

Reply via email to