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/12/19 12:23:38 UTC
svn commit: r1720898 - in
/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom:
components/crypto/ handler/ message/ message/token/ saml/
Author: coheigea
Date: Sat Dec 19 11:23:38 2015
New Revision: 1720898
URL: http://svn.apache.org/viewvc?rev=1720898&view=rev
Log:
Removing some whitespace
Modified:
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/ResultsOrderTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java?rev=1720898&r1=1720897&r2=1720898&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java Sat Dec 19 11:23:38 2015
@@ -99,7 +99,7 @@ public class CertificateStoreTest extend
WSSecurityEngineResult result = signatureResults.get(0);
X509Certificate cert =
(X509Certificate)result.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
- assertTrue (cert != null);
+ assertTrue(cert != null);
}
/**
@@ -137,7 +137,7 @@ public class CertificateStoreTest extend
WSSecurityEngineResult result = signatureResults.get(0);
X509Certificate cert =
(X509Certificate)result.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
- assertTrue (cert != null);
+ assertTrue(cert != null);
}
/**
@@ -171,7 +171,7 @@ public class CertificateStoreTest extend
WSSecurityEngineResult result = signatureResults.get(0);
X509Certificate cert =
(X509Certificate)result.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
- assertTrue (cert != null);
+ assertTrue(cert != null);
}
/**
@@ -205,7 +205,7 @@ public class CertificateStoreTest extend
X509Certificate cert =
(X509Certificate)result.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
- assertTrue (cert != null);
+ assertTrue(cert != null);
}
/**
@@ -239,7 +239,7 @@ public class CertificateStoreTest extend
WSSecurityEngineResult result = signatureResults.get(0);
X509Certificate cert =
(X509Certificate)result.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
- assertTrue (cert != null);
+ assertTrue(cert != null);
}
/**
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/ResultsOrderTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/ResultsOrderTest.java?rev=1720898&r1=1720897&r2=1720898&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/ResultsOrderTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/ResultsOrderTest.java Sat Dec 19 11:23:38 2015
@@ -62,8 +62,8 @@ public class ResultsOrderTest extends or
actions.add(WSConstants.TS);
actions.add(WSConstants.SIGN);
- assertTrue (handler.checkResults(results, actions));
- assertTrue (handler.checkResultsAnyOrder(results, actions));
+ assertTrue(handler.checkResults(results, actions));
+ assertTrue(handler.checkResultsAnyOrder(results, actions));
}
/**
@@ -92,9 +92,9 @@ public class ResultsOrderTest extends or
actions.add(WSConstants.TS);
actions.add(WSConstants.SIGN);
- assertFalse (handler.checkResults(results, actions));
- assertTrue (handler.checkResultsAnyOrder(results, actions));
- assertTrue (results.size() == 4 && actions.size() == 3);
+ assertFalse(handler.checkResults(results, actions));
+ assertTrue(handler.checkResultsAnyOrder(results, actions));
+ assertTrue(results.size() == 4 && actions.size() == 3);
}
/**
@@ -124,9 +124,9 @@ public class ResultsOrderTest extends or
actions.add(WSConstants.TS);
actions.add(WSConstants.SIGN);
- assertFalse (handler.checkResults(results, actions));
- assertTrue (handler.checkResultsAnyOrder(results, actions));
- assertFalse (actions.isEmpty());
+ assertFalse(handler.checkResults(results, actions));
+ assertTrue(handler.checkResultsAnyOrder(results, actions));
+ assertFalse(actions.isEmpty());
}
/**
@@ -156,8 +156,8 @@ public class ResultsOrderTest extends or
actions.add(WSConstants.UT);
actions.add(WSConstants.TS);
- assertFalse (handler.checkResults(results, actions));
- assertTrue (handler.checkResultsAnyOrder(results, actions));
+ assertFalse(handler.checkResults(results, actions));
+ assertTrue(handler.checkResultsAnyOrder(results, actions));
}
/**
@@ -184,8 +184,8 @@ public class ResultsOrderTest extends or
actions.add(WSConstants.UT);
actions.add(WSConstants.SIGN);
- assertFalse (handler.checkResults(results, actions));
- assertFalse (handler.checkResultsAnyOrder(results, actions));
+ assertFalse(handler.checkResults(results, actions));
+ assertFalse(handler.checkResultsAnyOrder(results, actions));
}
/**
@@ -214,8 +214,8 @@ public class ResultsOrderTest extends or
actions.add(WSConstants.TS);
actions.add(WSConstants.UT);
- assertFalse (handler.checkResults(results, actions));
- assertFalse (handler.checkResultsAnyOrder(results, actions));
+ assertFalse(handler.checkResults(results, actions));
+ assertFalse(handler.checkResultsAnyOrder(results, actions));
}
/**
@@ -231,8 +231,8 @@ public class ResultsOrderTest extends or
java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
actions.add(WSConstants.TS);
- assertFalse (handler.checkResults(results, actions));
- assertFalse (handler.checkResultsAnyOrder(results, actions));
+ assertFalse(handler.checkResults(results, actions));
+ assertFalse(handler.checkResultsAnyOrder(results, actions));
}
/**
@@ -250,8 +250,8 @@ public class ResultsOrderTest extends or
java.util.List<Integer> actions = new java.util.ArrayList<Integer>();
- assertFalse (handler.checkResults(results, actions));
- assertFalse (handler.checkResultsAnyOrder(results, actions));
+ assertFalse(handler.checkResults(results, actions));
+ assertFalse(handler.checkResultsAnyOrder(results, actions));
}
/**
@@ -278,8 +278,8 @@ public class ResultsOrderTest extends or
actions.add(WSConstants.UT);
actions.add(WSConstants.UT);
- assertFalse (handler.checkResults(results, actions));
- assertFalse (handler.checkResultsAnyOrder(results, actions));
+ assertFalse(handler.checkResults(results, actions));
+ assertFalse(handler.checkResultsAnyOrder(results, actions));
}
}
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java?rev=1720898&r1=1720897&r2=1720898&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java Sat Dec 19 11:23:38 2015
@@ -506,7 +506,7 @@ public class EncryptionPartsTest extends
if (LOG.isDebugEnabled()) {
LOG.debug(outputString);
}
- assertTrue (!outputString.contains("testMethod"));
+ assertTrue(!outputString.contains("testMethod"));
WSHandlerResult results = verify(encryptedDoc);
WSSecurityEngineResult actionResult =
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java?rev=1720898&r1=1720897&r2=1720898&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java Sat Dec 19 11:23:38 2015
@@ -111,7 +111,7 @@ public class SignatureCRLTest extends or
results.getActionResults().get(WSConstants.SIGN).get(0);
X509Certificate cert =
(X509Certificate)result.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
- assertTrue (cert != null);
+ assertTrue(cert != null);
}
/**
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java?rev=1720898&r1=1720897&r2=1720898&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java Sat Dec 19 11:23:38 2015
@@ -115,7 +115,7 @@ public class SignatureCertTest extends o
results.getActionResults().get(WSConstants.SIGN).get(0);
X509Certificate cert =
(X509Certificate)result.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
- assertTrue (cert != null);
+ assertTrue(cert != null);
}
//disabling this test as the certs are expired
@@ -155,10 +155,10 @@ public class SignatureCertTest extends o
results.getActionResults().get(WSConstants.SIGN).get(0);
X509Certificate cert =
(X509Certificate)result.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
- assertTrue (cert != null);
+ assertTrue(cert != null);
X509Certificate[] certs =
(X509Certificate[])result.get(WSSecurityEngineResult.TAG_X509_CERTIFICATES);
- assertTrue (certs != null && certs.length == 2);
+ assertTrue(certs != null && certs.length == 2);
}
/**
@@ -192,10 +192,10 @@ public class SignatureCertTest extends o
results.getActionResults().get(WSConstants.SIGN).get(0);
X509Certificate cert =
(X509Certificate)result.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
- assertTrue (cert != null);
+ assertTrue(cert != null);
X509Certificate[] certs =
(X509Certificate[])result.get(WSSecurityEngineResult.TAG_X509_CERTIFICATES);
- assertTrue (certs != null && certs.length == 2);
+ assertTrue(certs != null && certs.length == 2);
}
@@ -298,10 +298,10 @@ public class SignatureCertTest extends o
results.getActionResults().get(WSConstants.SIGN).get(0);
X509Certificate cert =
(X509Certificate)result.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
- assertTrue (cert != null);
+ assertTrue(cert != null);
X509Certificate[] certs =
(X509Certificate[])result.get(WSSecurityEngineResult.TAG_X509_CERTIFICATES);
- assertTrue (certs != null && certs.length == 2);
+ assertTrue(certs != null && certs.length == 2);
}
@org.junit.Test
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java?rev=1720898&r1=1720897&r2=1720898&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/SecurityTokenReferenceTest.java Sat Dec 19 11:23:38 2015
@@ -104,7 +104,7 @@ public class SecurityTokenReferenceTest
BSPEnforcer bspEnforcer = new BSPEnforcer();
// Process the STR
try {
- new SecurityTokenReference(strElement,bspEnforcer);
+ new SecurityTokenReference(strElement, bspEnforcer);
fail("Failure expected on multiple data references");
} catch (WSSecurityException ex) {
assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.INVALID_SECURITY);
@@ -134,7 +134,7 @@ public class SecurityTokenReferenceTest
BSPEnforcer bspEnforcer = new BSPEnforcer();
// Process the STR
try {
- new SecurityTokenReference(strElement,bspEnforcer);
+ new SecurityTokenReference(strElement, bspEnforcer);
fail("Failure expected on a Key Identifier with no ValueType");
} catch (WSSecurityException ex) {
assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.INVALID_SECURITY);
@@ -168,7 +168,7 @@ public class SecurityTokenReferenceTest
BSPEnforcer bspEnforcer = new BSPEnforcer();
// Process the STR
try {
- new SecurityTokenReference(strElement,bspEnforcer);
+ new SecurityTokenReference(strElement, bspEnforcer);
fail("Failure expected on a Key Identifier with a Bad EncodingType");
} catch (WSSecurityException ex) {
assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.INVALID_SECURITY);
@@ -202,7 +202,7 @@ public class SecurityTokenReferenceTest
BSPEnforcer bspEnforcer = new BSPEnforcer();
// Process the STR
try {
- new SecurityTokenReference(strElement,bspEnforcer);
+ new SecurityTokenReference(strElement, bspEnforcer);
fail("Failure expected on a Key Identifier with no EncodingType");
} catch (WSSecurityException ex) {
assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.INVALID_SECURITY);
@@ -301,7 +301,7 @@ public class SecurityTokenReferenceTest
BSPEnforcer bspEnforcer = new BSPEnforcer();
// Process the STR
try {
- new SecurityTokenReference(strElement,bspEnforcer);
+ new SecurityTokenReference(strElement, bspEnforcer);
fail("Failure expected on an Embedded Child with multiple children");
} catch (WSSecurityException ex) {
assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.INVALID_SECURITY);
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java?rev=1720898&r1=1720897&r2=1720898&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java Sat Dec 19 11:23:38 2015
@@ -276,7 +276,7 @@ public class SamlTokenTest extends org.j
LOG.debug("Unsigned SAML 1.1 authentication assertion via an Action:");
LOG.debug(outputString);
}
- assertFalse (outputString.contains("Signature"));
+ assertFalse(outputString.contains("Signature"));
WSHandlerResult results = verify(doc);
WSSecurityEngineResult actionResult =