You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2015/01/27 19:20:09 UTC
[1/3] cxf git commit: Fixing failing test
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes 55b805b3a -> c5dee8613
Fixing failing test
Conflicts:
systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6ead829d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6ead829d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6ead829d
Branch: refs/heads/2.7.x-fixes
Commit: 6ead829d12915101b5d63292f75c04b924563c46
Parents: 55b805b
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Jan 27 16:43:17 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Jan 27 18:16:52 2015 +0000
----------------------------------------------------------------------
.../cxf/systest/ws/fault/ModifiedRequestTest.java | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/6ead829d/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java
index a0c898c..9c1bd93 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java
@@ -215,6 +215,7 @@ public class ModifiedRequestTest extends AbstractBusClientServerTestBase {
fail("Expected failure on a modified request");
} catch (SOAPFaultException ex) {
SOAPFault fault = ex.getFault();
+<<<<<<< HEAD
assertEquals("soap:Sender", fault.getFaultCode());
assertEquals("The signature or decryption was invalid", fault.getFaultString());
Iterator<?> subcodeIterator = fault.getFaultSubcodes();
@@ -222,6 +223,23 @@ public class ModifiedRequestTest extends AbstractBusClientServerTestBase {
Object subcode = subcodeIterator.next();
assertEquals(WSConstants.FAILED_CHECK, subcode);
assertFalse(subcodeIterator.hasNext());
+=======
+ if (streaming) {
+ assertTrue("soap:Sender".equals(fault.getFaultCode())
+ || "soap:Receiver".equals(fault.getFaultCode()));
+ assertTrue(fault.getFaultString().contains(WSSecurityException.UNIFIED_SECURITY_ERR));
+ Iterator<?> subcodeIterator = fault.getFaultSubcodes();
+ assertFalse(subcodeIterator.hasNext());
+ } else {
+ assertTrue(fault.getFaultCode().endsWith("Sender"));
+ assertEquals(fault.getFaultString(), WSSecurityException.UNIFIED_SECURITY_ERR);
+ Iterator<?> subcodeIterator = fault.getFaultSubcodes();
+ assertTrue(subcodeIterator.hasNext());
+ Object subcode = subcodeIterator.next();
+ assertEquals(WSSecurityException.SECURITY_ERROR, subcode);
+ assertFalse(subcodeIterator.hasNext());
+ }
+>>>>>>> 32e2daf... Fixing failing test
}
}
[2/3] cxf git commit: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f59d8ca0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f59d8ca0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f59d8ca0
Branch: refs/heads/2.7.x-fixes
Commit: f59d8ca0a772988cf9d0c178c131bc4fe71e2a5d
Parents: 6ead829
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Jan 27 18:16:53 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Jan 27 18:16:53 2015 +0000
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/f59d8ca0/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index a949eb8..4cdea82 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1857,6 +1857,7 @@ M 31b6da012c6afa3a0729a8c00faf69b2c8aca492
M 31c005375e6f43978526a36e6dfb26169ebef9f7
M 324da3c497288723316797b9dee615f3200bacbd
M 32a194470bc6e123cbadc1ff7fdf2a4aaa4562ec
+M 32e2daf8352a60cec386dbb0bbcf90953e7b1f98
M 3378d284eb38373b80dd23d6f3d889af28763421
M 34b2d6c6d2a3a3e65494d6c7d8a3cf18700434ad
M 3544ff955cfdaea2ec3c842478b14e82cf15b209
[3/3] cxf git commit: Fixing merge
Posted by co...@apache.org.
Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c5dee861
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c5dee861
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c5dee861
Branch: refs/heads/2.7.x-fixes
Commit: c5dee8613451f8b1cb9a58f4bd755fd667b958e5
Parents: f59d8ca
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Jan 27 18:19:58 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Jan 27 18:19:58 2015 +0000
----------------------------------------------------------------------
.../systest/ws/fault/ModifiedRequestTest.java | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/c5dee861/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java
index 9c1bd93..bbcc4fe 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java
@@ -215,31 +215,13 @@ public class ModifiedRequestTest extends AbstractBusClientServerTestBase {
fail("Expected failure on a modified request");
} catch (SOAPFaultException ex) {
SOAPFault fault = ex.getFault();
-<<<<<<< HEAD
- assertEquals("soap:Sender", fault.getFaultCode());
+ assertTrue(fault.getFaultCode().endsWith("Sender"));
assertEquals("The signature or decryption was invalid", fault.getFaultString());
Iterator<?> subcodeIterator = fault.getFaultSubcodes();
assertTrue(subcodeIterator.hasNext());
Object subcode = subcodeIterator.next();
assertEquals(WSConstants.FAILED_CHECK, subcode);
assertFalse(subcodeIterator.hasNext());
-=======
- if (streaming) {
- assertTrue("soap:Sender".equals(fault.getFaultCode())
- || "soap:Receiver".equals(fault.getFaultCode()));
- assertTrue(fault.getFaultString().contains(WSSecurityException.UNIFIED_SECURITY_ERR));
- Iterator<?> subcodeIterator = fault.getFaultSubcodes();
- assertFalse(subcodeIterator.hasNext());
- } else {
- assertTrue(fault.getFaultCode().endsWith("Sender"));
- assertEquals(fault.getFaultString(), WSSecurityException.UNIFIED_SECURITY_ERR);
- Iterator<?> subcodeIterator = fault.getFaultSubcodes();
- assertTrue(subcodeIterator.hasNext());
- Object subcode = subcodeIterator.next();
- assertEquals(WSSecurityException.SECURITY_ERROR, subcode);
- assertFalse(subcodeIterator.hasNext());
- }
->>>>>>> 32e2daf... Fixing failing test
}
}