You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2015/06/04 12:40:46 UTC
svn commit: r1683512 - in /webservices/wss4j/trunk:
ws-security-dom/src/test/java/org/apache/wss4j/dom/message/
ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/
ws-security-stax/src/test/java/org/apache/wss4j/stax/test/
ws-security-stax/src/tes...
Author: coheigea
Date: Thu Jun 4 10:40:45 2015
New Revision: 1683512
URL: http://svn.apache.org/r1683512
Log:
Changing some test assertions
Modified:
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlAuthnTest.java
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java?rev=1683512&r1=1683511&r2=1683512&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java Thu Jun 4 10:40:45 2015
@@ -648,7 +648,7 @@ public class EncryptionTest extends org.
LOG.debug("Encrypted message, RSA-OAEP keytransport, 3DES:");
LOG.debug(outputString);
}
- assertTrue(!outputString.contains("counter_port_type") ? true : false);
+ assertFalse(outputString.contains("counter_port_type"));
WSSecurityEngine newEngine = new WSSecurityEngine();
WSHandlerResult results =
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java?rev=1683512&r1=1683511&r2=1683512&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAuthnTest.java Thu Jun 4 10:40:45 2015
@@ -182,7 +182,7 @@ public class SamlAuthnTest extends org.j
fail("Failure expected in processing the SAML assertion");
}
} catch (WSSecurityException ex) {
- assertTrue(!success);
+ assertFalse(success);
assertTrue(ex.getMessage().contains("SAML token security failure"));
}
}
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java?rev=1683512&r1=1683511&r2=1683512&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java Thu Jun 4 10:40:45 2015
@@ -707,7 +707,7 @@ public class SamlConditionsTest extends
fail("Failure expected in processing the SAML assertion");
}
} catch (WSSecurityException ex) {
- assertTrue(!success);
+ assertFalse(success);
assertTrue(ex.getMessage().contains("SAML token security failure"));
}
}
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java?rev=1683512&r1=1683511&r2=1683512&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java Thu Jun 4 10:40:45 2015
@@ -1187,7 +1187,7 @@ public class SamlTokenTest extends org.j
}
return results;
} catch (WSSecurityException ex) {
- assertTrue(!success);
+ assertFalse(success);
assertTrue(ex.getMessage().contains("SAML token security failure"));
return null;
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java?rev=1683512&r1=1683511&r2=1683512&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java Thu Jun 4 10:40:45 2015
@@ -80,7 +80,7 @@ public class TimestampTest extends Abstr
Assert.assertTrue(gregorianCalendarCreated.before(gregorianCalendarExpires));
GregorianCalendar now = new GregorianCalendar();
- Assert.assertTrue(!now.before(gregorianCalendarCreated));
+ Assert.assertFalse(now.before(gregorianCalendarCreated));
Assert.assertTrue(now.before(gregorianCalendarExpires));
gregorianCalendarCreated.add(Calendar.SECOND, 301);
@@ -157,7 +157,7 @@ public class TimestampTest extends Abstr
Assert.assertTrue(gregorianCalendarCreated.before(gregorianCalendarExpires));
GregorianCalendar now = new GregorianCalendar();
- Assert.assertTrue(!now.before(gregorianCalendarCreated));
+ Assert.assertFalse(now.before(gregorianCalendarCreated));
Assert.assertTrue(now.before(gregorianCalendarExpires));
gregorianCalendarCreated.add(Calendar.SECOND, 3601);
@@ -680,7 +680,7 @@ public class TimestampTest extends Abstr
Assert.assertTrue(gregorianCalendarCreated.before(gregorianCalendarExpires));
GregorianCalendar now = new GregorianCalendar();
- Assert.assertTrue(!now.before(gregorianCalendarCreated));
+ Assert.assertFalse(now.before(gregorianCalendarCreated));
Assert.assertTrue(now.before(gregorianCalendarExpires));
gregorianCalendarCreated.add(Calendar.SECOND, 301);
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlAuthnTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlAuthnTest.java?rev=1683512&r1=1683511&r2=1683512&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlAuthnTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlAuthnTest.java Thu Jun 4 10:40:45 2015
@@ -198,7 +198,7 @@ public class SamlAuthnTest extends Abstr
}
Assert.assertNotNull(document);
} catch (XMLStreamException e) {
- Assert.assertTrue(!success);
+ Assert.assertFalse(success);
Assert.assertNotNull(e.getCause());
}
}