svn commit: r1346444 - in /cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm: AbstractServerPersistenceTest.java CachedOutServerPersistenceTest.java ServerPersistenceTest.java

[dkulp]

Author: dkulp
Date: Tue Jun  5 15:53:50 2012
New Revision: 1346444

URL: http://svn.apache.org/viewvc?rev=1346444&view=rev
Log:
More ws-rm systest cleanups

Modified:
    
cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractServerPersistenceTest.java
    
cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutServerPersistenceTest.java
    
cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java

Modified: 
cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractServerPersistenceTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractServerPersistenceTest.java?rev=1346444&r1=1346443&r2=1346444&view=diff
==============================================================================
--- 
cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractServerPersistenceTest.java
 (original)
+++ 
cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractServerPersistenceTest.java
 Tue Jun  5 15:53:50 2012
@@ -56,7 +56,6 @@ import org.junit.Test;
  * exchange of WS-RM protocol messages.
  */
 public abstract class AbstractServerPersistenceTest extends 
AbstractBusClientServerTestBase {
-    public static final String DECOUPLE_PORT = 
allocatePort(AbstractServerPersistenceTest.class);
 
     public static final String GREETMEONEWAY_ACTION 
         = "http://cxf.apache.org/greeter_control/Greeter/greetMeOneWayRequest";;
@@ -109,6 +108,7 @@ public abstract class AbstractServerPers
     }    
     
     public abstract String getPort();
+    public abstract String getDecoupledPort();
     public abstract String getPrefix();
     
     public static void startServers(String port, String pfx) throws Exception {
@@ -152,7 +152,7 @@ public abstract class AbstractServerPers
         Client c = ClientProxy.getClient(greeter);
         HTTPConduit hc = (HTTPConduit)(c.getConduit());
         HTTPClientPolicy cp = hc.getClient();
-        cp.setDecoupledEndpoint("http://localhost:"; + DECOUPLE_PORT + 
"/decoupled_endpoint");
+        cp.setDecoupledEndpoint("http://localhost:"; + getDecoupledPort() + 
"/decoupled_endpoint");
 
         out = new OutMessageRecorder();
         in = new InMessageRecorder();

Modified: 
cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutServerPersistenceTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutServerPersistenceTest.java?rev=1346444&r1=1346443&r2=1346444&view=diff
==============================================================================
--- 
cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutServerPersistenceTest.java
 (original)
+++ 
cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutServerPersistenceTest.java
 Tue Jun  5 15:53:50 2012
@@ -30,7 +30,8 @@ import org.junit.Test;
  * A simulated-large message version of ServerPersistenceTest.
  */
 public class CachedOutServerPersistenceTest extends 
AbstractServerPersistenceTest {
-    public static final String PORT = 
allocatePort(CachedOutServerPersistenceTest.PORT);
+    public static final String PORT = 
allocatePort(CachedOutServerPersistenceTest.class);
+    public static final String DECOUPLED_PORT = 
allocatePort(CachedOutServerPersistenceTest.class, 1);
    
     @BeforeClass
     public static void setProperties() throws Exception {
@@ -58,4 +59,9 @@ public class CachedOutServerPersistenceT
         return "cospt";
     }
 
+    @Override
+    public String getDecoupledPort() {
+        return DECOUPLED_PORT;
+    }
+
 }

Modified: 
cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java?rev=1346444&r1=1346443&r2=1346444&view=diff
==============================================================================
--- 
cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java
 (original)
+++ 
cxf/trunk/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java
 Tue Jun  5 15:53:50 2012
@@ -30,7 +30,8 @@ import org.junit.BeforeClass;
  * exchange of WS-RM protocol messages.
  */
 public class ServerPersistenceTest extends AbstractServerPersistenceTest {
-    public static final String PORT = allocatePort(ServerPersistenceTest.PORT);
+    public static final String PORT = 
allocatePort(ServerPersistenceTest.class);
+    public static final String DECOUPLED_PORT = 
allocatePort(ServerPersistenceTest.class, 1);
     
     public String getPort() {
         return PORT;
@@ -49,5 +50,9 @@ public class ServerPersistenceTest exten
     public String getPrefix() {
         return "spt";
     }
+    @Override
+    public String getDecoupledPort() {
+        return DECOUPLED_PORT;
+    }
 
 }