commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t.@apache.org
Subject svn commit: r1728856 - in /commons/proper/jcs/trunk/commons-jcs-core/src/test: java/org/apache/commons/jcs/auxiliary/remote/server/BasicRemoteCacheClientServerUnitTest.java test-conf/TestRemoteCacheClientServer.ccf
Date Sat, 06 Feb 2016 17:36:54 GMT
Author: tv
Date: Sat Feb  6 17:36:54 2016
New Revision: 1728856

URL: http://svn.apache.org/viewvc?rev=1728856&view=rev
Log:
Attempt (again) to fix Continuum test failure. Thanks to Mat Jaggard for the patch.

Modified:
    commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/server/BasicRemoteCacheClientServerUnitTest.java
    commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestRemoteCacheClientServer.ccf

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/server/BasicRemoteCacheClientServerUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/server/BasicRemoteCacheClientServerUnitTest.java?rev=1728856&r1=1728855&r2=1728856&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/server/BasicRemoteCacheClientServerUnitTest.java
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/server/BasicRemoteCacheClientServerUnitTest.java
Sat Feb  6 17:36:54 2016
@@ -46,14 +46,16 @@ import org.junit.runners.MethodSorters;
 
 /**
  * These tests startup the remote server and make requests to it.
- * <p/>
+ * <p>
  *
  * @author Aaron Smuts
  */
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class BasicRemoteCacheClientServerUnitTest extends Assert
 {
-    /**
+    private static final int LOCAL_PORT = 12020;
+
+   /**
      * Server instance to use in the tests.
      */
     private static RemoteCacheServer<String, String> server = null;
@@ -124,12 +126,12 @@ public class BasicRemoteCacheClientServe
      * Verify that we can start the remote cache server. Send an item to the remote. Verify
that the
      * remote put count goes up. If we go through JCS, the manager will be shared and we
will get
      * into an endless loop. We will use a mock cache manager instead.
-     * <p/>
+     * <p>
      * The remote server uses the real JCS. We can verify that items are added to JCS behind
the
      * server by calling get. We cannot access it directly via JCS since it is serialized.
-     * <p/>
+     * <p>
      * This test uses a mock injected client to test a normal server.
-     * <p/>
+     * <p>
      *
      * @throws Exception
      */
@@ -142,7 +144,7 @@ public class BasicRemoteCacheClientServe
 
         RemoteCacheAttributes attributes = new RemoteCacheAttributes();
         attributes.setRemoteLocation("localhost", remotePort);
-        attributes.setLocalPort(1202);
+        attributes.setLocalPort(LOCAL_PORT);
 
         RemoteCacheManager remoteCacheManager = RemoteCacheFactory.getManager(attributes,
compositeCacheManager, new MockCacheEventLogger(), new MockElementSerializer());
         String regionName = "testSinglePut";
@@ -176,7 +178,7 @@ public class BasicRemoteCacheClientServe
 
     /**
      * Verify that we can remove an item via the remote server.
-     * <p/>
+     * <p>
      *
      * @throws Exception
      */
@@ -189,7 +191,7 @@ public class BasicRemoteCacheClientServe
 
         RemoteCacheAttributes attributes = new RemoteCacheAttributes();
         attributes.setRemoteLocation("localhost", remotePort);
-        attributes.setLocalPort(1202);
+        attributes.setLocalPort(LOCAL_PORT);
 
         MockCacheEventLogger cacheEventLogger = new MockCacheEventLogger();
 
@@ -245,7 +247,7 @@ public class BasicRemoteCacheClientServe
 
         RemoteCacheAttributes attributes = new RemoteCacheAttributes();
         attributes.setRemoteLocation("localhost", remotePort);
-        attributes.setLocalPort(1202);
+        attributes.setLocalPort(LOCAL_PORT);
 
         RemoteCacheManager remoteCacheManager = RemoteCacheFactory.getManager(attributes,
compositeCacheManager, new MockCacheEventLogger(), new MockElementSerializer());
         String regionName = "testPutAndListen";
@@ -294,7 +296,7 @@ public class BasicRemoteCacheClientServe
 
         RemoteCacheAttributes attributes = new RemoteCacheAttributes();
         attributes.setRemoteLocation("localhost", remotePort);
-        attributes.setLocalPort(1202);
+        attributes.setLocalPort(LOCAL_PORT);
 
         RemoteCacheManager remoteCacheManager = RemoteCacheFactory.getManager(attributes,
compositeCacheManager, new MockCacheEventLogger(), new MockElementSerializer());
         String regionName = "testPutaMultipleAndListen";

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestRemoteCacheClientServer.ccf
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestRemoteCacheClientServer.ccf?rev=1728856&r1=1728855&r2=1728856&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestRemoteCacheClientServer.ccf
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestRemoteCacheClientServer.ccf
Sat Feb  6 17:36:54 2016
@@ -18,10 +18,10 @@
 # ################# REMOTE SERVER CONFIG  #####################
 # Registry used to register and provide the IRmiCacheService service.
 registry.host=localhost
-registry.port=1102
+registry.port=11020
 
 # client callback port.
-remote.cache.service.port=1301
+remote.cache.service.port=13010
 remote.cache.rmiSocketFactoryTimeoutMillis=12345
 
 # cluster setting



Mime
View raw message