cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r608578 - in /incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws: policy/RMPolicyWsdlTest.java rm/ClientPersistenceTest.java rm/SequenceTest.java rm/ServerPersistenceTest.java
Date Thu, 03 Jan 2008 17:55:45 GMT
Author: dkulp
Date: Thu Jan  3 09:55:44 2008
New Revision: 608578

URL: http://svn.apache.org/viewvc?rev=608578&view=rev
Log:
Fix test failures on 2.0.4

Modified:
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java

Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java?rev=608578&r1=608577&r2=608578&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyWsdlTest.java
Thu Jan  3 09:55:44 2008
@@ -39,7 +39,6 @@
 import org.apache.cxf.systest.ws.util.OutMessageRecorder;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-import org.apache.cxf.ws.addressing.Names;
 import org.apache.cxf.ws.policy.PolicyConstants;
 import org.apache.cxf.ws.rm.RMConstants;
 
@@ -54,12 +53,17 @@
 public class RMPolicyWsdlTest extends AbstractBusClientServerTestBase {
 
     private static final Logger LOG = LogUtils.getLogger(RMPolicyWsdlTest.class);
-    private static final String GREETMEONEWAY_ACTION = null;
-    private static final String GREETME_ACTION = null;
-    private static final String GREETME_RESPONSE_ACTION = null;
-    private static final String PINGME_ACTION = null;
-    private static final String PINGME_RESPONSE_ACTION = 
-        Names.WSA_DEFAULT_FAULT_ACTION;
+    private static final String GREETMEONEWAY_ACTION 
+        = "http://cxf.apache.org/greeter_control/Greeter/greetMeOneWayRequest";
+    private static final String GREETME_ACTION 
+        = "http://cxf.apache.org/greeter_control/Greeter/greetMeRequest";
+    private static final String GREETME_RESPONSE_ACTION 
+        = "http://cxf.apache.org/greeter_control/Greeter/greetMeResponse";
+    private static final String PINGME_ACTION = "http://cxf.apache.org/greeter_control/Greeter/pingMeRequest";
+    private static final String PINGME_RESPONSE_ACTION 
+        = "http://cxf.apache.org/greeter_control/Greeter/pingMeResponse";
+    private static final String GREETER_FAULT_ACTION
+        = "http://cxf.apache.org/greeter_control/Greeter/Fault/faultDetail";
 
 
     public static class Server extends AbstractBusTestServerBase {
@@ -166,8 +170,8 @@
         expectedActions = new String[] {
             RMConstants.getCreateSequenceResponseAction(),
             GREETME_RESPONSE_ACTION,
-            GREETME_RESPONSE_ACTION,
-            PINGME_RESPONSE_ACTION
+            PINGME_RESPONSE_ACTION,
+            GREETER_FAULT_ACTION
         };
         mf.verifyActions(expectedActions, false);
         mf.verifyMessageNumbers(new String[] {null, "1", "2", "3"}, false);

Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java?rev=608578&r1=608577&r2=608578&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java
Thu Jan  3 09:55:44 2008
@@ -60,8 +60,10 @@
  */
 public class ClientPersistenceTest extends AbstractBusClientServerTestBase {
 
-    public static final String GREETMEONEWAY_ACTION = null;
-    public static final String GREETME_ACTION = null;
+    public static final String GREETMEONEWAY_ACTION 
+        = "http://cxf.apache.org/greeter_control/Greeter/greetMeOneWayRequest";
+    public static final String GREETME_ACTION
+        = "http://cxf.apache.org/greeter_control/Greeter/greetMeRequest";
     private static final Logger LOG = LogUtils.getLogger(ClientPersistenceTest.class);
     
     private Greeter greeter;

Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java?rev=608578&r1=608577&r2=608578&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
Thu Jan  3 09:55:44 2008
@@ -74,16 +74,12 @@
 public class SequenceTest extends AbstractBusClientServerTestBase {
 
     private static final Logger LOG = LogUtils.getLogger(SequenceTest.class);
-    // private static final String APP_NAMESPACE ="http://celtix.objectweb.org/greeter_control";
-    // private static final String GREETMEONEWAY_ACTION = APP_NAMESPACE +
-    //     "/types/Greeter/greetMeOneWay";
-    // private static final String GREETME_ACTION = APP_NAMESPACE +
-    //     "/types/Greeter/greetMe";
-    // private static final String GREETME_RESPONSE_ACTION = GREETME_ACTION +
-    //     "Response";
-    private static final String GREETMEONEWAY_ACTION = null;
-    private static final String GREETME_ACTION = null;
-    private static final String GREETME_RESPONSE_ACTION = null;
+    private static final String GREETMEONEWAY_ACTION 
+        = "http://cxf.apache.org/greeter_control/Greeter/greetMeOneWayRequest";
+    private static final String GREETME_ACTION
+        = "http://cxf.apache.org/greeter_control/Greeter/greetMeRequest";
+    private static final String GREETME_RESPONSE_ACTION
+        = "http://cxf.apache.org/greeter_control/Greeter/greetMeResponse";
 
     private static int decoupledEndpointPort = 10000;
     private static String decoupledEndpoint;
@@ -706,7 +702,8 @@
         
         mf.verifyMessages(3, false);
         expectedActions = new String[] {RMConstants.getCreateSequenceResponseAction(),
-                                        null, null};
+                                        GREETME_RESPONSE_ACTION, 
+                                        null};
         mf.verifyActions(expectedActions, false);
         mf.verifyMessageNumbers(new String[] {null, "1", null}, false);
         mf.verifyAcknowledgements(new boolean[3] , false);
@@ -804,7 +801,8 @@
         
         mf.verifyMessages(3, false);
         expectedActions = new String[] {RMConstants.getCreateSequenceResponseAction(),
-                                        null, null};
+                                        GREETME_RESPONSE_ACTION,
+                                        null};
         mf.verifyActions(expectedActions, false);
         mf.verifyMessageNumbers(new String[] {null, "1", null}, false);
         mf.verifyAcknowledgements(new boolean[] {false, true, false} , false);

Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java?rev=608578&r1=608577&r2=608578&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java
Thu Jan  3 09:55:44 2008
@@ -55,8 +55,13 @@
  */
 public class ServerPersistenceTest extends AbstractBusClientServerTestBase {
 
-    public static final String GREETMEONEWAY_ACTION = null;
-    public static final String GREETME_ACTION = null;
+    public static final String GREETMEONEWAY_ACTION 
+        = "http://cxf.apache.org/greeter_control/Greeter/greetMeOneWayRequest";
+    public static final String GREETME_ACTION
+        = "http://cxf.apache.org/greeter_control/Greeter/greetMeRequest";
+    private static final String GREETME_RESPONSE_ACTION
+        = "http://cxf.apache.org/greeter_control/Greeter/greetMeResponse";
+
     private static final Logger LOG = LogUtils.getLogger(ServerPersistenceTest.class);
     private static final String CFG = "/org/apache/cxf/systest/ws/rm/persistent.xml";
     private static final String SERVER_LOSS_CFG 
@@ -177,8 +182,8 @@
         mf.verifyPartialResponses(4);
         mf.purgePartialResponses();
         expectedActions = new String[] {RMConstants.getCreateSequenceResponseAction(),
-                                        GREETME_ACTION,
-                                        GREETME_ACTION};
+                                        GREETME_RESPONSE_ACTION,
+                                        GREETME_RESPONSE_ACTION};
         mf.verifyActions(expectedActions, false);
         // mf.verifyMessageNumbers(new String[] {null, "1", "3"}, false);
         // mf.verifyAcknowledgements(new boolean[] {false, true, true}, false);    
@@ -214,7 +219,7 @@
             assertTrue(nIn >= 1);
             String[] expectedActions = new String[nIn];
             for (int i = 0; i < nIn; i++) {
-                expectedActions[i] = GREETME_ACTION;
+                expectedActions[i] = GREETME_RESPONSE_ACTION;
             }
             mf.verifyActions(expectedActions, false);
         }



Mime
View raw message