You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2015/12/22 11:45:19 UTC
svn commit: r1721336 - in /santuario/xml-security-java/trunk: ./ etc/
src/test/java/javax/xml/crypto/test/
src/test/java/javax/xml/crypto/test/dsig/
src/test/java/org/apache/xml/security/test/dom/
src/test/java/org/apache/xml/security/test/dom/algorith...
Author: coheigea
Date: Tue Dec 22 10:45:18 2015
New Revision: 1721336
URL: http://svn.apache.org/viewvc?rev=1721336&view=rev
Log:
Updating PMD
Modified:
santuario/xml-security-java/trunk/etc/santuario-pmd-ruleset.xml
santuario/xml-security-java/trunk/pom.xml
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectors.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/HMACSignatureAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRForbiddenReferenceTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRWrappingAttackTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureDigestMethodTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/TestUtils.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignContextTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLValidateContextTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/TestUtils.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/DigestAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/HMACSignatureAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/KeyWrapEncryptionAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/AttrCompareTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/UtfHelperTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BobKeyResolver.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/SignedEncryptedTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/DEREncodedKeyValueTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/DEREncodedKeyValueResolverTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/resource/TestVectorResolver.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ProcessingInstructionTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/DocumentBuilderPoolingTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/RFC2253ParserTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResolverDirectHTTPTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecEventTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventReaderTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315ExclusiveTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/performance/PerformanceMemoryTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/utils/StAX2DOM.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/utils/XmlReaderToWriter.java
Modified: santuario/xml-security-java/trunk/etc/santuario-pmd-ruleset.xml
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/etc/santuario-pmd-ruleset.xml?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/etc/santuario-pmd-ruleset.xml (original)
+++ santuario/xml-security-java/trunk/etc/santuario-pmd-ruleset.xml Tue Dec 22 10:45:18 2015
@@ -30,10 +30,13 @@
<rule ref="rulesets/java/unusedcode.xml"/>
<rule ref="rulesets/java/imports.xml"/>
<rule ref="rulesets/java/braces.xml"/>
- <rule ref="rulesets/java/empty.xml"/>
+ <rule ref="rulesets/java/empty.xml">
+ <exclude name="EmptyCatchBlock" />
+ </rule>
<rule ref="rulesets/java/migrating.xml">
<exclude name="JUnit4TestShouldUseAfterAnnotation" />
<exclude name="JUnit4TestShouldUseTestAnnotation" />
+ <exclude name="JUnitUseExpected" />
</rule>
<rule ref="rulesets/java/unnecessary.xml"/>
Modified: santuario/xml-security-java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/pom.xml?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/pom.xml (original)
+++ santuario/xml-security-java/trunk/pom.xml Tue Dec 22 10:45:18 2015
@@ -120,7 +120,7 @@
<sourceEncoding>UTF-8</sourceEncoding>
<failOnViolation>true</failOnViolation>
<verbose>true</verbose>
- <!--<includeTests>true</includeTests>-->
+ <includeTests>true</includeTests>
<targetJdk>${targetJdk}</targetJdk>
</configuration>
<executions>
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectorTest.java Tue Dec 22 10:45:18 2015
@@ -88,7 +88,7 @@ public class KeySelectorTest extends org
private static boolean compareKey(Object answer, Key key) {
boolean result = false;
if (answer instanceof MyOwnKey) {
- result = (answer == key);
+ result = answer == key;
} else if (answer instanceof X509Certificate) {
result =
((X509Certificate)answer).getPublicKey().equals(key);
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectors.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectors.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectors.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectors.java Tue Dec 22 10:45:18 2015
@@ -105,7 +105,7 @@ public class KeySelectors {
Object[] entries = xd.getContent().toArray();
X509CRL crl = null;
// Looking for CRL before finding certificates
- for (int i = 0; (i < entries.length && crl == null); i++) {
+ for (int i = 0; i < entries.length && crl == null; i++) {
if (entries[i] instanceof X509CRL) {
crl = (X509CRL) entries[i];
}
@@ -116,8 +116,8 @@ public class KeySelectors {
Object o = xi.next();
// skip non-X509Certificate entries
if (o instanceof X509Certificate) {
- if ((purpose != KeySelector.Purpose.VERIFY) &&
- (crl != null) &&
+ if (purpose != KeySelector.Purpose.VERIFY &&
+ crl != null &&
crl.isRevoked((X509Certificate)o)) {
continue;
} else {
@@ -359,7 +359,7 @@ public class KeySelectors {
private static String getHex(byte value) {
int low = value & 0x0f;
- int high = ((value >> 4) & 0x0f);
+ int high = (value >> 4) & 0x0f;
char[] res = new char[2];
res[0] = mapping.charAt(high);
res[1] = mapping.charAt(low);
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/HMACSignatureAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/HMACSignatureAlgorithmTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/HMACSignatureAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/HMACSignatureAlgorithmTest.java Tue Dec 22 10:45:18 2015
@@ -78,7 +78,7 @@ public class HMACSignatureAlgorithmTest
//ignore
}
if (cons != null) {
- Provider provider = (java.security.Provider)cons.newInstance();
+ Provider provider = (Provider)cons.newInstance();
Security.insertProviderAt(provider, 2);
bcInstalled = true;
}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRForbiddenReferenceTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRForbiddenReferenceTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRForbiddenReferenceTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRForbiddenReferenceTest.java Tue Dec 22 10:45:18 2015
@@ -24,7 +24,6 @@ import java.security.Security;
import javax.xml.crypto.dsig.XMLSignatureException;
import javax.xml.crypto.dsig.dom.DOMValidateContext;
import javax.xml.crypto.test.KeySelectors;
-import javax.xml.crypto.test.dsig.SignatureValidator;
/**
* This is a test for a forbidden Reference algorithm when secure validation is enabled.
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRWrappingAttackTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRWrappingAttackTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRWrappingAttackTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRWrappingAttackTest.java Tue Dec 22 10:45:18 2015
@@ -24,7 +24,6 @@ import java.security.Security;
import javax.xml.crypto.dsig.XMLSignatureException;
import javax.xml.crypto.dsig.dom.DOMValidateContext;
import javax.xml.crypto.test.KeySelectors;
-import javax.xml.crypto.test.dsig.SignatureValidator;
import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Document;
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java Tue Dec 22 10:45:18 2015
@@ -88,7 +88,7 @@ public class PKSignatureAlgorithmTest ex
//ignore
}
if (cons != null) {
- Provider provider = (java.security.Provider)cons.newInstance();
+ Provider provider = (Provider)cons.newInstance();
Security.insertProviderAt(provider, 2);
bcInstalled = true;
}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureDigestMethodTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureDigestMethodTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureDigestMethodTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureDigestMethodTest.java Tue Dec 22 10:45:18 2015
@@ -81,7 +81,7 @@ public class SignatureDigestMethodTest e
//ignore
}
if (cons != null) {
- Provider provider = (java.security.Provider)cons.newInstance();
+ Provider provider = (Provider)cons.newInstance();
Security.insertProviderAt(provider, 2);
bcInstalled = true;
}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/TestUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/TestUtils.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/TestUtils.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/TestUtils.java Tue Dec 22 10:45:18 2015
@@ -120,7 +120,9 @@ public class TestUtils {
return getPublicKey("DSA", 1024);
} else if (algo.equalsIgnoreCase("RSA")) {
return getPublicKey("RSA", 512);
- } else throw new RuntimeException("Unsupported key algorithm " + algo);
+ } else {
+ throw new RuntimeException("Unsupported key algorithm " + algo);
+ }
}
public static PublicKey getPublicKey(String algo, int keysize)
@@ -138,13 +140,19 @@ public class TestUtils {
new BigInteger(DSA_2048_P),
new BigInteger(DSA_2048_Q),
new BigInteger(DSA_2048_G));
- } else throw new RuntimeException("Unsupported keysize:" + keysize);
+ } else {
+ throw new RuntimeException("Unsupported keysize:" + keysize);
+ }
} else if (algo.equalsIgnoreCase("RSA")) {
if (keysize == 512) {
kspec = new RSAPublicKeySpec(new BigInteger(RSA_MOD),
new BigInteger(RSA_PUB));
- } else throw new RuntimeException("Unsupported keysize:" + keysize);
- } else throw new RuntimeException("Unsupported key algorithm " + algo);
+ } else {
+ throw new RuntimeException("Unsupported keysize:" + keysize);
+ }
+ } else {
+ throw new RuntimeException("Unsupported key algorithm " + algo);
+ }
return kf.generatePublic(kspec);
}
@@ -162,7 +170,9 @@ public class TestUtils {
return getPrivateKey("DSA", 1024);
} else if (algo.equalsIgnoreCase("RSA")) {
return getPrivateKey("RSA", 512);
- } else throw new RuntimeException("Unsupported key algorithm " + algo);
+ } else {
+ throw new RuntimeException("Unsupported key algorithm " + algo);
+ }
}
public static PrivateKey getPrivateKey(String algo, int keysize)
@@ -178,13 +188,19 @@ public class TestUtils {
kspec = new DSAPrivateKeySpec
(new BigInteger(DSA_2048_X), new BigInteger(DSA_2048_P),
new BigInteger(DSA_2048_Q), new BigInteger(DSA_2048_G));
- } else throw new RuntimeException("Unsupported keysize:" + keysize);
+ } else {
+ throw new RuntimeException("Unsupported keysize:" + keysize);
+ }
} else if (algo.equalsIgnoreCase("RSA")) {
if (keysize == 512) {
kspec = new RSAPrivateKeySpec
(new BigInteger(RSA_MOD), new BigInteger(RSA_PRIV));
- } else throw new RuntimeException("Unsupported keysize:" + keysize);
- } else throw new RuntimeException("Unsupported key algorithm " + algo);
+ } else {
+ throw new RuntimeException("Unsupported keysize:" + keysize);
+ }
+ } else {
+ throw new RuntimeException("Unsupported key algorithm " + algo);
+ }
return kf.generatePrivate(kspec);
}
@@ -232,8 +248,7 @@ public class TestUtils {
(TestUtils.getPublicKey("RSA", 512), list.item(0));
}
} else {
- throw new Exception("Unsupported XMLValidateContext type: " +
- type);
+ throw new Exception("Unsupported XMLValidateContext type: " + type);
}
}
@@ -318,7 +333,9 @@ public class TestUtils {
public boolean isFeatureSupported(String feature)
throws NullPointerException {
- if (feature == null) throw new NullPointerException();
+ if (feature == null) {
+ throw new NullPointerException();
+ }
return false;
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignContextTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignContextTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignContextTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignContextTest.java Tue Dec 22 10:45:18 2015
@@ -21,10 +21,11 @@
*/
package javax.xml.crypto.test.dsig;
-import javax.xml.crypto.*;
import javax.xml.crypto.dsig.*;
import javax.xml.crypto.dsig.dom.DOMSignContext;
import javax.xml.crypto.KeySelector;
+import javax.xml.crypto.URIDereferencer;
+
import java.security.*;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java Tue Dec 22 10:45:18 2015
@@ -132,11 +132,11 @@ public class XMLSignatureFactoryTest ext
return null;
}
public String getBaseURI() { return null; }
- public void setBaseURI(String uri) { return; }
+ public void setBaseURI(String uri) { }
public KeySelector getKeySelector() { return null; }
- public void setKeySelector(KeySelector ks) { return; }
+ public void setKeySelector(KeySelector ks) { }
public URIDereferencer getURIDereferencer() { return null; }
- public void setURIDereferencer(URIDereferencer ud) {return;}
+ public void setURIDereferencer(URIDereferencer ud) {}
public Object get(Object key) {return null;}
public Object put(Object key, Object value) {return null;}
public void setDefaultNamespacePrefix(String defPrefix) {}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java Tue Dec 22 10:45:18 2015
@@ -338,8 +338,9 @@ public class XMLSignatureTest extends or
// check that Object element retained namespace definitions
Element objElem = (Element)parent.getFirstChild().getLastChild();
Attr a = objElem.getAttributeNode("xmlns:test");
- if (!a.getValue().equals("http://www.example.org/ns"))
+ if (!a.getValue().equals("http://www.example.org/ns")) {
throw new Exception("Object namespace definition not retained");
+ }
}
@org.junit.Test
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLValidateContextTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLValidateContextTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLValidateContextTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLValidateContextTest.java Tue Dec 22 10:45:18 2015
@@ -24,7 +24,6 @@ package javax.xml.crypto.test.dsig;
import javax.xml.crypto.*;
import javax.xml.crypto.dsig.dom.DOMValidateContext;
import javax.xml.crypto.dsig.*;
-import java.security.*;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
@@ -37,16 +36,9 @@ import javax.crypto.spec.SecretKeySpec;
public class XMLValidateContextTest extends org.junit.Assert {
private XMLValidateContext defContext;
- private Key[] KEYS;
private KeySelector[] KEY_SELECTORS;
public XMLValidateContextTest() throws Exception {
- // set up the validatingKeys
- KEYS = new Key[3];
- KEYS[0] = TestUtils.getPublicKey("DSA");
- KEYS[1] = TestUtils.getPublicKey("RSA");
- KEYS[2] = new SecretKeySpec(new byte[16], "HmacSHA1");
-
// set up the default XMLValidateContext
SecretKey sk = new SecretKeySpec(new byte[8], "DES");
defContext = new DOMValidateContext(sk, TestUtils.newDocument());
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/TestUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/TestUtils.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/TestUtils.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/TestUtils.java Tue Dec 22 10:45:18 2015
@@ -33,7 +33,7 @@ public class TestUtils {
* @return the element.
*/
public static Element createDSctx(Document doc, String prefix, String namespace) {
- if ((prefix == null) || (prefix.trim().length() == 0)) {
+ if (prefix == null || prefix.trim().length() == 0) {
throw new IllegalArgumentException("You must supply a prefix");
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/DigestAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/DigestAlgorithmTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/DigestAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/DigestAlgorithmTest.java Tue Dec 22 10:45:18 2015
@@ -51,7 +51,7 @@ public class DigestAlgorithmTest extends
//ignore
}
if (cons != null) {
- Provider provider = (java.security.Provider)cons.newInstance();
+ Provider provider = (Provider)cons.newInstance();
Security.insertProviderAt(provider, 2);
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/HMACSignatureAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/HMACSignatureAlgorithmTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/HMACSignatureAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/HMACSignatureAlgorithmTest.java Tue Dec 22 10:45:18 2015
@@ -46,7 +46,7 @@ import org.w3c.dom.NodeList;
/**
* A test to make sure that the various Signature HMAC algorithms are working
*/
-public class HMACSignatureAlgorithmTest extends org.junit.Assert {
+public class HMACSignatureAlgorithmTest extends Assert {
static {
org.apache.xml.security.Init.init();
@@ -68,7 +68,7 @@ public class HMACSignatureAlgorithmTest
//ignore
}
if (cons != null) {
- Provider provider = (java.security.Provider)cons.newInstance();
+ Provider provider = (Provider)cons.newInstance();
Security.insertProviderAt(provider, 2);
bcInstalled = true;
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/KeyWrapEncryptionAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/KeyWrapEncryptionAlgorithmTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/KeyWrapEncryptionAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/KeyWrapEncryptionAlgorithmTest.java Tue Dec 22 10:45:18 2015
@@ -50,7 +50,7 @@ import org.w3c.dom.NodeList;
/**
* A test to make sure that the various KeyWrap Encryption algorithms are working
*/
-public class KeyWrapEncryptionAlgorithmTest extends org.junit.Assert {
+public class KeyWrapEncryptionAlgorithmTest extends Assert {
private KeyPair rsaKeyPair;
private boolean bcInstalled;
@@ -73,7 +73,7 @@ public class KeyWrapEncryptionAlgorithmT
//ignore
}
if (cons != null) {
- Provider provider = (java.security.Provider)cons.newInstance();
+ Provider provider = (Provider)cons.newInstance();
Security.insertProviderAt(provider, 2);
bcInstalled = true;
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java Tue Dec 22 10:45:18 2015
@@ -46,7 +46,7 @@ import org.w3c.dom.NodeList;
/**
* A test to make sure that the various Public Key Signature algorithms are working
*/
-public class PKSignatureAlgorithmTest extends org.junit.Assert {
+public class PKSignatureAlgorithmTest extends Assert {
private KeyPair rsaKeyPair, ecKeyPair;
private boolean bcInstalled;
@@ -69,7 +69,7 @@ public class PKSignatureAlgorithmTest ex
//ignore
}
if (cons != null) {
- Provider provider = (java.security.Provider)cons.newInstance();
+ Provider provider = (Provider)cons.newInstance();
Security.insertProviderAt(provider, 2);
bcInstalled = true;
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java Tue Dec 22 10:45:18 2015
@@ -45,7 +45,7 @@ import org.w3c.dom.NodeList;
/**
* A test to make sure that the various Symmetric Encryption algorithms are working
*/
-public class SymmetricEncryptionAlgorithmTest extends org.junit.Assert {
+public class SymmetricEncryptionAlgorithmTest extends Assert {
private boolean bcInstalled;
@@ -104,7 +104,7 @@ public class SymmetricEncryptionAlgorith
Assert.assertEquals(nodeList.getLength(), 0);
// XMLUtils.outputDOM(document, System.out);
- document = decrypt(encryptionAlgorithm, document, key, localNames);
+ document = decrypt(encryptionAlgorithm, document, key);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -137,7 +137,7 @@ public class SymmetricEncryptionAlgorith
Assert.assertEquals(nodeList.getLength(), 0);
// XMLUtils.outputDOM(document, System.out);
- document = decrypt(encryptionAlgorithm, document, key, localNames);
+ document = decrypt(encryptionAlgorithm, document, key);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -170,7 +170,7 @@ public class SymmetricEncryptionAlgorith
Assert.assertEquals(nodeList.getLength(), 0);
// XMLUtils.outputDOM(document, System.out);
- document = decrypt(encryptionAlgorithm, document, key, localNames);
+ document = decrypt(encryptionAlgorithm, document, key);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -203,7 +203,7 @@ public class SymmetricEncryptionAlgorith
Assert.assertEquals(nodeList.getLength(), 0);
// XMLUtils.outputDOM(document, System.out);
- document = decrypt(encryptionAlgorithm, document, key, localNames);
+ document = decrypt(encryptionAlgorithm, document, key);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -236,7 +236,7 @@ public class SymmetricEncryptionAlgorith
Assert.assertEquals(nodeList.getLength(), 0);
// XMLUtils.outputDOM(document, System.out);
- document = decrypt(encryptionAlgorithm, document, key, localNames);
+ document = decrypt(encryptionAlgorithm, document, key);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -269,7 +269,7 @@ public class SymmetricEncryptionAlgorith
Assert.assertEquals(nodeList.getLength(), 0);
// XMLUtils.outputDOM(document, System.out);
- document = decrypt(encryptionAlgorithm, document, key, localNames);
+ document = decrypt(encryptionAlgorithm, document, key);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -301,7 +301,7 @@ public class SymmetricEncryptionAlgorith
Assert.assertEquals(nodeList.getLength(), 0);
// XMLUtils.outputDOM(document, System.out);
- document = decrypt(encryptionAlgorithm, document, key, localNames);
+ document = decrypt(encryptionAlgorithm, document, key);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -337,7 +337,7 @@ public class SymmetricEncryptionAlgorith
Assert.assertEquals(nodeList.getLength(), 0);
// XMLUtils.outputDOM(document, System.out);
- document = decrypt(encryptionAlgorithm, document, key, localNames);
+ document = decrypt(encryptionAlgorithm, document, key);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -373,7 +373,7 @@ public class SymmetricEncryptionAlgorith
Assert.assertEquals(nodeList.getLength(), 0);
// XMLUtils.outputDOM(document, System.out);
- document = decrypt(encryptionAlgorithm, document, key, localNames);
+ document = decrypt(encryptionAlgorithm, document, key);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -409,7 +409,7 @@ public class SymmetricEncryptionAlgorith
Assert.assertEquals(nodeList.getLength(), 0);
// XMLUtils.outputDOM(document, System.out);
- document = decrypt(encryptionAlgorithm, document, key, localNames);
+ document = decrypt(encryptionAlgorithm, document, key);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -445,7 +445,7 @@ public class SymmetricEncryptionAlgorith
Assert.assertEquals(nodeList.getLength(), 0);
// XMLUtils.outputDOM(document, System.out);
- document = decrypt(encryptionAlgorithm, document, key, localNames);
+ document = decrypt(encryptionAlgorithm, document, key);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -484,8 +484,7 @@ public class SymmetricEncryptionAlgorith
private Document decrypt(
String algorithm,
Document document,
- Key key,
- List<String> localNames
+ Key key
) throws Exception {
XMLCipher cipher = XMLCipher.getInstance(algorithm);
cipher.init(XMLCipher.DECRYPT_MODE, key);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/AttrCompareTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/AttrCompareTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/AttrCompareTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/AttrCompareTest.java Tue Dec 22 10:45:18 2015
@@ -196,7 +196,7 @@ public class AttrCompareTest extends org
) {
Attr attr = null;
- if ((NamespaceURI != null) && (NamespaceURI.length() > 0)) {
+ if (NamespaceURI != null && NamespaceURI.length() > 0) {
attr = doc.createAttributeNS(NamespaceURI, QName);
} else {
attr = doc.createAttributeNS(null, QName);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java Tue Dec 22 10:45:18 2015
@@ -986,8 +986,7 @@ public class Canonicalizer20010315Test e
DocumentBuilder db = XMLUtils.createDocumentBuilder(true);
- db.setErrorHandler(new org.apache.xml.security.utils
- .IgnoreAllErrorHandler());
+ db.setErrorHandler(new IgnoreAllErrorHandler());
Document doc = db.parse(new ByteArrayInputStream(input.getBytes()));
Canonicalizer c14nizer =
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/UtfHelperTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/UtfHelperTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/UtfHelperTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/UtfHelperTest.java Tue Dec 22 10:45:18 2015
@@ -52,8 +52,8 @@ public class UtfHelperTest extends org.j
// if system property org.apache.xml.security.c14n.oldUtf8=true, can only validate
// 16bit chars against String.getBytes("UTF8");
- int chunk = (Boolean.getBoolean("org.apache.xml.security.c14n.oldUtf8")) ? (1 << 16)
- : (Character.MAX_CODE_POINT + 1);
+ int chunk = Boolean.getBoolean("org.apache.xml.security.c14n.oldUtf8") ? 1 << 16
+ : Character.MAX_CODE_POINT + 1;
int j = 0;
ByteArrayOutputStream charByCharOs = new ByteArrayOutputStream();
ByteArrayOutputStream strOs = new ByteArrayOutputStream();
@@ -61,7 +61,7 @@ public class UtfHelperTest extends org.j
char chs[] = new char[chunk * 2];
int pos = 0;
for (int i = 0; i < chunk; i++) {
- int ch = (chunk * j) + i;
+ int ch = chunk * j + i;
int offset = Character.toChars(ch, chs, pos);
pos += offset;
if (ch == 0xDBFF) {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java Tue Dec 22 10:45:18 2015
@@ -146,7 +146,7 @@ public class BaltimoreEncTest extends or
}
haveKeyWraps =
- (JCEMapper.translateURItoJCEID(EncryptionConstants.ALGO_ID_KEYWRAP_AES128) != null);
+ JCEMapper.translateURItoJCEID(EncryptionConstants.ALGO_ID_KEYWRAP_AES128) != null;
}
/**
@@ -498,7 +498,7 @@ public class BaltimoreEncTest extends or
// First check for a known key name
KeyName keyName = ki.itemKeyName(0);
if (keyName != null) {
- return (mapKeyName(keyName.getKeyName()));
+ return mapKeyName(keyName.getKeyName());
}
// Decrypt any encryptedKey structures
@@ -520,10 +520,8 @@ public class BaltimoreEncTest extends or
XMLX509Certificate xcert = certData.itemCertificate(0);
X509Certificate cert = xcert.getX509Certificate();
- if (cert != null) {
- if (cert.getSerialNumber().toString().equals(rsaCertSerialNumber)) {
- kek = rsaKey;
- }
+ if (cert != null && cert.getSerialNumber().toString().equals(rsaCertSerialNumber)) {
+ kek = rsaKey;
}
}
if (kek != null) {
@@ -601,15 +599,14 @@ public class BaltimoreEncTest extends or
String cc = retrieveCCNumber(d);
log.debug("Retrieved Credit Card : " + cc);
- assertTrue(cc, ((cc!= null) && (cc.equals(cardNumber))));
+ assertTrue(cc, cc!= null && cc.equals(cardNumber));
// Test cc numbers
if (doNodeCheck) {
int myNodeCount = countNodes(d);
assertTrue(
- "Node count mismatches",
- ((myNodeCount > 0) && myNodeCount == nodeCount)
+ "Node count mismatches", myNodeCount > 0 && myNodeCount == nodeCount
);
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BobKeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BobKeyResolver.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BobKeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BobKeyResolver.java Tue Dec 22 10:45:18 2015
@@ -112,7 +112,7 @@ public class BobKeyResolver extends KeyR
*
* @throws KeyResolverException
*/
- public javax.crypto.SecretKey engineLookupAndResolveSecretKey(
+ public SecretKey engineLookupAndResolveSecretKey(
Element element, String BaseURI, StorageResolver storage
) throws KeyResolverException {
if (engineCanResolve(element, BaseURI, storage)) {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/SignedEncryptedTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/SignedEncryptedTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/SignedEncryptedTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/SignedEncryptedTest.java Tue Dec 22 10:45:18 2015
@@ -142,12 +142,10 @@ public class SignedEncryptedTest extends
document = cipher.doFinal(document, element, true);
XMLCipher deCipher = XMLCipher.getInstance(XMLCipher.AES_128);
- if (transformerFactory != null) {
- if (deCipher.getSerializer() instanceof TransformSerializer) {
- Field f = deCipher.getSerializer().getClass().getDeclaredField("transformerFactory");
- f.setAccessible(true);
- f.set(deCipher.getSerializer(), transformerFactory);
- }
+ if (transformerFactory != null && deCipher.getSerializer() instanceof TransformSerializer) {
+ Field f = deCipher.getSerializer().getClass().getDeclaredField("transformerFactory");
+ f.setAccessible(true);
+ f.set(deCipher.getSerializer(), transformerFactory);
}
if (useDocumentSerializer) {
deCipher.setSerializer(new DocumentSerializer());
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java Tue Dec 22 10:45:18 2015
@@ -113,7 +113,7 @@ public class XMLCipherTest extends org.j
}
haveKeyWraps =
- (JCEMapper.translateURItoJCEID(EncryptionConstants.ALGO_ID_KEYWRAP_AES128) != null);
+ JCEMapper.translateURItoJCEID(EncryptionConstants.ALGO_ID_KEYWRAP_AES128) != null;
//
// If the BouncyCastle provider is not installed, then try to load it
@@ -128,7 +128,7 @@ public class XMLCipherTest extends org.j
//ignore
}
if (cons != null) {
- Provider provider = (java.security.Provider)cons.newInstance();
+ Provider provider = (Provider)cons.newInstance();
Security.insertProviderAt(provider, 2);
bcInstalled = true;
}
@@ -1010,11 +1010,11 @@ public class XMLCipherTest extends org.j
System.exit(-1);
}
- return (d);
+ return d;
}
private String element() {
- return (elementName);
+ return elementName;
}
private int index() {
@@ -1027,7 +1027,7 @@ public class XMLCipherTest extends org.j
System.exit(-1);
}
- return (result);
+ return result;
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java Tue Dec 22 10:45:18 2015
@@ -92,7 +92,7 @@ public class XMLEncryption11Test extends
//ignore
}
if (cons != null) {
- Provider provider = (java.security.Provider)cons.newInstance();
+ Provider provider = (Provider)cons.newInstance();
Security.insertProviderAt(provider, 2);
}
}
@@ -751,15 +751,14 @@ public class XMLEncryption11Test extends
String cc = retrieveCCNumber(d);
log.debug("Retrieved Credit Card : " + cc);
- assertTrue(cc, ((cc!= null) && (cc.equals(cardNumber))));
+ assertTrue(cc, cc!= null && cc.equals(cardNumber));
// Test cc numbers
if (doNodeCheck) {
int myNodeCount = countNodes(d);
assertTrue(
- "Node count mismatches",
- ((myNodeCount > 0) && myNodeCount == nodeCount)
+ "Node count mismatches", myNodeCount > 0 && myNodeCount == nodeCount
);
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java Tue Dec 22 10:45:18 2015
@@ -99,9 +99,7 @@ public class BaltimoreTest extends Inter
log.error("Verification crashed for " + filename);
throw ex;
} catch (XMLSignatureException ex) {
- if (ex.getMsgID().equals("algorithms.HMACOutputLengthMin")) {
- // succeed
- } else {
+ if (!ex.getMsgID().equals("algorithms.HMACOutputLengthMin")) {
fail(ex.getMessage());
}
}
@@ -367,9 +365,7 @@ public class BaltimoreTest extends Inter
log.error("Verification crashed for " + filename);
throw ex;
} catch (XMLSignatureException ex) {
- if (ex.getMsgID().equals("algorithms.HMACOutputLengthMin")) {
- // succeed
- } else {
+ if (!ex.getMsgID().equals("algorithms.HMACOutputLengthMin")) {
fail(ex.getMessage());
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java Tue Dec 22 10:45:18 2015
@@ -76,9 +76,7 @@ public class IAIKTest extends InteropTes
log.error("Verification crashed for " + filename);
throw ex;
} catch (XMLSignatureException ex) {
- if (ex.getMsgID().equals("algorithms.HMACOutputLengthMin")) {
- // succeed
- } else {
+ if (!ex.getMsgID().equals("algorithms.HMACOutputLengthMin")) {
fail(ex.getMessage());
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/DEREncodedKeyValueTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/DEREncodedKeyValueTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/DEREncodedKeyValueTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/DEREncodedKeyValueTest.java Tue Dec 22 10:45:18 2015
@@ -67,7 +67,7 @@ public class DEREncodedKeyValueTest exte
//ignore
}
if (cons != null) {
- Provider provider = (java.security.Provider)cons.newInstance();
+ Provider provider = (Provider)cons.newInstance();
Security.insertProviderAt(provider, 1);
ecKeyControl = loadPublicKey("ec.key", "EC");
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/DEREncodedKeyValueResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/DEREncodedKeyValueResolverTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/DEREncodedKeyValueResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/DEREncodedKeyValueResolverTest.java Tue Dec 22 10:45:18 2015
@@ -64,7 +64,7 @@ public class DEREncodedKeyValueResolverT
//ignore
}
if (cons != null) {
- Provider provider = (java.security.Provider)cons.newInstance();
+ Provider provider = (Provider)cons.newInstance();
Security.insertProviderAt(provider, 1);
ecKeyControl = loadPublicKey("ec.key", "EC");
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/resource/TestVectorResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/resource/TestVectorResolver.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/resource/TestVectorResolver.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/resource/TestVectorResolver.java Tue Dec 22 10:45:18 2015
@@ -88,10 +88,10 @@ public class TestVectorResolver implemen
+ "#" + ze.getName() + " " + data.length + " bytes");
}
}
- } catch (java.lang.ClassNotFoundException e) {
+ } catch (ClassNotFoundException e) {
//
}
- catch (java.io.IOException e) {
+ catch (IOException e) {
//
}
}
@@ -105,7 +105,7 @@ public class TestVectorResolver implemen
*/
private String getCurrentDir() throws IOException {
- String currentDir = new java.io.File(".").getCanonicalPath();
+ String currentDir = new File(".").getCanonicalPath();
currentDir = currentDir.replace(File.separatorChar, '/');
currentDir = "file:///" + currentDir + "/";
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java Tue Dec 22 10:45:18 2015
@@ -211,7 +211,7 @@ public class CreateSignatureTest extends
public void testCanonicalizedOctetStream() throws Exception {
String signedXML = doSign();
- org.w3c.dom.Document doc = db.parse(new ByteArrayInputStream(signedXML.getBytes()));
+ Document doc = db.parse(new ByteArrayInputStream(signedXML.getBytes()));
XPathFactory xpf = XPathFactory.newInstance();
XPath xpath = xpf.newXPath();
@@ -249,7 +249,7 @@ public class CreateSignatureTest extends
private String doSign() throws Exception {
PrivateKey privateKey = kp.getPrivate();
- org.w3c.dom.Document doc = db.newDocument();
+ Document doc = db.newDocument();
doc.appendChild(doc.createComment(" Comment before "));
Element root = doc.createElementNS("", "RootElement");
@@ -294,7 +294,7 @@ public class CreateSignatureTest extends
}
ks.load(fis, "changeit".toCharArray());
PrivateKey privateKey = (PrivateKey) ks.getKey("mullan", "changeit".toCharArray());
- org.w3c.dom.Document doc = db.newDocument();
+ Document doc = db.newDocument();
X509Certificate signingCert = (X509Certificate) ks.getCertificate("mullan");
doc.appendChild(doc.createComment(" Comment before "));
Element root = doc.createElementNS("", "RootElement");
@@ -331,7 +331,7 @@ public class CreateSignatureTest extends
}
private void doVerify(String signedXML) throws Exception {
- org.w3c.dom.Document doc = db.parse(new ByteArrayInputStream(signedXML.getBytes()));
+ Document doc = db.parse(new ByteArrayInputStream(signedXML.getBytes()));
XPathFactory xpf = XPathFactory.newInstance();
XPath xpath = xpf.newXPath();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java Tue Dec 22 10:45:18 2015
@@ -79,7 +79,7 @@ public class ECDSASignatureTest extends
// BouncyCastle is not available so just return
return;
} else {
- Provider provider = (java.security.Provider)cons.newInstance();
+ Provider provider = (Provider)cons.newInstance();
Security.insertProviderAt(provider, 1);
}
}
@@ -110,10 +110,7 @@ public class ECDSASignatureTest extends
}
keyStore = KeyStore.getInstance("JKS");
- keyStore.load(
- new java.io.FileInputStream(ECDSA_JKS),
- ECDSA_JKS_PASSWORD.toCharArray()
- );
+ keyStore.load(new FileInputStream(ECDSA_JKS), ECDSA_JKS_PASSWORD.toCharArray());
doVerify(doSign());
doVerify(doSign());
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java Tue Dec 22 10:45:18 2015
@@ -53,9 +53,7 @@ public class HMACOutputLengthTest extend
fail("Expected HMACOutputLength exception");
} catch (XMLSignatureException xse) {
// System.out.println(xse.getMessage());
- if (xse.getMsgID().equals("algorithms.HMACOutputLengthMin")) {
- // pass
- } else {
+ if (!xse.getMsgID().equals("algorithms.HMACOutputLengthMin")) {
fail(xse.getMessage());
}
}
@@ -67,9 +65,7 @@ public class HMACOutputLengthTest extend
validate("signature-enveloping-hmac-sha1-trunclen-8-attack.xml");
} catch (XMLSignatureException xse) {
// System.out.println(xse.getMessage());
- if (xse.getMsgID().equals("algorithms.HMACOutputLengthMin")) {
- // pass
- } else {
+ if (!xse.getMsgID().equals("algorithms.HMACOutputLengthMin")) {
fail(xse.getMessage());
}
}
@@ -88,9 +84,7 @@ public class HMACOutputLengthTest extend
fail("Expected HMACOutputLength Exception");
} catch (XMLSignatureException xse) {
// System.out.println(xse.getMessage());
- if (xse.getMsgID().equals("algorithms.HMACOutputLengthMin")) {
- // pass
- } else {
+ if (!xse.getMsgID().equals("algorithms.HMACOutputLengthMin")) {
fail(xse.getMessage());
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ProcessingInstructionTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ProcessingInstructionTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ProcessingInstructionTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ProcessingInstructionTest.java Tue Dec 22 10:45:18 2015
@@ -65,7 +65,7 @@ public class ProcessingInstructionTest e
String signatureFileName = dir + "upp_sign.xml";
DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
File f = new File(signatureFileName);
- Document doc = db.parse(new java.io.FileInputStream(f));
+ Document doc = db.parse(new FileInputStream(f));
Node obj =
doc.getElementsByTagNameNS("http://uri.etsi.org/01903/v1.3.2#", "QualifyingProperties").item(0);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java Tue Dec 22 10:45:18 2015
@@ -42,7 +42,7 @@ public class X509DataTest extends org.ju
Init.init();
javax.xml.parsers.DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
- org.w3c.dom.Document doc = db.newDocument();
+ Document doc = db.newDocument();
XMLSignature sig = new XMLSignature(doc, "", XMLSignature.ALGO_ID_SIGNATURE_DSA);
doc.appendChild(sig.getElement());
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/DocumentBuilderPoolingTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/DocumentBuilderPoolingTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/DocumentBuilderPoolingTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/DocumentBuilderPoolingTest.java Tue Dec 22 10:45:18 2015
@@ -115,13 +115,13 @@ public class DocumentBuilderPoolingTest
while (true) {
// retrieve some DocumentBuilders...
DocumentBuilder documentBuilders[] = new DocumentBuilder[10];
- for (int i = 0; i < documentBuilders.length; i++) {
- documentBuilders[i] = XMLUtils.createDocumentBuilder(false);
- assertNotNull(documentBuilders[i]);
+ for (int j = 0; j < documentBuilders.length; j++) {
+ documentBuilders[j] = XMLUtils.createDocumentBuilder(false);
+ assertNotNull(documentBuilders[j]);
}
// ...then repool them so that another thread may pickup them again
- for (int i = 0; i < documentBuilders.length; i++) {
- assertTrue(XMLUtils.repoolDocumentBuilder(documentBuilders[i]));
+ for (int j = 0; j < documentBuilders.length; j++) {
+ assertTrue(XMLUtils.repoolDocumentBuilder(documentBuilders[j]));
}
}
} catch (Exception e) {
@@ -167,7 +167,7 @@ public class DocumentBuilderPoolingTest
try {
assertNull(f.get(1000, TimeUnit.MILLISECONDS));
} catch (CancellationException ce) {
- ;//expected since we did cancel it
+ //expected since we did cancel it
} catch (TimeoutException e) {
fail(f + "didn't cancel after timeout?");
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/RFC2253ParserTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/RFC2253ParserTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/RFC2253ParserTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/RFC2253ParserTest.java Tue Dec 22 10:45:18 2015
@@ -26,7 +26,7 @@ import org.junit.Test;
* @author $Author$
* @version $Revision$ $Date$
*/
-public class RFC2253ParserTest extends org.junit.Assert {
+public class RFC2253ParserTest extends Assert {
@Test
public void testToXML1() throws Exception {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResolverDirectHTTPTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResolverDirectHTTPTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResolverDirectHTTPTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResolverDirectHTTPTest.java Tue Dec 22 10:45:18 2015
@@ -31,7 +31,7 @@ import org.junit.Test;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
-public class ResolverDirectHTTPTest extends org.junit.Assert {
+public class ResolverDirectHTTPTest extends Assert {
//change these properties to match your environment
private static final String url = "http://www.apache.org";
@@ -44,12 +44,11 @@ public class ResolverDirectHTTPTest exte
@Before
public void setUp() {
- org.apache.xml.security.Init.init();
+ Init.init();
}
@Test
public void testBug40783() throws Exception {
- Init.init();
Document doc = XMLUtils.createDocumentBuilder(false).newDocument();
Attr uri = doc.createAttribute("id");
uri.setNodeValue("urn:ddd:uuu");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecEventTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecEventTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecEventTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecEventTest.java Tue Dec 22 10:45:18 2015
@@ -164,7 +164,7 @@ public class XMLSecEventTest extends Ass
xmlStreamReader.next();
}
while (xmlStreamReader.hasNext());
- xmlSecEventDeque.push((XMLSecEventFactory.allocate(xmlStreamReader, null)));//EndDocumentEvent
+ xmlSecEventDeque.push(XMLSecEventFactory.allocate(xmlStreamReader, null));//EndDocumentEvent
XMLSecurityEventReader xmlSecurityEventReader = new XMLSecurityEventReader(xmlSecEventDeque, 0);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventReaderTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventReaderTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventReaderTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventReaderTest.java Tue Dec 22 10:45:18 2015
@@ -51,7 +51,7 @@ public class XMLSecurityEventReaderTest
xmlStreamReader.next();
}
while (xmlStreamReader.hasNext());
- xmlSecEventDeque.push((XMLSecEventFactory.allocate(xmlStreamReader, null)));//EndDocumentEvent
+ xmlSecEventDeque.push(XMLSecEventFactory.allocate(xmlStreamReader, null));//EndDocumentEvent
XMLSecurityEventReader xmlSecurityEventReader = new XMLSecurityEventReader(xmlSecEventDeque, 0);
@@ -90,7 +90,7 @@ public class XMLSecurityEventReaderTest
xmlStreamReader.next();
}
while (xmlStreamReader.hasNext());
- xmlSecEventDeque.push((XMLSecEventFactory.allocate(xmlStreamReader, null)));//EndDocumentEvent
+ xmlSecEventDeque.push(XMLSecEventFactory.allocate(xmlStreamReader, null));//EndDocumentEvent
int skip = 100;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315ExclusiveTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315ExclusiveTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315ExclusiveTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315ExclusiveTest.java Tue Dec 22 10:45:18 2015
@@ -20,7 +20,6 @@ package org.apache.xml.security.test.sta
import org.apache.xml.security.stax.impl.transformer.canonicalizer.Canonicalizer20010315_Excl;
import org.junit.Before;
-import org.junit.Test;
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
import org.apache.xml.security.stax.impl.transformer.canonicalizer.Canonicalizer20010315_ExclOmitCommentsTransformer;
import org.apache.xml.security.stax.impl.transformer.canonicalizer.Canonicalizer20010315_ExclWithCommentsTransformer;
@@ -59,7 +58,7 @@ public class Canonicalizer20010315Exclus
this.xmlInputFactory.setEventAllocator(new XMLSecEventAllocator());
}
- @Test
+ @org.junit.Test
public void test221excl() throws Exception {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -101,7 +100,7 @@ public class Canonicalizer20010315Exclus
assertTrue(equals);
}
- @Test
+ @org.junit.Test
public void test222excl() throws Exception {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -128,7 +127,7 @@ public class Canonicalizer20010315Exclus
assertTrue(equals);
}
- @Test
+ @org.junit.Test
public void test24excl() throws Exception {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -155,7 +154,7 @@ public class Canonicalizer20010315Exclus
assertTrue(equals);
}
- @Test
+ @org.junit.Test
public void testComplexDocexcl() throws Exception {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -181,7 +180,7 @@ public class Canonicalizer20010315Exclus
assertTrue(equals);
}
- @Test
+ @org.junit.Test
public void testNodeSet() throws Exception {
final String XML =
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java Tue Dec 22 10:45:18 2015
@@ -413,15 +413,14 @@ public class BaltimoreEncTest extends or
private void checkDecryptedDoc(Document d, boolean doNodeCheck) throws Exception {
String cc = retrieveCCNumber(d);
- assertTrue(cc, ((cc != null) && (cc.equals(cardNumber))));
+ assertTrue(cc, cc != null && cc.equals(cardNumber));
// Test cc numbers
if (doNodeCheck) {
int myNodeCount = countNodes(d);
assertTrue(
- "Node count mismatches",
- ((myNodeCount > 0) && myNodeCount == nodeCount)
+ "Node count mismatches", myNodeCount > 0 && myNodeCount == nodeCount
);
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/performance/PerformanceMemoryTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/performance/PerformanceMemoryTest.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/performance/PerformanceMemoryTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/performance/PerformanceMemoryTest.java Tue Dec 22 10:45:18 2015
@@ -248,7 +248,7 @@ public class PerformanceMemoryTest exten
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
- memory.add((int) (((getUsedMemory()) - memoryDiff) / 1024.0 / 1024.0));
+ memory.add((int)((getUsedMemory() - memoryDiff) / 1024.0 / 1024.0));
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/utils/StAX2DOM.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/utils/StAX2DOM.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/utils/StAX2DOM.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/utils/StAX2DOM.java Tue Dec 22 10:45:18 2015
@@ -35,7 +35,7 @@ public class StAX2DOM {
public static Document readDoc(DocumentBuilder documentBuilder, XMLStreamReader xmlStreamReader) throws XMLStreamException {
//skip possible text at the beginning of a document and go directly to the root tag
- while (xmlStreamReader.hasNext() && xmlStreamReader.next() != XMLStreamConstants.START_ELEMENT) {
+ while (xmlStreamReader.hasNext() && xmlStreamReader.next() != XMLStreamConstants.START_ELEMENT) { //NOPMD
}
Document document = documentBuilder.newDocument();
StAX2DOM.readDocElements(document, document, xmlStreamReader, false, false);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/utils/XmlReaderToWriter.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/utils/XmlReaderToWriter.java?rev=1721336&r1=1721335&r2=1721336&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/utils/XmlReaderToWriter.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/utils/XmlReaderToWriter.java Tue Dec 22 10:45:18 2015
@@ -46,10 +46,11 @@ public final class XmlReaderToWriter {
final String namespaceURI = xmlr.getNamespaceURI();
if (namespaceURI != null && namespaceURI.length() > 0) {
final String prefix = xmlr.getPrefix();
- if (prefix != null)
+ if (prefix != null) {
writer.writeStartElement(prefix, localName, namespaceURI);
- else
+ } else {
writer.writeStartElement(namespaceURI, localName);
+ }
} else {
writer.writeStartElement(localName);
}
@@ -68,10 +69,11 @@ public final class XmlReaderToWriter {
if (attUri != null && attUri.length() > 0) {
final String prefix = xmlr.getAttributePrefix(i);
- if (prefix != null)
+ if (prefix != null) {
writer.writeAttribute(prefix, attUri, xmlr.getAttributeLocalName(i), xmlr.getAttributeValue(i));
- else
+ } else {
writer.writeAttribute(attUri, xmlr.getAttributeLocalName(i), xmlr.getAttributeValue(i));
+ }
} else {
writer.writeAttribute(xmlr.getAttributeLocalName(i), xmlr.getAttributeValue(i));
}
@@ -103,10 +105,11 @@ public final class XmlReaderToWriter {
String encoding = xmlr.getCharacterEncodingScheme();
String version = xmlr.getVersion();
- if (encoding != null && version != null)
+ if (encoding != null && version != null) {
writer.writeStartDocument(encoding, version);
- else if (version != null)
+ } else if (version != null) {
writer.writeStartDocument(xmlr.getVersion());
+ }
break;
case XMLEvent.END_DOCUMENT:
writer.writeEndDocument();