[java-opensaml] branch main updated: IDP-2069 - Null Handling Task
Scott Cantor
cantor.2 at osu.edu
Mon Apr 3 18:54:17 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=ccc3169ea4594cfa08acaaeb19a5476ff9816bf8
The following commit(s) were added to refs/heads/main by this push:
new ccc3169ea IDP-2069 - Null Handling Task
ccc3169ea is described below
commit ccc3169ea4594cfa08acaaeb19a5476ff9816bf8
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Apr 3 14:54:13 2023 -0400
IDP-2069 - Null Handling Task
https://shibboleth.atlassian.net/browse/IDP-2069
Clean remaining tests.
---
.../xmlsec/encryption/impl/CipherReferenceTest.java | 12 ++++++------
.../xmlsec/encryption/impl/CipherValueTest.java | 6 +++---
.../xmlsec/encryption/impl/ConcatKDFParamsTest.java | 17 +++++++++--------
.../xmlsec/encryption/impl/DHKeyValueTest.java | 12 ++++++------
.../xmlsec/encryption/impl/DataReferenceTest.java | 12 ++++++------
.../xmlsec/encryption/impl/DerivedKeyNameTest.java | 6 +++---
.../xmlsec/encryption/impl/DerivedKeyTest.java | 15 ++++++++-------
.../xmlsec/encryption/impl/EncryptedDataTest.java | 18 +++++++++---------
.../xmlsec/encryption/impl/EncryptedKeyTest.java | 20 ++++++++++----------
.../xmlsec/encryption/impl/EncryptionMethodTest.java | 12 ++++++------
.../encryption/impl/EncryptionPropertiesTest.java | 20 ++++++++++----------
.../encryption/impl/EncryptionPropertyTest.java | 20 ++++++++++----------
.../xmlsec/encryption/impl/GeneratorTest.java | 6 +++---
.../xmlsec/encryption/impl/IterationCountTest.java | 6 +++---
.../opensaml/xmlsec/encryption/impl/KANonceTest.java | 6 +++---
.../encryption/impl/KeyDerivationMethodTest.java | 12 ++++++------
.../xmlsec/encryption/impl/KeyLengthTest.java | 6 +++---
.../xmlsec/encryption/impl/KeyReferenceTest.java | 12 ++++++------
.../opensaml/xmlsec/encryption/impl/KeySizeTest.java | 6 +++---
.../org/opensaml/xmlsec/encryption/impl/MGFTest.java | 14 +++++++-------
.../xmlsec/encryption/impl/MasterKeyNameTest.java | 6 +++---
.../xmlsec/encryption/impl/OAEPparamsTest.java | 6 +++---
.../encryption/impl/OriginatorKeyInfoTest.java | 18 +++++++++---------
.../xmlsec/encryption/impl/OtherSourceTest.java | 13 ++++++-------
.../xmlsec/encryption/impl/PBKDF2ParamsTest.java | 10 +++++-----
.../org/opensaml/xmlsec/encryption/impl/PRFTest.java | 13 ++++++-------
.../org/opensaml/xmlsec/encryption/impl/PTest.java | 6 +++---
.../xmlsec/encryption/impl/PgenCounterTest.java | 6 +++---
.../opensaml/xmlsec/encryption/impl/PublicTest.java | 6 +++---
.../org/opensaml/xmlsec/encryption/impl/QTest.java | 6 +++---
.../xmlsec/encryption/impl/RecipientKeyInfoTest.java | 18 +++++++++---------
.../xmlsec/encryption/impl/ReferenceListTest.java | 12 ++++++------
.../opensaml/xmlsec/encryption/impl/SaltTest.java | 10 +++++-----
.../opensaml/xmlsec/encryption/impl/SeedTest.java | 6 +++---
.../xmlsec/encryption/impl/SpecifiedTest.java | 6 +++---
.../xmlsec/encryption/impl/TransformsTest.java | 12 ++++++------
.../signature/impl/DEREncodedKeyValueTest.java | 14 +++++++-------
.../xmlsec/signature/impl/DSAKeyValueTest.java | 12 ++++++------
.../xmlsec/signature/impl/DigestMethodTest.java | 13 +++++++------
.../xmlsec/signature/impl/ECKeyValueTest.java | 20 ++++++++++----------
.../opensaml/xmlsec/signature/impl/ExponentTest.java | 6 +++---
.../org/opensaml/xmlsec/signature/impl/GTest.java | 6 +++---
.../org/opensaml/xmlsec/signature/impl/JTest.java | 6 +++---
.../xmlsec/signature/impl/KeyInfoReferenceTest.java | 14 +++++++-------
.../opensaml/xmlsec/signature/impl/KeyInfoTest.java | 20 ++++++++++----------
.../opensaml/xmlsec/signature/impl/KeyNameTest.java | 6 +++---
.../opensaml/xmlsec/signature/impl/KeyValueTest.java | 12 ++++++------
.../opensaml/xmlsec/signature/impl/MgmtDataTest.java | 6 +++---
.../opensaml/xmlsec/signature/impl/ModulusTest.java | 6 +++---
.../xmlsec/signature/impl/NamedCurveTest.java | 7 ++++---
.../opensaml/xmlsec/signature/impl/PGPDataTest.java | 12 ++++++------
.../opensaml/xmlsec/signature/impl/PGPKeyIDTest.java | 6 +++---
.../xmlsec/signature/impl/PGPKeyPacketTest.java | 6 +++---
.../org/opensaml/xmlsec/signature/impl/PTest.java | 6 +++---
.../xmlsec/signature/impl/PgenCounterTest.java | 6 +++---
.../xmlsec/signature/impl/PublicKeyTest.java | 6 +++---
.../org/opensaml/xmlsec/signature/impl/QTest.java | 6 +++---
.../xmlsec/signature/impl/RSAKeyValueTest.java | 12 ++++++------
.../xmlsec/signature/impl/RetrievalMethodTest.java | 18 +++++++++---------
.../opensaml/xmlsec/signature/impl/SPKIDataTest.java | 12 ++++++------
.../opensaml/xmlsec/signature/impl/SPKISexpTest.java | 6 +++---
.../org/opensaml/xmlsec/signature/impl/SeedTest.java | 6 +++---
.../xmlsec/signature/impl/TransformTest.java | 12 ++++++------
.../xmlsec/signature/impl/TransformsTest.java | 12 ++++++------
.../opensaml/xmlsec/signature/impl/X509CRLTest.java | 6 +++---
.../xmlsec/signature/impl/X509CertificateTest.java | 6 +++---
.../opensaml/xmlsec/signature/impl/X509DataTest.java | 12 ++++++------
.../xmlsec/signature/impl/X509DigestTest.java | 7 ++++---
.../xmlsec/signature/impl/X509IssuerNameTest.java | 6 +++---
.../xmlsec/signature/impl/X509IssuerSerialTest.java | 12 ++++++------
.../opensaml/xmlsec/signature/impl/X509SKITest.java | 6 +++---
.../xmlsec/signature/impl/X509SerialNumberTest.java | 6 +++---
.../xmlsec/signature/impl/X509SubjectNameTest.java | 6 +++---
.../opensaml/xmlsec/signature/impl/XPathTest.java | 6 +++---
.../org/opensaml/xmlsec/signature/impl/YTest.java | 6 +++---
75 files changed, 374 insertions(+), 371 deletions(-)
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceTest.java
index cf921dc22..b3b9fef32 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceTest.java
@@ -49,9 +49,9 @@ public class CipherReferenceTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- CipherReference cr = (CipherReference) unmarshallElement(singleElementFile);
+ final CipherReference cr = (CipherReference) unmarshallElement(singleElementFile);
- Assert.assertNotNull(cr, "CipherReference");
+ assert cr != null;
Assert.assertEquals(cr.getURI(), expectedURI, "URI attribute");
Assert.assertNull(cr.getTransforms(), "Transforms child");
}
@@ -59,9 +59,9 @@ public class CipherReferenceTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- CipherReference cr = (CipherReference) unmarshallElement(childElementsFile);
+ final CipherReference cr = (CipherReference) unmarshallElement(childElementsFile);
- Assert.assertNotNull(cr, "CipherReference");
+ assert cr != null;
Assert.assertEquals(cr.getURI(), expectedURI, "URI attribute");
Assert.assertNotNull(cr.getTransforms(), "Transforms child");
}
@@ -69,7 +69,7 @@ public class CipherReferenceTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- CipherReference cr = (CipherReference) buildXMLObject(CipherReference.DEFAULT_ELEMENT_NAME);
+ final CipherReference cr = (CipherReference) buildXMLObject(CipherReference.DEFAULT_ELEMENT_NAME);
cr.setURI(expectedURI);
@@ -79,7 +79,7 @@ public class CipherReferenceTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- CipherReference cr = (CipherReference) buildXMLObject(CipherReference.DEFAULT_ELEMENT_NAME);
+ final CipherReference cr = (CipherReference) buildXMLObject(CipherReference.DEFAULT_ELEMENT_NAME);
cr.setURI(expectedURI);
cr.setTransforms((Transforms) buildXMLObject(Transforms.DEFAULT_ELEMENT_NAME));
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherValueTest.java
index 55865e448..aa8f439a9 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/CipherValueTest.java
@@ -48,16 +48,16 @@ public class CipherValueTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- CipherValue cv = (CipherValue) unmarshallElement(singleElementFile);
+ final CipherValue cv = (CipherValue) unmarshallElement(singleElementFile);
- Assert.assertNotNull(cv, "CipherValue");
+ assert cv != null;
Assert.assertEquals(expectedBase64Content, cv.getValue(), "CipherValue value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- CipherValue cv = (CipherValue) buildXMLObject(CipherValue.DEFAULT_ELEMENT_NAME);
+ final CipherValue cv = (CipherValue) buildXMLObject(CipherValue.DEFAULT_ELEMENT_NAME);
cv.setValue(expectedBase64Content);
assertXMLEquals(expectedDOM, cv);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/ConcatKDFParamsTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/ConcatKDFParamsTest.java
index d56fee9b3..b0ae0ef85 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/ConcatKDFParamsTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/ConcatKDFParamsTest.java
@@ -60,9 +60,9 @@ public class ConcatKDFParamsTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- ConcatKDFParams params = (ConcatKDFParams) unmarshallElement(singleElementFile);
+ final ConcatKDFParams params = (ConcatKDFParams) unmarshallElement(singleElementFile);
- Assert.assertNotNull(params);
+ assert params != null;
Assert.assertEquals(params.getAlgorithmID(), expectedAlgorithmID);
Assert.assertEquals(params.getPartyVInfo(), expectedPartyVInfo);
Assert.assertEquals(params.getPartyUInfo(), expectedPartyUInfo);
@@ -73,23 +73,24 @@ public class ConcatKDFParamsTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- ConcatKDFParams params = (ConcatKDFParams) unmarshallElement(childElementsFile);
+ final ConcatKDFParams params = (ConcatKDFParams) unmarshallElement(childElementsFile);
- Assert.assertNotNull(params);
+ assert params != null;
Assert.assertEquals(params.getAlgorithmID(), expectedAlgorithmID);
Assert.assertEquals(params.getPartyVInfo(), expectedPartyVInfo);
Assert.assertEquals(params.getPartyUInfo(), expectedPartyUInfo);
Assert.assertEquals(params.getSuppPubInfo(), expectedSuppPubInfo);
Assert.assertEquals(params.getSuppPrivInfo(), expectedSuppPrivInfo);
- Assert.assertNotNull(params.getDigestMethod());
- Assert.assertEquals(params.getDigestMethod().getAlgorithm(), expectedDigestMethod);
+ final DigestMethod method = params.getDigestMethod();
+ assert method != null;
+ Assert.assertEquals(method.getAlgorithm(), expectedDigestMethod);
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- ConcatKDFParams params = (ConcatKDFParams) buildXMLObject(ConcatKDFParams.DEFAULT_ELEMENT_NAME);
+ final ConcatKDFParams params = (ConcatKDFParams) buildXMLObject(ConcatKDFParams.DEFAULT_ELEMENT_NAME);
params.setAlgorithmID(expectedAlgorithmID);
params.setPartyUInfo(expectedPartyUInfo);
@@ -103,7 +104,7 @@ public class ConcatKDFParamsTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- ConcatKDFParams params = (ConcatKDFParams) buildXMLObject(ConcatKDFParams.DEFAULT_ELEMENT_NAME);
+ final ConcatKDFParams params = (ConcatKDFParams) buildXMLObject(ConcatKDFParams.DEFAULT_ELEMENT_NAME);
params.setAlgorithmID(expectedAlgorithmID);
params.setPartyUInfo(expectedPartyUInfo);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueTest.java
index 0e2223654..69a830280 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueTest.java
@@ -51,9 +51,9 @@ public class DHKeyValueTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- DHKeyValue keyValue = (DHKeyValue) unmarshallElement(singleElementFile);
+ final DHKeyValue keyValue = (DHKeyValue) unmarshallElement(singleElementFile);
- Assert.assertNotNull(keyValue, "DHKeyValue");
+ assert keyValue != null;
Assert.assertNull(keyValue.getP(), "P child element");
Assert.assertNull(keyValue.getQ(), "Q child element");
Assert.assertNull(keyValue.getGenerator(), "Generator child element");
@@ -65,9 +65,9 @@ public class DHKeyValueTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- DHKeyValue keyValue = (DHKeyValue) unmarshallElement(childElementsFile);
+ final DHKeyValue keyValue = (DHKeyValue) unmarshallElement(childElementsFile);
- Assert.assertNotNull(keyValue, "DHKeyValue");
+ assert keyValue != null;
Assert.assertNotNull(keyValue.getP(), "P child element");
Assert.assertNotNull(keyValue.getQ(), "Q child element");
Assert.assertNotNull(keyValue.getGenerator(), "Generator child element");
@@ -79,7 +79,7 @@ public class DHKeyValueTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- DHKeyValue keyValue = (DHKeyValue) buildXMLObject(DHKeyValue.DEFAULT_ELEMENT_NAME);
+ final DHKeyValue keyValue = (DHKeyValue) buildXMLObject(DHKeyValue.DEFAULT_ELEMENT_NAME);
assertXMLEquals(expectedDOM, keyValue);
}
@@ -87,7 +87,7 @@ public class DHKeyValueTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- DHKeyValue keyValue = (DHKeyValue) buildXMLObject(DHKeyValue.DEFAULT_ELEMENT_NAME);
+ final DHKeyValue keyValue = (DHKeyValue) buildXMLObject(DHKeyValue.DEFAULT_ELEMENT_NAME);
keyValue.setP((P) buildXMLObject(P.DEFAULT_ELEMENT_NAME));
keyValue.setQ((Q) buildXMLObject(Q.DEFAULT_ELEMENT_NAME));
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DataReferenceTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DataReferenceTest.java
index 4df563730..8d1d205be 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DataReferenceTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DataReferenceTest.java
@@ -51,9 +51,9 @@ public class DataReferenceTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- DataReference ref = (DataReference) unmarshallElement(singleElementFile);
+ final DataReference ref = (DataReference) unmarshallElement(singleElementFile);
- Assert.assertNotNull(ref, "DataReference");
+ assert ref != null;
Assert.assertEquals(ref.getURI(), expectedURI, "URI attribute");
Assert.assertEquals(ref.getUnknownXMLObjects().size(), 0, "Unknown children");
}
@@ -61,9 +61,9 @@ public class DataReferenceTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- DataReference ref = (DataReference) unmarshallElement(childElementsFile);
+ final DataReference ref = (DataReference) unmarshallElement(childElementsFile);
- Assert.assertNotNull(ref, "DataReference");
+ assert ref != null;
Assert.assertEquals(ref.getURI(), expectedURI, "URI attribute");
Assert.assertEquals(ref.getUnknownXMLObjects().size(), expectedNumUnknownChildren, "Unknown children");
}
@@ -71,7 +71,7 @@ public class DataReferenceTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- DataReference ref = (DataReference) buildXMLObject(DataReference.DEFAULT_ELEMENT_NAME);
+ final DataReference ref = (DataReference) buildXMLObject(DataReference.DEFAULT_ELEMENT_NAME);
ref.setURI(expectedURI);
@@ -81,7 +81,7 @@ public class DataReferenceTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- DataReference ref = (DataReference) buildXMLObject(DataReference.DEFAULT_ELEMENT_NAME);
+ final DataReference ref = (DataReference) buildXMLObject(DataReference.DEFAULT_ELEMENT_NAME);
ref.setURI(expectedURI);
ref.getUnknownXMLObjects().add(buildXMLObject(SimpleXMLObject.ELEMENT_NAME));
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DerivedKeyNameTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DerivedKeyNameTest.java
index e9c1dddf7..17f2f1fbe 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DerivedKeyNameTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DerivedKeyNameTest.java
@@ -48,16 +48,16 @@ public class DerivedKeyNameTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- DerivedKeyName dkn = (DerivedKeyName) unmarshallElement(singleElementFile);
+ final DerivedKeyName dkn = (DerivedKeyName) unmarshallElement(singleElementFile);
- Assert.assertNotNull(dkn, "DerivedKeyName");
+ assert dkn != null;
Assert.assertEquals(expectedStringContent, dkn.getValue(), "DerivedKeyName value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- DerivedKeyName dkn = (DerivedKeyName) buildXMLObject(DerivedKeyName.DEFAULT_ELEMENT_NAME);
+ final DerivedKeyName dkn = (DerivedKeyName) buildXMLObject(DerivedKeyName.DEFAULT_ELEMENT_NAME);
dkn.setValue(expectedStringContent);
assertXMLEquals(expectedDOM, dkn);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DerivedKeyTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DerivedKeyTest.java
index 7c76a63fa..936b5888c 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DerivedKeyTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/DerivedKeyTest.java
@@ -57,7 +57,7 @@ public class DerivedKeyTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- DerivedKey dk = (DerivedKey) unmarshallElement(singleElementFile);
+ final DerivedKey dk = (DerivedKey) unmarshallElement(singleElementFile);
Assert.assertNotNull(dk);
}
@@ -65,7 +65,8 @@ public class DerivedKeyTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- DerivedKey dk = (DerivedKey) unmarshallElement(childElementsFile);
+ final DerivedKey dk = (DerivedKey) unmarshallElement(childElementsFile);
+ assert dk != null;
Assert.assertNotNull(dk.getKeyDerivationMethod());
Assert.assertNotNull(dk.getReferenceList());
@@ -76,9 +77,9 @@ public class DerivedKeyTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
public void testSingleElementOptionalAttributesUnmarshall() {
- DerivedKey dk = (DerivedKey) unmarshallElement(singleElementOptionalAttributesFile);
+ final DerivedKey dk = (DerivedKey) unmarshallElement(singleElementOptionalAttributesFile);
- Assert.assertNotNull(dk);
+ assert dk != null;
Assert.assertEquals(dk.getId(), expectedId);
Assert.assertEquals(dk.getRecipient(), expectedRecipient);
Assert.assertEquals(dk.getType(), expectedType);
@@ -87,7 +88,7 @@ public class DerivedKeyTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- DerivedKey dk = (DerivedKey) buildXMLObject(DerivedKey.DEFAULT_ELEMENT_NAME);
+ final DerivedKey dk = (DerivedKey) buildXMLObject(DerivedKey.DEFAULT_ELEMENT_NAME);
assertXMLEquals(expectedDOM, dk);
}
@@ -95,7 +96,7 @@ public class DerivedKeyTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- DerivedKey dk = (DerivedKey) buildXMLObject(DerivedKey.DEFAULT_ELEMENT_NAME);
+ final DerivedKey dk = (DerivedKey) buildXMLObject(DerivedKey.DEFAULT_ELEMENT_NAME);
dk.setKeyDerivationMethod(buildXMLObject(KeyDerivationMethod.DEFAULT_ELEMENT_NAME));
dk.setReferenceList(buildXMLObject(ReferenceList.DEFAULT_ELEMENT_NAME));
@@ -107,7 +108,7 @@ public class DerivedKeyTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
public void testSingleElementOptionalAttributesMarshall() {
- DerivedKey dk = (DerivedKey) buildXMLObject(DerivedKey.DEFAULT_ELEMENT_NAME);
+ final DerivedKey dk = (DerivedKey) buildXMLObject(DerivedKey.DEFAULT_ELEMENT_NAME);
dk.setId(expectedId);
dk.setRecipient(expectedRecipient);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptedDataTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptedDataTest.java
index 8d619d4b3..e75137ae8 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptedDataTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptedDataTest.java
@@ -67,9 +67,9 @@ public class EncryptedDataTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- EncryptedData ed = (EncryptedData) unmarshallElement(singleElementFile);
+ final EncryptedData ed = (EncryptedData) unmarshallElement(singleElementFile);
- Assert.assertNotNull(ed, "EncryptedData");
+ assert ed != null;
Assert.assertNull(ed.getEncryptionMethod(), "EncryptionMethod child");
Assert.assertNull(ed.getKeyInfo(), "KeyInfo child");
Assert.assertNull(ed.getCipherData(), "CipherData child");
@@ -79,9 +79,9 @@ public class EncryptedDataTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- EncryptedData ed = (EncryptedData) unmarshallElement(childElementsFile);
+ final EncryptedData ed = (EncryptedData) unmarshallElement(childElementsFile);
- Assert.assertNotNull(ed, "EncryptedData");
+ assert ed != null;
Assert.assertNotNull(ed.getEncryptionMethod(), "EncryptionMethod child");
Assert.assertNotNull(ed.getKeyInfo(), "KeyInfo child");
Assert.assertNotNull(ed.getCipherData(), "CipherData child");
@@ -91,9 +91,9 @@ public class EncryptedDataTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
- EncryptedData ed = (EncryptedData) unmarshallElement(singleElementOptionalAttributesFile);
+ final EncryptedData ed = (EncryptedData) unmarshallElement(singleElementOptionalAttributesFile);
- Assert.assertNotNull(ed, "EncryptedData");
+ assert ed != null;
Assert.assertEquals(ed.getID(), expectedId, "Id attribute");
Assert.assertEquals(ed.getType(), expectedType, "Type attribute");
Assert.assertEquals(ed.getMimeType(), expectedMimeType, "MimeType attribute");
@@ -118,7 +118,7 @@ public class EncryptedDataTest extends XMLObjectProviderBaseTestCase {
* */
@Test
public void testAttributeIDnessMarshall() throws MarshallingException, XMLParserException {
- XMLObject target = buildXMLObject(EncryptedData.DEFAULT_ELEMENT_NAME);
+ final XMLObject target = buildXMLObject(EncryptedData.DEFAULT_ELEMENT_NAME);
((EncryptedData)target).setID("id123");
@@ -128,7 +128,7 @@ public class EncryptedDataTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- EncryptedData ed = (EncryptedData) buildXMLObject(EncryptedData.DEFAULT_ELEMENT_NAME);
+ final EncryptedData ed = (EncryptedData) buildXMLObject(EncryptedData.DEFAULT_ELEMENT_NAME);
ed.setEncryptionMethod((EncryptionMethod) buildXMLObject(EncryptionMethod.DEFAULT_ELEMENT_NAME));
ed.setKeyInfo((KeyInfo) buildXMLObject(KeyInfo.DEFAULT_ELEMENT_NAME));
@@ -141,7 +141,7 @@ public class EncryptedDataTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesMarshall() {
- EncryptedData ed = (EncryptedData) buildXMLObject(EncryptedData.DEFAULT_ELEMENT_NAME);
+ final EncryptedData ed = (EncryptedData) buildXMLObject(EncryptedData.DEFAULT_ELEMENT_NAME);
ed.setID(expectedId);
ed.setType(expectedType);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyTest.java
index 15e9cf7d5..1ac44b0a2 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyTest.java
@@ -71,9 +71,9 @@ public class EncryptedKeyTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- EncryptedKey ek = (EncryptedKey) unmarshallElement(singleElementFile);
+ final EncryptedKey ek = (EncryptedKey) unmarshallElement(singleElementFile);
- Assert.assertNotNull(ek, "EncryptedKey");
+ assert ek != null;
Assert.assertNull(ek.getEncryptionMethod(), "EncryptionMethod child");
Assert.assertNull(ek.getKeyInfo(), "KeyInfo child");
Assert.assertNull(ek.getCipherData(), "CipherData child");
@@ -85,9 +85,9 @@ public class EncryptedKeyTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- EncryptedKey ek = (EncryptedKey) unmarshallElement(childElementsFile);
+ final EncryptedKey ek = (EncryptedKey) unmarshallElement(childElementsFile);
- Assert.assertNotNull(ek, "EncryptedKey");
+ assert ek != null;
Assert.assertNotNull(ek.getEncryptionMethod(), "EncryptionMethod child");
Assert.assertNotNull(ek.getKeyInfo(), "KeyInfo child");
Assert.assertNotNull(ek.getCipherData(), "CipherData child");
@@ -99,9 +99,9 @@ public class EncryptedKeyTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
- EncryptedKey ek = (EncryptedKey) unmarshallElement(singleElementOptionalAttributesFile);
+ final EncryptedKey ek = (EncryptedKey) unmarshallElement(singleElementOptionalAttributesFile);
- Assert.assertNotNull(ek, "EncryptedKey");
+ assert ek != null;
Assert.assertEquals(ek.getID(), expectedId, "Id attribute");
Assert.assertEquals(ek.getType(), expectedType, "Type attribute");
Assert.assertEquals(ek.getMimeType(), expectedMimeType, "MimeType attribute");
@@ -114,7 +114,7 @@ public class EncryptedKeyTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- EncryptedKey ek = (EncryptedKey) buildXMLObject(EncryptedKey.DEFAULT_ELEMENT_NAME);
+ final EncryptedKey ek = (EncryptedKey) buildXMLObject(EncryptedKey.DEFAULT_ELEMENT_NAME);
assertXMLEquals(expectedDOM, ek);
}
@@ -127,7 +127,7 @@ public class EncryptedKeyTest extends XMLObjectProviderBaseTestCase {
* */
@Test
public void testAttributeIDnessMarshall() throws MarshallingException, XMLParserException {
- XMLObject target = buildXMLObject(EncryptedKey.DEFAULT_ELEMENT_NAME);
+ final XMLObject target = buildXMLObject(EncryptedKey.DEFAULT_ELEMENT_NAME);
((EncryptedKey)target).setID("id123");
@@ -137,7 +137,7 @@ public class EncryptedKeyTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- EncryptedKey ek = (EncryptedKey) buildXMLObject(EncryptedKey.DEFAULT_ELEMENT_NAME);
+ final EncryptedKey ek = (EncryptedKey) buildXMLObject(EncryptedKey.DEFAULT_ELEMENT_NAME);
ek.setEncryptionMethod((EncryptionMethod) buildXMLObject(EncryptionMethod.DEFAULT_ELEMENT_NAME));
@@ -153,7 +153,7 @@ public class EncryptedKeyTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesMarshall() {
- EncryptedKey ek = (EncryptedKey) buildXMLObject(EncryptedKey.DEFAULT_ELEMENT_NAME);
+ final EncryptedKey ek = (EncryptedKey) buildXMLObject(EncryptedKey.DEFAULT_ELEMENT_NAME);
ek.setID(expectedId);
ek.setType(expectedType);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodTest.java
index 3412fd1bb..4ccadb5af 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodTest.java
@@ -54,9 +54,9 @@ public class EncryptionMethodTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- EncryptionMethod em = (EncryptionMethod) unmarshallElement(singleElementFile);
+ final EncryptionMethod em = (EncryptionMethod) unmarshallElement(singleElementFile);
- Assert.assertNotNull(em, "EncryptionMethod");
+ assert em != null;
Assert.assertEquals(em.getAlgorithm(), expectedAlgorithm, "Algorithm attribute");
Assert.assertNull(em.getKeySize(), "KeySize child");
Assert.assertNull(em.getOAEPparams(), "OAEPparams child");
@@ -66,9 +66,9 @@ public class EncryptionMethodTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- EncryptionMethod em = (EncryptionMethod) unmarshallElement(childElementsFile);
+ final EncryptionMethod em = (EncryptionMethod) unmarshallElement(childElementsFile);
- Assert.assertNotNull(em, "EncryptionMethod");
+ assert em != null;
Assert.assertEquals(em.getAlgorithm(), expectedAlgorithm, "Algorithm attribute");
Assert.assertNotNull(em.getKeySize(), "KeySize child");
Assert.assertNotNull(em.getOAEPparams(), "OAEPparams child");
@@ -78,7 +78,7 @@ public class EncryptionMethodTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- EncryptionMethod em = (EncryptionMethod) buildXMLObject(EncryptionMethod.DEFAULT_ELEMENT_NAME);
+ final EncryptionMethod em = (EncryptionMethod) buildXMLObject(EncryptionMethod.DEFAULT_ELEMENT_NAME);
em.setAlgorithm(expectedAlgorithm);
@@ -88,7 +88,7 @@ public class EncryptionMethodTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- EncryptionMethod em = (EncryptionMethod) buildXMLObject(EncryptionMethod.DEFAULT_ELEMENT_NAME);
+ final EncryptionMethod em = (EncryptionMethod) buildXMLObject(EncryptionMethod.DEFAULT_ELEMENT_NAME);
em.setAlgorithm(expectedAlgorithm);
em.setKeySize((KeySize) buildXMLObject(KeySize.DEFAULT_ELEMENT_NAME));
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesTest.java
index 74994101d..47627b354 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesTest.java
@@ -57,9 +57,9 @@ public class EncryptionPropertiesTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- EncryptionProperties ep = (EncryptionProperties) unmarshallElement(singleElementFile);
+ final EncryptionProperties ep = (EncryptionProperties) unmarshallElement(singleElementFile);
- Assert.assertNotNull(ep, "EncryptionProperties");
+ assert ep != null;
Assert.assertNull(ep.getID(), "Id attribute");
Assert.assertEquals(ep.getEncryptionProperties().size(), 0, "# of EncryptionProperty children");
}
@@ -67,9 +67,9 @@ public class EncryptionPropertiesTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
- EncryptionProperties ep = (EncryptionProperties) unmarshallElement(singleElementOptionalAttributesFile);
+ final EncryptionProperties ep = (EncryptionProperties) unmarshallElement(singleElementOptionalAttributesFile);
- Assert.assertNotNull(ep, "EncryptionProperties");
+ assert ep != null;
Assert.assertEquals(ep.getID(), expectedID, "Id attribute");
Assert.assertEquals(ep.getEncryptionProperties().size(), 0, "# of EncryptionProperty children");
@@ -79,9 +79,9 @@ public class EncryptionPropertiesTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- EncryptionProperties ep = (EncryptionProperties) unmarshallElement(childElementsFile);
+ final EncryptionProperties ep = (EncryptionProperties) unmarshallElement(childElementsFile);
- Assert.assertNotNull(ep, "EncryptionProperties");
+ assert ep != null;
Assert.assertNull(ep.getID(), "Id attribute");
Assert.assertEquals(ep.getEncryptionProperties().size(), expectedNumEncProps, "# of EncryptionProperty children");
}
@@ -89,7 +89,7 @@ public class EncryptionPropertiesTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- EncryptionProperties ep = (EncryptionProperties) buildXMLObject(EncryptionProperties.DEFAULT_ELEMENT_NAME);
+ final EncryptionProperties ep = (EncryptionProperties) buildXMLObject(EncryptionProperties.DEFAULT_ELEMENT_NAME);
assertXMLEquals(expectedDOM, ep);
}
@@ -102,7 +102,7 @@ public class EncryptionPropertiesTest extends XMLObjectProviderBaseTestCase {
* */
@Test
public void testAttributeIDnessMarshall() throws MarshallingException, XMLParserException {
- XMLObject target = buildXMLObject(EncryptionProperties.DEFAULT_ELEMENT_NAME);
+ final XMLObject target = buildXMLObject(EncryptionProperties.DEFAULT_ELEMENT_NAME);
((EncryptionProperties)target).setID("id123");
@@ -113,7 +113,7 @@ public class EncryptionPropertiesTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesMarshall() {
- EncryptionProperties ep = (EncryptionProperties) buildXMLObject(EncryptionProperties.DEFAULT_ELEMENT_NAME);
+ final EncryptionProperties ep = (EncryptionProperties) buildXMLObject(EncryptionProperties.DEFAULT_ELEMENT_NAME);
ep.setID(expectedID);
@@ -123,7 +123,7 @@ public class EncryptionPropertiesTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- EncryptionProperties ep = (EncryptionProperties) buildXMLObject(EncryptionProperties.DEFAULT_ELEMENT_NAME);
+ final EncryptionProperties ep = (EncryptionProperties) buildXMLObject(EncryptionProperties.DEFAULT_ELEMENT_NAME);
ep.getEncryptionProperties().add((EncryptionProperty) buildXMLObject(EncryptionProperty.DEFAULT_ELEMENT_NAME));
ep.getEncryptionProperties().add((EncryptionProperty) buildXMLObject(EncryptionProperty.DEFAULT_ELEMENT_NAME));
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyTest.java
index 31eaedb0b..32f4c713e 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyTest.java
@@ -73,9 +73,9 @@ public class EncryptionPropertyTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- EncryptionProperty ep = (EncryptionProperty) unmarshallElement(singleElementFile);
+ final EncryptionProperty ep = (EncryptionProperty) unmarshallElement(singleElementFile);
- Assert.assertNotNull(ep, "EncryptionProperty");
+ assert ep != null;
Assert.assertNull(ep.getTarget(), "Target attribute");
Assert.assertNull(ep.getID(), "Id attribute");
Assert.assertEquals(ep.getUnknownXMLObjects().size(), 0, "Unknown children");
@@ -86,9 +86,9 @@ public class EncryptionPropertyTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
- EncryptionProperty ep = (EncryptionProperty) unmarshallElement(singleElementOptionalAttributesFile);
+ final EncryptionProperty ep = (EncryptionProperty) unmarshallElement(singleElementOptionalAttributesFile);
- Assert.assertNotNull(ep, "EncryptionProperty");
+ assert ep != null;
Assert.assertEquals(ep.getTarget(), expectedTarget, "Target attribute");
Assert.assertEquals(ep.getID(), expectedID, "Id attribute");
Assert.assertEquals(ep.getUnknownXMLObjects().size(), 0, "Unknown children");
@@ -101,9 +101,9 @@ public class EncryptionPropertyTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- EncryptionProperty ep = (EncryptionProperty) unmarshallElement(childElementsFile);
+ final EncryptionProperty ep = (EncryptionProperty) unmarshallElement(childElementsFile);
- Assert.assertNotNull(ep, "EncryptionProperty");
+ assert ep != null;
Assert.assertNull(ep.getTarget(), "Target attribute");
Assert.assertNull(ep.getID(), "Id attribute");
Assert.assertEquals(ep.getUnknownXMLObjects().size(), expectedNumUnknownChildren, "Unknown children");
@@ -112,7 +112,7 @@ public class EncryptionPropertyTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- EncryptionProperty ep = (EncryptionProperty) buildXMLObject(EncryptionProperty.DEFAULT_ELEMENT_NAME);
+ final EncryptionProperty ep = (EncryptionProperty) buildXMLObject(EncryptionProperty.DEFAULT_ELEMENT_NAME);
assertXMLEquals(expectedDOM, ep);
}
@@ -125,7 +125,7 @@ public class EncryptionPropertyTest extends XMLObjectProviderBaseTestCase {
* */
@Test
public void testAttributeIDnessMarshall() throws MarshallingException, XMLParserException {
- XMLObject target = buildXMLObject(EncryptionProperty.DEFAULT_ELEMENT_NAME);
+ final XMLObject target = buildXMLObject(EncryptionProperty.DEFAULT_ELEMENT_NAME);
((EncryptionProperty)target).setID("id123");
@@ -135,7 +135,7 @@ public class EncryptionPropertyTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesMarshall() {
- EncryptionProperty ep = (EncryptionProperty) buildXMLObject(EncryptionProperty.DEFAULT_ELEMENT_NAME);
+ final EncryptionProperty ep = (EncryptionProperty) buildXMLObject(EncryptionProperty.DEFAULT_ELEMENT_NAME);
ep.setTarget(expectedTarget);
ep.setID(expectedID);
@@ -148,7 +148,7 @@ public class EncryptionPropertyTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- EncryptionProperty ep = (EncryptionProperty) buildXMLObject(EncryptionProperty.DEFAULT_ELEMENT_NAME);
+ final EncryptionProperty ep = (EncryptionProperty) buildXMLObject(EncryptionProperty.DEFAULT_ELEMENT_NAME);
ep.getUnknownXMLObjects().add( buildXMLObject(SimpleXMLObject.ELEMENT_NAME));
ep.getUnknownXMLObjects().add( buildXMLObject(SimpleXMLObject.ELEMENT_NAME));
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/GeneratorTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/GeneratorTest.java
index 36a5b52a3..3139feaa8 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/GeneratorTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/GeneratorTest.java
@@ -48,16 +48,16 @@ public class GeneratorTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- Generator cbType = (Generator) unmarshallElement(singleElementFile);
+ final Generator cbType = (Generator) unmarshallElement(singleElementFile);
- Assert.assertNotNull(cbType, "Generator");
+ assert cbType != null;
Assert.assertEquals(expectedCryptoBinaryContent, cbType.getValue(), "Generator value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- Generator cbType = (Generator) buildXMLObject(Generator.DEFAULT_ELEMENT_NAME);
+ final Generator cbType = (Generator) buildXMLObject(Generator.DEFAULT_ELEMENT_NAME);
cbType.setValue(expectedCryptoBinaryContent);
assertXMLEquals(expectedDOM, cbType);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/IterationCountTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/IterationCountTest.java
index 8cb7af6d0..a57c6c12a 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/IterationCountTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/IterationCountTest.java
@@ -48,16 +48,16 @@ public class IterationCountTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- IterationCount ic = (IterationCount) unmarshallElement(singleElementFile);
+ final IterationCount ic = (IterationCount) unmarshallElement(singleElementFile);
- Assert.assertNotNull(ic, "IterationCount");
+ assert ic != null;
Assert.assertEquals(expectedIntegerContent, ic.getValue(), "IterationCount value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- IterationCount ic = (IterationCount) buildXMLObject(IterationCount.DEFAULT_ELEMENT_NAME);
+ final IterationCount ic = (IterationCount) buildXMLObject(IterationCount.DEFAULT_ELEMENT_NAME);
ic.setValue(expectedIntegerContent);
assertXMLEquals(expectedDOM, ic);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KANonceTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KANonceTest.java
index d57572c78..c7f1f9315 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KANonceTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KANonceTest.java
@@ -48,16 +48,16 @@ public class KANonceTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- KANonce kan = (KANonce) unmarshallElement(singleElementFile);
+ final KANonce kan = (KANonce) unmarshallElement(singleElementFile);
- Assert.assertNotNull(kan, "KANonce");
+ assert kan != null;
Assert.assertEquals(expectedBase64Content, kan.getValue(), "KANonce value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- KANonce kan = (KANonce) buildXMLObject(KANonce.DEFAULT_ELEMENT_NAME);
+ final KANonce kan = (KANonce) buildXMLObject(KANonce.DEFAULT_ELEMENT_NAME);
kan.setValue(expectedBase64Content);
assertXMLEquals(expectedDOM, kan);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyDerivationMethodTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyDerivationMethodTest.java
index 85e7e1874..80c0c83d1 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyDerivationMethodTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyDerivationMethodTest.java
@@ -51,9 +51,9 @@ public class KeyDerivationMethodTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- KeyDerivationMethod kdm = (KeyDerivationMethod) unmarshallElement(singleElementFile);
+ final KeyDerivationMethod kdm = (KeyDerivationMethod) unmarshallElement(singleElementFile);
- Assert.assertNotNull(kdm, "KeyDerivationMethod");
+ assert kdm != null;
Assert.assertEquals(kdm.getAlgorithm(), expectedAlgorithm, "Algorithm attribute");
Assert.assertEquals(kdm.getUnknownXMLObjects().size(), 0, "Unknown children");
}
@@ -61,9 +61,9 @@ public class KeyDerivationMethodTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- KeyDerivationMethod kdm = (KeyDerivationMethod) unmarshallElement(childElementsFile);
+ final KeyDerivationMethod kdm = (KeyDerivationMethod) unmarshallElement(childElementsFile);
- Assert.assertNotNull(kdm, "KeyDerivationMethod");
+ assert kdm != null;
Assert.assertEquals(kdm.getAlgorithm(), expectedAlgorithm, "Algorithm attribute");
Assert.assertEquals(kdm.getUnknownXMLObjects().size(), expectedNumUnknownChildren, "Unknown children");
}
@@ -71,7 +71,7 @@ public class KeyDerivationMethodTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- KeyDerivationMethod kdm = (KeyDerivationMethod) buildXMLObject(KeyDerivationMethod.DEFAULT_ELEMENT_NAME);
+ final KeyDerivationMethod kdm = (KeyDerivationMethod) buildXMLObject(KeyDerivationMethod.DEFAULT_ELEMENT_NAME);
kdm.setAlgorithm(expectedAlgorithm);
@@ -81,7 +81,7 @@ public class KeyDerivationMethodTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- KeyDerivationMethod kdm = (KeyDerivationMethod) buildXMLObject(KeyDerivationMethod.DEFAULT_ELEMENT_NAME);
+ final KeyDerivationMethod kdm = (KeyDerivationMethod) buildXMLObject(KeyDerivationMethod.DEFAULT_ELEMENT_NAME);
kdm.setAlgorithm(expectedAlgorithm);
kdm.getUnknownXMLObjects().add(buildXMLObject(SimpleXMLObject.ELEMENT_NAME));
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyLengthTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyLengthTest.java
index 27be76eaf..69995122a 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyLengthTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyLengthTest.java
@@ -48,16 +48,16 @@ public class KeyLengthTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- KeyLength kl = (KeyLength) unmarshallElement(singleElementFile);
+ final KeyLength kl = (KeyLength) unmarshallElement(singleElementFile);
- Assert.assertNotNull(kl, "KeyLength");
+ assert kl != null;
Assert.assertEquals(expectedIntegerContent, kl.getValue(), "KeyLength value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- KeyLength kl = (KeyLength) buildXMLObject(KeyLength.DEFAULT_ELEMENT_NAME);
+ final KeyLength kl = (KeyLength) buildXMLObject(KeyLength.DEFAULT_ELEMENT_NAME);
kl.setValue(expectedIntegerContent);
assertXMLEquals(expectedDOM, kl);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyReferenceTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyReferenceTest.java
index ccc788aa1..bfc4a6a93 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyReferenceTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeyReferenceTest.java
@@ -51,9 +51,9 @@ public class KeyReferenceTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- KeyReference ref = (KeyReference) unmarshallElement(singleElementFile);
+ final KeyReference ref = (KeyReference) unmarshallElement(singleElementFile);
- Assert.assertNotNull(ref, "KeyReference");
+ assert ref != null;
Assert.assertEquals(ref.getURI(), expectedURI, "URI attribute");
Assert.assertEquals(ref.getUnknownXMLObjects().size(), 0, "Unknown children");
}
@@ -61,9 +61,9 @@ public class KeyReferenceTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- KeyReference ref = (KeyReference) unmarshallElement(childElementsFile);
+ final KeyReference ref = (KeyReference) unmarshallElement(childElementsFile);
- Assert.assertNotNull(ref, "KeyReference");
+ assert ref != null;
Assert.assertEquals(ref.getURI(), expectedURI, "URI attribute");
Assert.assertEquals(ref.getUnknownXMLObjects().size(), expectedNumUnknownChildren, "Unknown children");
}
@@ -71,7 +71,7 @@ public class KeyReferenceTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- KeyReference ref = (KeyReference) buildXMLObject(KeyReference.DEFAULT_ELEMENT_NAME);
+ final KeyReference ref = (KeyReference) buildXMLObject(KeyReference.DEFAULT_ELEMENT_NAME);
ref.setURI(expectedURI);
@@ -81,7 +81,7 @@ public class KeyReferenceTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- KeyReference ref = (KeyReference) buildXMLObject(KeyReference.DEFAULT_ELEMENT_NAME);
+ final KeyReference ref = (KeyReference) buildXMLObject(KeyReference.DEFAULT_ELEMENT_NAME);
ref.setURI(expectedURI);
ref.getUnknownXMLObjects().add(buildXMLObject(SimpleXMLObject.ELEMENT_NAME));
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeySizeTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeySizeTest.java
index 4414ee523..3225563c7 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeySizeTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/KeySizeTest.java
@@ -48,16 +48,16 @@ public class KeySizeTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- KeySize keySize = (KeySize) unmarshallElement(singleElementFile);
+ final KeySize keySize = (KeySize) unmarshallElement(singleElementFile);
- Assert.assertNotNull(keySize, "KeySize");
+ assert keySize != null;
Assert.assertEquals(expectedIntegerContent, keySize.getValue(), "KeySize value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- KeySize keySize = (KeySize) buildXMLObject(KeySize.DEFAULT_ELEMENT_NAME);
+ final KeySize keySize = (KeySize) buildXMLObject(KeySize.DEFAULT_ELEMENT_NAME);
keySize.setValue(expectedIntegerContent);
assertXMLEquals(expectedDOM, keySize);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/MGFTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/MGFTest.java
index 3a9d4dfbe..b3989833b 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/MGFTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/MGFTest.java
@@ -54,27 +54,27 @@ public class MGFTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- MGF mgf = (MGF) unmarshallElement(singleElementFile);
+ final MGF mgf = (MGF) unmarshallElement(singleElementFile);
- Assert.assertNotNull(mgf, "MGF");
+ assert mgf != null;
Assert.assertEquals(mgf.getAlgorithm(), expectedAlgorithm, "Algorithm attribute");
}
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- MGF mgf = (MGF) unmarshallElement(childElementsFile);
+ final MGF mgf = (MGF) unmarshallElement(childElementsFile);
- Assert.assertNotNull(mgf, "MGF");
+ assert mgf != null;
Assert.assertEquals(mgf.getAlgorithm(), expectedAlgorithm, "Algorithm attribute");
+
Assert.assertNotNull(mgf.getParameters(), "Parameters child element");
- System.out.println("Parameters: " + mgf.getParameters().getClass().getName());
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- MGF mgf = (MGF) buildXMLObject(MGF.DEFAULT_ELEMENT_NAME);
+ final MGF mgf = (MGF) buildXMLObject(MGF.DEFAULT_ELEMENT_NAME);
mgf.setAlgorithm(expectedAlgorithm);
@@ -84,7 +84,7 @@ public class MGFTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- MGF mgf = (MGF) buildXMLObject(MGF.DEFAULT_ELEMENT_NAME);
+ final MGF mgf = (MGF) buildXMLObject(MGF.DEFAULT_ELEMENT_NAME);
mgf.setAlgorithm(expectedAlgorithm);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/MasterKeyNameTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/MasterKeyNameTest.java
index 96d6843a1..76d25630c 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/MasterKeyNameTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/MasterKeyNameTest.java
@@ -48,16 +48,16 @@ public class MasterKeyNameTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- MasterKeyName mkn = (MasterKeyName) unmarshallElement(singleElementFile);
+ final MasterKeyName mkn = (MasterKeyName) unmarshallElement(singleElementFile);
- Assert.assertNotNull(mkn, "MasterKeyName");
+ assert mkn != null;
Assert.assertEquals(expectedStringContent, mkn.getValue(), "MasterKeyName value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- MasterKeyName mkn = (MasterKeyName) buildXMLObject(MasterKeyName.DEFAULT_ELEMENT_NAME);
+ final MasterKeyName mkn = (MasterKeyName) buildXMLObject(MasterKeyName.DEFAULT_ELEMENT_NAME);
mkn.setValue(expectedStringContent);
assertXMLEquals(expectedDOM, mkn);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OAEPparamsTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OAEPparamsTest.java
index 8ffc43847..c0d0ea944 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OAEPparamsTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OAEPparamsTest.java
@@ -48,16 +48,16 @@ public class OAEPparamsTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- OAEPparams oaep = (OAEPparams) unmarshallElement(singleElementFile);
+ final OAEPparams oaep = (OAEPparams) unmarshallElement(singleElementFile);
- Assert.assertNotNull(oaep, "OAEPparams");
+ assert oaep != null;
Assert.assertEquals(expectedBase64Content, oaep.getValue(), "OAEPparams value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- OAEPparams oaep = (OAEPparams) buildXMLObject(OAEPparams.DEFAULT_ELEMENT_NAME);
+ final OAEPparams oaep = (OAEPparams) buildXMLObject(OAEPparams.DEFAULT_ELEMENT_NAME);
oaep.setValue(expectedBase64Content);
assertXMLEquals(expectedDOM, oaep);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OriginatorKeyInfoTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OriginatorKeyInfoTest.java
index 40b349ff0..c3497a492 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OriginatorKeyInfoTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OriginatorKeyInfoTest.java
@@ -57,9 +57,9 @@ public class OriginatorKeyInfoTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- OriginatorKeyInfo keyInfo = (OriginatorKeyInfo) unmarshallElement(singleElementFile);
+ final OriginatorKeyInfo keyInfo = (OriginatorKeyInfo) unmarshallElement(singleElementFile);
- Assert.assertNotNull(keyInfo, "OriginatorKeyInfo");
+ assert keyInfo != null;
Assert.assertNull(keyInfo.getID(), "Id attribute");
Assert.assertEquals(keyInfo.getXMLObjects().size(), 0, "Total # of XMLObject child elements");
}
@@ -67,9 +67,9 @@ public class OriginatorKeyInfoTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
- OriginatorKeyInfo keyInfo = (OriginatorKeyInfo) unmarshallElement(singleElementOptionalAttributesFile);
+ final OriginatorKeyInfo keyInfo = (OriginatorKeyInfo) unmarshallElement(singleElementOptionalAttributesFile);
- Assert.assertNotNull(keyInfo, "OriginatorKeyInfo");
+ assert keyInfo != null;
Assert.assertEquals(keyInfo.getID(), expectedID, "Id attribute");
Assert.assertEquals(keyInfo.getXMLObjects().size(), 0, "Total # of XMLObject child elements");
}
@@ -77,9 +77,9 @@ public class OriginatorKeyInfoTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- OriginatorKeyInfo keyInfo = (OriginatorKeyInfo) unmarshallElement(childElementsFile);
+ final OriginatorKeyInfo keyInfo = (OriginatorKeyInfo) unmarshallElement(childElementsFile);
- Assert.assertNotNull(keyInfo, "OriginatorKeyInfo");
+ assert keyInfo != null;
Assert.assertEquals(keyInfo.getXMLObjects().size(), 11, "Total # of XMLObject child elements");
Assert.assertEquals(keyInfo.getKeyNames().size(), 2, "# of KeyName child elements");
Assert.assertEquals(keyInfo.getKeyValues().size(), 2, "# of KeyValue child elements");
@@ -94,7 +94,7 @@ public class OriginatorKeyInfoTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- OriginatorKeyInfo keyInfo = (OriginatorKeyInfo) buildXMLObject(OriginatorKeyInfo.DEFAULT_ELEMENT_NAME);
+ final OriginatorKeyInfo keyInfo = (OriginatorKeyInfo) buildXMLObject(OriginatorKeyInfo.DEFAULT_ELEMENT_NAME);
assertXMLEquals(expectedDOM, keyInfo);
}
@@ -102,7 +102,7 @@ public class OriginatorKeyInfoTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesMarshall() {
- OriginatorKeyInfo keyInfo = (OriginatorKeyInfo) buildXMLObject(OriginatorKeyInfo.DEFAULT_ELEMENT_NAME);
+ final OriginatorKeyInfo keyInfo = (OriginatorKeyInfo) buildXMLObject(OriginatorKeyInfo.DEFAULT_ELEMENT_NAME);
keyInfo.setID(expectedID);
@@ -112,7 +112,7 @@ public class OriginatorKeyInfoTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- OriginatorKeyInfo keyInfo = (OriginatorKeyInfo) buildXMLObject(OriginatorKeyInfo.DEFAULT_ELEMENT_NAME);
+ final OriginatorKeyInfo keyInfo = (OriginatorKeyInfo) buildXMLObject(OriginatorKeyInfo.DEFAULT_ELEMENT_NAME);
keyInfo.getXMLObjects().add(buildXMLObject(KeyName.DEFAULT_ELEMENT_NAME));
keyInfo.getXMLObjects().add(buildXMLObject(KeyValue.DEFAULT_ELEMENT_NAME));
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OtherSourceTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OtherSourceTest.java
index 97232cebd..a64855da1 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OtherSourceTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/OtherSourceTest.java
@@ -54,27 +54,26 @@ public class OtherSourceTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- OtherSource otherSource = (OtherSource) unmarshallElement(singleElementFile);
+ final OtherSource otherSource = (OtherSource) unmarshallElement(singleElementFile);
- Assert.assertNotNull(otherSource, "OtherSource");
+ assert otherSource != null;
Assert.assertEquals(otherSource.getAlgorithm(), expectedAlgorithm, "Algorithm attribute");
}
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- OtherSource otherSource = (OtherSource) unmarshallElement(childElementsFile);
+ final OtherSource otherSource = (OtherSource) unmarshallElement(childElementsFile);
- Assert.assertNotNull(otherSource, "OtherSource");
+ assert otherSource != null;
Assert.assertEquals(otherSource.getAlgorithm(), expectedAlgorithm, "Algorithm attribute");
Assert.assertNotNull(otherSource.getParameters(), "Parameters child element");
- System.out.println("Parameters: " + otherSource.getParameters().getClass().getName());
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- OtherSource otherSource = (OtherSource) buildXMLObject(OtherSource.DEFAULT_ELEMENT_NAME);
+ final OtherSource otherSource = (OtherSource) buildXMLObject(OtherSource.DEFAULT_ELEMENT_NAME);
otherSource.setAlgorithm(expectedAlgorithm);
@@ -84,7 +83,7 @@ public class OtherSourceTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- OtherSource otherSource = (OtherSource) buildXMLObject(OtherSource.DEFAULT_ELEMENT_NAME);
+ final OtherSource otherSource = (OtherSource) buildXMLObject(OtherSource.DEFAULT_ELEMENT_NAME);
otherSource.setAlgorithm(expectedAlgorithm);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PBKDF2ParamsTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PBKDF2ParamsTest.java
index 3d6270bbb..563d59b73 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PBKDF2ParamsTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PBKDF2ParamsTest.java
@@ -44,7 +44,7 @@ public class PBKDF2ParamsTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- PBKDF2Params params = (PBKDF2Params) unmarshallElement(singleElementFile);
+ final PBKDF2Params params = (PBKDF2Params) unmarshallElement(singleElementFile);
Assert.assertNotNull(params, "PBKDF2Params");
}
@@ -52,9 +52,9 @@ public class PBKDF2ParamsTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- PBKDF2Params params = (PBKDF2Params) unmarshallElement(childElementsFile);
+ final PBKDF2Params params = (PBKDF2Params) unmarshallElement(childElementsFile);
- Assert.assertNotNull(params, "PBKDF2Params");
+ assert params != null;
Assert.assertNotNull(params.getSalt());
Assert.assertNotNull(params.getIterationCount());
Assert.assertNotNull(params.getKeyLength());
@@ -64,7 +64,7 @@ public class PBKDF2ParamsTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- PBKDF2Params params = (PBKDF2Params) buildXMLObject(PBKDF2Params.DEFAULT_ELEMENT_NAME);
+ final PBKDF2Params params = (PBKDF2Params) buildXMLObject(PBKDF2Params.DEFAULT_ELEMENT_NAME);
assertXMLEquals(expectedDOM, params);
}
@@ -72,7 +72,7 @@ public class PBKDF2ParamsTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- PBKDF2Params params = (PBKDF2Params) buildXMLObject(PBKDF2Params.DEFAULT_ELEMENT_NAME);
+ final PBKDF2Params params = (PBKDF2Params) buildXMLObject(PBKDF2Params.DEFAULT_ELEMENT_NAME);
params.setSalt(buildXMLObject(Salt.DEFAULT_ELEMENT_NAME));
params.setIterationCount(buildXMLObject(IterationCount.DEFAULT_ELEMENT_NAME));
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PRFTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PRFTest.java
index c6b62d1f6..9278b4b41 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PRFTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PRFTest.java
@@ -54,27 +54,26 @@ public class PRFTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- PRF prf = (PRF) unmarshallElement(singleElementFile);
+ final PRF prf = (PRF) unmarshallElement(singleElementFile);
- Assert.assertNotNull(prf, "PRF");
+ assert prf != null;
Assert.assertEquals(prf.getAlgorithm(), expectedAlgorithm, "Algorithm attribute");
}
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- PRF prf = (PRF) unmarshallElement(childElementsFile);
+ final PRF prf = (PRF) unmarshallElement(childElementsFile);
- Assert.assertNotNull(prf, "PRF");
+ assert prf != null;
Assert.assertEquals(prf.getAlgorithm(), expectedAlgorithm, "Algorithm attribute");
Assert.assertNotNull(prf.getParameters(), "Parameters child element");
- System.out.println("Parameters: " + prf.getParameters().getClass().getName());
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- PRF prf = (PRF) buildXMLObject(PRF.DEFAULT_ELEMENT_NAME);
+ final PRF prf = (PRF) buildXMLObject(PRF.DEFAULT_ELEMENT_NAME);
prf.setAlgorithm(expectedAlgorithm);
@@ -84,7 +83,7 @@ public class PRFTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- PRF prf = (PRF) buildXMLObject(PRF.DEFAULT_ELEMENT_NAME);
+ final PRF prf = (PRF) buildXMLObject(PRF.DEFAULT_ELEMENT_NAME);
prf.setAlgorithm(expectedAlgorithm);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PTest.java
index 13a45485e..d8b93c94c 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PTest.java
@@ -48,16 +48,16 @@ public class PTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- P cbType = (P) unmarshallElement(singleElementFile);
+ final P cbType = (P) unmarshallElement(singleElementFile);
- Assert.assertNotNull(cbType, "P");
+ assert cbType != null;
Assert.assertEquals(expectedCryptoBinaryContent, cbType.getValue(), "P value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- P cbType = (P) buildXMLObject(P.DEFAULT_ELEMENT_NAME);
+ final P cbType = (P) buildXMLObject(P.DEFAULT_ELEMENT_NAME);
cbType.setValue(expectedCryptoBinaryContent);
assertXMLEquals(expectedDOM, cbType);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PgenCounterTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PgenCounterTest.java
index e57acef10..590a0dc95 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PgenCounterTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PgenCounterTest.java
@@ -48,16 +48,16 @@ public class PgenCounterTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- PgenCounter cbType = (PgenCounter) unmarshallElement(singleElementFile);
+ final PgenCounter cbType = (PgenCounter) unmarshallElement(singleElementFile);
- Assert.assertNotNull(cbType, "pgenCounter");
+ assert cbType != null;
Assert.assertEquals(expectedCryptoBinaryContent, cbType.getValue(), "pgenCounter value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- PgenCounter cbType = (PgenCounter) buildXMLObject(PgenCounter.DEFAULT_ELEMENT_NAME);
+ final PgenCounter cbType = (PgenCounter) buildXMLObject(PgenCounter.DEFAULT_ELEMENT_NAME);
cbType.setValue(expectedCryptoBinaryContent);
assertXMLEquals(expectedDOM, cbType);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PublicTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PublicTest.java
index ffe5c5413..f61c92c36 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PublicTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/PublicTest.java
@@ -48,16 +48,16 @@ public class PublicTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- Public cbType = (Public) unmarshallElement(singleElementFile);
+ final Public cbType = (Public) unmarshallElement(singleElementFile);
- Assert.assertNotNull(cbType, "Public");
+ assert cbType != null;
Assert.assertEquals(expectedCryptoBinaryContent, cbType.getValue(), "Public");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- Public cbType = (Public) buildXMLObject(Public.DEFAULT_ELEMENT_NAME);
+ final Public cbType = (Public) buildXMLObject(Public.DEFAULT_ELEMENT_NAME);
cbType.setValue(expectedCryptoBinaryContent);
assertXMLEquals(expectedDOM, cbType);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/QTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/QTest.java
index 9f76cf7eb..bcf9a4571 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/QTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/QTest.java
@@ -48,16 +48,16 @@ public class QTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- Q cbType = (Q) unmarshallElement(singleElementFile);
+ final Q cbType = (Q) unmarshallElement(singleElementFile);
- Assert.assertNotNull(cbType, "Q");
+ assert cbType != null;
Assert.assertEquals(expectedCryptoBinaryContent, cbType.getValue(), "Q value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- Q cbType = (Q) buildXMLObject(Q.DEFAULT_ELEMENT_NAME);
+ final Q cbType = (Q) buildXMLObject(Q.DEFAULT_ELEMENT_NAME);
cbType.setValue(expectedCryptoBinaryContent);
assertXMLEquals(expectedDOM, cbType);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/RecipientKeyInfoTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/RecipientKeyInfoTest.java
index deb444c10..324e0372a 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/RecipientKeyInfoTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/RecipientKeyInfoTest.java
@@ -57,9 +57,9 @@ public class RecipientKeyInfoTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- RecipientKeyInfo keyInfo = (RecipientKeyInfo) unmarshallElement(singleElementFile);
+ final RecipientKeyInfo keyInfo = (RecipientKeyInfo) unmarshallElement(singleElementFile);
- Assert.assertNotNull(keyInfo, "RecipientKeyInfo");
+ assert keyInfo != null;
Assert.assertNull(keyInfo.getID(), "Id attribute");
Assert.assertEquals(keyInfo.getXMLObjects().size(), 0, "Total # of XMLObject child elements");
}
@@ -67,9 +67,9 @@ public class RecipientKeyInfoTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
- RecipientKeyInfo keyInfo = (RecipientKeyInfo) unmarshallElement(singleElementOptionalAttributesFile);
+ final RecipientKeyInfo keyInfo = (RecipientKeyInfo) unmarshallElement(singleElementOptionalAttributesFile);
- Assert.assertNotNull(keyInfo, "RecipientKeyInfo");
+ assert keyInfo != null;
Assert.assertEquals(keyInfo.getID(), expectedID, "Id attribute");
Assert.assertEquals(keyInfo.getXMLObjects().size(), 0, "Total # of XMLObject child elements");
}
@@ -77,9 +77,9 @@ public class RecipientKeyInfoTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- RecipientKeyInfo keyInfo = (RecipientKeyInfo) unmarshallElement(childElementsFile);
+ final RecipientKeyInfo keyInfo = (RecipientKeyInfo) unmarshallElement(childElementsFile);
- Assert.assertNotNull(keyInfo, "RecipientKeyInfo");
+ assert keyInfo != null;
Assert.assertEquals(keyInfo.getXMLObjects().size(), 11, "Total # of XMLObject child elements");
Assert.assertEquals(keyInfo.getKeyNames().size(), 2, "# of KeyName child elements");
Assert.assertEquals(keyInfo.getKeyValues().size(), 2, "# of KeyValue child elements");
@@ -94,7 +94,7 @@ public class RecipientKeyInfoTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- RecipientKeyInfo keyInfo = (RecipientKeyInfo) buildXMLObject(RecipientKeyInfo.DEFAULT_ELEMENT_NAME);
+ final RecipientKeyInfo keyInfo = (RecipientKeyInfo) buildXMLObject(RecipientKeyInfo.DEFAULT_ELEMENT_NAME);
assertXMLEquals(expectedDOM, keyInfo);
}
@@ -102,7 +102,7 @@ public class RecipientKeyInfoTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesMarshall() {
- RecipientKeyInfo keyInfo = (RecipientKeyInfo) buildXMLObject(RecipientKeyInfo.DEFAULT_ELEMENT_NAME);
+ final RecipientKeyInfo keyInfo = (RecipientKeyInfo) buildXMLObject(RecipientKeyInfo.DEFAULT_ELEMENT_NAME);
keyInfo.setID(expectedID);
@@ -112,7 +112,7 @@ public class RecipientKeyInfoTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- RecipientKeyInfo keyInfo = (RecipientKeyInfo) buildXMLObject(RecipientKeyInfo.DEFAULT_ELEMENT_NAME);
+ final RecipientKeyInfo keyInfo = (RecipientKeyInfo) buildXMLObject(RecipientKeyInfo.DEFAULT_ELEMENT_NAME);
keyInfo.getXMLObjects().add(buildXMLObject(KeyName.DEFAULT_ELEMENT_NAME));
keyInfo.getXMLObjects().add(buildXMLObject(KeyValue.DEFAULT_ELEMENT_NAME));
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/ReferenceListTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/ReferenceListTest.java
index 92a8c1f9a..b7ef5daf9 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/ReferenceListTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/ReferenceListTest.java
@@ -52,9 +52,9 @@ public class ReferenceListTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- ReferenceList rl = (ReferenceList) unmarshallElement(singleElementFile);
+ final ReferenceList rl = (ReferenceList) unmarshallElement(singleElementFile);
- Assert.assertNotNull(rl, "ReferenceList");
+ assert rl != null;
Assert.assertEquals(rl.getDataReferences().size(), 0, "# of DataReference children");
Assert.assertEquals(rl.getKeyReferences().size(), 0, "# of KeyReference children");
}
@@ -62,9 +62,9 @@ public class ReferenceListTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- ReferenceList rl = (ReferenceList) unmarshallElement(childElementsFile);
+ final ReferenceList rl = (ReferenceList) unmarshallElement(childElementsFile);
- Assert.assertNotNull(rl, "ReferenceList");
+ assert rl != null;
Assert.assertEquals(rl.getDataReferences().size(), expectedNumDataRefs, "# of DataReference children");
Assert.assertEquals(rl.getKeyReferences().size(), expectedNumKeyRefs, "# of KeyReference children");
}
@@ -72,7 +72,7 @@ public class ReferenceListTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- ReferenceList rl = (ReferenceList) buildXMLObject(ReferenceList.DEFAULT_ELEMENT_NAME);
+ final ReferenceList rl = (ReferenceList) buildXMLObject(ReferenceList.DEFAULT_ELEMENT_NAME);
assertXMLEquals(expectedDOM, rl);
}
@@ -80,7 +80,7 @@ public class ReferenceListTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- ReferenceList rl = (ReferenceList) buildXMLObject(ReferenceList.DEFAULT_ELEMENT_NAME);
+ final ReferenceList rl = (ReferenceList) buildXMLObject(ReferenceList.DEFAULT_ELEMENT_NAME);
rl.getReferences().add( (DataReference) buildXMLObject(DataReference.DEFAULT_ELEMENT_NAME));
rl.getReferences().add( (KeyReference) buildXMLObject(KeyReference.DEFAULT_ELEMENT_NAME));
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SaltTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SaltTest.java
index 6e52755f1..55dfbb953 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SaltTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SaltTest.java
@@ -42,7 +42,7 @@ public class SaltTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- Salt salt = (Salt) unmarshallElement(singleElementFile);
+ final Salt salt = (Salt) unmarshallElement(singleElementFile);
Assert.assertNotNull(salt, "Salt");
}
@@ -50,9 +50,9 @@ public class SaltTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- Salt salt = (Salt) unmarshallElement(childElementsFile);
+ final Salt salt = (Salt) unmarshallElement(childElementsFile);
- Assert.assertNotNull(salt, "Salt");
+ assert salt != null;
Assert.assertNotNull(salt.getSpecified());
Assert.assertNotNull(salt.getOtherSource());
}
@@ -60,7 +60,7 @@ public class SaltTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- Salt salt = (Salt) buildXMLObject(Salt.DEFAULT_ELEMENT_NAME);
+ final Salt salt = (Salt) buildXMLObject(Salt.DEFAULT_ELEMENT_NAME);
assertXMLEquals(expectedDOM, salt);
}
@@ -68,7 +68,7 @@ public class SaltTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- Salt salt = (Salt) buildXMLObject(Salt.DEFAULT_ELEMENT_NAME);
+ final Salt salt = (Salt) buildXMLObject(Salt.DEFAULT_ELEMENT_NAME);
salt.setSpecified(buildXMLObject(Specified.DEFAULT_ELEMENT_NAME));
salt.setOtherSource(buildXMLObject(OtherSource.DEFAULT_ELEMENT_NAME));
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SeedTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SeedTest.java
index 598ec0b12..b2dd3975a 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SeedTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SeedTest.java
@@ -48,16 +48,16 @@ public class SeedTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- Seed cbType = (Seed) unmarshallElement(singleElementFile);
+ final Seed cbType = (Seed) unmarshallElement(singleElementFile);
- Assert.assertNotNull(cbType, "Seed");
+ assert cbType != null;
Assert.assertEquals(expectedCryptoBinaryContent, cbType.getValue(), "Seed value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- Seed cbType = (Seed) buildXMLObject(Seed.DEFAULT_ELEMENT_NAME);
+ final Seed cbType = (Seed) buildXMLObject(Seed.DEFAULT_ELEMENT_NAME);
cbType.setValue(expectedCryptoBinaryContent);
assertXMLEquals(expectedDOM, cbType);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SpecifiedTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SpecifiedTest.java
index 98648c191..d8e64841f 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SpecifiedTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/SpecifiedTest.java
@@ -48,16 +48,16 @@ public class SpecifiedTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- Specified specified = (Specified) unmarshallElement(singleElementFile);
+ final Specified specified = (Specified) unmarshallElement(singleElementFile);
- Assert.assertNotNull(specified, "Specified");
+ assert specified != null;
Assert.assertEquals(expectedStringContent, specified.getValue(), "Specified value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- Specified specified = (Specified) buildXMLObject(Specified.DEFAULT_ELEMENT_NAME);
+ final Specified specified = (Specified) buildXMLObject(Specified.DEFAULT_ELEMENT_NAME);
specified.setValue(expectedStringContent);
assertXMLEquals(expectedDOM, specified);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/TransformsTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/TransformsTest.java
index 61dbabf25..1fa2ea824 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/TransformsTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/TransformsTest.java
@@ -49,25 +49,25 @@ public class TransformsTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- Transforms em = (Transforms) unmarshallElement(singleElementFile);
+ final Transforms em = (Transforms) unmarshallElement(singleElementFile);
- Assert.assertNotNull(em, "Transforms");
+ assert em != null;
Assert.assertEquals(em.getTransforms().size(), 0, "Transform children");
}
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- Transforms em = (Transforms) unmarshallElement(childElementsFile);
+ final Transforms em = (Transforms) unmarshallElement(childElementsFile);
- Assert.assertNotNull(em, "Transforms");
+ assert em != null;
Assert.assertEquals(em.getTransforms().size(), expectedNumTransforms, "Transform children");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- Transforms em = (Transforms) buildXMLObject(Transforms.DEFAULT_ELEMENT_NAME);
+ final Transforms em = (Transforms) buildXMLObject(Transforms.DEFAULT_ELEMENT_NAME);
assertXMLEquals(expectedDOM, em);
}
@@ -75,7 +75,7 @@ public class TransformsTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- Transforms em = (Transforms) buildXMLObject(Transforms.DEFAULT_ELEMENT_NAME);
+ final Transforms em = (Transforms) buildXMLObject(Transforms.DEFAULT_ELEMENT_NAME);
em.getTransforms().add( (Transform) buildXMLObject(Transform.DEFAULT_ELEMENT_NAME));
em.getTransforms().add( (Transform) buildXMLObject(Transform.DEFAULT_ELEMENT_NAME));
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueTest.java
index b257431f2..02d95a858 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueTest.java
@@ -55,18 +55,18 @@ public class DEREncodedKeyValueTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- DEREncodedKeyValue der = (DEREncodedKeyValue) unmarshallElement(singleElementFile);
+ final DEREncodedKeyValue der = (DEREncodedKeyValue) unmarshallElement(singleElementFile);
- Assert.assertNotNull(der, "DEREncodedKeyValue");
+ assert der != null;
Assert.assertEquals(der.getValue(), expectedStringContent, "DEREncodedKeyValue value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
- DEREncodedKeyValue der = (DEREncodedKeyValue) unmarshallElement(singleElementOptionalAttributesFile);
+ final DEREncodedKeyValue der = (DEREncodedKeyValue) unmarshallElement(singleElementOptionalAttributesFile);
- Assert.assertNotNull(der, "DEREncodedKeyValue");
+ assert der != null;
Assert.assertEquals(expectedID, der.getID(), "Id attribute");
Assert.assertEquals(der.getValue(), expectedStringContent, "DEREncodedKeyValue value");
Assert.assertEquals(der.resolveIDFromRoot(expectedID), der);
@@ -75,7 +75,7 @@ public class DEREncodedKeyValueTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- DEREncodedKeyValue der = (DEREncodedKeyValue) buildXMLObject(DEREncodedKeyValue.DEFAULT_ELEMENT_NAME);
+ final DEREncodedKeyValue der = (DEREncodedKeyValue) buildXMLObject(DEREncodedKeyValue.DEFAULT_ELEMENT_NAME);
der.setValue(expectedStringContent);
@@ -90,7 +90,7 @@ public class DEREncodedKeyValueTest extends XMLObjectProviderBaseTestCase {
* */
@Test
public void testAttributeIDnessMarshall() throws MarshallingException, XMLParserException {
- XMLObject target = buildXMLObject(DEREncodedKeyValue.DEFAULT_ELEMENT_NAME);
+ final XMLObject target = buildXMLObject(DEREncodedKeyValue.DEFAULT_ELEMENT_NAME);
((DEREncodedKeyValue)target).setID("id123");
@@ -100,7 +100,7 @@ public class DEREncodedKeyValueTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesMarshall() {
- DEREncodedKeyValue der = (DEREncodedKeyValue) buildXMLObject(DEREncodedKeyValue.DEFAULT_ELEMENT_NAME);
+ final DEREncodedKeyValue der = (DEREncodedKeyValue) buildXMLObject(DEREncodedKeyValue.DEFAULT_ELEMENT_NAME);
der.setID(expectedID);
der.setValue(expectedStringContent);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueTest.java
index b0d58afff..1f0feb337 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueTest.java
@@ -47,9 +47,9 @@ public class DSAKeyValueTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- DSAKeyValue keyValue = (DSAKeyValue) unmarshallElement(singleElementFile);
+ final DSAKeyValue keyValue = (DSAKeyValue) unmarshallElement(singleElementFile);
- Assert.assertNotNull(keyValue, "DSAKeyValue");
+ assert keyValue != null;
Assert.assertNull(keyValue.getP(), "P child element");
Assert.assertNull(keyValue.getQ(), "Q child element");
Assert.assertNull(keyValue.getG(), "G child element");
@@ -62,9 +62,9 @@ public class DSAKeyValueTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- DSAKeyValue keyValue = (DSAKeyValue) unmarshallElement(childElementsFile);
+ final DSAKeyValue keyValue = (DSAKeyValue) unmarshallElement(childElementsFile);
- Assert.assertNotNull(keyValue, "DSAKeyValue");
+ assert keyValue != null;
Assert.assertNotNull(keyValue.getP(), "P child element");
Assert.assertNotNull(keyValue.getQ(), "Q child element");
Assert.assertNotNull(keyValue.getG(), "G child element");
@@ -77,7 +77,7 @@ public class DSAKeyValueTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- DSAKeyValue keyValue = (DSAKeyValue) buildXMLObject(DSAKeyValue.DEFAULT_ELEMENT_NAME);
+ final DSAKeyValue keyValue = (DSAKeyValue) buildXMLObject(DSAKeyValue.DEFAULT_ELEMENT_NAME);
assertXMLEquals(expectedDOM, keyValue);
}
@@ -85,7 +85,7 @@ public class DSAKeyValueTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- DSAKeyValue keyValue = (DSAKeyValue) buildXMLObject(DSAKeyValue.DEFAULT_ELEMENT_NAME);
+ final DSAKeyValue keyValue = (DSAKeyValue) buildXMLObject(DSAKeyValue.DEFAULT_ELEMENT_NAME);
keyValue.setP((P) buildXMLObject(P.DEFAULT_ELEMENT_NAME));
keyValue.setQ((Q) buildXMLObject(Q.DEFAULT_ELEMENT_NAME));
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DigestMethodTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DigestMethodTest.java
index d308500ab..406aca265 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DigestMethodTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/DigestMethodTest.java
@@ -25,6 +25,7 @@ import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.mock.SimpleXMLObject;
import org.opensaml.xmlsec.signature.DigestMethod;
+ at SuppressWarnings("javadoc")
public class DigestMethodTest extends XMLObjectProviderBaseTestCase {
private String expectedAlgorithm;
@@ -48,9 +49,9 @@ public class DigestMethodTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- DigestMethod digestMethod = (DigestMethod) unmarshallElement(singleElementFile);
+ final DigestMethod digestMethod = (DigestMethod) unmarshallElement(singleElementFile);
- Assert.assertNotNull(digestMethod, "DigestMethod");
+ assert digestMethod != null;
Assert.assertEquals(digestMethod.getAlgorithm(), expectedAlgorithm, "Algorithm attribute");
Assert.assertEquals(digestMethod.getUnknownXMLObjects().size(), 0, "Total children");
}
@@ -58,9 +59,9 @@ public class DigestMethodTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- DigestMethod digestMethod = (DigestMethod) unmarshallElement(childElementsFile);
+ final DigestMethod digestMethod = (DigestMethod) unmarshallElement(childElementsFile);
- Assert.assertNotNull(digestMethod, "DigestMethod");
+ assert digestMethod != null;
Assert.assertEquals(digestMethod.getAlgorithm(), expectedAlgorithm, "Algorithm attribute");
Assert.assertEquals(digestMethod.getUnknownXMLObjects().size(), expectedTotalChildren, "Total children");
}
@@ -68,7 +69,7 @@ public class DigestMethodTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- DigestMethod digestMethod = (DigestMethod) buildXMLObject(DigestMethod.DEFAULT_ELEMENT_NAME);
+ final DigestMethod digestMethod = (DigestMethod) buildXMLObject(DigestMethod.DEFAULT_ELEMENT_NAME);
digestMethod.setAlgorithm(expectedAlgorithm);
@@ -78,7 +79,7 @@ public class DigestMethodTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- DigestMethod digestMethod = (DigestMethod) buildXMLObject(DigestMethod.DEFAULT_ELEMENT_NAME);
+ final DigestMethod digestMethod = (DigestMethod) buildXMLObject(DigestMethod.DEFAULT_ELEMENT_NAME);
digestMethod.setAlgorithm(expectedAlgorithm);
digestMethod.getUnknownXMLObjects().add( buildXMLObject(SimpleXMLObject.ELEMENT_NAME));
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ECKeyValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ECKeyValueTest.java
index 35928603d..360b41403 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ECKeyValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ECKeyValueTest.java
@@ -55,9 +55,9 @@ public class ECKeyValueTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- ECKeyValue keyValue = (ECKeyValue) unmarshallElement(singleElementFile);
+ final ECKeyValue keyValue = (ECKeyValue) unmarshallElement(singleElementFile);
- Assert.assertNotNull(keyValue, "ECKeyValue");
+ assert keyValue != null;
Assert.assertNull(keyValue.getNamedCurve(), "NamedCurve child element");
Assert.assertNull(keyValue.getPublicKey(), "PublicKey child element");
}
@@ -65,9 +65,9 @@ public class ECKeyValueTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
- ECKeyValue keyValue = (ECKeyValue) unmarshallElement(singleElementOptionalAttributesFile);
+ final ECKeyValue keyValue = (ECKeyValue) unmarshallElement(singleElementOptionalAttributesFile);
- Assert.assertNotNull(keyValue, "ECKeyValue");
+ assert keyValue != null;
Assert.assertEquals(expectedID, keyValue.getID(), "Id attribute");
Assert.assertEquals(keyValue.resolveIDFromRoot(expectedID), keyValue);
Assert.assertNull(keyValue.getNamedCurve(), "NamedCurve child element");
@@ -77,9 +77,9 @@ public class ECKeyValueTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- ECKeyValue keyValue = (ECKeyValue) unmarshallElement(childElementsFile);
+ final ECKeyValue keyValue = (ECKeyValue) unmarshallElement(childElementsFile);
- Assert.assertNotNull(keyValue, "ECKeyValue");
+ assert keyValue != null;
Assert.assertNotNull(keyValue.getNamedCurve(), "NamedCurve child element");
Assert.assertNotNull(keyValue.getPublicKey(), "PublicKey child element");
}
@@ -87,7 +87,7 @@ public class ECKeyValueTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- ECKeyValue keyValue = (ECKeyValue) buildXMLObject(ECKeyValue.DEFAULT_ELEMENT_NAME);
+ final ECKeyValue keyValue = (ECKeyValue) buildXMLObject(ECKeyValue.DEFAULT_ELEMENT_NAME);
assertXMLEquals(expectedDOM, keyValue);
}
@@ -100,7 +100,7 @@ public class ECKeyValueTest extends XMLObjectProviderBaseTestCase {
* */
@Test
public void testAttributeIDnessMarshall() throws MarshallingException, XMLParserException {
- XMLObject target = buildXMLObject(ECKeyValue.DEFAULT_ELEMENT_NAME);
+ final XMLObject target = buildXMLObject(ECKeyValue.DEFAULT_ELEMENT_NAME);
((ECKeyValue)target).setID("id123");
@@ -110,7 +110,7 @@ public class ECKeyValueTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesMarshall() {
- ECKeyValue keyValue = (ECKeyValue) buildXMLObject(ECKeyValue.DEFAULT_ELEMENT_NAME);
+ final ECKeyValue keyValue = (ECKeyValue) buildXMLObject(ECKeyValue.DEFAULT_ELEMENT_NAME);
keyValue.setID(expectedID);
@@ -121,7 +121,7 @@ public class ECKeyValueTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- ECKeyValue keyValue = (ECKeyValue) buildXMLObject(ECKeyValue.DEFAULT_ELEMENT_NAME);
+ final ECKeyValue keyValue = (ECKeyValue) buildXMLObject(ECKeyValue.DEFAULT_ELEMENT_NAME);
keyValue.setNamedCurve((NamedCurve) buildXMLObject(NamedCurve.DEFAULT_ELEMENT_NAME));
keyValue.setPublicKey((PublicKey) buildXMLObject(PublicKey.DEFAULT_ELEMENT_NAME));
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ExponentTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ExponentTest.java
index bd16aee67..48553dcba 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ExponentTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ExponentTest.java
@@ -48,16 +48,16 @@ public class ExponentTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- Exponent cbType = (Exponent) unmarshallElement(singleElementFile);
+ final Exponent cbType = (Exponent) unmarshallElement(singleElementFile);
- Assert.assertNotNull(cbType, "Exponent");
+ assert cbType != null;
Assert.assertEquals(expectedCryptoBinaryContent, cbType.getValue(), "Exponent value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- Exponent cbType = (Exponent) buildXMLObject(Exponent.DEFAULT_ELEMENT_NAME);
+ final Exponent cbType = (Exponent) buildXMLObject(Exponent.DEFAULT_ELEMENT_NAME);
cbType.setValue(expectedCryptoBinaryContent);
assertXMLEquals(expectedDOM, cbType);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/GTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/GTest.java
index b45997e5a..f98aa7af4 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/GTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/GTest.java
@@ -48,16 +48,16 @@ public class GTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- G cbType = (G) unmarshallElement(singleElementFile);
+ final G cbType = (G) unmarshallElement(singleElementFile);
- Assert.assertNotNull(cbType, "G");
+ assert cbType != null;
Assert.assertEquals(expectedCryptoBinaryContent, cbType.getValue(), "G value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- G cbType = (G) buildXMLObject(G.DEFAULT_ELEMENT_NAME);
+ final G cbType = (G) buildXMLObject(G.DEFAULT_ELEMENT_NAME);
cbType.setValue(expectedCryptoBinaryContent);
assertXMLEquals(expectedDOM, cbType);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/JTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/JTest.java
index 97f62b576..827ccc7b5 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/JTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/JTest.java
@@ -48,16 +48,16 @@ public class JTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- J cbType = (J) unmarshallElement(singleElementFile);
+ final J cbType = (J) unmarshallElement(singleElementFile);
- Assert.assertNotNull(cbType, "J");
+ assert cbType != null;
Assert.assertEquals(expectedCryptoBinaryContent, cbType.getValue(), "J value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- J cbType = (J) buildXMLObject(J.DEFAULT_ELEMENT_NAME);
+ final J cbType = (J) buildXMLObject(J.DEFAULT_ELEMENT_NAME);
cbType.setValue(expectedCryptoBinaryContent);
assertXMLEquals(expectedDOM, cbType);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceTest.java
index b47fe2144..0008cf665 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceTest.java
@@ -53,17 +53,17 @@ public class KeyInfoReferenceTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
public void testSingleElementUnmarshall() {
- KeyInfoReference ref = (KeyInfoReference) unmarshallElement(singleElementFile);
+ final KeyInfoReference ref = (KeyInfoReference) unmarshallElement(singleElementFile);
- Assert.assertNotNull(ref, "KeyInfoReference");
+ assert ref != null;
Assert.assertEquals(ref.getURI(), expectedURI, "URI attribute");
}
/** {@inheritDoc} */
public void testSingleElementOptionalAttributesUnmarshall() {
- KeyInfoReference ref = (KeyInfoReference) unmarshallElement(singleElementOptionalAttributesFile);
+ final KeyInfoReference ref = (KeyInfoReference) unmarshallElement(singleElementOptionalAttributesFile);
- Assert.assertNotNull(ref, "KeyInfoReference");
+ assert ref != null;
Assert.assertEquals(ref.getID(), expectedID, "Id attribute");
Assert.assertEquals(ref.getURI(), expectedURI, "URI attribute");
Assert.assertEquals(ref.resolveIDFromRoot(expectedID), ref);
@@ -71,7 +71,7 @@ public class KeyInfoReferenceTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
public void testSingleElementMarshall() {
- KeyInfoReference ref = (KeyInfoReference) buildXMLObject(KeyInfoReference.DEFAULT_ELEMENT_NAME);
+ final KeyInfoReference ref = (KeyInfoReference) buildXMLObject(KeyInfoReference.DEFAULT_ELEMENT_NAME);
ref.setURI(expectedURI);
@@ -86,7 +86,7 @@ public class KeyInfoReferenceTest extends XMLObjectProviderBaseTestCase {
* */
@Test
public void testAttributeIDnessMarshall() throws MarshallingException, XMLParserException {
- XMLObject target = buildXMLObject(KeyInfoReference.DEFAULT_ELEMENT_NAME);
+ final XMLObject target = buildXMLObject(KeyInfoReference.DEFAULT_ELEMENT_NAME);
((KeyInfoReference)target).setID("id123");
@@ -95,7 +95,7 @@ public class KeyInfoReferenceTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
public void testSingleElementOptionalAttributesMarshall() {
- KeyInfoReference ref = (KeyInfoReference) buildXMLObject(KeyInfoReference.DEFAULT_ELEMENT_NAME);
+ final KeyInfoReference ref = (KeyInfoReference) buildXMLObject(KeyInfoReference.DEFAULT_ELEMENT_NAME);
ref.setID(expectedID);
ref.setURI(expectedURI);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyInfoTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyInfoTest.java
index d7d4aae6f..ecf0613a2 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyInfoTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyInfoTest.java
@@ -61,9 +61,9 @@ public class KeyInfoTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- KeyInfo keyInfo = (KeyInfo) unmarshallElement(singleElementFile);
+ final KeyInfo keyInfo = (KeyInfo) unmarshallElement(singleElementFile);
- Assert.assertNotNull(keyInfo, "KeyInfo");
+ assert keyInfo != null;
Assert.assertNull(keyInfo.getID(), "Id attribute");
Assert.assertEquals(keyInfo.getXMLObjects().size(), 0, "Total # of XMLObject child elements");
}
@@ -71,9 +71,9 @@ public class KeyInfoTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
- KeyInfo keyInfo = (KeyInfo) unmarshallElement(singleElementOptionalAttributesFile);
+ final KeyInfo keyInfo = (KeyInfo) unmarshallElement(singleElementOptionalAttributesFile);
- Assert.assertNotNull(keyInfo, "KeyInfo");
+ assert keyInfo != null;
Assert.assertEquals(keyInfo.getID(), expectedID, "Id attribute");
Assert.assertEquals(keyInfo.getXMLObjects().size(), 0, "Total # of XMLObject child elements");
@@ -83,9 +83,9 @@ public class KeyInfoTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- KeyInfo keyInfo = (KeyInfo) unmarshallElement(childElementsFile);
+ final KeyInfo keyInfo = (KeyInfo) unmarshallElement(childElementsFile);
- Assert.assertNotNull(keyInfo, "KeyInfo");
+ assert keyInfo != null;
Assert.assertEquals(keyInfo.getXMLObjects().size(), 11, "Total # of XMLObject child elements");
Assert.assertEquals(keyInfo.getKeyNames().size(), 2, "# of KeyName child elements");
Assert.assertEquals(keyInfo.getKeyValues().size(), 2, "# of KeyValue child elements");
@@ -100,7 +100,7 @@ public class KeyInfoTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- KeyInfo keyInfo = (KeyInfo) buildXMLObject(KeyInfo.DEFAULT_ELEMENT_NAME);
+ final KeyInfo keyInfo = (KeyInfo) buildXMLObject(KeyInfo.DEFAULT_ELEMENT_NAME);
assertXMLEquals(expectedDOM, keyInfo);
}
@@ -113,7 +113,7 @@ public class KeyInfoTest extends XMLObjectProviderBaseTestCase {
* */
@Test
public void testAttributeIDnessMarshall() throws MarshallingException, XMLParserException {
- XMLObject target = buildXMLObject(KeyInfo.DEFAULT_ELEMENT_NAME);
+ final XMLObject target = buildXMLObject(KeyInfo.DEFAULT_ELEMENT_NAME);
((KeyInfo)target).setID("id123");
@@ -123,7 +123,7 @@ public class KeyInfoTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesMarshall() {
- KeyInfo keyInfo = (KeyInfo) buildXMLObject(KeyInfo.DEFAULT_ELEMENT_NAME);
+ final KeyInfo keyInfo = (KeyInfo) buildXMLObject(KeyInfo.DEFAULT_ELEMENT_NAME);
keyInfo.setID(expectedID);
@@ -133,7 +133,7 @@ public class KeyInfoTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- KeyInfo keyInfo = (KeyInfo) buildXMLObject(KeyInfo.DEFAULT_ELEMENT_NAME);
+ final KeyInfo keyInfo = (KeyInfo) buildXMLObject(KeyInfo.DEFAULT_ELEMENT_NAME);
keyInfo.getXMLObjects().add(buildXMLObject(KeyName.DEFAULT_ELEMENT_NAME));
keyInfo.getXMLObjects().add(buildXMLObject(KeyValue.DEFAULT_ELEMENT_NAME));
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyNameTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyNameTest.java
index 873c8f16e..eaec9c1f1 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyNameTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyNameTest.java
@@ -48,16 +48,16 @@ public class KeyNameTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- KeyName keyName = (KeyName) unmarshallElement(singleElementFile);
+ final KeyName keyName = (KeyName) unmarshallElement(singleElementFile);
- Assert.assertNotNull(keyName, "KeyName");
+ assert keyName != null;
Assert.assertEquals(expectedStringContent, keyName.getValue(), "KeyName value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- KeyName keyName = (KeyName) buildXMLObject(KeyName.DEFAULT_ELEMENT_NAME);
+ final KeyName keyName = (KeyName) buildXMLObject(KeyName.DEFAULT_ELEMENT_NAME);
keyName.setValue(expectedStringContent);
assertXMLEquals(expectedDOM, keyName);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyValueTest.java
index 2cbd95c91..37804a563 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/KeyValueTest.java
@@ -41,9 +41,9 @@ public class KeyValueTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- KeyValue keyValue = (KeyValue) unmarshallElement(singleElementFile);
+ final KeyValue keyValue = (KeyValue) unmarshallElement(singleElementFile);
- Assert.assertNotNull(keyValue, "KeyValue");
+ assert keyValue != null;
Assert.assertNull(keyValue.getRSAKeyValue(), "RSAKeyValue child element");
Assert.assertNull(keyValue.getDSAKeyValue(), "DSAKeyValue child element");
Assert.assertNull(keyValue.getUnknownXMLObject(), "Wildcard child element");
@@ -52,9 +52,9 @@ public class KeyValueTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- KeyValue keyValue = (KeyValue) unmarshallElement(childElementsFile);
+ final KeyValue keyValue = (KeyValue) unmarshallElement(childElementsFile);
- Assert.assertNotNull(keyValue, "KeyValue");
+ assert keyValue != null;
Assert.assertNotNull(keyValue.getRSAKeyValue(), "RSAKeyValue child element");
Assert.assertNull(keyValue.getDSAKeyValue(), "DSAKeyValue child element");
Assert.assertNull(keyValue.getUnknownXMLObject(), "Wildcard child element");
@@ -63,7 +63,7 @@ public class KeyValueTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- KeyValue keyValue = (KeyValue) buildXMLObject(KeyValue.DEFAULT_ELEMENT_NAME);
+ final KeyValue keyValue = (KeyValue) buildXMLObject(KeyValue.DEFAULT_ELEMENT_NAME);
assertXMLEquals(expectedDOM, keyValue);
}
@@ -71,7 +71,7 @@ public class KeyValueTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- KeyValue keyValue = (KeyValue) buildXMLObject(KeyValue.DEFAULT_ELEMENT_NAME);
+ final KeyValue keyValue = (KeyValue) buildXMLObject(KeyValue.DEFAULT_ELEMENT_NAME);
keyValue.setRSAKeyValue((RSAKeyValue) buildXMLObject(RSAKeyValue.DEFAULT_ELEMENT_NAME));
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/MgmtDataTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/MgmtDataTest.java
index 2059bf6f6..67c05267b 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/MgmtDataTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/MgmtDataTest.java
@@ -48,16 +48,16 @@ public class MgmtDataTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- MgmtData keyName = (MgmtData) unmarshallElement(singleElementFile);
+ final MgmtData keyName = (MgmtData) unmarshallElement(singleElementFile);
- Assert.assertNotNull(keyName, "MgmtData");
+ assert keyName != null;
Assert.assertEquals(expectedStringContent, keyName.getValue(), "MgmtData value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- MgmtData keyName = (MgmtData) buildXMLObject(MgmtData.DEFAULT_ELEMENT_NAME);
+ final MgmtData keyName = (MgmtData) buildXMLObject(MgmtData.DEFAULT_ELEMENT_NAME);
keyName.setValue(expectedStringContent);
assertXMLEquals(expectedDOM, keyName);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ModulusTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ModulusTest.java
index c437db789..d22902a49 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ModulusTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/ModulusTest.java
@@ -48,16 +48,16 @@ public class ModulusTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- Modulus cbType = (Modulus) unmarshallElement(singleElementFile);
+ final Modulus cbType = (Modulus) unmarshallElement(singleElementFile);
- Assert.assertNotNull(cbType, "Modulus");
+ assert cbType != null;
Assert.assertEquals(expectedCryptoBinaryContent, cbType.getValue(), "Modulus value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- Modulus cbType = (Modulus) buildXMLObject(Modulus.DEFAULT_ELEMENT_NAME);
+ final Modulus cbType = (Modulus) buildXMLObject(Modulus.DEFAULT_ELEMENT_NAME);
cbType.setValue(expectedCryptoBinaryContent);
assertXMLEquals(expectedDOM, cbType);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/NamedCurveTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/NamedCurveTest.java
index 4ca2e4efe..a5f2dae5f 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/NamedCurveTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/NamedCurveTest.java
@@ -24,6 +24,7 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+ at SuppressWarnings("javadoc")
public class NamedCurveTest extends XMLObjectProviderBaseTestCase {
private String expectedURI;
@@ -44,16 +45,16 @@ public class NamedCurveTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- NamedCurve nc = (NamedCurve) unmarshallElement(singleElementFile);
+ final NamedCurve nc = (NamedCurve) unmarshallElement(singleElementFile);
- Assert.assertNotNull(nc, "NamedCurve");
+ assert nc != null;
Assert.assertEquals(expectedURI, nc.getURI(), "URI attribute");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- NamedCurve nc = (NamedCurve) buildXMLObject(NamedCurve.DEFAULT_ELEMENT_NAME);
+ final NamedCurve nc = (NamedCurve) buildXMLObject(NamedCurve.DEFAULT_ELEMENT_NAME);
nc.setURI(expectedURI);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPDataTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPDataTest.java
index 6faa74b70..78c5d11ad 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPDataTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPDataTest.java
@@ -44,9 +44,9 @@ public class PGPDataTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- PGPData pgpData = (PGPData) unmarshallElement(singleElementFile);
+ final PGPData pgpData = (PGPData) unmarshallElement(singleElementFile);
- Assert.assertNotNull(pgpData, "PGPData");
+ assert pgpData != null;
Assert.assertNull(pgpData.getPGPKeyID(), "PGPKeyID child element");
Assert.assertNull(pgpData.getPGPKeyPacket(), "PGPKeyPacket child element");
Assert.assertEquals(pgpData.getUnknownXMLObjects().size(), 0, "# of other XMLObject children");
@@ -55,9 +55,9 @@ public class PGPDataTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- PGPData pgpData = (PGPData) unmarshallElement(childElementsFile);
+ final PGPData pgpData = (PGPData) unmarshallElement(childElementsFile);
- Assert.assertNotNull(pgpData, "PGPData");
+ assert pgpData != null;
Assert.assertNotNull(pgpData.getPGPKeyID(), "PGPKeyID child element");
Assert.assertNotNull(pgpData.getPGPKeyPacket(), "PGPKeyPacket child element");
Assert.assertEquals(pgpData.getUnknownXMLObjects().size(), 2, "# of other XMLObject children");
@@ -66,7 +66,7 @@ public class PGPDataTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- PGPData pgpData = (PGPData) buildXMLObject(PGPData.DEFAULT_ELEMENT_NAME);
+ final PGPData pgpData = (PGPData) buildXMLObject(PGPData.DEFAULT_ELEMENT_NAME);
assertXMLEquals(expectedDOM, pgpData);
}
@@ -74,7 +74,7 @@ public class PGPDataTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- PGPData pgpData = (PGPData) buildXMLObject(PGPData.DEFAULT_ELEMENT_NAME);
+ final PGPData pgpData = (PGPData) buildXMLObject(PGPData.DEFAULT_ELEMENT_NAME);
pgpData.setPGPKeyID((PGPKeyID) buildXMLObject(PGPKeyID.DEFAULT_ELEMENT_NAME));
pgpData.setPGPKeyPacket((PGPKeyPacket) buildXMLObject(PGPKeyPacket.DEFAULT_ELEMENT_NAME));
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPKeyIDTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPKeyIDTest.java
index 60d3573c5..a133ab178 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPKeyIDTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPKeyIDTest.java
@@ -48,16 +48,16 @@ public class PGPKeyIDTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- PGPKeyID pgpElement = (PGPKeyID) unmarshallElement(singleElementFile);
+ final PGPKeyID pgpElement = (PGPKeyID) unmarshallElement(singleElementFile);
- Assert.assertNotNull(pgpElement, "PGPKeyID");
+ assert pgpElement != null;
Assert.assertEquals(expectedStringContent, pgpElement.getValue(), "PGPKeyID value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- PGPKeyID pgpElement = (PGPKeyID) buildXMLObject(PGPKeyID.DEFAULT_ELEMENT_NAME);
+ final PGPKeyID pgpElement = (PGPKeyID) buildXMLObject(PGPKeyID.DEFAULT_ELEMENT_NAME);
pgpElement.setValue(expectedStringContent);
assertXMLEquals(expectedDOM, pgpElement);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPKeyPacketTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPKeyPacketTest.java
index 1f78bddfc..569a7c5e0 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPKeyPacketTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PGPKeyPacketTest.java
@@ -48,16 +48,16 @@ public class PGPKeyPacketTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- PGPKeyPacket pgpElement = (PGPKeyPacket) unmarshallElement(singleElementFile);
+ final PGPKeyPacket pgpElement = (PGPKeyPacket) unmarshallElement(singleElementFile);
- Assert.assertNotNull(pgpElement, "PGPKeyPacket");
+ assert pgpElement != null;
Assert.assertEquals(expectedStringContent, pgpElement.getValue(), "PGPKeyPacket value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- PGPKeyPacket pgpElement = (PGPKeyPacket) buildXMLObject(PGPKeyPacket.DEFAULT_ELEMENT_NAME);
+ final PGPKeyPacket pgpElement = (PGPKeyPacket) buildXMLObject(PGPKeyPacket.DEFAULT_ELEMENT_NAME);
pgpElement.setValue(expectedStringContent);
assertXMLEquals(expectedDOM, pgpElement);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PTest.java
index f959ad3c7..2b8f1fe0b 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PTest.java
@@ -48,16 +48,16 @@ public class PTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- P cbType = (P) unmarshallElement(singleElementFile);
+ final P cbType = (P) unmarshallElement(singleElementFile);
- Assert.assertNotNull(cbType, "P");
+ assert cbType != null;
Assert.assertEquals(expectedCryptoBinaryContent, cbType.getValue(), "P value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- P cbType = (P) buildXMLObject(P.DEFAULT_ELEMENT_NAME);
+ final P cbType = (P) buildXMLObject(P.DEFAULT_ELEMENT_NAME);
cbType.setValue(expectedCryptoBinaryContent);
assertXMLEquals(expectedDOM, cbType);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PgenCounterTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PgenCounterTest.java
index e0bd57c81..03ad8b055 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PgenCounterTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PgenCounterTest.java
@@ -48,16 +48,16 @@ public class PgenCounterTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- PgenCounter cbType = (PgenCounter) unmarshallElement(singleElementFile);
+ final PgenCounter cbType = (PgenCounter) unmarshallElement(singleElementFile);
- Assert.assertNotNull(cbType, "PgenCounter");
+ assert cbType != null;
Assert.assertEquals(expectedCryptoBinaryContent, cbType.getValue(), "PgenCounter value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- PgenCounter cbType = (PgenCounter) buildXMLObject(PgenCounter.DEFAULT_ELEMENT_NAME);
+ final PgenCounter cbType = (PgenCounter) buildXMLObject(PgenCounter.DEFAULT_ELEMENT_NAME);
cbType.setValue(expectedCryptoBinaryContent);
assertXMLEquals(expectedDOM, cbType);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PublicKeyTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PublicKeyTest.java
index 18ee660cc..c0db0bc4a 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PublicKeyTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/PublicKeyTest.java
@@ -47,16 +47,16 @@ public class PublicKeyTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- PublicKey cbType = (PublicKey) unmarshallElement(singleElementFile);
+ final PublicKey cbType = (PublicKey) unmarshallElement(singleElementFile);
- Assert.assertNotNull(cbType, "PublicKey");
+ assert cbType != null;
Assert.assertEquals(cbType.getValue(), expectedCryptoBinaryContent, "PublicKey value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- PublicKey cbType = (PublicKey) buildXMLObject(PublicKey.DEFAULT_ELEMENT_NAME);
+ final PublicKey cbType = (PublicKey) buildXMLObject(PublicKey.DEFAULT_ELEMENT_NAME);
cbType.setValue(expectedCryptoBinaryContent);
assertXMLEquals(expectedDOM, cbType);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/QTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/QTest.java
index ffc443daf..a10a19aee 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/QTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/QTest.java
@@ -48,16 +48,16 @@ public class QTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- Q cbType = (Q) unmarshallElement(singleElementFile);
+ final Q cbType = (Q) unmarshallElement(singleElementFile);
- Assert.assertNotNull(cbType, "Q");
+ assert cbType != null;
Assert.assertEquals(expectedCryptoBinaryContent, cbType.getValue(), "Q value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- Q cbType = (Q) buildXMLObject(Q.DEFAULT_ELEMENT_NAME);
+ final Q cbType = (Q) buildXMLObject(Q.DEFAULT_ELEMENT_NAME);
cbType.setValue(expectedCryptoBinaryContent);
assertXMLEquals(expectedDOM, cbType);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueTest.java
index 97b792891..5201b5893 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueTest.java
@@ -42,9 +42,9 @@ public class RSAKeyValueTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- RSAKeyValue keyValue = (RSAKeyValue) unmarshallElement(singleElementFile);
+ final RSAKeyValue keyValue = (RSAKeyValue) unmarshallElement(singleElementFile);
- Assert.assertNotNull(keyValue, "RSAKeyValue");
+ assert keyValue != null;
Assert.assertNull(keyValue.getModulus(), "Modulus child element");
Assert.assertNull(keyValue.getExponent(), "Exponent child element");
}
@@ -52,9 +52,9 @@ public class RSAKeyValueTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- RSAKeyValue keyValue = (RSAKeyValue) unmarshallElement(childElementsFile);
+ final RSAKeyValue keyValue = (RSAKeyValue) unmarshallElement(childElementsFile);
- Assert.assertNotNull(keyValue, "RSAKeyValue");
+ assert keyValue != null;
Assert.assertNotNull(keyValue.getModulus(), "Modulus child element");
Assert.assertNotNull(keyValue.getExponent(), "Exponent child element");
}
@@ -62,7 +62,7 @@ public class RSAKeyValueTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- RSAKeyValue keyValue = (RSAKeyValue) buildXMLObject(RSAKeyValue.DEFAULT_ELEMENT_NAME);
+ final RSAKeyValue keyValue = (RSAKeyValue) buildXMLObject(RSAKeyValue.DEFAULT_ELEMENT_NAME);
assertXMLEquals(expectedDOM, keyValue);
}
@@ -70,7 +70,7 @@ public class RSAKeyValueTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- RSAKeyValue keyValue = (RSAKeyValue) buildXMLObject(RSAKeyValue.DEFAULT_ELEMENT_NAME);
+ final RSAKeyValue keyValue = (RSAKeyValue) buildXMLObject(RSAKeyValue.DEFAULT_ELEMENT_NAME);
keyValue.setModulus((Modulus) buildXMLObject(Modulus.DEFAULT_ELEMENT_NAME));
keyValue.setExponent((Exponent) buildXMLObject(Exponent.DEFAULT_ELEMENT_NAME));
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodTest.java
index 2680f18d6..c8606bcce 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodTest.java
@@ -52,9 +52,9 @@ public class RetrievalMethodTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- RetrievalMethod rm = (RetrievalMethod) unmarshallElement(singleElementFile);
+ final RetrievalMethod rm = (RetrievalMethod) unmarshallElement(singleElementFile);
- Assert.assertNotNull(rm, "RetrievalMethod");
+ assert rm != null;
Assert.assertEquals(rm.getURI(), expectedURI, "URI attribute");
Assert.assertNull(rm.getTransforms(), "Transforms child element");
}
@@ -64,9 +64,9 @@ public class RetrievalMethodTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
- RetrievalMethod rm = (RetrievalMethod) unmarshallElement(singleElementOptionalAttributesFile);
+ final RetrievalMethod rm = (RetrievalMethod) unmarshallElement(singleElementOptionalAttributesFile);
- Assert.assertNotNull(rm, "RetrievalMethod");
+ assert rm != null;
Assert.assertEquals(rm.getURI(), expectedURI, "URI attribute");
Assert.assertEquals(rm.getType(), expectedType, "Type attribute");
Assert.assertNull(rm.getTransforms(), "Transforms child element");
@@ -75,9 +75,9 @@ public class RetrievalMethodTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- RetrievalMethod rm = (RetrievalMethod) unmarshallElement(childElementsFile);
+ final RetrievalMethod rm = (RetrievalMethod) unmarshallElement(childElementsFile);
- Assert.assertNotNull(rm, "RetrievalMethod");
+ assert rm != null;
Assert.assertEquals(rm.getURI(), expectedURI, "URI attribute");
Assert.assertNotNull(rm.getTransforms(), "Transforms child element");
}
@@ -85,7 +85,7 @@ public class RetrievalMethodTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- RetrievalMethod rm = (RetrievalMethod) buildXMLObject(RetrievalMethod.DEFAULT_ELEMENT_NAME);
+ final RetrievalMethod rm = (RetrievalMethod) buildXMLObject(RetrievalMethod.DEFAULT_ELEMENT_NAME);
rm.setURI(expectedURI);
@@ -97,7 +97,7 @@ public class RetrievalMethodTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesMarshall() {
- RetrievalMethod rm = (RetrievalMethod) buildXMLObject(RetrievalMethod.DEFAULT_ELEMENT_NAME);
+ final RetrievalMethod rm = (RetrievalMethod) buildXMLObject(RetrievalMethod.DEFAULT_ELEMENT_NAME);
rm.setURI(expectedURI);
rm.setType(expectedType);
@@ -108,7 +108,7 @@ public class RetrievalMethodTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- RetrievalMethod rm = (RetrievalMethod) buildXMLObject(RetrievalMethod.DEFAULT_ELEMENT_NAME);
+ final RetrievalMethod rm = (RetrievalMethod) buildXMLObject(RetrievalMethod.DEFAULT_ELEMENT_NAME);
rm.setURI(expectedURI);
rm.setTransforms((Transforms) buildXMLObject(Transforms.DEFAULT_ELEMENT_NAME));
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SPKIDataTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SPKIDataTest.java
index e1c142a83..f86de10a1 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SPKIDataTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SPKIDataTest.java
@@ -42,18 +42,18 @@ public class SPKIDataTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- SPKIData spkiData = (SPKIData) unmarshallElement(singleElementFile);
+ final SPKIData spkiData = (SPKIData) unmarshallElement(singleElementFile);
- Assert.assertNotNull(spkiData, "SPKIData");
+ assert spkiData != null;
Assert.assertEquals(spkiData.getXMLObjects().size(), 0, "Total # of XMLObject child elements");
}
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- SPKIData spkiData = (SPKIData) unmarshallElement(childElementsFile);
+ final SPKIData spkiData = (SPKIData) unmarshallElement(childElementsFile);
- Assert.assertNotNull(spkiData, "SPKIData");
+ assert spkiData != null;
Assert.assertEquals(spkiData.getXMLObjects().size(), 4, "Total # of XMLObject child elements");
Assert.assertEquals(spkiData.getSPKISexps().size(), 2, "# of SPKISexp child elements");
Assert.assertEquals(spkiData.getXMLObjects(SimpleXMLObject.ELEMENT_NAME).size(), 2, "# of SimpleElement child elements");
@@ -62,7 +62,7 @@ public class SPKIDataTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- SPKIData spkiData = (SPKIData) buildXMLObject(SPKIData.DEFAULT_ELEMENT_NAME);
+ final SPKIData spkiData = (SPKIData) buildXMLObject(SPKIData.DEFAULT_ELEMENT_NAME);
assertXMLEquals(expectedDOM, spkiData);
}
@@ -70,7 +70,7 @@ public class SPKIDataTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- SPKIData spkiData = (SPKIData) buildXMLObject(SPKIData.DEFAULT_ELEMENT_NAME);
+ final SPKIData spkiData = (SPKIData) buildXMLObject(SPKIData.DEFAULT_ELEMENT_NAME);
spkiData.getXMLObjects().add(buildXMLObject(SPKISexp.DEFAULT_ELEMENT_NAME));
spkiData.getXMLObjects().add(buildXMLObject(SimpleXMLObject.ELEMENT_NAME));
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SPKISexpTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SPKISexpTest.java
index f5d84d695..260b91fd8 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SPKISexpTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SPKISexpTest.java
@@ -48,16 +48,16 @@ public class SPKISexpTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- SPKISexp spkiElement = (SPKISexp) unmarshallElement(singleElementFile);
+ final SPKISexp spkiElement = (SPKISexp) unmarshallElement(singleElementFile);
- Assert.assertNotNull(spkiElement, "SPKISexp");
+ assert spkiElement != null;
Assert.assertEquals(expectedStringContent, spkiElement.getValue(), "SPKISexp value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- SPKISexp spkiElement = (SPKISexp) buildXMLObject(SPKISexp.DEFAULT_ELEMENT_NAME);
+ final SPKISexp spkiElement = (SPKISexp) buildXMLObject(SPKISexp.DEFAULT_ELEMENT_NAME);
spkiElement.setValue(expectedStringContent);
assertXMLEquals(expectedDOM, spkiElement);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SeedTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SeedTest.java
index ae62c3f36..c1cd0ec4d 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SeedTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/SeedTest.java
@@ -48,16 +48,16 @@ public class SeedTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- Seed cbType = (Seed) unmarshallElement(singleElementFile);
+ final Seed cbType = (Seed) unmarshallElement(singleElementFile);
- Assert.assertNotNull(cbType, "Seed");
+ assert cbType != null;
Assert.assertEquals(expectedCryptoBinaryContent, cbType.getValue(), "Seed value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- Seed cbType = (Seed) buildXMLObject(Seed.DEFAULT_ELEMENT_NAME);
+ final Seed cbType = (Seed) buildXMLObject(Seed.DEFAULT_ELEMENT_NAME);
cbType.setValue(expectedCryptoBinaryContent);
assertXMLEquals(expectedDOM, cbType);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/TransformTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/TransformTest.java
index ceadd1beb..6fd56438d 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/TransformTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/TransformTest.java
@@ -54,9 +54,9 @@ public class TransformTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- Transform transform = (Transform) unmarshallElement(singleElementFile);
+ final Transform transform = (Transform) unmarshallElement(singleElementFile);
- Assert.assertNotNull(transform, "Transform");
+ assert transform != null;
Assert.assertEquals(transform.getAlgorithm(), expectedAlgorithm, "Algorithm attribute");
Assert.assertEquals(transform.getAllChildren().size(), 0, "Total children");
Assert.assertEquals(transform.getXPaths().size(), 0, "XPath children");
@@ -65,9 +65,9 @@ public class TransformTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- Transform transform = (Transform) unmarshallElement(childElementsFile);
+ final Transform transform = (Transform) unmarshallElement(childElementsFile);
- Assert.assertNotNull(transform, "Transform");
+ assert transform != null;
Assert.assertEquals(transform.getAlgorithm(), expectedAlgorithm, "Algorithm attribute");
Assert.assertEquals(transform.getAllChildren().size(), expectedTotalChildren, "Total children");
Assert.assertEquals(transform.getXPaths().size(), expectedXPathChildren, "XPath children");
@@ -76,7 +76,7 @@ public class TransformTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- Transform transform = (Transform) buildXMLObject(Transform.DEFAULT_ELEMENT_NAME);
+ final Transform transform = (Transform) buildXMLObject(Transform.DEFAULT_ELEMENT_NAME);
transform.setAlgorithm(expectedAlgorithm);
@@ -86,7 +86,7 @@ public class TransformTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- Transform transform = (Transform) buildXMLObject(Transform.DEFAULT_ELEMENT_NAME);
+ final Transform transform = (Transform) buildXMLObject(Transform.DEFAULT_ELEMENT_NAME);
transform.setAlgorithm(expectedAlgorithm);
transform.getAllChildren().add( buildXMLObject(XPath.DEFAULT_ELEMENT_NAME));
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/TransformsTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/TransformsTest.java
index acef81ef0..5b38f101d 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/TransformsTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/TransformsTest.java
@@ -49,25 +49,25 @@ public class TransformsTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- Transforms em = (Transforms) unmarshallElement(singleElementFile);
+ final Transforms em = (Transforms) unmarshallElement(singleElementFile);
- Assert.assertNotNull(em, "Transforms");
+ assert em != null;
Assert.assertEquals(em.getTransforms().size(), 0, "Transform children");
}
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- Transforms em = (Transforms) unmarshallElement(childElementsFile);
+ final Transforms em = (Transforms) unmarshallElement(childElementsFile);
- Assert.assertNotNull(em, "Transforms");
+ assert em != null;
Assert.assertEquals(em.getTransforms().size(), expectedNumTransforms, "Transform children");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- Transforms em = (Transforms) buildXMLObject(Transforms.DEFAULT_ELEMENT_NAME);
+ final Transforms em = (Transforms) buildXMLObject(Transforms.DEFAULT_ELEMENT_NAME);
assertXMLEquals(expectedDOM, em);
}
@@ -75,7 +75,7 @@ public class TransformsTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- Transforms em = (Transforms) buildXMLObject(Transforms.DEFAULT_ELEMENT_NAME);
+ final Transforms em = (Transforms) buildXMLObject(Transforms.DEFAULT_ELEMENT_NAME);
em.getTransforms().add( (Transform) buildXMLObject(Transform.DEFAULT_ELEMENT_NAME));
em.getTransforms().add( (Transform) buildXMLObject(Transform.DEFAULT_ELEMENT_NAME));
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509CRLTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509CRLTest.java
index 0db38d2db..86277a7b8 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509CRLTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509CRLTest.java
@@ -48,16 +48,16 @@ public class X509CRLTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- X509CRL x509Element = (X509CRL) unmarshallElement(singleElementFile);
+ final X509CRL x509Element = (X509CRL) unmarshallElement(singleElementFile);
- Assert.assertNotNull(x509Element, "X509CRL");
+ assert x509Element != null;
Assert.assertEquals(expectedStringContent, x509Element.getValue(), "X509CRL value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- X509CRL x509Element = (X509CRL) buildXMLObject(X509CRL.DEFAULT_ELEMENT_NAME);
+ final X509CRL x509Element = (X509CRL) buildXMLObject(X509CRL.DEFAULT_ELEMENT_NAME);
x509Element.setValue(expectedStringContent);
assertXMLEquals(expectedDOM, x509Element);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509CertificateTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509CertificateTest.java
index 346722112..352c424cf 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509CertificateTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509CertificateTest.java
@@ -47,16 +47,16 @@ public class X509CertificateTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- X509Certificate x509Element = (X509Certificate) unmarshallElement(singleElementFile);
+ final X509Certificate x509Element = (X509Certificate) unmarshallElement(singleElementFile);
- Assert.assertNotNull(x509Element, "X509Certificate");
+ assert x509Element != null;
Assert.assertEquals(expectedStringContent, x509Element.getValue(), "X509Certificate value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- X509Certificate x509Element = (X509Certificate) buildXMLObject(X509Certificate.DEFAULT_ELEMENT_NAME);
+ final X509Certificate x509Element = (X509Certificate) buildXMLObject(X509Certificate.DEFAULT_ELEMENT_NAME);
x509Element.setValue(expectedStringContent);
assertXMLEquals(expectedDOM, x509Element);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509DataTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509DataTest.java
index 1f5c55f64..f61a4eff8 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509DataTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509DataTest.java
@@ -46,18 +46,18 @@ public class X509DataTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- X509Data x509Data = (X509Data) unmarshallElement(singleElementFile);
+ final X509Data x509Data = (X509Data) unmarshallElement(singleElementFile);
- Assert.assertNotNull(x509Data, "X509Data");
+ assert x509Data != null;
Assert.assertEquals(x509Data.getXMLObjects().size(), 0, "Total # of XMLObject child elements");
}
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- X509Data x509Data = (X509Data) unmarshallElement(childElementsFile);
+ final X509Data x509Data = (X509Data) unmarshallElement(childElementsFile);
- Assert.assertNotNull(x509Data, "X509Data");
+ assert x509Data != null;
Assert.assertEquals(x509Data.getXMLObjects().size(), 11, "Total # of XMLObject child elements");
Assert.assertEquals(x509Data.getX509IssuerSerials().size(), 1, "# of X509IssuerSerial child elements");
Assert.assertEquals(x509Data.getX509SKIs().size(), 1, "# of X509SKI child elements");
@@ -70,7 +70,7 @@ public class X509DataTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- X509Data x509Data = (X509Data) buildXMLObject(X509Data.DEFAULT_ELEMENT_NAME);
+ final X509Data x509Data = (X509Data) buildXMLObject(X509Data.DEFAULT_ELEMENT_NAME);
assertXMLEquals(expectedDOM, x509Data);
}
@@ -78,7 +78,7 @@ public class X509DataTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- X509Data x509Data = (X509Data) buildXMLObject(X509Data.DEFAULT_ELEMENT_NAME);
+ final X509Data x509Data = (X509Data) buildXMLObject(X509Data.DEFAULT_ELEMENT_NAME);
x509Data.getXMLObjects().add(buildXMLObject(X509IssuerSerial.DEFAULT_ELEMENT_NAME));
x509Data.getXMLObjects().add(buildXMLObject(X509SKI.DEFAULT_ELEMENT_NAME));
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509DigestTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509DigestTest.java
index d76b89342..6a3137afe 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509DigestTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509DigestTest.java
@@ -25,6 +25,7 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+ at SuppressWarnings("javadoc")
public class X509DigestTest extends XMLObjectProviderBaseTestCase {
private String expectedAlgorithm;
@@ -48,9 +49,9 @@ public class X509DigestTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- X509Digest digest = (X509Digest) unmarshallElement(singleElementFile);
+ final X509Digest digest = (X509Digest) unmarshallElement(singleElementFile);
- Assert.assertNotNull(digest, "X509Digest");
+ assert digest != null;
Assert.assertEquals(expectedAlgorithm, digest.getAlgorithm(), "Algorithm attribute");
Assert.assertEquals(digest.getValue(), expectedStringContent, "X509Digest value");
}
@@ -58,7 +59,7 @@ public class X509DigestTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- X509Digest digest = (X509Digest) buildXMLObject(X509Digest.DEFAULT_ELEMENT_NAME);
+ final X509Digest digest = (X509Digest) buildXMLObject(X509Digest.DEFAULT_ELEMENT_NAME);
digest.setValue(expectedStringContent);
digest.setAlgorithm(expectedAlgorithm);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509IssuerNameTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509IssuerNameTest.java
index 71a8c85f6..0b65807c0 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509IssuerNameTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509IssuerNameTest.java
@@ -48,16 +48,16 @@ public class X509IssuerNameTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- X509IssuerName x509Element = (X509IssuerName) unmarshallElement(singleElementFile);
+ final X509IssuerName x509Element = (X509IssuerName) unmarshallElement(singleElementFile);
- Assert.assertNotNull(x509Element, "X509IssuerName");
+ assert x509Element != null;
Assert.assertEquals(expectedStringContent, x509Element.getValue(), "X509IssuerName value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- X509IssuerName x509Element = (X509IssuerName) buildXMLObject(X509IssuerName.DEFAULT_ELEMENT_NAME);
+ final X509IssuerName x509Element = (X509IssuerName) buildXMLObject(X509IssuerName.DEFAULT_ELEMENT_NAME);
x509Element.setValue(expectedStringContent);
assertXMLEquals(expectedDOM, x509Element);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialTest.java
index 732fb3143..e5b2cf18d 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialTest.java
@@ -42,9 +42,9 @@ public class X509IssuerSerialTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- X509IssuerSerial x509Element = (X509IssuerSerial) unmarshallElement(singleElementFile);
+ final X509IssuerSerial x509Element = (X509IssuerSerial) unmarshallElement(singleElementFile);
- Assert.assertNotNull(x509Element, "X509IssuerSerial");
+ assert x509Element != null;
Assert.assertNull(x509Element.getX509IssuerName(), "X509IssuerName child element");
Assert.assertNull(x509Element.getX509SerialNumber(), "X509SerialNumber child element");
}
@@ -52,9 +52,9 @@ public class X509IssuerSerialTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- X509IssuerSerial x509Element = (X509IssuerSerial) unmarshallElement(childElementsFile);
+ final X509IssuerSerial x509Element = (X509IssuerSerial) unmarshallElement(childElementsFile);
- Assert.assertNotNull(x509Element, "X509IssuerSerial");
+ assert x509Element != null;
Assert.assertNotNull(x509Element.getX509IssuerName(), "X509IssuerName child element");
Assert.assertNotNull(x509Element.getX509SerialNumber(), "X509SerialNumber child element");
}
@@ -62,7 +62,7 @@ public class X509IssuerSerialTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- X509IssuerSerial x509Element = (X509IssuerSerial) buildXMLObject(X509IssuerSerial.DEFAULT_ELEMENT_NAME);
+ final X509IssuerSerial x509Element = (X509IssuerSerial) buildXMLObject(X509IssuerSerial.DEFAULT_ELEMENT_NAME);
assertXMLEquals(expectedDOM, x509Element);
}
@@ -70,7 +70,7 @@ public class X509IssuerSerialTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsMarshall() {
- X509IssuerSerial x509Element = (X509IssuerSerial) buildXMLObject(X509IssuerSerial.DEFAULT_ELEMENT_NAME);
+ final X509IssuerSerial x509Element = (X509IssuerSerial) buildXMLObject(X509IssuerSerial.DEFAULT_ELEMENT_NAME);
x509Element.setX509IssuerName((X509IssuerName) buildXMLObject(X509IssuerName.DEFAULT_ELEMENT_NAME));
x509Element.setX509SerialNumber((X509SerialNumber) buildXMLObject(X509SerialNumber.DEFAULT_ELEMENT_NAME));
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SKITest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SKITest.java
index 711e68c31..bf529a5ac 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SKITest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SKITest.java
@@ -48,16 +48,16 @@ public class X509SKITest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- X509SKI x509Element = (X509SKI) unmarshallElement(singleElementFile);
+ final X509SKI x509Element = (X509SKI) unmarshallElement(singleElementFile);
- Assert.assertNotNull(x509Element, "X509SKI");
+ assert x509Element != null;
Assert.assertEquals(expectedStringContent, x509Element.getValue(), "X509SKI value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- X509SKI x509Element = (X509SKI) buildXMLObject(X509SKI.DEFAULT_ELEMENT_NAME);
+ final X509SKI x509Element = (X509SKI) buildXMLObject(X509SKI.DEFAULT_ELEMENT_NAME);
x509Element.setValue(expectedStringContent);
assertXMLEquals(expectedDOM, x509Element);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberTest.java
index b674ea9f7..27496b057 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberTest.java
@@ -50,16 +50,16 @@ public class X509SerialNumberTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- X509SerialNumber x509Element = (X509SerialNumber) unmarshallElement(singleElementFile);
+ final X509SerialNumber x509Element = (X509SerialNumber) unmarshallElement(singleElementFile);
- Assert.assertNotNull(x509Element, "X509SerialNumber");
+ assert x509Element != null;
Assert.assertEquals(expectedBigIntegerContent, x509Element.getValue(), "X509SerialNumber value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- X509SerialNumber x509Element = (X509SerialNumber) buildXMLObject(X509SerialNumber.DEFAULT_ELEMENT_NAME);
+ final X509SerialNumber x509Element = (X509SerialNumber) buildXMLObject(X509SerialNumber.DEFAULT_ELEMENT_NAME);
x509Element.setValue(expectedBigIntegerContent);
assertXMLEquals(expectedDOM, x509Element);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SubjectNameTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SubjectNameTest.java
index 8883c19cb..b705b41a9 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SubjectNameTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/X509SubjectNameTest.java
@@ -48,16 +48,16 @@ public class X509SubjectNameTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- X509SubjectName x509Element = (X509SubjectName) unmarshallElement(singleElementFile);
+ final X509SubjectName x509Element = (X509SubjectName) unmarshallElement(singleElementFile);
- Assert.assertNotNull(x509Element, "X509SubjectName");
+ assert x509Element != null;
Assert.assertEquals(expectedStringContent, x509Element.getValue(), "X509SubjectName value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- X509SubjectName x509Element = (X509SubjectName) buildXMLObject(X509SubjectName.DEFAULT_ELEMENT_NAME);
+ final X509SubjectName x509Element = (X509SubjectName) buildXMLObject(X509SubjectName.DEFAULT_ELEMENT_NAME);
x509Element.setValue(expectedStringContent);
assertXMLEquals(expectedDOM, x509Element);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/XPathTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/XPathTest.java
index 69f76eb73..caf8b79e3 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/XPathTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/XPathTest.java
@@ -48,16 +48,16 @@ public class XPathTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- XPath xp = (XPath) unmarshallElement(singleElementFile);
+ final XPath xp = (XPath) unmarshallElement(singleElementFile);
- Assert.assertNotNull(xp, "XPath");
+ assert xp != null;
Assert.assertEquals(expectedStringContent, xp.getValue(), "XPath value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- XPath xp = (XPath) buildXMLObject(XPath.DEFAULT_ELEMENT_NAME);
+ final XPath xp = (XPath) buildXMLObject(XPath.DEFAULT_ELEMENT_NAME);
xp.setValue(expectedStringContent);
assertXMLEquals(expectedDOM, xp);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/YTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/YTest.java
index db59b1832..4f7611b54 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/YTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/impl/YTest.java
@@ -48,16 +48,16 @@ public class YTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- Y cbType = (Y) unmarshallElement(singleElementFile);
+ final Y cbType = (Y) unmarshallElement(singleElementFile);
- Assert.assertNotNull(cbType, "Y");
+ assert cbType != null;
Assert.assertEquals(expectedCryptoBinaryContent, cbType.getValue(), "Y value");
}
/** {@inheritDoc} */
@Test
public void testSingleElementMarshall() {
- Y cbType = (Y) buildXMLObject(Y.DEFAULT_ELEMENT_NAME);
+ final Y cbType = (Y) buildXMLObject(Y.DEFAULT_ELEMENT_NAME);
cbType.setValue(expectedCryptoBinaryContent);
assertXMLEquals(expectedDOM, cbType);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list