[java-opensaml] 04/05: IDP-2069 Null Handling Task
Rod Widdowson
rdw at steadingsoftware.com
Thu Apr 20 14:00:22 UTC 2023
This is an automated email from the git hooks/post-receive script.
rdw 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=749b55b6ed270ae0961dfddfd86d086d3d7d9004
commit 749b55b6ed270ae0961dfddfd86d086d3d7d9004
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Apr 19 20:07:09 2023 +0100
IDP-2069 Null Handling Task
https://shibboleth.atlassian.net/browse/IDP-2069
opensaml-saml-impl:
Clean red from SAML1 tests and a lot of yellow for the tests
---
.../artifact/impl/BasicSAMLArtifactMapTest.java | 2 +-
...rageServiceSAMLArtifactMapEntryFactoryTest.java | 2 +-
.../impl/StorageServiceSAMLArtifactMapTest.java | 2 +-
.../impl/AddChannelBindingsHeaderHandlerTest.java | 2 +-
.../binding/impl/DefaultEndpointResolverTest.java | 2 +-
.../impl/SAMLMetadataLookupHandlerTest.java | 2 +-
.../impl/SAMLOutboundDestinationHandlerTest.java | 2 +-
.../impl/SAMLProtocolAndRoleHandlerTest.java | 2 +-
.../impl/MessageLifetimeSecurityHandlerTest.java | 1 +
.../impl/MessageReplaySecurityHandlerTest.java | 1 +
.../impl/ReceivedEndpointSecurityHandlerTest.java | 2 +-
.../SAMLMDClientCertAuthSecurityHandlerTest.java | 1 +
...LOutboundProtocolMessageSigningHandlerTest.java | 2 +-
...ocolMessageXMLSignatureSecurityHandlerTest.java | 1 +
.../binding/encoding/impl/HTTPPostEncoderTest.java | 2 +-
.../encoding/impl/HTTPSOAP11EncoderTest.java | 1 +
.../SAML1ArtifactRequestIssuerHandlerTest.java | 2 +-
.../opensaml/saml/saml1/core/impl/ActionTest.java | 7 ++-
.../opensaml/saml/saml1/core/impl/AdviceTest.java | 5 +-
.../saml1/core/impl/AssertionArtifactTest.java | 9 +--
.../saml1/core/impl/AssertionIDReferenceTest.java | 11 ++--
.../saml/saml1/core/impl/AssertionTest.java | 48 ++++++++++------
.../saml1/core/impl/AttributeDesignatorTest.java | 3 +
.../saml/saml1/core/impl/AttributeQueryTest.java | 13 +++--
.../saml1/core/impl/AttributeStatementTest.java | 3 +
.../saml/saml1/core/impl/AttributeTest.java | 10 +++-
.../impl/AudienceRestrictionConditionTest.java | 14 ++---
.../saml/saml1/core/impl/AudienceTest.java | 13 +++--
.../saml1/core/impl/AuthenticationQueryTest.java | 16 +++---
.../core/impl/AuthenticationStatementTest.java | 13 +++--
.../saml/saml1/core/impl/AuthorityBindingTest.java | 7 ++-
.../core/impl/AuthorizationDecisionQueryTest.java | 13 +++--
.../impl/AuthorizationDecisionStatementTest.java | 15 +++--
.../saml/saml1/core/impl/ConditionsTest.java | 15 +++--
.../saml1/core/impl/ConfirmationMethodTest.java | 9 +--
.../saml1/core/impl/DoNotCacheConditionTest.java | 1 +
.../saml/saml1/core/impl/EvidenceTest.java | 13 +++--
.../saml/saml1/core/impl/NameIdentifierTest.java | 7 ++-
.../opensaml/saml/saml1/core/impl/RequestTest.java | 67 ++++++++++++++--------
.../saml/saml1/core/impl/RespondWithTest.java | 5 +-
.../saml/saml1/core/impl/ResponseTest.java | 56 ++++++++++++------
.../saml/saml1/core/impl/StatusCodeTest.java | 18 +++---
.../saml/saml1/core/impl/StatusMessageTest.java | 7 ++-
.../opensaml/saml/saml1/core/impl/StatusTest.java | 17 +++---
.../saml1/core/impl/SubjectConfirmationTest.java | 9 +--
.../saml/saml1/core/impl/SubjectLocalityTest.java | 9 +--
.../opensaml/saml/saml1/core/impl/SubjectTest.java | 9 +--
.../saml/saml1/core/tests/ResponseTest.java | 1 +
.../impl/AddNameIdentifierToSubjectsTest.java | 2 +-
.../profile/impl/AddStatusToResponseTest.java | 2 +-
.../impl/AddSubjectConfirmationToSubjectsTest.java | 2 +-
.../impl/CopyNameIdentifierFromRequestTest.java | 2 +-
.../saml1/profile/impl/ResolveArtifactsTest.java | 2 +-
.../binding/encoding/impl/HTTPPostEncoderTest.java | 2 +-
.../impl/HTTPPostSimpleSignEncoderTest.java | 8 +--
.../opensaml/saml/saml2/core/impl/ActionTest.java | 8 ++-
56 files changed, 303 insertions(+), 197 deletions(-)
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMapTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMapTest.java
index 9748682e1..760350134 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMapTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMapTest.java
@@ -36,7 +36,7 @@ import org.xmlunit.diff.Diff;
/**
* Test the storage-backed SAML artifact map implementation.
*/
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
public class BasicSAMLArtifactMapTest extends XMLObjectBaseTestCase {
private BasicSAMLArtifactMap artifactMap;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMapEntryFactoryTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMapEntryFactoryTest.java
index 5182ba2ff..55da15951 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMapEntryFactoryTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMapEntryFactoryTest.java
@@ -38,7 +38,7 @@ import org.opensaml.saml.saml1.core.Response;
/**
* Test the storage-backed SAML artifact map entry factory.
*/
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
public class StorageServiceSAMLArtifactMapEntryFactoryTest extends XMLObjectBaseTestCase {
@Nonnull private final String artifact = "the-artifact";
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMapTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMapTest.java
index e9993cc68..59b29d20d 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMapTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMapTest.java
@@ -37,7 +37,7 @@ import org.xmlunit.diff.Diff;
/**
* Test the storage-backed SAML artifact map implementation.
*/
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
public class StorageServiceSAMLArtifactMapTest extends XMLObjectBaseTestCase {
private MemoryStorageService storageService;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/AddChannelBindingsHeaderHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/AddChannelBindingsHeaderHandlerTest.java
index 8bb8e5aba..34b58a706 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/AddChannelBindingsHeaderHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/AddChannelBindingsHeaderHandlerTest.java
@@ -37,7 +37,7 @@ import org.testng.annotations.Test;
import net.shibboleth.shared.component.ComponentInitializationException;
/** {@link AddChannelBindingsHeaderHandler} unit test. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
public class AddChannelBindingsHeaderHandlerTest extends OpenSAMLInitBaseTestCase {
private ChannelBindingsContext cbc;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/DefaultEndpointResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/DefaultEndpointResolverTest.java
index 0053d9200..73046e304 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/DefaultEndpointResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/DefaultEndpointResolverTest.java
@@ -53,7 +53,7 @@ import org.testng.annotations.Test;
import org.w3c.dom.Document;
/** Test for {@link DefaultEndpointResolver}. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
public class DefaultEndpointResolverTest extends XMLObjectBaseTestCase {
private static final String LOCATION = "https://sp.example.org/ACS";
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/SAMLMetadataLookupHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/SAMLMetadataLookupHandlerTest.java
index bf7c300e0..4b3645d1d 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/SAMLMetadataLookupHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/SAMLMetadataLookupHandlerTest.java
@@ -57,7 +57,7 @@ import net.shibboleth.shared.resolver.ResolverException;
/**
* Test for {@link SAMLMetadataLookupHandler}.
*/
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
public class SAMLMetadataLookupHandlerTest extends XMLObjectBaseTestCase {
private PredicateRoleDescriptorResolver roleResolver;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/SAMLOutboundDestinationHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/SAMLOutboundDestinationHandlerTest.java
index 75deb7fc6..da585e878 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/SAMLOutboundDestinationHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/SAMLOutboundDestinationHandlerTest.java
@@ -34,7 +34,7 @@ import net.shibboleth.shared.component.ComponentInitializationException;
/**
* Test the {@link SAMLOutboundDestinationHandler}.
*/
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
public class SAMLOutboundDestinationHandlerTest extends XMLObjectBaseTestCase {
private SAMLOutboundDestinationHandler handler;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/SAMLProtocolAndRoleHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/SAMLProtocolAndRoleHandlerTest.java
index b4dbfbf57..fc1bd2cf1 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/SAMLProtocolAndRoleHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/SAMLProtocolAndRoleHandlerTest.java
@@ -32,7 +32,7 @@ import org.testng.annotations.Test;
import net.shibboleth.shared.component.ComponentInitializationException;
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
public class SAMLProtocolAndRoleHandlerTest {
private SAMLProtocolAndRoleHandler handler;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/MessageLifetimeSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/MessageLifetimeSecurityHandlerTest.java
index 0b0b17929..fe7f5e101 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/MessageLifetimeSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/MessageLifetimeSecurityHandlerTest.java
@@ -30,6 +30,7 @@ import org.testng.annotations.Test;
/**
* Testing SAML issue instant security policy rule.
*/
+ at SuppressWarnings({"null", "javadoc"})
public class MessageLifetimeSecurityHandlerTest extends XMLObjectBaseTestCase {
private MessageContext messageContext;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/MessageReplaySecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/MessageReplaySecurityHandlerTest.java
index 75bde7707..be44bbb1e 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/MessageReplaySecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/MessageReplaySecurityHandlerTest.java
@@ -35,6 +35,7 @@ import net.shibboleth.shared.component.ComponentInitializationException;
/**
* Testing SAML message replay security policy rule.
*/
+ at SuppressWarnings({"null", "javadoc"})
public class MessageReplaySecurityHandlerTest extends XMLObjectBaseTestCase {
private MessageContext messageContext;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandlerTest.java
index 6d5fc68ef..cfd39d97c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandlerTest.java
@@ -39,7 +39,7 @@ import net.shibboleth.shared.testing.ConstantSupplier;
/**
* Test the received endpoint check message handler.
*/
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
public class ReceivedEndpointSecurityHandlerTest extends XMLObjectBaseTestCase {
private MessageContext messageContext;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLMDClientCertAuthSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLMDClientCertAuthSecurityHandlerTest.java
index 31c5eeada..0748a5444 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLMDClientCertAuthSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLMDClientCertAuthSecurityHandlerTest.java
@@ -56,6 +56,7 @@ import net.shibboleth.shared.testing.ConstantSupplier;
/**
* Test SAML client cert auth message handler.
*/
+ at SuppressWarnings({"null", "javadoc"})
public class SAMLMDClientCertAuthSecurityHandlerTest extends XMLObjectBaseTestCase {
private MessageContext messageContext;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLOutboundProtocolMessageSigningHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLOutboundProtocolMessageSigningHandlerTest.java
index 3f181b642..8f77cc79d 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLOutboundProtocolMessageSigningHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLOutboundProtocolMessageSigningHandlerTest.java
@@ -44,7 +44,7 @@ import net.shibboleth.shared.component.ComponentInitializationException;
/**
* Tests for {@link SAMLOutboundProtocolMessageSigningHandler}.
*/
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
public class SAMLOutboundProtocolMessageSigningHandlerTest extends XMLObjectBaseTestCase {
private MessageContext messageContext;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLProtocolMessageXMLSignatureSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLProtocolMessageXMLSignatureSecurityHandlerTest.java
index 95b3bc346..0cab75121 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLProtocolMessageXMLSignatureSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/impl/SAMLProtocolMessageXMLSignatureSecurityHandlerTest.java
@@ -49,6 +49,7 @@ import org.testng.annotations.Test;
/**
* Test SAML protocol message XML signature message handler.
*/
+ at SuppressWarnings({"null", "javadoc"})
public class SAMLProtocolMessageXMLSignatureSecurityHandlerTest extends XMLObjectBaseTestCase {
private MessageContext messageContext;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPPostEncoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPPostEncoderTest.java
index bad8d9cf4..82b1c7475 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPPostEncoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPPostEncoderTest.java
@@ -52,7 +52,7 @@ import net.shibboleth.shared.testing.ConstantSupplier;
/**
* Test class for SAML 1 HTTP Post encoding.
*/
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
public class HTTPPostEncoderTest extends XMLObjectBaseTestCase {
/** Velocity template engine. */
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPSOAP11EncoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPSOAP11EncoderTest.java
index e270a1878..a9106c16a 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPSOAP11EncoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPSOAP11EncoderTest.java
@@ -43,6 +43,7 @@ import net.shibboleth.shared.testing.ConstantSupplier;
/**
* Test case for SAML 1.X HTTP SOAP 1.1 binding encoding.
*/
+ at SuppressWarnings({"null", "javadoc"})
public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/impl/SAML1ArtifactRequestIssuerHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/impl/SAML1ArtifactRequestIssuerHandlerTest.java
index 7107a81b2..3333505a2 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/impl/SAML1ArtifactRequestIssuerHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/impl/SAML1ArtifactRequestIssuerHandlerTest.java
@@ -32,7 +32,7 @@ import org.testng.annotations.Test;
import net.shibboleth.shared.component.ComponentInitializationException;
/** {@link SAML1ArtifactRequestIssuerHandler} unit test. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
public class SAML1ArtifactRequestIssuerHandlerTest extends OpenSAMLInitBaseTestCase {
private BasicSAMLArtifactMap artifactMap;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ActionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ActionTest.java
index 8d81b664b..3385282b1 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ActionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ActionTest.java
@@ -31,6 +31,7 @@ import org.opensaml.saml.saml1.core.Action;
/**
* Test for {@link org.opensaml.saml.saml1.core.impl.ActionImpl}
*/
+ at SuppressWarnings({"null", "javadoc"})
public class ActionTest extends XMLObjectProviderBaseTestCase {
private final String expectedContents;
@@ -54,7 +55,8 @@ public class ActionTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementUnmarshall() {
- Action action = (Action) unmarshallElement(singleElementFile);
+ final Action action = (Action) unmarshallElement(singleElementFile);
+ assert action!=null;
Assert.assertNull(action.getNamespace(), "namespace attribute present");
Assert.assertNull(action.getValue(), "Contents present");
}
@@ -63,7 +65,8 @@ public class ActionTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
- Action action = (Action) unmarshallElement(singleElementOptionalAttributesFile);
+ final Action action = (Action) unmarshallElement(singleElementOptionalAttributesFile);
+ assert action!=null;
Assert.assertEquals(action.getNamespace(), expectedNamespace, "namespace attribute ");
Assert.assertEquals(action.getValue(), expectedContents, "Contents ");
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AdviceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AdviceTest.java
index 7718c56bb..6b034a299 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AdviceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AdviceTest.java
@@ -34,6 +34,7 @@ import org.opensaml.saml.saml1.core.AssertionIDReference;
/**
* Test for {@link org.opensaml.saml.saml1.core.Advice}
*/
+ at SuppressWarnings({"null", "javadoc"})
public class AdviceTest extends XMLObjectProviderBaseTestCase {
/** name used to generate objects */
@@ -52,7 +53,7 @@ public class AdviceTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementUnmarshall() {
Advice advice = (Advice) unmarshallElement(singleElementFile);
-
+ assert advice != null;
Assert.assertEquals(advice.getAssertionIDReferences().size(), 0, "Number of child AssertIDReference elements");
Assert.assertEquals(advice.getAssertions().size(), 0, "Number of child Assertion elements");
}
@@ -63,7 +64,7 @@ public class AdviceTest extends XMLObjectProviderBaseTestCase {
@Test
public void testChildElementsUnmarshall() {
Advice advice = (Advice) unmarshallElement(childElementsFile);
-
+ assert advice != null;
Assert.assertEquals(advice.getAssertionIDReferences().size(), 2, "Number of child AssertIDReference elements");
Assert.assertEquals(advice.getAssertions().size(), 1, "Number of child Assertion elements");
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactTest.java
index 708f375ab..501f0eda4 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactTest.java
@@ -31,6 +31,7 @@ import org.opensaml.saml.saml1.core.AssertionArtifact;
/**
* Test for {@link org.opensaml.saml.saml1.core.AssertionArtifact}
*/
+ at SuppressWarnings({"null", "javadoc"})
public class AssertionArtifactTest extends XMLObjectProviderBaseTestCase {
/** name used to generate objects */
@@ -52,16 +53,16 @@ public class AssertionArtifactTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- AssertionArtifact artifact = (AssertionArtifact) unmarshallElement(singleElementFile);
-
+ final AssertionArtifact artifact = (AssertionArtifact) unmarshallElement(singleElementFile);
+ assert artifact!=null;
Assert.assertNull(artifact.getValue(), "AssertionArtifact contents present");
}
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
- AssertionArtifact artifact = (AssertionArtifact) unmarshallElement(singleElementOptionalAttributesFile);
-
+ final AssertionArtifact artifact = (AssertionArtifact) unmarshallElement(singleElementOptionalAttributesFile);
+ assert artifact!=null;
Assert.assertEquals(artifact.getValue(), expectedAssertionArtifact, "AssertionArtifact contents present");
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceTest.java
index 886a1ae2c..33346e91a 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceTest.java
@@ -32,6 +32,7 @@ import org.opensaml.saml.saml1.core.AssertionIDReference;
/**
* Test case for {@link org.opensaml.saml.saml1.core.impl.AssertionIDReferenceImpl}
*/
+ at SuppressWarnings({"null", "javadoc"})
public class AssertionIDReferenceTest extends XMLObjectProviderBaseTestCase {
private final String expectedNCName;
@@ -55,10 +56,10 @@ public class AssertionIDReferenceTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementUnmarshall() {
- AssertionIDReference assertionIDReference;
+ final AssertionIDReference assertionIDReference;
assertionIDReference = (AssertionIDReference) unmarshallElement(singleElementFile);
-
+ assert assertionIDReference!=null;
Assert.assertNull(assertionIDReference
.getValue(), "NCName was " + assertionIDReference.getValue() + " expected null");
}
@@ -67,10 +68,10 @@ public class AssertionIDReferenceTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
- AssertionIDReference assertionIDReference;
+ final AssertionIDReference assertionIDReference;
assertionIDReference = (AssertionIDReference) unmarshallElement(singleElementOptionalAttributesFile);
-
+ assert assertionIDReference!=null;
Assert.assertEquals(assertionIDReference.getValue(), expectedNCName, "NCName ");
}
@@ -85,7 +86,7 @@ public class AssertionIDReferenceTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementOptionalAttributesMarshall() {
- AssertionIDReference assertionIDReference = (AssertionIDReference) buildXMLObject(qname);
+ final AssertionIDReference assertionIDReference = (AssertionIDReference) buildXMLObject(qname);
assertionIDReference.setValue(expectedNCName);
assertXMLEquals(expectedOptionalAttributesDOM, assertionIDReference);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AssertionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AssertionTest.java
index a40b4a1c0..9b5673cb0 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AssertionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AssertionTest.java
@@ -27,6 +27,7 @@ import javax.xml.namespace.QName;
import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.XMLObject;
+import org.opensaml.core.xml.io.Marshaller;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.saml.saml1.core.Advice;
import org.opensaml.saml.saml1.core.Assertion;
@@ -35,6 +36,7 @@ import org.opensaml.saml.saml1.core.AuthenticationStatement;
import org.opensaml.saml.saml1.core.AuthorizationDecisionStatement;
import org.opensaml.saml.saml1.core.Conditions;
import org.opensaml.saml.saml1.core.Statement;
+import org.opensaml.xmlsec.signature.Signature;
import org.testng.Assert;
import org.testng.annotations.Test;
import org.w3c.dom.Document;
@@ -45,6 +47,7 @@ import net.shibboleth.shared.xml.XMLParserException;
/**
* Test for {@link org.opensaml.saml.saml1.core.Assertion}
*/
+ at SuppressWarnings({"null", "javadoc"})
public class AssertionTest extends XMLObjectProviderBaseTestCase {
/** name used to generate objects */
@@ -78,6 +81,7 @@ public class AssertionTest extends XMLObjectProviderBaseTestCase {
public void testSingleElementUnmarshall() {
Assertion assertion = (Assertion) unmarshallElement(singleElementFile);
+ assert assertion!=null;
Assert.assertNull(assertion.getIssuer(), "Issuer attribute");
Assert.assertNull(assertion.getIssueInstant(), "IssueInstant attribute");
@@ -98,6 +102,7 @@ public class AssertionTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
Assertion assertion = (Assertion) unmarshallElement(singleElementOptionalAttributesFile);
+ assert assertion!=null;
Assert.assertEquals(assertion.getIssuer(), expectedIssuer, "Issuer attribute");
Assert.assertEquals(assertion.getIssueInstant(), expectedIssueInstant, "IssueInstant attribute");
@@ -121,6 +126,7 @@ public class AssertionTest extends XMLObjectProviderBaseTestCase {
@Test
public void testChildElementsUnmarshall() {
Assertion assertion = (Assertion) unmarshallElement(childElementsFile);
+ assert assertion!=null;
Assert.assertNull(assertion.getIssuer(), "Issuer attribute");
Assert.assertNull(assertion.getID(), "ID attribute");
@@ -201,37 +207,47 @@ public class AssertionTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSignatureUnmarshall() {
- Assertion assertion = (Assertion) unmarshallElement("/org/opensaml/saml/saml1/impl/AssertionWithSignature.xml");
-
+ final Assertion assertion = (Assertion) unmarshallElement("/org/opensaml/saml/saml1/impl/AssertionWithSignature.xml");
+ assert assertion!=null;
+
Assert.assertNotNull(assertion, "Assertion was null");
- Assert.assertNotNull(assertion.getSignature(), "Signature was null");
- Assert.assertNotNull(assertion.getSignature().getKeyInfo(), "KeyInfo was null");
+ final Signature sig = assertion.getSignature();
+ assert sig != null && sig.getKeyInfo()!=null;
}
@Test
public void testDOMIDResolutionUnmarshall() {
- Assertion assertion = (Assertion) unmarshallElement("/org/opensaml/saml/saml1/impl/AssertionWithSignature.xml");
-
+ final Assertion assertion = (Assertion) unmarshallElement("/org/opensaml/saml/saml1/impl/AssertionWithSignature.xml");
+ assert assertion!=null;
+
Assert.assertNotNull(assertion, "Assertion was null");
Assert.assertNotNull(assertion.getSignature(), "Signature was null");
- Document document = assertion.getSignature().getDOM().getOwnerDocument();
- Element idElem = assertion.getDOM();
-
+ final Signature sig = assertion.getSignature();
+ assert sig != null;
+ final Element element = sig.getDOM();
+ assert element!= null;
+ final Document document = element.getOwnerDocument();
+ final Element idElem = assertion.getDOM();
+ assert idElem!=null;
Assert.assertNotNull(document.getElementById(expectedID), "DOM ID resolution returned null");
Assert.assertTrue(idElem.isSameNode(document.getElementById(expectedID)), "DOM elements were not equal");
}
@Test
public void testDOMIDResolutionMarshall() throws MarshallingException {
- Assertion assertion = (Assertion) buildXMLObject(Assertion.DEFAULT_ELEMENT_NAME);
+ final Assertion assertion = (Assertion) buildXMLObject(Assertion.DEFAULT_ELEMENT_NAME);
assertion.setID(expectedID);
assertion.getAttributeStatements().add((AttributeStatement) buildXMLObject(AttributeStatement.DEFAULT_ELEMENT_NAME));
-
- marshallerFactory.getMarshaller(assertion).marshall(assertion);
-
- Document document = assertion.getStatements().get(0).getDOM().getOwnerDocument();
- Element idElem = assertion.getDOM();
-
+ assert assertion!=null;
+
+ final Marshaller marshaller = marshallerFactory.getMarshaller(assertion);
+ assert marshaller!=null;
+ marshaller.marshall(assertion);
+ final Element statementElem = assertion.getStatements().get(0).getDOM();
+ assert statementElem!=null;
+ final Document document = statementElem.getOwnerDocument();
+ final Element idElem = assertion.getDOM();
+ assert idElem!=null;
Assert.assertNotNull(document.getElementById(expectedID), "DOM ID resolution returned null");
Assert.assertTrue(idElem.isSameNode(document.getElementById(expectedID)), "DOM elements were not equal");
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorTest.java
index 1b920ae74..bd6426720 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorTest.java
@@ -32,6 +32,7 @@ import org.opensaml.saml.saml1.core.AttributeDesignator;
/**
*
*/
+ at SuppressWarnings({"null", "javadoc"})
public class AttributeDesignatorTest extends XMLObjectProviderBaseTestCase {
/** name used to generate objects */
@@ -59,6 +60,7 @@ public class AttributeDesignatorTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementUnmarshall() {
AttributeDesignator ad = (AttributeDesignator) unmarshallElement(singleElementFile);
+ assert ad!=null;
Assert.assertNull(ad.getAttributeName(), "AttributeName");
Assert.assertNull(ad.getAttributeNamespace(), "AttributeNamespace");
@@ -68,6 +70,7 @@ public class AttributeDesignatorTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
AttributeDesignator ad = (AttributeDesignator) unmarshallElement(singleElementOptionalAttributesFile);
+ assert ad!=null;
Assert.assertEquals(ad.getAttributeName(), expectedAttributeName, "AttributeName");
Assert.assertEquals(ad.getAttributeNamespace(), expectedAttributeNamespace, "AttributeNamespace");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeQueryTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeQueryTest.java
index 60e770010..9577fbd41 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeQueryTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeQueryTest.java
@@ -36,6 +36,7 @@ import org.opensaml.saml.saml1.core.Subject;
/**
* Test class for org.opensaml.saml.saml1.core.AttributeQuery
*/
+ at SuppressWarnings({"null", "javadoc"})
public class AttributeQueryTest extends XMLObjectProviderBaseTestCase {
/** name used to generate objects */
@@ -59,9 +60,9 @@ public class AttributeQueryTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementUnmarshall() {
- AttributeQuery attributeQuery;
+ final AttributeQuery attributeQuery;
attributeQuery = (AttributeQuery) unmarshallElement(singleElementFile);
-
+ assert attributeQuery!=null;
Assert.assertNull(attributeQuery.getResource(), "Resource attribute present");
Assert.assertNull(attributeQuery.getSubject(), "Subject element present");
Assert.assertEquals(attributeQuery.getAttributeDesignators().size(), 0, "Count of AttributeDesignator elements");
@@ -70,9 +71,9 @@ public class AttributeQueryTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
- AttributeQuery attributeQuery;
+ final AttributeQuery attributeQuery;
attributeQuery = (AttributeQuery) unmarshallElement(singleElementOptionalAttributesFile);
-
+ assert attributeQuery!=null;
Assert.assertEquals(attributeQuery.getResource(), expectedResource, "Resource attribute");
Assert.assertNull(attributeQuery.getSubject(), "Subject element present");
Assert.assertEquals(attributeQuery.getAttributeDesignators().size(), 0, "Count of AttributeDesignator elements");
@@ -81,9 +82,9 @@ public class AttributeQueryTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- AttributeQuery attributeQuery;
+ final AttributeQuery attributeQuery;
attributeQuery = (AttributeQuery) unmarshallElement(childElementsFile);
-
+ assert attributeQuery!=null;
Assert.assertNotNull(attributeQuery.getSubject(), "Subject element present");
Assert.assertEquals(attributeQuery.getAttributeDesignators().size(), 4, "Count of AttributeDesignator elements");
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeStatementTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeStatementTest.java
index d5be272b6..f984cf8b0 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeStatementTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeStatementTest.java
@@ -36,6 +36,7 @@ import org.opensaml.saml.saml1.core.Subject;
/**
* Test for {@link org.opensaml.saml.saml1.core.AttributeStatement}
*/
+ at SuppressWarnings({"null", "javadoc"})
public class AttributeStatementTest extends XMLObjectProviderBaseTestCase {
/** name used to generate objects */
@@ -56,6 +57,7 @@ public class AttributeStatementTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementUnmarshall() {
AttributeStatement attributeStatement = (AttributeStatement) unmarshallElement(singleElementFile);
+ assert attributeStatement!=null;
Assert.assertNull(attributeStatement.getSubject(), "<Subject> element present");
Assert.assertEquals(attributeStatement.getAttributes().size(), 0, "Non zero count of <Attribute> elements");
@@ -66,6 +68,7 @@ public class AttributeStatementTest extends XMLObjectProviderBaseTestCase {
@Test
public void testChildElementsUnmarshall() {
AttributeStatement attributeStatement = (AttributeStatement) unmarshallElement(childElementsFile);
+ assert attributeStatement!=null;
Assert.assertNotNull(attributeStatement.getSubject(), "<Subject> element not present");
Assert.assertNotNull(attributeStatement.getAttributes(), "<AuthorityBinding> elements not present");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeTest.java
index f172fb3ef..14373d939 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AttributeTest.java
@@ -35,6 +35,7 @@ import org.opensaml.saml.saml1.core.AttributeValue;
/**
*
*/
+ at SuppressWarnings({"null", "javadoc"})
public class AttributeTest extends XMLObjectProviderBaseTestCase {
/** name used to generate objects */
@@ -62,7 +63,8 @@ public class AttributeTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- Attribute attribute = (Attribute) unmarshallElement(singleElementFile);
+ final Attribute attribute = (Attribute) unmarshallElement(singleElementFile);
+ assert attribute!=null;
Assert.assertNull(attribute.getAttributeName(), "AttributeName");
Assert.assertNull(attribute.getAttributeNamespace(), "AttributeNamespace");
@@ -73,6 +75,7 @@ public class AttributeTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
Attribute attribute = (Attribute) unmarshallElement(singleElementOptionalAttributesFile);
+ assert attribute!=null;
Assert.assertEquals(attribute.getAttributeName(), expectedAttributeName, "AttributeName");
Assert.assertEquals(attribute.getAttributeNamespace(), expectedAttributeNamespace, "AttributeNamespace");
@@ -81,7 +84,8 @@ public class AttributeTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- Attribute attribute = (Attribute) unmarshallElement(childElementsFile);
+ final Attribute attribute = (Attribute) unmarshallElement(childElementsFile);
+ assert attribute!=null;
Assert.assertNotNull(attribute.getAttributeValues(), "<AttributeValue> subelement not found");
Assert.assertEquals(attribute.getAttributeValues().size(), 4, "Number of <AttributeValue> subelement not found");
@@ -96,7 +100,7 @@ public class AttributeTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesMarshall() {
- Attribute attribute = (Attribute) buildXMLObject(qname);
+ final Attribute attribute = (Attribute) buildXMLObject(qname);
attribute.setAttributeName(expectedAttributeName);
attribute.setAttributeNamespace(expectedAttributeNamespace);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AudienceRestrictionConditionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AudienceRestrictionConditionTest.java
index 3dd4a65aa..4e0f8a213 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AudienceRestrictionConditionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AudienceRestrictionConditionTest.java
@@ -33,6 +33,7 @@ import org.opensaml.saml.saml1.core.AudienceRestrictionCondition;
/**
* Test class for data.org.opensaml.saml1.AudienceRestrictionCondition
*/
+ at SuppressWarnings({"null", "javadoc"})
public class AudienceRestrictionConditionTest extends XMLObjectProviderBaseTestCase {
/** name used to generate objects */
@@ -51,10 +52,9 @@ public class AudienceRestrictionConditionTest extends XMLObjectProviderBaseTestC
@Test
public void testSingleElementUnmarshall() {
- AudienceRestrictionCondition audienceRestrictionCondition;
-
+ final AudienceRestrictionCondition audienceRestrictionCondition;
audienceRestrictionCondition = (AudienceRestrictionCondition) unmarshallElement(singleElementFile);
-
+ assert audienceRestrictionCondition!=null;
Assert.assertEquals(audienceRestrictionCondition.getAudiences().size(), 0, "Count of child Audience elements !=0");
}
@@ -63,9 +63,9 @@ public class AudienceRestrictionConditionTest extends XMLObjectProviderBaseTestC
@Test
public void testChildElementsUnmarshall() {
- AudienceRestrictionCondition audienceRestrictionCondition;
-
+ final AudienceRestrictionCondition audienceRestrictionCondition;
audienceRestrictionCondition = (AudienceRestrictionCondition) unmarshallElement(childElementsFile);
+ assert audienceRestrictionCondition!=null;
Assert.assertEquals(audienceRestrictionCondition.getAudiences().size(), 2, "Count of child Audience elements");
@@ -82,9 +82,9 @@ public class AudienceRestrictionConditionTest extends XMLObjectProviderBaseTestC
@Test
public void testChildElementsMarshall() {
- AudienceRestrictionCondition audienceRestrictionCondition;
-
+ final AudienceRestrictionCondition audienceRestrictionCondition;
audienceRestrictionCondition = (AudienceRestrictionCondition) buildXMLObject(qname);
+ assert audienceRestrictionCondition!=null;
QName audienceName = new QName(SAMLConstants.SAML1_NS, Audience.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML1_PREFIX);
audienceRestrictionCondition.getAudiences().add((Audience) buildXMLObject(audienceName));
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AudienceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AudienceTest.java
index f94b8161c..544eb44ec 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AudienceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AudienceTest.java
@@ -31,6 +31,7 @@ import org.opensaml.saml.saml1.core.Audience;
/**
* Test for org.opensaml.saml.saml1.core.Audience Objects
*/
+ at SuppressWarnings({"null", "javadoc"})
public class AudienceTest extends XMLObjectProviderBaseTestCase {
/** name used to generate objects */
@@ -53,8 +54,8 @@ public class AudienceTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementUnmarshall() {
- Audience audience = (Audience) unmarshallElement(singleElementFile);
-
+ final Audience audience = (Audience) unmarshallElement(singleElementFile);
+ assert audience!= null;
Assert.assertNull(audience.getURI(), "Uri is non-null");
}
@@ -62,8 +63,8 @@ public class AudienceTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
- Audience audience = (Audience) unmarshallElement(singleElementOptionalAttributesFile);
-
+ final Audience audience = (Audience) unmarshallElement(singleElementOptionalAttributesFile);
+ assert audience!= null;
Assert.assertEquals(audience.getURI(), expectedUri, "Uri");
}
@@ -78,8 +79,8 @@ public class AudienceTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementOptionalAttributesMarshall() {
- Audience audience = (Audience) buildXMLObject(qname);
-
+ final Audience audience = (Audience) buildXMLObject(qname);
+ assert audience!= null;
audience.setURI(expectedUri);
assertXMLEquals(expectedOptionalAttributesDOM, audience);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthenticationQueryTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthenticationQueryTest.java
index 3214dac91..0ff94d315 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthenticationQueryTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthenticationQueryTest.java
@@ -33,6 +33,7 @@ import org.opensaml.saml.saml1.core.Subject;
/**
* Test class for org.opensaml.saml.saml1.core.AuthenticationQuery
*/
+ at SuppressWarnings({"null", "javadoc"})
public class AuthenticationQueryTest extends XMLObjectProviderBaseTestCase {
/** name used to generate objects */
@@ -55,10 +56,9 @@ public class AuthenticationQueryTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementUnmarshall() {
- AuthenticationQuery authenticationQuery;
-
+ final AuthenticationQuery authenticationQuery;
authenticationQuery = (AuthenticationQuery) unmarshallElement(singleElementFile);
-
+ assert authenticationQuery!=null;
Assert.assertNull(authenticationQuery.getAuthenticationMethod(), "AuthenticationQuery attribute present");;
Assert.assertNull(authenticationQuery.getSubject(), "Subject element present");
}
@@ -66,10 +66,9 @@ public class AuthenticationQueryTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
- AuthenticationQuery authenticationQuery;
-
+ final AuthenticationQuery authenticationQuery;
authenticationQuery = (AuthenticationQuery) unmarshallElement(singleElementOptionalAttributesFile);
-
+ assert authenticationQuery!=null;
Assert.assertEquals(authenticationQuery.getAuthenticationMethod(), expectedAuthenticationMethod, "AuthenticationQuery attribute");;
Assert.assertNull(authenticationQuery.getSubject(), "Subject element present");
}
@@ -77,10 +76,9 @@ public class AuthenticationQueryTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- AuthenticationQuery authenticationQuery;
-
+ final AuthenticationQuery authenticationQuery;
authenticationQuery = (AuthenticationQuery) unmarshallElement(childElementsFile);
-
+ assert authenticationQuery!=null;
Assert.assertNotNull(authenticationQuery.getSubject(), "No Subject element found");
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementTest.java
index c04ee1689..caccdb3e5 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementTest.java
@@ -38,6 +38,7 @@ import org.opensaml.saml.saml1.core.SubjectLocality;
/**
*
*/
+ at SuppressWarnings({"null", "javadoc"})
public class AuthenticationStatementTest extends XMLObjectProviderBaseTestCase {
/** name used to generate objects */
@@ -68,8 +69,8 @@ public class AuthenticationStatementTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementUnmarshall() {
- AuthenticationStatement authenticationStatement = (AuthenticationStatement) unmarshallElement(singleElementFile);
-
+ final AuthenticationStatement authenticationStatement = (AuthenticationStatement) unmarshallElement(singleElementFile);
+ assert authenticationStatement!=null;
Assert.assertNull(authenticationStatement.getAuthenticationMethod(), "AuthenticationMethod attribute present");
Assert.assertNull(authenticationStatement.getAuthenticationInstant(), "AuthenticationInstant attribute present");
@@ -82,8 +83,8 @@ public class AuthenticationStatementTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
- AuthenticationStatement authenticationStatement = (AuthenticationStatement) unmarshallElement(singleElementOptionalAttributesFile);
-
+ final AuthenticationStatement authenticationStatement = (AuthenticationStatement) unmarshallElement(singleElementOptionalAttributesFile);
+ assert authenticationStatement!=null;
Assert.assertEquals(authenticationStatement
.getAuthenticationMethod(), expectedAuthenticationMethod, "AuthenticationMethod");
Assert.assertEquals(authenticationStatement.getAuthenticationInstant(), expectedAuthenticationInstant, "AuthenticationInstant");
@@ -95,8 +96,8 @@ public class AuthenticationStatementTest extends XMLObjectProviderBaseTestCase {
@Test
public void testChildElementsUnmarshall() {
- AuthenticationStatement authenticationStatement = (AuthenticationStatement) unmarshallElement(childElementsFile);
-
+ final AuthenticationStatement authenticationStatement = (AuthenticationStatement) unmarshallElement(childElementsFile);
+ assert authenticationStatement!=null;
Assert.assertNotNull(authenticationStatement.getSubject(), "<Subject> element not present");
Assert.assertNotNull(authenticationStatement.getSubjectLocality(), "<SubjectLocality> element not present");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingTest.java
index 7fbfd639c..c2bae9c7c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingTest.java
@@ -32,6 +32,7 @@ import org.opensaml.saml.saml1.core.AuthorityBinding;
/**
* Test for {@link org.opensaml.saml.saml1.core.AuthorityBinding}
*/
+ at SuppressWarnings({"null", "javadoc"})
public class AuthorityBindingTest extends XMLObjectProviderBaseTestCase {
/** name used to generate objects */
@@ -62,7 +63,8 @@ public class AuthorityBindingTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- AuthorityBinding authorityBinding = (AuthorityBinding) unmarshallElement(singleElementFile);
+ final AuthorityBinding authorityBinding = (AuthorityBinding) unmarshallElement(singleElementFile);
+ assert authorityBinding!=null;
Assert.assertNull(authorityBinding.getAuthorityKind(), "AuthorityKind attribute present");
Assert.assertNull(authorityBinding.getBinding(), "Binding attribute present");
Assert.assertNull(authorityBinding.getLocation(), "Location attribute present");
@@ -71,7 +73,8 @@ public class AuthorityBindingTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
- AuthorityBinding authorityBinding = (AuthorityBinding) unmarshallElement(singleElementOptionalAttributesFile);
+ final AuthorityBinding authorityBinding = (AuthorityBinding) unmarshallElement(singleElementOptionalAttributesFile);
+ assert authorityBinding!=null;
Assert.assertEquals(authorityBinding.getAuthorityKind(), expectedAuthorityKind, "AuthorityKind attribute");
Assert.assertEquals(authorityBinding.getBinding(), expectedBinding, "Binding attribute");
Assert.assertEquals(authorityBinding.getLocation(), expectedLocation, "Location attribute");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionQueryTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionQueryTest.java
index 8778545e9..16faa3945 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionQueryTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionQueryTest.java
@@ -39,6 +39,7 @@ import org.w3c.dom.Document;
/**
* Test class for org.opensaml.saml.saml1.core.AttributeQuery
*/
+ at SuppressWarnings({"null", "javadoc"})
public class AuthorizationDecisionQueryTest extends XMLObjectProviderBaseTestCase {
/** name used to generate objects */
@@ -76,9 +77,9 @@ public class AuthorizationDecisionQueryTest extends XMLObjectProviderBaseTestCas
@Test
public void testSingleElementUnmarshall() {
- AuthorizationDecisionQuery authorizationDecisionQuery;
+ final AuthorizationDecisionQuery authorizationDecisionQuery;
authorizationDecisionQuery = (AuthorizationDecisionQuery) unmarshallElement(singleElementFile);
-
+ assert authorizationDecisionQuery!=null;
Assert.assertNull(authorizationDecisionQuery.getResource(), "Resource attribute present");
Assert.assertNull(authorizationDecisionQuery.getSubject(), "Subject element present");
Assert.assertEquals(authorizationDecisionQuery.getActions().size(), 0, "Count of AttributeDesignator elements");
@@ -88,9 +89,9 @@ public class AuthorizationDecisionQueryTest extends XMLObjectProviderBaseTestCas
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
- AuthorizationDecisionQuery authorizationDecisionQuery;
+ final AuthorizationDecisionQuery authorizationDecisionQuery;
authorizationDecisionQuery = (AuthorizationDecisionQuery) unmarshallElement(singleElementOptionalAttributesFile);
-
+ assert authorizationDecisionQuery!=null;
Assert.assertEquals(authorizationDecisionQuery.getResource(), expectedResource, "Resource attribute");
Assert.assertNull(authorizationDecisionQuery.getSubject(), "Subject element present");
Assert.assertEquals(authorizationDecisionQuery.getActions().size(), 0, "Count of AttributeDesignator elements");
@@ -102,9 +103,9 @@ public class AuthorizationDecisionQueryTest extends XMLObjectProviderBaseTestCas
*/
@Test
public void testFullElementsUnmarshall() {
- AuthorizationDecisionQuery authorizationDecisionQuery;
+ final AuthorizationDecisionQuery authorizationDecisionQuery;
authorizationDecisionQuery = (AuthorizationDecisionQuery) unmarshallElement(fullElementsFile);
-
+ assert authorizationDecisionQuery!=null;
Assert.assertNotNull(authorizationDecisionQuery.getSubject(), "Subject element present");
Assert.assertEquals(authorizationDecisionQuery.getActions().size(), 3, "Count of Action elements");
Assert.assertNotNull(authorizationDecisionQuery.getEvidence(), "Evidence element present");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionStatementTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionStatementTest.java
index 5a0407e98..9a4e679aa 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionStatementTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionStatementTest.java
@@ -41,6 +41,7 @@ import net.shibboleth.shared.xml.XMLParserException;
/**
*
*/
+ at SuppressWarnings({"null", "javadoc"})
public class AuthorizationDecisionStatementTest extends XMLObjectProviderBaseTestCase {
/** name used to generate objects */
@@ -73,9 +74,9 @@ public class AuthorizationDecisionStatementTest extends XMLObjectProviderBaseTes
@Test
public void testSingleElementUnmarshall() {
- AuthorizationDecisionStatement authorizationDecisionStatement;
+ final AuthorizationDecisionStatement authorizationDecisionStatement;
authorizationDecisionStatement = (AuthorizationDecisionStatement) unmarshallElement(singleElementFile);
-
+ assert authorizationDecisionStatement!=null;
Assert.assertNull(authorizationDecisionStatement.getDecision(), "Decision attribute null");
Assert.assertNull(authorizationDecisionStatement.getResource(), "Resource attribute null");
Assert.assertEquals(authorizationDecisionStatement.getActions().size(), 0, "<Actions> elements present");
@@ -89,9 +90,12 @@ public class AuthorizationDecisionStatementTest extends XMLObjectProviderBaseTes
AuthorizationDecisionStatement authorizationDecisionStatement;
authorizationDecisionStatement = (AuthorizationDecisionStatement) unmarshallElement(singleElementOptionalAttributesFile);
+ assert authorizationDecisionStatement!=null;
Assert.assertEquals(authorizationDecisionStatement.getResource(), expectedResource, "Resource attribute ");
- Assert.assertEquals(authorizationDecisionStatement.getDecision().toString(), expectedDecision.toString(), "Decision attribute ");
+ final DecisionTypeEnumeration decision = authorizationDecisionStatement.getDecision();
+ assert decision!=null;
+ Assert.assertEquals(decision.toString(), expectedDecision.toString(), "Decision attribute ");
try {
Document doc = parserPool.parse(this.getClass().getResourceAsStream(illegalAttributesFile));
@@ -113,10 +117,9 @@ public class AuthorizationDecisionStatementTest extends XMLObjectProviderBaseTes
@Test
public void testChildElementsUnmarshall() {
- AuthorizationDecisionStatement authorizationDecisionStatement;
-
+ final AuthorizationDecisionStatement authorizationDecisionStatement;
authorizationDecisionStatement = (AuthorizationDecisionStatement) unmarshallElement(childElementsFile);
-
+ assert authorizationDecisionStatement!=null;
Assert.assertNotNull(authorizationDecisionStatement.getSubject(), "<Subject> element not present");
Assert.assertNotNull(authorizationDecisionStatement.getEvidence(), "<Evidence> element not present");
Assert.assertNotNull(authorizationDecisionStatement.getActions(), "<Action> elements not present");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ConditionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ConditionsTest.java
index 34b8ba83b..bf6025481 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ConditionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ConditionsTest.java
@@ -37,6 +37,7 @@ import org.opensaml.saml.saml1.core.DoNotCacheCondition;
/**
* Test class for org.opensaml.saml.saml1.core.Conditions
*/
+ at SuppressWarnings({"null", "javadoc"})
public class ConditionsTest extends XMLObjectProviderBaseTestCase {
/** name used to generate objects */
@@ -69,10 +70,9 @@ public class ConditionsTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- Conditions conditions;
-
+ final Conditions conditions;
conditions = (Conditions) unmarshallElement(singleElementFile);
-
+ assert conditions!=null;
Instant date = conditions.getNotBefore();
Assert.assertNull(date, "NotBefore attribute has a value of " + date + ", expected no value");
@@ -84,10 +84,9 @@ public class ConditionsTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
- Conditions conditions;
-
+ final Conditions conditions;
conditions = (Conditions) unmarshallElement(singleElementOptionalAttributesFile);
-
+ assert conditions!=null;
Assert.assertEquals(conditions.getNotBefore(), expectedNotBeforeDate, "NotBefore attribute ");
Assert.assertEquals(conditions.getNotOnOrAfter(), expectedNotOnOfAfter, "NotOnOrAfter attribute ");
}
@@ -97,10 +96,10 @@ public class ConditionsTest extends XMLObjectProviderBaseTestCase {
*/
@Test
public void testChildElementsUnmarshall() {
- Conditions conditions;
+ final Conditions conditions;
conditions = (Conditions) unmarshallElement(childElementsFile);
-
+ assert conditions!=null;
Assert.assertEquals(conditions
.getAudienceRestrictionConditions().size(), 3, "Number of AudienceRestrictionCondition elements");
Assert.assertEquals(conditions.getDoNotCacheConditions().size(), 1, "Number of DoNotCacheCondition children");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodTest.java
index 062abc5e8..1d9110068 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodTest.java
@@ -31,6 +31,7 @@ import org.opensaml.saml.saml1.core.ConfirmationMethod;
/**
* test for {@link org.opensaml.saml.saml1.core.ConfirmationMethod}
*/
+ at SuppressWarnings({"null", "javadoc"})
public class ConfirmationMethodTest extends XMLObjectProviderBaseTestCase {
/** name used to generate objects */
@@ -54,8 +55,8 @@ public class ConfirmationMethodTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementUnmarshall() {
- ConfirmationMethod confirmationMethod = (ConfirmationMethod) unmarshallElement(singleElementFile);
-
+ final ConfirmationMethod confirmationMethod = (ConfirmationMethod) unmarshallElement(singleElementFile);
+ assert confirmationMethod!=null;
Assert.assertNull(confirmationMethod.getURI(), "Contents of Confirmation Method");
}
@@ -64,8 +65,8 @@ public class ConfirmationMethodTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
- ConfirmationMethod confirmationMethod = (ConfirmationMethod) unmarshallElement(singleElementOptionalAttributesFile);
-
+ final ConfirmationMethod confirmationMethod = (ConfirmationMethod) unmarshallElement(singleElementOptionalAttributesFile);
+ assert confirmationMethod!=null;
Assert.assertEquals(confirmationMethod.getURI(), expectedConfirmationMethod, "Contents of Confirmation Method");
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/DoNotCacheConditionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/DoNotCacheConditionTest.java
index f929a708d..5a56c2690 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/DoNotCacheConditionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/DoNotCacheConditionTest.java
@@ -30,6 +30,7 @@ import org.opensaml.saml.saml1.core.DoNotCacheCondition;
/**
* Test class for {@link org.opensaml.saml.saml1.core.impl.DoNotCacheConditionImpl} objects
*/
+ at SuppressWarnings({"null", "javadoc"})
public class DoNotCacheConditionTest extends XMLObjectProviderBaseTestCase {
/**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/EvidenceTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/EvidenceTest.java
index e91bc1e17..f62c5950e 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/EvidenceTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/EvidenceTest.java
@@ -34,6 +34,7 @@ import org.opensaml.saml.saml1.core.Evidence;
/**
* Test for {@link EvidenceImpl}
*/
+ at SuppressWarnings({"null", "javadoc"})
public class EvidenceTest extends XMLObjectProviderBaseTestCase {
/** name used to generate objects */
@@ -55,7 +56,8 @@ public class EvidenceTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementUnmarshall() {
- Evidence evidence = (Evidence) unmarshallElement(singleElementFile);
+ final Evidence evidence = (Evidence) unmarshallElement(singleElementFile);
+ assert evidence !=null;
Assert.assertEquals(evidence.getEvidence().size(), 0, "AssertionIDReference or Assertion element was present");
}
@@ -64,7 +66,8 @@ public class EvidenceTest extends XMLObjectProviderBaseTestCase {
@Test
public void testChildElementsUnmarshall() {
- Evidence evidence = (Evidence) unmarshallElement(childElementsFile);
+ final Evidence evidence = (Evidence) unmarshallElement(childElementsFile);
+ assert evidence !=null;
Assert.assertEquals(evidence.getEvidence().size(), 4, "Assertion and AssertionIDReference element count");
Assert.assertEquals(evidence.getAssertionIDReferences().size(), 2, "AssertionIDReference element count");
@@ -82,10 +85,10 @@ public class EvidenceTest extends XMLObjectProviderBaseTestCase {
@Test
public void testChildElementsMarshall() {
- Evidence evidence = (Evidence) buildXMLObject(qname);
+ final Evidence evidence = (Evidence) buildXMLObject(qname);
- QName refQname = new QName(SAMLConstants.SAML1_NS, AssertionIDReference.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML1_PREFIX);
- QName assertionQname = new QName(SAMLConstants.SAML1_NS, Assertion.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML1_PREFIX);
+ final QName refQname = new QName(SAMLConstants.SAML1_NS, AssertionIDReference.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML1_PREFIX);
+ final QName assertionQname = new QName(SAMLConstants.SAML1_NS, Assertion.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML1_PREFIX);
evidence.getAssertionIDReferences().add((AssertionIDReference) buildXMLObject(refQname));
evidence.getAssertions().add((Assertion) buildXMLObject(assertionQname));
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/NameIdentifierTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/NameIdentifierTest.java
index ba4a4ef58..b0c9e1482 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/NameIdentifierTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/NameIdentifierTest.java
@@ -31,6 +31,7 @@ import org.opensaml.saml.saml1.core.NameIdentifier;
/**
* Test case for NameIdentifier
*/
+ at SuppressWarnings({"null", "javadoc"})
public class NameIdentifierTest extends XMLObjectProviderBaseTestCase {
/** name used to generate objects */
@@ -57,8 +58,8 @@ public class NameIdentifierTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementUnmarshall() {
- NameIdentifier nameIdentifier = (NameIdentifier) unmarshallElement(singleElementFile);
-
+ final NameIdentifier nameIdentifier = (NameIdentifier) unmarshallElement(singleElementFile);
+ assert nameIdentifier != null;
Assert.assertNull(nameIdentifier.getValue(), "Name Identifer contents present");
Assert.assertNull(nameIdentifier.getNameQualifier(), "NameQualifier present");
Assert.assertNull(nameIdentifier.getFormat(), "Format present");
@@ -69,7 +70,7 @@ public class NameIdentifierTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
NameIdentifier nameIdentifier = (NameIdentifier) unmarshallElement(singleElementOptionalAttributesFile);
-
+ assert nameIdentifier != null;
Assert.assertEquals(nameIdentifier.getValue(), expectedNameIdentifier, "Name Identifier contents");
Assert.assertEquals(nameIdentifier.getNameQualifier(), expectedNameQualifier, "NameQualfier attribute");
Assert.assertEquals(nameIdentifier.getFormat(), expectedFormat, "Format attribute");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/RequestTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/RequestTest.java
index 5378c1dcb..7f7935c55 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/RequestTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/RequestTest.java
@@ -26,11 +26,15 @@ import javax.xml.namespace.QName;
import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.XMLObject;
+import org.opensaml.core.xml.io.Marshaller;
import org.opensaml.core.xml.io.MarshallingException;
+import org.opensaml.saml.common.SAMLVersion;
import org.opensaml.saml.saml1.core.AssertionArtifact;
import org.opensaml.saml.saml1.core.AssertionIDReference;
import org.opensaml.saml.saml1.core.AttributeQuery;
+import org.opensaml.saml.saml1.core.Query;
import org.opensaml.saml.saml1.core.Request;
+import org.opensaml.xmlsec.signature.Signature;
import org.testng.Assert;
import org.testng.annotations.Test;
import org.w3c.dom.Document;
@@ -41,6 +45,7 @@ import net.shibboleth.shared.xml.XMLParserException;
/**
* Test in and around the {@link org.opensaml.saml.saml1.core.Request} interface
*/
+ at SuppressWarnings({"null", "javadoc"})
public class RequestTest extends XMLObjectProviderBaseTestCase {
/** name used to generate objects */
@@ -64,8 +69,8 @@ public class RequestTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- Request request = (Request) unmarshallElement(singleElementFile);
-
+ final Request request = (Request) unmarshallElement(singleElementFile);
+ assert request != null;
String id = request.getID();
Assert.assertNull(id, "ID attribute has value " + id + "expected no value");
@@ -81,10 +86,12 @@ public class RequestTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
- Request request = (Request) unmarshallElement(singleElementOptionalAttributesFile);
-
+ final Request request = (Request) unmarshallElement(singleElementOptionalAttributesFile);
+ assert request != null;
Assert.assertEquals(request.getID(), expectedID, "ID");
- Assert.assertEquals(request.getVersion().getMinorVersion(), expectedMinorVersion, "MinorVersion");
+ final SAMLVersion version = request.getVersion();
+ assert version!=null;
+ Assert.assertEquals(version.getMinorVersion(), expectedMinorVersion, "MinorVersion");
Assert.assertEquals(request.getIssueInstant(), expectedIssueInstant, "IssueInstant");
}
@@ -97,18 +104,19 @@ public class RequestTest extends XMLObjectProviderBaseTestCase {
Request request;
request = (Request) unmarshallElement("/org/opensaml/saml/saml1/impl/RequestWithAssertionArtifact.xml");
-
+ assert request != null;
Assert.assertNull(request.getQuery(), "Query is not null");
Assert.assertEquals(request.getAssertionIDReferences().size(), 0, "AssertionId count");
Assert.assertEquals(request.getAssertionArtifacts().size(), 2, "AssertionArtifact count");
request = (Request) unmarshallElement("/org/opensaml/saml/saml1/impl/RequestWithQuery.xml");
-
+ assert request != null;
Assert.assertNotNull(request.getQuery(), "Query is null");
Assert.assertEquals(request.getAssertionIDReferences().size(), 0, "AssertionId count");
Assert.assertEquals(request.getAssertionArtifacts().size(), 0, "AssertionArtifact count");
request = (Request) unmarshallElement("/org/opensaml/saml/saml1/impl/RequestWithAssertionIDReference.xml");
+ assert request != null;
Assert.assertNull(request.getQuery(), "Query is not null");
Assert.assertNotNull(request.getAssertionIDReferences(), "AssertionId");
Assert.assertEquals(request.getAssertionIDReferences().size(), 3, "AssertionId count");
@@ -185,36 +193,47 @@ public class RequestTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSignatureUnmarshall() {
- Request request = (Request) unmarshallElement("/org/opensaml/saml/saml1/impl/RequestWithSignature.xml");
-
- Assert.assertNotNull(request, "Request was null");
- Assert.assertNotNull(request.getSignature(), "Signature was null");
- Assert.assertNotNull(request.getSignature().getKeyInfo(), "KeyInfo was null");
+ final Request request = (Request) unmarshallElement("/org/opensaml/saml/saml1/impl/RequestWithSignature.xml");
+ assert request != null;
+ final Signature sig = request.getSignature();
+ assert sig != null;
+ Assert.assertNotNull(sig.getKeyInfo(), "KeyInfo was null");
}
@Test
public void testDOMIDResolutionUnmarshall() {
- Request request = (Request) unmarshallElement("/org/opensaml/saml/saml1/impl/RequestWithSignature.xml");
-
- Assert.assertNotNull(request, "Request was null");
- Assert.assertNotNull(request.getSignature(), "Signature was null");
- Document document = request.getSignature().getDOM().getOwnerDocument();
- Element idElem = request.getDOM();
-
+ final Request request = (Request) unmarshallElement("/org/opensaml/saml/saml1/impl/RequestWithSignature.xml");
+ assert request != null;
+ assert request != null;
+ final Signature sig = request.getSignature();
+ assert sig != null;
+ final Element elem = sig.getDOM();
+ assert elem != null;
+ final Document document = elem.getOwnerDocument();
+ final Element idElem = request.getDOM();
+ assert idElem != null;
Assert.assertNotNull(document.getElementById(expectedID), "DOM ID resolution returned null");
Assert.assertTrue(idElem.isSameNode(document.getElementById(expectedID)), "DOM elements were not equal");
}
@Test
public void testDOMIDResolutionMarshall() throws MarshallingException {
- Request request = (Request) buildXMLObject(Request.DEFAULT_ELEMENT_NAME);
+ final Request request = (Request) buildXMLObject(Request.DEFAULT_ELEMENT_NAME);
+ assert request != null;
request.setID(expectedID);
request.setQuery((AttributeQuery) buildXMLObject(AttributeQuery.DEFAULT_ELEMENT_NAME));
- marshallerFactory.getMarshaller(request).marshall(request);
-
- Document document = request.getQuery().getDOM().getOwnerDocument();
- Element idElem = request.getDOM();
+ final Marshaller marshaller = marshallerFactory.getMarshaller(request);
+ assert marshaller!=null;
+ marshaller.marshall(request);
+
+ final Query query = request.getQuery();
+ assert query != null;
+ final Element elem = query.getDOM();
+ assert elem != null;
+ final Document document = elem.getOwnerDocument();
+ final Element idElem = request.getDOM();
+ assert idElem != null;
Assert.assertNotNull(document.getElementById(expectedID), "DOM ID resolution returned null");
Assert.assertTrue(idElem.isSameNode(document.getElementById(expectedID)), "DOM elements were not equal");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/RespondWithTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/RespondWithTest.java
index 886516bc9..513f63f87 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/RespondWithTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/RespondWithTest.java
@@ -31,6 +31,7 @@ import org.opensaml.saml.saml1.core.RespondWith;
/**
* Test for org.opensaml.saml.saml1.core.RespondWith.
*/
+ at SuppressWarnings({"null", "javadoc"})
public class RespondWithTest extends XMLObjectProviderBaseTestCase {
/** Expected QName element content. */
@@ -51,8 +52,8 @@ public class RespondWithTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementUnmarshall() {
- RespondWith respondWith = (RespondWith) unmarshallElement(singleElementFile);
- Assert.assertNotNull(respondWith, "Object was null");
+ final RespondWith respondWith = (RespondWith) unmarshallElement(singleElementFile);
+ assert respondWith != null;
Assert.assertEquals(respondWith.getValue(), expectedQName, "Unexpected QName content value");
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ResponseTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ResponseTest.java
index da15d369b..a4e96bc4c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ResponseTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/ResponseTest.java
@@ -27,10 +27,13 @@ import javax.xml.namespace.QName;
import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.core.xml.XMLObject;
+import org.opensaml.core.xml.io.Marshaller;
import org.opensaml.core.xml.io.MarshallingException;
+import org.opensaml.saml.common.SAMLVersion;
import org.opensaml.saml.saml1.core.Assertion;
import org.opensaml.saml.saml1.core.Response;
import org.opensaml.saml.saml1.core.Status;
+import org.opensaml.xmlsec.signature.Signature;
import org.testng.Assert;
import org.testng.annotations.Test;
import org.w3c.dom.Document;
@@ -41,6 +44,7 @@ import net.shibboleth.shared.xml.XMLParserException;
/**
* Test class for org.opensaml.saml.saml1.core.Response
*/
+ at SuppressWarnings({"null", "javadoc"})
public class ResponseTest extends XMLObjectProviderBaseTestCase {
/** name used to generate objects */
@@ -82,7 +86,8 @@ public class ResponseTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementUnmarshall() {
- Response response = (Response) unmarshallElement(singleElementFile);
+ final Response response = (Response) unmarshallElement(singleElementFile);
+ assert response != null;
String id = response.getID();
Assert.assertNull(id, "ID attribute has value " + id + "expected no value");
@@ -100,8 +105,9 @@ public class ResponseTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
- Response response;
+ final Response response;
response = (Response) unmarshallElement(singleElementOptionalAttributesFile);
+ assert response != null;
Assert.assertEquals(response.getID(), expectedID, "ID");
Assert.assertEquals(response.getIssueInstant(), expectedIssueInstant, "IssueInstant attribute ");
@@ -112,14 +118,17 @@ public class ResponseTest extends XMLObjectProviderBaseTestCase {
string = response.getRecipient();
Assert.assertEquals(string, expectedRecipient, "Recipient attribute ");
- int i = response.getVersion().getMinorVersion();
+ final SAMLVersion version =response.getVersion();
+ assert version!=null;
+ int i = version.getMinorVersion();
Assert.assertEquals(i, expectedMinorVersion, "MinorVersion attribute ");
}
/** {@inheritDoc} */
@Test
public void testChildElementsUnmarshall() {
- Response response = (Response) unmarshallElement(childElementsFile);
+ final Response response = (Response) unmarshallElement(childElementsFile);
+ assert response != null;
Assert.assertEquals(response.getAssertions().size(), 1, "No Assertion elements count");
@@ -176,36 +185,49 @@ public class ResponseTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSignatureUnmarshall() {
- Response response = (Response) unmarshallElement("/org/opensaml/saml/saml1/impl/ResponseWithSignature.xml");
-
+ final Response response = (Response) unmarshallElement("/org/opensaml/saml/saml1/impl/ResponseWithSignature.xml");
+ assert response != null;
+
Assert.assertNotNull(response, "Response was null");
- Assert.assertNotNull(response.getSignature(), "Signature was null");
- Assert.assertNotNull(response.getSignature().getKeyInfo(), "KeyInfo was null");
+ final Signature sig = response.getSignature();
+ assert sig != null;
+ Assert.assertNotNull(sig.getKeyInfo(), "KeyInfo was null");
}
@Test
public void testDOMIDResolutionUnmarshall() {
- Response response = (Response) unmarshallElement("/org/opensaml/saml/saml1/impl/ResponseWithSignature.xml");
-
+ final Response response = (Response) unmarshallElement("/org/opensaml/saml/saml1/impl/ResponseWithSignature.xml");
+ assert response != null;
Assert.assertNotNull(response, "Response was null");
- Assert.assertNotNull(response.getSignature(), "Signature was null");
- Document document = response.getSignature().getDOM().getOwnerDocument();
- Element idElem = response.getDOM();
+ final Signature sig = response.getSignature();
+ assert sig != null;
+ final Element elem = sig.getDOM();
+ assert elem != null;
+ final Document document = elem.getOwnerDocument();
+ final Element idElem = response.getDOM();
Assert.assertNotNull(document.getElementById(expectedID), "DOM ID resolution returned null");
+ assert idElem != null;
Assert.assertTrue(idElem.isSameNode(document.getElementById(expectedID)), "DOM elements were not equal");
}
@Test
public void testDOMIDResolutionMarshall() throws MarshallingException {
- Response response = (Response) buildXMLObject(Response.DEFAULT_ELEMENT_NAME);
+ final Response response = (Response) buildXMLObject(Response.DEFAULT_ELEMENT_NAME);
response.setID(expectedID);
response.setStatus((Status) buildXMLObject(Status.DEFAULT_ELEMENT_NAME));
- marshallerFactory.getMarshaller(response).marshall(response);
+ final Marshaller marshaller = marshallerFactory.getMarshaller(response);
+ assert marshaller!=null;
+ marshaller.marshall(response);
- Document document = response.getStatus().getDOM().getOwnerDocument();
- Element idElem = response.getDOM();
+ final Status status =response.getStatus();
+ assert status != null;
+ final Element elem = status.getDOM();
+ assert elem != null;
+ final Document document = elem.getOwnerDocument();
+ final Element idElem = response.getDOM();
+ assert idElem != null;
Assert.assertNotNull(document.getElementById(expectedID), "DOM ID resolution returned null");
Assert.assertTrue(idElem.isSameNode(document.getElementById(expectedID)), "DOM elements were not equal");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/StatusCodeTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/StatusCodeTest.java
index 1c0c3ebf0..5707c2aa5 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/StatusCodeTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/StatusCodeTest.java
@@ -17,17 +17,18 @@
package org.opensaml.saml.saml1.core.impl;
-import org.testng.annotations.Test;
-import org.testng.Assert;
import javax.xml.namespace.QName;
import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.StatusCode;
+import org.testng.Assert;
+import org.testng.annotations.Test;
/**
* Test class for org.opensaml.saml.saml1.core.StatusCode.
*/
+ at SuppressWarnings({"null", "javadoc"})
public class StatusCodeTest extends XMLObjectProviderBaseTestCase {
/** name used to generate objects. */
@@ -46,7 +47,8 @@ public class StatusCodeTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementUnmarshall() {
- StatusCode code = (StatusCode) unmarshallElement(singleElementFile);
+ final StatusCode code = (StatusCode) unmarshallElement(singleElementFile);
+ assert code != null;
Assert.assertEquals(code.getValue(), StatusCode.SUCCESS, "Single Element Value wrong");
}
@@ -56,7 +58,8 @@ public class StatusCodeTest extends XMLObjectProviderBaseTestCase {
@Test
public void testChildElementsUnmarshall() {
- StatusCode code = (StatusCode) unmarshallElement(childElementsFile);
+ final StatusCode code = (StatusCode) unmarshallElement(childElementsFile);
+ assert code != null;
Assert.assertNotNull(code.getStatusCode(), "Child StatusCode");
}
@@ -77,13 +80,14 @@ public class StatusCodeTest extends XMLObjectProviderBaseTestCase {
@Test
public void testChildElementsMarshall() {
- StatusCode code = (StatusCode) buildXMLObject(qname);
+ final StatusCode code = (StatusCode) buildXMLObject(qname);
code.setValue(StatusCode.REQUESTER);
code.setStatusCode((StatusCode) buildXMLObject(qname));
-
- code.getStatusCode().setValue(StatusCode.VERSION_MISMATCH);
+ final StatusCode code2 = code.getStatusCode();
+ assert code2 != null;
+ code2.setValue(StatusCode.VERSION_MISMATCH);
assertXMLEquals(expectedChildElementsDOM, code);
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/StatusMessageTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/StatusMessageTest.java
index 8a5ca5184..4d2466c0a 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/StatusMessageTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/StatusMessageTest.java
@@ -31,6 +31,7 @@ import org.opensaml.saml.saml1.core.StatusMessage;
/**
* Test for org.opensaml.saml.saml1.core.StatusMessage
*/
+ at SuppressWarnings({"null", "javadoc"})
public class StatusMessageTest extends XMLObjectProviderBaseTestCase {
/** name used to generate objects */
@@ -54,7 +55,8 @@ public class StatusMessageTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementUnmarshall() {
- StatusMessage statusMessage = (StatusMessage) unmarshallElement(singleElementFile);
+ final StatusMessage statusMessage = (StatusMessage) unmarshallElement(singleElementFile);
+ assert statusMessage != null;
Assert.assertNull(statusMessage.getValue(), "Contents");
}
@@ -62,7 +64,8 @@ public class StatusMessageTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
- StatusMessage statusMessage = (StatusMessage) unmarshallElement(singleElementOptionalAttributesFile);
+ final StatusMessage statusMessage = (StatusMessage) unmarshallElement(singleElementOptionalAttributesFile);
+ assert statusMessage != null;
Assert.assertEquals(statusMessage.getValue(), contents, "Contents");
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/StatusTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/StatusTest.java
index 7952a9698..5e0b89626 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/StatusTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/StatusTest.java
@@ -21,8 +21,6 @@
package org.opensaml.saml.saml1.core.impl;
-import org.testng.annotations.Test;
-import org.testng.Assert;
import javax.xml.namespace.QName;
import org.opensaml.core.testing.XMLObjectProviderBaseTestCase;
@@ -30,10 +28,13 @@ import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml1.core.Status;
import org.opensaml.saml.saml1.core.StatusCode;
import org.opensaml.saml.saml1.core.StatusMessage;
+import org.testng.Assert;
+import org.testng.annotations.Test;
/**
* org.opensaml.saml.saml1.core.Status.
*/
+ at SuppressWarnings({"null", "javadoc"})
public class StatusTest extends XMLObjectProviderBaseTestCase {
/** name used to generate objects. */
@@ -54,8 +55,8 @@ public class StatusTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementUnmarshall() {
- Status status = (Status) unmarshallElement(singleElementFile);
-
+ final Status status = (Status) unmarshallElement(singleElementFile);
+ assert status!= null;
Assert.assertNotNull(status.getStatusCode(), "StatusCode");
Assert.assertNull(status.getStatusMessage(), "StatusMessage");
Assert.assertNull(status.getStatusDetail(), "StatusDetail");
@@ -66,8 +67,8 @@ public class StatusTest extends XMLObjectProviderBaseTestCase {
*/
@Test
public void testChildElementsUnmarshall() {
- Status status = (Status) unmarshallElement(childElementsFile);
-
+ final Status status = (Status) unmarshallElement(childElementsFile);
+ assert status!= null;
Assert.assertNotNull(status.getStatusCode(), "StatusCode");
Assert.assertNotNull(status.getStatusMessage(), "StatusMessage");
}
@@ -76,8 +77,8 @@ public class StatusTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementMarshall() {
- Status status = (Status) buildXMLObject(qname);
-
+ final Status status = (Status) buildXMLObject(qname);
+ assert status!= null;
StatusCode statusCode = (StatusCode) buildXMLObject(StatusCode.DEFAULT_ELEMENT_NAME);
statusCode.setValue(StatusCode.SUCCESS);
status.setStatusCode(statusCode);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationTest.java
index 6bf18d8b4..03b69a4e4 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationTest.java
@@ -38,6 +38,7 @@ import org.w3c.dom.Document;
/**
* Test for {@link org.opensaml.saml.saml1.core.SubjectConfirmation}
*/
+ at SuppressWarnings({"null", "javadoc"})
public class SubjectConfirmationTest extends XMLObjectProviderBaseTestCase {
/** name used to generate objects */
@@ -65,8 +66,8 @@ public class SubjectConfirmationTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- SubjectConfirmation subjectConfirmation = (SubjectConfirmation) unmarshallElement(singleElementFile);
-
+ final SubjectConfirmation subjectConfirmation = (SubjectConfirmation) unmarshallElement(singleElementFile);
+ assert subjectConfirmation != null;
Assert.assertEquals(subjectConfirmation
.getConfirmationMethods().size(), 0, "Non zero number of child ConfirmationMethods elements");
Assert.assertNull(subjectConfirmation
@@ -84,8 +85,8 @@ public class SubjectConfirmationTest extends XMLObjectProviderBaseTestCase {
*/
@Test
public void testFullElementsUnmarshall() {
- SubjectConfirmation subjectConfirmation = (SubjectConfirmation) unmarshallElement(fullElementsFile);
-
+ final SubjectConfirmation subjectConfirmation = (SubjectConfirmation) unmarshallElement(fullElementsFile);
+ assert subjectConfirmation != null;
Assert.assertEquals(subjectConfirmation.getConfirmationMethods().size(), 2, "Number of ConfirmationMethods");
Assert.assertNotNull(subjectConfirmation.getSubjectConfirmationData(), "Zero child SubjectConfirmationData elements");
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityTest.java
index bae89f6c5..3d3500719 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityTest.java
@@ -31,6 +31,7 @@ import org.opensaml.saml.saml1.core.SubjectLocality;
/**
* Test for {@link org.opensaml.saml.saml1.core.SubjectLocality}
*/
+ at SuppressWarnings({"null", "javadoc"})
public class SubjectLocalityTest extends XMLObjectProviderBaseTestCase {
/** name used to generate objects */
@@ -57,8 +58,8 @@ public class SubjectLocalityTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementUnmarshall() {
- SubjectLocality subjectLocality = (SubjectLocality) unmarshallElement(singleElementFile);
-
+ final SubjectLocality subjectLocality = (SubjectLocality) unmarshallElement(singleElementFile);
+ assert subjectLocality != null;
Assert.assertNull(subjectLocality.getIPAddress(), "IPAddress present");
Assert.assertNull(subjectLocality.getDNSAddress(), "DNSAddress present");
}
@@ -67,8 +68,8 @@ public class SubjectLocalityTest extends XMLObjectProviderBaseTestCase {
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
- SubjectLocality subjectLocality = (SubjectLocality) unmarshallElement(singleElementOptionalAttributesFile);
-
+ final SubjectLocality subjectLocality = (SubjectLocality) unmarshallElement(singleElementOptionalAttributesFile);
+ assert subjectLocality != null;
Assert.assertEquals(subjectLocality.getIPAddress(), expectedIPAddress, "IPAddress");
Assert.assertEquals(subjectLocality.getDNSAddress(), expectedDNSAddress, "DNSAddress");
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/SubjectTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/SubjectTest.java
index 859473938..f3460725e 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/SubjectTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/impl/SubjectTest.java
@@ -34,6 +34,7 @@ import org.opensaml.saml.saml1.core.SubjectConfirmation;
/**
* Test for {@link org.opensaml.saml.saml1.core.Subject}
*/
+ at SuppressWarnings({"null", "javadoc"})
public class SubjectTest extends XMLObjectProviderBaseTestCase {
/** name used to generate objects */
@@ -51,8 +52,8 @@ public class SubjectTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- Subject subject = (Subject) unmarshallElement(singleElementFile);
-
+ final Subject subject = (Subject) unmarshallElement(singleElementFile);
+ assert subject != null;
Assert.assertNull(subject.getNameIdentifier(), "Non zero number of child NameIdentifier elements");
Assert.assertNull(subject.getSubjectConfirmation(), "Non zero number of child SubjectConfirmation elements");
}
@@ -62,8 +63,8 @@ public class SubjectTest extends XMLObjectProviderBaseTestCase {
*/
@Test
public void testChildElementsUnmarshall() {
- Subject subject = (Subject) unmarshallElement(childElementsFile);
-
+ final Subject subject = (Subject) unmarshallElement(childElementsFile);
+ assert subject != null;
Assert.assertNotNull(subject.getNameIdentifier(), "Zero child NameIdentifier elements");
Assert.assertNotNull(subject.getSubjectConfirmation(), "Zero child SubjectConfirmation elements");
}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/tests/ResponseTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/tests/ResponseTest.java
index 08b7f42ba..4af50fa06 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/tests/ResponseTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/core/tests/ResponseTest.java
@@ -33,6 +33,7 @@ import net.shibboleth.shared.xml.XMLParserException;
/**
* Tests unmarshalling and marshalling for various response messages.
*/
+ at SuppressWarnings({"null", "javadoc"})
public class ResponseTest extends XMLObjectBaseTestCase {
/** Path to file with full response message */
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjectsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjectsTest.java
index 6c5c0d757..4b5964a72 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjectsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjectsTest.java
@@ -42,7 +42,7 @@ import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.PredicateSupport;
/** Test for {@link AddNameIdentifierToSubjects}. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
public class AddNameIdentifierToSubjectsTest extends OpenSAMLInitBaseTestCase {
private static final String NAME_QUALIFIER = "https://idp.example.org";
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddStatusToResponseTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddStatusToResponseTest.java
index ee3eaaf9a..942451ea4 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddStatusToResponseTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddStatusToResponseTest.java
@@ -34,7 +34,7 @@ import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.ComponentInitializationException;
/** {@link AddStatusToResponse} unit test. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
public class AddStatusToResponseTest extends OpenSAMLInitBaseTestCase {
private ProfileRequestContext prc;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddSubjectConfirmationToSubjectsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddSubjectConfirmationToSubjectsTest.java
index 668aadc3b..1ce9652ec 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddSubjectConfirmationToSubjectsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddSubjectConfirmationToSubjectsTest.java
@@ -39,7 +39,7 @@ import net.shibboleth.shared.component.ComponentInitializationException;
/** Test for {@link AddSubjectConfirmationToSubjects}. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
public class AddSubjectConfirmationToSubjectsTest extends OpenSAMLInitBaseTestCase {
private ProfileRequestContext prc;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/CopyNameIdentifierFromRequestTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/CopyNameIdentifierFromRequestTest.java
index f8a3065fa..cfe2bd3fd 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/CopyNameIdentifierFromRequestTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/CopyNameIdentifierFromRequestTest.java
@@ -35,7 +35,7 @@ import net.shibboleth.shared.component.ComponentInitializationException;
/** Test for {@link CopyNameIdentifierFromRequest}. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
public class CopyNameIdentifierFromRequestTest extends OpenSAMLInitBaseTestCase {
private static final String NAME_QUALIFIER = "https://idp.example.org";
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/ResolveArtifactsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/ResolveArtifactsTest.java
index f3907f213..8a9c4245d 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/ResolveArtifactsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/ResolveArtifactsTest.java
@@ -38,7 +38,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
/** {@link ResolveArtifacts} unit test. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
public class ResolveArtifactsTest extends OpenSAMLInitBaseTestCase {
private BasicSAMLArtifactMap artifactMap;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostEncoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostEncoderTest.java
index 17c6374ad..5174aab63 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostEncoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostEncoderTest.java
@@ -55,7 +55,7 @@ import net.shibboleth.shared.testing.ConstantSupplier;
/**
* Test case for {@link HTTPPostEncoder}.
*/
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
public class HTTPPostEncoderTest extends XMLObjectBaseTestCase {
/** Velocity template engine. */
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostSimpleSignEncoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostSimpleSignEncoderTest.java
index 82178844c..4582f0b14 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostSimpleSignEncoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostSimpleSignEncoderTest.java
@@ -67,7 +67,7 @@ import net.shibboleth.shared.testing.ConstantSupplier;
/**
* Test case for {@link HTTPPostEncoder}.
*/
- at SuppressWarnings("javadoc")
+ at SuppressWarnings({"null", "javadoc"})
public class HTTPPostSimpleSignEncoderTest extends XMLObjectBaseTestCase {
/** Velocity template engine. */
@@ -198,7 +198,6 @@ public class HTTPPostSimpleSignEncoderTest extends XMLObjectBaseTestCase {
}
@Test
- @SuppressWarnings("unchecked")
public void testRequestEncoding() throws Exception {
SAMLObjectBuilder<AuthnRequest> responseBuilder =
(SAMLObjectBuilder<AuthnRequest>) builderFactory.<AuthnRequest>ensureBuilder(AuthnRequest.DEFAULT_ELEMENT_NAME);
@@ -292,7 +291,6 @@ public class HTTPPostSimpleSignEncoderTest extends XMLObjectBaseTestCase {
}
@Test
- @SuppressWarnings("unchecked")
public void testRequestEncodingWithSimpleSign() throws Exception {
SAMLObjectBuilder<AuthnRequest> responseBuilder =
(SAMLObjectBuilder<AuthnRequest>) builderFactory.<AuthnRequest>ensureBuilder(AuthnRequest.DEFAULT_ELEMENT_NAME);
@@ -394,7 +392,9 @@ public class HTTPPostSimpleSignEncoderTest extends XMLObjectBaseTestCase {
Assert.assertTrue(xmlObject instanceof KeyInfo);
final KeyInfoGenerator generator = signingParameters.getKeyInfoGenerator();
assert generator != null;
- assertXMLEquals(xmlObject.ensureDOM().getOwnerDocument(), generator.generate(signingParameters.getSigningCredential()));
+ final KeyInfo generated = generator.generate(signingParameters.getSigningCredential());
+ assert generated != null;
+ assertXMLEquals(xmlObject.ensureDOM().getOwnerDocument(), generated);
}
Element submit = body.selectFirst("noscript > div > input[type=submit]");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ActionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ActionTest.java
index 68a138bed..997458089 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ActionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/ActionTest.java
@@ -29,6 +29,7 @@ import org.opensaml.saml.saml2.core.Action;
/**
* Test case for creating, marshalling, and unmarshalling {@link org.opensaml.saml.saml2.core.impl.ActionImpl}.
*/
+ at SuppressWarnings({"null", "javadoc"})
public class ActionTest extends XMLObjectProviderBaseTestCase {
/** Expected value of action */
@@ -52,7 +53,8 @@ public class ActionTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementUnmarshall() {
- Action action = (Action) unmarshallElement(singleElementFile);
+ final Action action = (Action) unmarshallElement(singleElementFile);
+ assert action != null;
String actionname = action.getValue();
Assert.assertEquals(actionname, expectedAction, "Action was " + actionname + ", expected " + expectedAction);
@@ -61,8 +63,8 @@ public class ActionTest extends XMLObjectProviderBaseTestCase {
/** {@inheritDoc} */
@Test
public void testSingleElementOptionalAttributesUnmarshall() {
- Action action = (Action) unmarshallElement(singleElementOptionalAttributesFile);
-
+ final Action action = (Action) unmarshallElement(singleElementOptionalAttributesFile);
+ assert action != null;
String actionname = action.getValue();
Assert.assertEquals(actionname, expectedAction, "Action was " + actionname + ", expected " + expectedAction);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list