cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/3] cxf git commit: Fixing merge
Date Tue, 27 Jan 2015 18:20:11 GMT
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 <coheigea@apache.org>
Authored: Tue Jan 27 18:19:58 2015 +0000
Committer: Colm O hEigeartaigh <coheigea@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
         }
     }
     


Mime
View raw message