Repository: cxf
Updated Branches:
refs/heads/master 126775733 -> a4c85510a
Reorder some of hte calls to get the createSequence stuff occuring immediately
to fix the tests
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a4c85510
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a4c85510
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a4c85510
Branch: refs/heads/master
Commit: a4c85510a14854349d877510d3688c47457e6b3b
Parents: 1267757
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri May 2 14:14:55 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri May 2 14:14:55 2014 -0400
----------------------------------------------------------------------
.../cxf/systest/ws/policy/RM10PolicyWsdlTest.java | 11 ++++++-----
.../cxf/systest/ws/policy/RM12PolicyWsdlTest.java | 13 +++++++------
.../org/apache/cxf/systest/ws/policy/RMPolicyTest.java | 13 +++++++------
3 files changed, 20 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/a4c85510/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM10PolicyWsdlTest.java
----------------------------------------------------------------------
diff --git
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM10PolicyWsdlTest.java
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM10PolicyWsdlTest.java
index 3bb79e8..b19536f 100644
---
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM10PolicyWsdlTest.java
+++
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM10PolicyWsdlTest.java
@@ -82,13 +82,14 @@ public class RM10PolicyWsdlTest extends
RMPolicyWsdlTestBase {
ConnectionHelper.setKeepAliveConnection(greeter, true);
- // oneway
-
- greeter.greetMeOneWay("CXF");
// two-way
assertEquals("CXF", greeter.greetMe("cxf"));
+
+ // oneway
+
+ greeter.greetMeOneWay("CXF");
// exception
@@ -118,14 +119,14 @@ public class RM10PolicyWsdlTest extends
RMPolicyWsdlTestBase {
mf.verifyMessages(5, true);
String[] expectedActions = new String[]
{RM10Constants.INSTANCE.getCreateSequenceAction(),
- GREETMEONEWAY_ACTION,
GREETME_ACTION,
+ GREETMEONEWAY_ACTION,
PINGME_ACTION,
PINGME_ACTION};
mf.verifyActions(expectedActions, true);
mf.verifyMessageNumbers(new String[] {null, "1", "2", "3", "4"},
true);
mf.verifyLastMessage(new boolean[] {false, false, false, false,
false}, true);
- mf.verifyAcknowledgements(new boolean[] {false, false, false, true,
true}, true);
+ mf.verifyAcknowledgements(new boolean[] {false, false, true, false,
true}, true);
mf.verifyMessages(4, false);
// mf.verifyMessages(9, false);
http://git-wip-us.apache.org/repos/asf/cxf/blob/a4c85510/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM12PolicyWsdlTest.java
----------------------------------------------------------------------
diff --git
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM12PolicyWsdlTest.java
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM12PolicyWsdlTest.java
index e31d86f..e1b9191 100644
---
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM12PolicyWsdlTest.java
+++
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM12PolicyWsdlTest.java
@@ -81,14 +81,15 @@ public class RM12PolicyWsdlTest extends
RMPolicyWsdlTestBase {
ConnectionHelper.setKeepAliveConnection(greeter, true);
LOG.fine("Created greeter client.");
- // oneway
-
- greeter.greetMeOneWay("CXF");
// two-way
assertEquals("CXF", greeter.greetMe("cxf"));
-
+
+ // oneway
+
+ greeter.greetMeOneWay("CXF");
+
// exception
try {
@@ -117,14 +118,14 @@ public class RM12PolicyWsdlTest extends
RMPolicyWsdlTestBase {
mf.verifyMessages(5, true);
String[] expectedActions = new String[]
{RM11Constants.INSTANCE.getCreateSequenceAction(),
- GREETMEONEWAY_ACTION,
GREETME_ACTION,
+ GREETMEONEWAY_ACTION,
PINGME_ACTION,
PINGME_ACTION};
mf.verifyActions(expectedActions, true);
mf.verifyMessageNumbers(new String[] {null, "1", "2", "3", "4"},
true);
mf.verifyLastMessage(new boolean[] {false, false, false, false,
false}, true);
- mf.verifyAcknowledgements(new boolean[] {false, false, false, true,
true}, true);
+ mf.verifyAcknowledgements(new boolean[] {false, false, true, false,
true}, true);
mf.verifyMessages(4, false);
// mf.verifyMessages(9, false);
http://git-wip-us.apache.org/repos/asf/cxf/blob/a4c85510/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyTest.java
----------------------------------------------------------------------
diff --git
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyTest.java
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyTest.java
index 4507d96..0f18399 100644
---
a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyTest.java
+++
b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyTest.java
@@ -145,14 +145,15 @@ public class RMPolicyTest extends
AbstractBusClientServerTestBase {
LOG.fine("Created greeter client.");
ConnectionHelper.setKeepAliveConnection(greeter, true);
- // oneway
-
- greeter.greetMeOneWay("CXF");
// two-way
assertEquals("CXF", greeter.greetMe("cxf"));
-
+
+ // oneway
+
+ greeter.greetMeOneWay("CXF");
+
// exception
try {
@@ -178,14 +179,14 @@ public class RMPolicyTest extends
AbstractBusClientServerTestBase {
mf.verifyMessages(5, true);
String[] expectedActions = new String[]
{RM10Constants.INSTANCE.getCreateSequenceAction(),
- GREETMEONEWAY_ACTION,
GREETME_ACTION,
+ GREETMEONEWAY_ACTION,
PINGME_ACTION,
PINGME_ACTION};
mf.verifyActions(expectedActions, true);
mf.verifyMessageNumbers(new String[] {null, "1", "2", "3", "4"},
true);
mf.verifyLastMessage(new boolean[] {false, false, false, false,
false}, true);
- mf.verifyAcknowledgements(new boolean[] {false, false, false, true,
true}, true);
+ mf.verifyAcknowledgements(new boolean[] {false, false, true, false,
true}, true);
mf.verifyMessages(4, false);
// mf.verifyMessages(9, false);