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 2019/02/11 11:55:57 UTC
svn commit: r1853346 - in /santuario/xml-security-java/trunk: etc/
src/test/java/javax/xml/crypto/test/dsig/
src/test/java/javax/xml/crypto/test/dsig/keyinfo/
src/test/java/org/apache/xml/security/test/dom/algorithms/
src/test/java/org/apache/xml/secur...
Author: coheigea
Date: Mon Feb 11 11:55:56 2019
New Revision: 1853346
URL: http://svn.apache.org/viewvc?rev=1853346&view=rev
Log:
Enabling PMD UseAssertEqualsInsteadOfAssertTrue
Modified:
santuario/xml-security-java/trunk/etc/santuario-pmd-ruleset.xml
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXMLDSig11Test.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreatePhaosXMLDSig3Test.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/ManifestTest.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/ReferenceTest.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/SignaturePropertiesTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertyTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignedInfoTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLObjectTest.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/keyinfo/KeyInfoFactoryTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/PGPDataTest.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/c14n/implementations/Santuario191Test.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/XMLEncryption11Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureReferenceTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/version/VersionTest.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/encryption/XMLEncryption11Test.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=1853346&r1=1853345&r2=1853346&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/etc/santuario-pmd-ruleset.xml (original)
+++ santuario/xml-security-java/trunk/etc/santuario-pmd-ruleset.xml Mon Feb 11 11:55:56 2019
@@ -41,7 +41,6 @@
<exclude name="OneDeclarationPerLine" />
<exclude name="PreserveStackTrace" />
<exclude name="UseAssertSameInsteadOfAssertTrue" />
- <exclude name="UseAssertEqualsInsteadOfAssertTrue" />
<exclude name="UseVarargs" />
<!-- To fix -->
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java?rev=1853346&r1=1853345&r2=1853346&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java Mon Feb 11 11:55:56 2019
@@ -55,6 +55,7 @@ import org.apache.xml.security.utils.XML
import javax.xml.crypto.test.KeySelectors;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -95,10 +96,11 @@ public class CreateBaltimore23Test {
String fs = System.getProperty("file.separator");
String base = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
- FileInputStream fis = new FileInputStream
- (base + fs + "src/test/resources" + fs + "test.jks");
- ks = KeyStore.getInstance("JKS");
- ks.load(fis, "changeit".toCharArray());
+ try (FileInputStream fis = new FileInputStream
+ (base + fs + "src/test/resources" + fs + "test.jks")) {
+ ks = KeyStore.getInstance("JKS");
+ ks.load(fis, "changeit".toCharArray());
+ }
signingKey = ks.getKey("mullan", "changeit".toCharArray());
signingCert = ks.getCertificate("mullan");
validatingKey = signingCert.getPublicKey();
@@ -151,7 +153,7 @@ public class CreateBaltimore23Test {
(kvks, envelope.getFirstChild());
XMLSignature sig2 = fac.unmarshalXMLSignature(dvc);
- assertTrue(sig.equals(sig2));
+ assertEquals(sig, sig2);
assertTrue(sig2.validate(dvc));
}
@@ -627,7 +629,7 @@ public class CreateBaltimore23Test {
XMLSignature sig2 = fac.unmarshalXMLSignature(dvc);
- assertTrue(sig.equals(sig2));
+ assertEquals(sig, sig2);
assertTrue(sig2.validate(dvc));
}
@@ -690,7 +692,7 @@ public class CreateBaltimore23Test {
XMLSignature sig2 = fac.unmarshalXMLSignature(dvc);
- assertTrue(sig.equals(sig2));
+ assertEquals(sig, sig2);
assertTrue(sig2.validate(dvc));
}
@@ -731,7 +733,7 @@ public class CreateBaltimore23Test {
(ks, doc.getDocumentElement());
XMLSignature sig2 = fac.unmarshalXMLSignature(dvc);
- assertTrue(sig.equals(sig2));
+ assertEquals(sig, sig2);
assertTrue(sig2.validate(dvc));
}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java?rev=1853346&r1=1853345&r2=1853346&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java Mon Feb 11 11:55:56 2019
@@ -38,6 +38,7 @@ import org.w3c.dom.*;
import javax.xml.crypto.test.KeySelectors;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
/**
@@ -67,10 +68,11 @@ public class CreateInteropExcC14NTest {
String base = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
String fs = System.getProperty("file.separator");
- FileInputStream fis = new FileInputStream
- (base + fs + "src/test/resources" + fs + "test.jks");
- ks = KeyStore.getInstance("JKS");
- ks.load(fis, "changeit".toCharArray());
+ try (FileInputStream fis = new FileInputStream
+ (base + fs + "src/test/resources" + fs + "test.jks")) {
+ ks = KeyStore.getInstance("JKS");
+ ks.load(fis, "changeit".toCharArray());
+ }
Certificate signingCert = ks.getCertificate("mullan");
signingKey = ks.getKey("mullan", "changeit".toCharArray());
validatingKey = signingCert.getPublicKey();
@@ -163,7 +165,7 @@ public class CreateInteropExcC14NTest {
(new KeySelectors.KeyValueKeySelector(), foo.getLastChild());
XMLSignature sig2 = fac.unmarshalXMLSignature(dvc);
- assertTrue(sig.equals(sig2));
+ assertEquals(sig, sig2);
assertTrue(sig2.validate(dvc));
}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java?rev=1853346&r1=1853345&r2=1853346&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java Mon Feb 11 11:55:56 2019
@@ -38,6 +38,7 @@ import org.w3c.dom.*;
import javax.xml.crypto.test.KeySelectors;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
/**
@@ -68,10 +69,11 @@ public class CreateInteropXFilter2Test {
String fs = System.getProperty("file.separator");
String base = System.getProperty("basedir") == null ? "./": System.getProperty("basedir");
- FileInputStream fis = new FileInputStream
- (base + fs + "src/test/resources" + fs + "test.jks");
- ks = KeyStore.getInstance("JKS");
- ks.load(fis, "changeit".toCharArray());
+ try (FileInputStream fis = new FileInputStream
+ (base + fs + "src/test/resources" + fs + "test.jks")) {
+ ks = KeyStore.getInstance("JKS");
+ ks.load(fis, "changeit".toCharArray());
+ }
signingKey = ks.getKey("mullan", "changeit".toCharArray());
signingCert = ks.getCertificate("mullan");
validatingKey = signingCert.getPublicKey();
@@ -163,7 +165,7 @@ public class CreateInteropXFilter2Test {
(new KeySelectors.KeyValueKeySelector(), document.getLastChild());
XMLSignature sig2 = fac.unmarshalXMLSignature(dvc);
- assertTrue(sig.equals(sig2));
+ assertEquals(sig, sig2);
assertTrue(sig2.validate(dvc));
}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXMLDSig11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXMLDSig11Test.java?rev=1853346&r1=1853345&r2=1853346&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXMLDSig11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXMLDSig11Test.java Mon Feb 11 11:55:56 2019
@@ -35,6 +35,7 @@ import org.w3c.dom.*;
import javax.xml.crypto.test.KeySelectors;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -315,7 +316,7 @@ public class CreateInteropXMLDSig11Test
(ks, doc.getDocumentElement());
XMLSignature sig2 = fac.unmarshalXMLSignature(dvc);
- assertTrue(sig.equals(sig2));
+ assertEquals(sig, sig2);
assertTrue(sig2.validate(dvc));
}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreatePhaosXMLDSig3Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreatePhaosXMLDSig3Test.java?rev=1853346&r1=1853345&r2=1853346&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreatePhaosXMLDSig3Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreatePhaosXMLDSig3Test.java Mon Feb 11 11:55:56 2019
@@ -36,6 +36,7 @@ import org.w3c.dom.*;
import javax.xml.crypto.test.KeySelectors;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -119,7 +120,7 @@ public class CreatePhaosXMLDSig3Test {
XMLSignature sig2 = fac.unmarshalXMLSignature(dvc);
- assertTrue(sig.equals(sig2));
+ assertEquals(sig, sig2);
assertTrue(sig2.validate(dvc));
}
@@ -175,7 +176,7 @@ public class CreatePhaosXMLDSig3Test {
XMLSignature sig2 = fac.unmarshalXMLSignature(dvc);
- assertTrue(sig.equals(sig2));
+ assertEquals(sig, sig2);
assertTrue(sig2.validate(dvc));
}
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=1853346&r1=1853345&r2=1853346&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 Mon Feb 11 11:55:56 2019
@@ -46,6 +46,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Text;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -186,7 +187,7 @@ public class HMACSignatureAlgorithmTest
(ks, doc.getDocumentElement());
XMLSignature sig2 = fac.unmarshalXMLSignature(dvc);
- assertTrue(sig.equals(sig2));
+ assertEquals(sig, sig2);
assertTrue(sig2.validate(dvc));
}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ManifestTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ManifestTest.java?rev=1853346&r1=1853345&r2=1853346&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ManifestTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ManifestTest.java Mon Feb 11 11:55:56 2019
@@ -25,6 +25,7 @@ package javax.xml.crypto.test.dsig;
import java.util.*;
import javax.xml.crypto.dsig.*;
+import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -75,7 +76,7 @@ public class ManifestTest {
break;
}
assertNotNull(man);
- assertTrue(Arrays.equals(man.getReferences().toArray(), refs.toArray()));
+ assertArrayEquals(man.getReferences().toArray(), refs.toArray());
assertEquals(man.getId(), expectedId);
}
@@ -182,4 +183,4 @@ public class ManifestTest {
private static void addEntryToRawList(List list, Object entry) {
list.add(entry);
}
-}
\ No newline at end of file
+}
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=1853346&r1=1853345&r2=1853346&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 Mon Feb 11 11:55:56 2019
@@ -51,6 +51,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Text;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -313,7 +314,7 @@ public class PKSignatureAlgorithmTest {
(ks, doc.getDocumentElement());
XMLSignature sig2 = fac.unmarshalXMLSignature(dvc);
- assertTrue(sig.equals(sig2));
+ assertEquals(sig, sig2);
assertTrue(sig2.validate(dvc));
}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ReferenceTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ReferenceTest.java?rev=1853346&r1=1853345&r2=1853346&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ReferenceTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ReferenceTest.java Mon Feb 11 11:55:56 2019
@@ -35,6 +35,7 @@ import javax.xml.crypto.dsig.spec.C14NMe
import javax.xml.crypto.dsig.spec.TransformParameterSpec;
import org.w3c.dom.Document;
+import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -136,8 +137,8 @@ public class ReferenceTest {
// try empty transforms list
ref = fac.newReference(uri, dmSHA1, transforms,
type, id);
- assertTrue(Arrays.equals(transforms.toArray(),
- ref.getTransforms().toArray()));
+ assertArrayEquals(transforms.toArray(),
+ ref.getTransforms().toArray());
} catch(Exception ex) {
fail("Unexpected Exception: " + ex);
}
@@ -176,8 +177,8 @@ public class ReferenceTest {
try {
// try a transforms list with a Transform object
ref = fac.newReference(uri, dmSHA1, transforms, type, id);
- assertTrue(Arrays.equals(transforms.toArray(),
- ref.getTransforms().toArray()));
+ assertArrayEquals(transforms.toArray(),
+ ref.getTransforms().toArray());
} catch (Exception ex) {
fail("Unexpected Exception: " + ex);
}
@@ -271,7 +272,7 @@ public class ReferenceTest {
}
byte[] dv = validated_ref.getDigestValue();
byte[] cdv = validated_ref.getCalculatedDigestValue();
- assertTrue(Arrays.equals(dv, cdv));
+ assertArrayEquals(dv, cdv);
boolean valid = validated_ref.validate(validateContext);
assertTrue(valid);
}
@@ -298,4 +299,4 @@ public class ReferenceTest {
private static void addEntryToRawList(List list, Object entry) {
list.add(entry);
}
-}
\ No newline at end of file
+}
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=1853346&r1=1853345&r2=1853346&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 Mon Feb 11 11:55:56 2019
@@ -44,6 +44,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Text;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -205,7 +206,7 @@ public class SignatureDigestMethodTest {
(ks, doc.getDocumentElement());
XMLSignature sig2 = fac.unmarshalXMLSignature(dvc);
- assertTrue(sig.equals(sig2));
+ assertEquals(sig, sig2);
assertTrue(sig2.validate(dvc));
}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertiesTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertiesTest.java?rev=1853346&r1=1853345&r2=1853346&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertiesTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertiesTest.java Mon Feb 11 11:55:56 2019
@@ -25,6 +25,7 @@ package javax.xml.crypto.test.dsig;
import java.util.*;
import javax.xml.crypto.dsig.*;
+import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -97,7 +98,7 @@ public class SignaturePropertiesTest {
unmodifiable.add(prop);
fail("Should return an unmodifiable List object");
} catch (UnsupportedOperationException uoe) {}
- assertTrue(Arrays.equals(unmodifiable.toArray(), list.toArray()));
+ assertArrayEquals(unmodifiable.toArray(), list.toArray());
assertNotNull(props);
assertEquals(props.getId(), id);
}
@@ -121,4 +122,4 @@ public class SignaturePropertiesTest {
private static void addEntryToRawList(List list, Object entry) {
list.add(entry);
}
-}
\ No newline at end of file
+}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertyTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertyTest.java?rev=1853346&r1=1853345&r2=1853346&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertyTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertyTest.java Mon Feb 11 11:55:56 2019
@@ -26,6 +26,7 @@ import java.util.*;
import javax.xml.crypto.XMLStructure;
import javax.xml.crypto.dsig.*;
+import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -99,7 +100,7 @@ public class SignaturePropertyTest {
unmodifiable.add(new TestUtils.MyOwnXMLStructure());
fail("Should return an unmodifiable List object");
} catch (UnsupportedOperationException uoe) {}
- assertTrue(Arrays.equals(unmodifiable.toArray(), list.toArray()));
+ assertArrayEquals(unmodifiable.toArray(), list.toArray());
assertEquals(prop.getTarget(), target);
assertEquals(prop.getId(), id);
assertNotNull(prop);
@@ -125,4 +126,4 @@ public class SignaturePropertyTest {
private static void addEntryToRawList(List list, Object entry) {
list.add(entry);
}
-}
\ No newline at end of file
+}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignedInfoTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignedInfoTest.java?rev=1853346&r1=1853345&r2=1853346&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignedInfoTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignedInfoTest.java Mon Feb 11 11:55:56 2019
@@ -27,10 +27,10 @@ import java.util.*;
import javax.xml.crypto.dsig.*;
import javax.xml.crypto.dsig.spec.C14NMethodParameterSpec;
+import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -123,8 +123,8 @@ public class SignedInfoTest {
sm.getAlgorithm());
assertEquals(si.getSignatureMethod().getParameterSpec(),
sm.getParameterSpec());
- assertTrue(Arrays.equals(si.getReferences().toArray(),
- references.toArray()));
+ assertArrayEquals(si.getReferences().toArray(),
+ references.toArray());
assertNull(si.getId());
// test XMLSignatureFactory.newSignedInfo(
@@ -144,4 +144,4 @@ public class SignedInfoTest {
private static void addEntryToRawList(List list, Object entry) {
list.add(entry);
}
-}
\ No newline at end of file
+}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLObjectTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLObjectTest.java?rev=1853346&r1=1853345&r2=1853346&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLObjectTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLObjectTest.java Mon Feb 11 11:55:56 2019
@@ -26,6 +26,7 @@ import java.util.*;
import javax.xml.crypto.XMLStructure;
import javax.xml.crypto.dsig.*;
+import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -78,7 +79,7 @@ public class XMLObjectTest {
obj = factory.newXMLObject(list, id, mimeType, encoding);
assertNotNull(obj);
assertNotNull(obj.getContent());
- assertTrue(Arrays.equals(obj.getContent().toArray(), list.toArray()));
+ assertArrayEquals(obj.getContent().toArray(), list.toArray());
assertEquals(obj.getId(), id);
assertEquals(obj.getMimeType(), mimeType);
assertEquals(obj.getEncoding(), encoding);
@@ -89,7 +90,7 @@ public class XMLObjectTest {
unmodifiable.add(new TestUtils.MyOwnXMLStructure());
fail("Should return an unmodifiable List object");
} catch (UnsupportedOperationException uoe) {}
- assertTrue(Arrays.equals(unmodifiable.toArray(), list.toArray()));
+ assertArrayEquals(unmodifiable.toArray(), list.toArray());
}
@org.junit.Test
@@ -111,4 +112,4 @@ public class XMLObjectTest {
private static void addEntryToRawList(List list, Object entry) {
list.add(entry);
}
-}
\ No newline at end of file
+}
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=1853346&r1=1853345&r2=1853346&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 Mon Feb 11 11:55:56 2019
@@ -38,6 +38,7 @@ import javax.crypto.spec.SecretKeySpec;
import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.*;
+import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
@@ -136,7 +137,7 @@ public class XMLSignatureTest {
sig = fac.newXMLSignature(defSi, defKi, objs, id, sigValueId);
assertEquals(sig.getId(), id);
assertEquals(sig.getKeyInfo(), defKi);
- assertTrue(Arrays.equals(sig.getObjects().toArray(), objs.toArray()));
+ assertArrayEquals(sig.getObjects().toArray(), objs.toArray());
assertNull(sig.getSignatureValue().getValue());
assertEquals(sig.getSignatureValue().getId(), sigValueId);
assertEquals(sig.getSignedInfo(), defSi);
@@ -429,4 +430,4 @@ public class XMLSignatureTest {
super("TestProvider", 0, "TestProvider");
}
}
-}
\ No newline at end of file
+}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyInfoFactoryTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyInfoFactoryTest.java?rev=1853346&r1=1853345&r2=1853346&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyInfoFactoryTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyInfoFactoryTest.java Mon Feb 11 11:55:56 2019
@@ -29,6 +29,7 @@ import java.security.PublicKey;
import javax.xml.crypto.dsig.keyinfo.*;
import javax.xml.crypto.*;
+import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -147,7 +148,7 @@ public class KeyInfoFactoryTest {
// test newPGPData(byte[])
PGPData pd = factory.newPGPData(valid_id);
- assertTrue(Arrays.equals(valid_id, pd.getKeyId()));
+ assertArrayEquals(valid_id, pd.getKeyId());
try {
pd = factory.newPGPData(invalid_id);
fail("Should throw IAE for invalid key id values");
@@ -155,8 +156,8 @@ public class KeyInfoFactoryTest {
// test newPGPData(byte[], byte[], List)
pd = factory.newPGPData(valid_id, valid_packet, null);
- assertTrue(Arrays.equals(valid_id, pd.getKeyId()));
- assertTrue(Arrays.equals(valid_packet, pd.getKeyPacket()));
+ assertArrayEquals(valid_id, pd.getKeyId());
+ assertArrayEquals(valid_packet, pd.getKeyPacket());
try {
pd = factory.newPGPData(invalid_id, valid_packet, null);
fail("Should throw IAE for invalid key id values");
@@ -172,7 +173,7 @@ public class KeyInfoFactoryTest {
// test newPGPData(byte[], List)
pd = factory.newPGPData(valid_packet, null);
- assertTrue(Arrays.equals(valid_packet, pd.getKeyPacket()));
+ assertArrayEquals(valid_packet, pd.getKeyPacket());
try {
pd = factory.newPGPData(invalid_packet, null);
fail("Should throw IAE for invalid key packet values");
@@ -252,4 +253,4 @@ public class KeyInfoFactoryTest {
} catch (IllegalArgumentException ex) {}
}
-}
\ No newline at end of file
+}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/PGPDataTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/PGPDataTest.java?rev=1853346&r1=1853345&r2=1853346&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/PGPDataTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/PGPDataTest.java Mon Feb 11 11:55:56 2019
@@ -23,11 +23,11 @@ package javax.xml.crypto.test.dsig.keyin
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import javax.xml.crypto.*;
import javax.xml.crypto.dsig.keyinfo.*;
+import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -109,16 +109,16 @@ public class PGPDataTest {
public void testConstructor() {
// test newPGPKeyData(byte[])
PGPData pd = fac.newPGPData(values[0]);
- assertTrue(Arrays.equals(values[0], pd.getKeyId()));
+ assertArrayEquals(values[0], pd.getKeyId());
// test newPGPData(byte[], byte[], List)
pd = fac.newPGPData(values[0], values[1], null);
- assertTrue(Arrays.equals(values[0], pd.getKeyId()));
- assertTrue(Arrays.equals(values[1], pd.getKeyPacket()));
+ assertArrayEquals(values[0], pd.getKeyId());
+ assertArrayEquals(values[1], pd.getKeyPacket());
// test newPGPData(byte[], List)
pd = fac.newPGPData(values[1], null);
- assertTrue(Arrays.equals(values[1], pd.getKeyPacket()));
+ assertArrayEquals(values[1], pd.getKeyPacket());
}
@org.junit.Test
@@ -150,4 +150,4 @@ public class PGPDataTest {
private static void addEntryToRawList(List list, Object entry) {
list.add(entry);
}
-}
\ No newline at end of file
+}
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=1853346&r1=1853345&r2=1853346&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 Mon Feb 11 11:55:56 2019
@@ -23,12 +23,12 @@ import java.lang.reflect.Constructor;
import java.security.MessageDigest;
import java.security.Provider;
import java.security.Security;
-import java.util.Arrays;
import org.apache.xml.security.algorithms.MessageDigestAlgorithm;
import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Document;
+import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -86,7 +86,7 @@ public class DigestAlgorithmTest {
// Now compare against a JDK MessageDigest Object
MessageDigest md = MessageDigest.getInstance("SHA-1");
byte[] digest2 = md.digest("test-string".getBytes());
- assertTrue(Arrays.equals(digest, digest2));
+ assertArrayEquals(digest, digest2);
}
@org.junit.Test
@@ -104,7 +104,7 @@ public class DigestAlgorithmTest {
// Now compare against a JDK MessageDigest Object
MessageDigest md = MessageDigest.getInstance("SHA-224");
byte[] digest2 = md.digest("test-string".getBytes());
- assertTrue(Arrays.equals(digest, digest2));
+ assertArrayEquals(digest, digest2);
}
@org.junit.Test
@@ -122,7 +122,7 @@ public class DigestAlgorithmTest {
// Now compare against a JDK MessageDigest Object
MessageDigest md = MessageDigest.getInstance("SHA-256");
byte[] digest2 = md.digest("test-string".getBytes());
- assertTrue(Arrays.equals(digest, digest2));
+ assertArrayEquals(digest, digest2);
}
@org.junit.Test
@@ -140,7 +140,7 @@ public class DigestAlgorithmTest {
// Now compare against a JDK MessageDigest Object
MessageDigest md = MessageDigest.getInstance("SHA-384");
byte[] digest2 = md.digest("test-string".getBytes());
- assertTrue(Arrays.equals(digest, digest2));
+ assertArrayEquals(digest, digest2);
}
@org.junit.Test
@@ -158,7 +158,7 @@ public class DigestAlgorithmTest {
// Now compare against a JDK MessageDigest Object
MessageDigest md = MessageDigest.getInstance("SHA-512");
byte[] digest2 = md.digest("test-string".getBytes());
- assertTrue(Arrays.equals(digest, digest2));
+ assertArrayEquals(digest, digest2);
}
@org.junit.Test
@@ -176,7 +176,7 @@ public class DigestAlgorithmTest {
// Now compare against a JDK MessageDigest Object
MessageDigest md = MessageDigest.getInstance("MD5");
byte[] digest2 = md.digest("test-string".getBytes());
- assertTrue(Arrays.equals(digest, digest2));
+ assertArrayEquals(digest, digest2);
}
@org.junit.Test
@@ -195,7 +195,7 @@ public class DigestAlgorithmTest {
// Now compare against a JDK MessageDigest Object
MessageDigest md = MessageDigest.getInstance("RIPEMD160");
byte[] digest2 = md.digest("test-string".getBytes());
- assertTrue(Arrays.equals(digest, digest2));
+ assertArrayEquals(digest, digest2);
}
@org.junit.Test
@@ -214,7 +214,7 @@ public class DigestAlgorithmTest {
// Now compare against a JDK MessageDigest Object
MessageDigest md = MessageDigest.getInstance("WHIRLPOOL");
byte[] digest2 = md.digest("test-string".getBytes());
- assertTrue(Arrays.equals(digest, digest2));
+ assertArrayEquals(digest, digest2);
}
@org.junit.Test
@@ -233,7 +233,7 @@ public class DigestAlgorithmTest {
// Now compare against a JDK MessageDigest Object
MessageDigest md = MessageDigest.getInstance("SHA3-224");
byte[] digest2 = md.digest("test-string".getBytes());
- assertTrue(Arrays.equals(digest, digest2));
+ assertArrayEquals(digest, digest2);
}
@org.junit.Test
@@ -252,7 +252,7 @@ public class DigestAlgorithmTest {
// Now compare against a JDK MessageDigest Object
MessageDigest md = MessageDigest.getInstance("SHA3-256");
byte[] digest2 = md.digest("test-string".getBytes());
- assertTrue(Arrays.equals(digest, digest2));
+ assertArrayEquals(digest, digest2);
}
@org.junit.Test
@@ -271,7 +271,7 @@ public class DigestAlgorithmTest {
// Now compare against a JDK MessageDigest Object
MessageDigest md = MessageDigest.getInstance("SHA3-384");
byte[] digest2 = md.digest("test-string".getBytes());
- assertTrue(Arrays.equals(digest, digest2));
+ assertArrayEquals(digest, digest2);
}
@org.junit.Test
@@ -290,7 +290,7 @@ public class DigestAlgorithmTest {
// Now compare against a JDK MessageDigest Object
MessageDigest md = MessageDigest.getInstance("SHA3-512");
byte[] digest2 = md.digest("test-string".getBytes());
- assertTrue(Arrays.equals(digest, digest2));
+ assertArrayEquals(digest, digest2);
}
-}
\ No newline at end of file
+}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java?rev=1853346&r1=1853345&r2=1853346&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java Mon Feb 11 11:55:56 2019
@@ -29,7 +29,7 @@ import org.w3c.dom.NodeList;
import org.apache.xml.security.c14n.implementations.Canonicalizer11_OmitComments;
import org.apache.xml.security.utils.XMLUtils;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
/**
* This is a test for Santuario-191:
@@ -80,7 +80,7 @@ public class Santuario191Test {
//
ByteArrayOutputStream out = new ByteArrayOutputStream();
out.write(result);
- assertTrue(EXPECTED_RESULT.equals(out.toString(StandardCharsets.UTF_8.name())));
+ assertEquals(EXPECTED_RESULT, out.toString(StandardCharsets.UTF_8.name()));
}
}
\ No newline at end of file
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=1853346&r1=1853345&r2=1853346&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 Mon Feb 11 11:55:56 2019
@@ -20,13 +20,11 @@ package org.apache.xml.security.test.dom
import java.io.ByteArrayOutputStream;
-import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
import org.apache.xml.security.c14n.implementations.UtfHelpper;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertArrayEquals;
public class UtfHelperTest {
@@ -35,8 +33,7 @@ public class UtfHelperTest {
String s = "\u00e4\u00f6\u00fc";
byte[] a = UtfHelpper.getStringInUtf8(s);
byte[] correct = s.getBytes(StandardCharsets.UTF_8);
- boolean equals = Arrays.equals(correct, a);
- assertTrue(equals);
+ assertArrayEquals(correct, a);
}
@org.junit.Test
@@ -82,16 +79,16 @@ public class UtfHelperTest {
// System.out.println("chunk:"+j);
byte[] correct = str.getBytes(StandardCharsets.UTF_8);
- assertTrue("UtfHelper.getStringInUtf8 false", Arrays.equals(correct, a));
- assertTrue(
+ assertArrayEquals("UtfHelper.getStringInUtf8 false", correct, a);
+ assertArrayEquals(
"UtfHelper.getStringInUtf8 false",
- Arrays.equals(correct, charByCharOs.toByteArray())
+ correct, charByCharOs.toByteArray()
);
UtfHelpper.writeStringToUtf8(str, strOs);
- assertTrue(
+ assertArrayEquals(
"UtfHelper.writeStringToUtf8 false",
- Arrays.equals(correct, strOs.toByteArray())
+ correct, strOs.toByteArray()
);
}
-}
\ No newline at end of file
+}
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=1853346&r1=1853345&r2=1853346&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 Mon Feb 11 11:55:56 2019
@@ -599,7 +599,7 @@ public class BaltimoreEncTest {
String cc = retrieveCCNumber(d);
LOG.debug("Retrieved Credit Card : " + cc);
- assertTrue(cardNumber.equals(cc));
+ assertEquals(cardNumber, cc);
// Test cc numbers
if (doNodeCheck) {
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=1853346&r1=1853345&r2=1853346&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 Mon Feb 11 11:55:56 2019
@@ -52,6 +52,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -634,7 +635,7 @@ public class XMLEncryption11Test {
X509Data certData = kiek.itemX509Data(0);
XMLX509Certificate xcert = certData.itemCertificate(0);
X509Certificate cert = xcert.getX509Certificate();
- assertTrue(rsaCert.equals(cert));
+ assertEquals(rsaCert, cert);
XMLCipher cipher2 = XMLCipher.getInstance();
cipher2.init(XMLCipher.UNWRAP_MODE, rsaKey);
@@ -800,7 +801,7 @@ public class XMLEncryption11Test {
String cc = retrieveCCNumber(d);
LOG.debug("Retrieved Credit Card : " + cc);
- assertTrue(cardNumber.equals(cc));
+ assertEquals(cardNumber, cc);
// Test cc numbers
if (doNodeCheck) {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java?rev=1853346&r1=1853345&r2=1853346&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java Mon Feb 11 11:55:56 2019
@@ -29,6 +29,7 @@ import org.apache.xml.security.utils.Con
import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Element;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -63,7 +64,7 @@ public class ForbiddenAlgorithmTest exte
} catch (XMLSignatureException ex) {
String error = "It is forbidden to use algorithm http://www.w3.org/2001/04/xmldsig-more#md5 "
+ "when secure validation is enabled";
- assertTrue(ex.getMessage().equals(error));
+ assertEquals(ex.getMessage(), error);
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureReferenceTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureReferenceTest.java?rev=1853346&r1=1853345&r2=1853346&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureReferenceTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureReferenceTest.java Mon Feb 11 11:55:56 2019
@@ -101,7 +101,7 @@ public class SignatureReferenceTest {
Element referenceElement =
(Element)((ReferenceNodeSetData)referenceData).iterator().next();
assertNotNull(referenceElement);
- assertTrue("root".equals(referenceElement.getLocalName()));
+ assertEquals("root", referenceElement.getLocalName());
Element originalElement =
(Element) doc.getElementsByTagNameNS("http://ns.example.org/", "root").item(0);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java?rev=1853346&r1=1853345&r2=1853346&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java Mon Feb 11 11:55:56 2019
@@ -28,6 +28,7 @@ import org.apache.xml.security.c14n.Cano
import org.apache.xml.security.c14n.InvalidCanonicalizerException;
import org.apache.xml.security.signature.XMLSignatureInput;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
/**
@@ -106,7 +107,7 @@ public class XMLSignatureInputTest {
byte[] resBytes = baos.toByteArray();
String resString = new String(resBytes, java.nio.charset.StandardCharsets.UTF_8);
- assertTrue(resString.equals(_octetStreamTextInput));
+ assertEquals(resString, _octetStreamTextInput);
}
@org.junit.Test
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java?rev=1853346&r1=1853345&r2=1853346&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java Mon Feb 11 11:55:56 2019
@@ -35,7 +35,7 @@ import org.apache.xml.security.utils.XML
import org.w3c.dom.Document;
import org.w3c.dom.Node;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
/**
* Unit test for {@link org.apache.xml.security.transforms.implementations.TransformBase64Decode}
@@ -69,9 +69,7 @@ public class TransformBase64DecodeTest {
XMLSignatureInput out = t.performTransforms(in);
String result = new String(out.getBytes());
- assertTrue(
- result.equals("The URI of the transform is http://www.w3.org/2000/09/xmldsig#base64")
- );
+ assertEquals(result, "The URI of the transform is http://www.w3.org/2000/09/xmldsig#base64");
}
@org.junit.Test
@@ -93,9 +91,7 @@ public class TransformBase64DecodeTest {
XMLSignatureInput out = t.performTransforms(t.performTransforms(in));
String result = new String(out.getBytes());
- assertTrue(
- result.equals("The URI of the transform is http://www.w3.org/2000/09/xmldsig#base64")
- );
+ assertEquals(result, "The URI of the transform is http://www.w3.org/2000/09/xmldsig#base64");
}
@org.junit.Test
@@ -135,9 +131,9 @@ public class TransformBase64DecodeTest {
XMLSignatureInput out = t.performTransforms(xmlinput);
String result = new String(out.getBytes());
- assertTrue(
+ assertEquals(
"\"" + result + "\"",
- result.equals("The URI of the transform is http://www.w3.org/2000/09/xmldsig#base64")
+ result, "The URI of the transform is http://www.w3.org/2000/09/xmldsig#base64"
);
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/version/VersionTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/version/VersionTest.java?rev=1853346&r1=1853345&r2=1853346&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/version/VersionTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/version/VersionTest.java Mon Feb 11 11:55:56 2019
@@ -22,6 +22,7 @@ package org.apache.xml.security.test.dom
import java.security.Provider;
import java.security.Security;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -37,13 +38,13 @@ public class VersionTest {
@org.junit.Test
public void testConvertVersion() throws Exception {
String version = convertVersion("1.4.4");
- assertTrue("1.44".equals(version));
+ assertEquals("1.44", version);
version = convertVersion("1.4.4-SNAPSHOT");
- assertTrue("1.44".equals(version));
+ assertEquals("1.44", version);
version = convertVersion("1.4");
- assertTrue("1.4".equals(version));
+ assertEquals("1.4", version);
}
@org.junit.Test
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=1853346&r1=1853345&r2=1853346&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 Mon Feb 11 11:55:56 2019
@@ -55,6 +55,7 @@ import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -431,7 +432,7 @@ public class BaltimoreEncTest {
private void checkDecryptedDoc(Document d, boolean doNodeCheck) throws Exception {
String cc = retrieveCCNumber(d);
- assertTrue(cardNumber.equals(cc));
+ assertEquals(cardNumber, cc);
// Test cc numbers
if (doNodeCheck) {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java?rev=1853346&r1=1853345&r2=1853346&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java Mon Feb 11 11:55:56 2019
@@ -632,7 +632,7 @@ public class XMLEncryption11Test {
private void checkDecryptedDoc(Document d, boolean doNodeCheck) throws Exception {
String cc = retrieveCCNumber(d);
- assertTrue(cardNumber.equals(cc));
+ assertEquals(cardNumber, cc);
// Test cc numbers
if (doNodeCheck) {