[java-opensaml] branch master updated: JPAR-131 - Fix doclint issues in test javadoc

Ian Young ian at iay.org.uk
Sat Dec 28 12:29:39 EST 2019


This is an automated email from the git hooks/post-receive script.

iay pushed a commit to branch master
in repository java-opensaml.

View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=f44e11951c751b4174ad5eaf6c618c94ab0156d6

The following commit(s) were added to refs/heads/master by this push:
       new  f44e119   JPAR-131 - Fix doclint issues in test javadoc
f44e119 is described below

commit f44e11951c751b4174ad5eaf6c618c94ab0156d6
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Sat Dec 28 17:29:28 2019 +0000

    JPAR-131 - Fix doclint issues in test javadoc
    
    https://issues.shibboleth.net/jira/browse/JPAR-131
---
 .../profile/action/AbstractProfileActionTest.java  | 32 +++++++--
 .../profile/action/impl/DecodeMessageTest.java     |  7 +-
 .../profile/action/impl/EncodeMessageTest.java     | 12 +++-
 .../saml2/profile/SAML2ActionTestingSupport.java   |  2 +-
 .../impl/AddChannelBindingsHeaderHandlerTest.java  | 22 +++++--
 .../impl/CheckMessageVersionHandlerTest.java       | 30 +++++++--
 .../binding/impl/DefaultEndpointResolverTest.java  | 77 ++++++++++++++++++----
 .../impl/MessageLifetimeSecurityHandlerTest.java   | 23 ++++---
 .../impl/MessageReplaySecurityHandlerTest.java     | 15 +++--
 .../SAMLMDClientCertAuthSecurityHandlerTest.java   | 26 +++++---
 ...ocolMessageXMLSignatureSecurityHandlerTest.java | 19 ++++--
 .../AddAudienceRestrictionToAssertionsTest.java    | 32 +++++++--
 .../impl/AddInResponseToToResponseTest.java        | 14 +++-
 .../AddNotOnOrAfterConditionToAssertionsTest.java  | 10 ++-
 .../filter/impl/ByReferenceMetadataFilterTest.java |  4 ++
 .../AbstractDynamicHTTPMetadataResolverTest.java   |  5 --
 .../impl/FileBackedHTTPMetadataResolverTest.java   | 31 +++++----
 .../impl/FilesystemMetadataResolverTest.java       | 29 ++++----
 .../resolver/impl/HTTPMetadataResolverTest.java    |  6 ++
 .../impl/ResourceBackedMetadataResolverTest.java   |  2 +
 .../resolver/index/impl/RoleMetadataIndexTest.java |  7 --
 .../AttributeConsumingServiceSelectorTest.java     | 21 ++++--
 .../binding/decoding/impl/HTTPPostDecoderTest.java |  8 ++-
 .../decoding/impl/HTTPSOAP11DecoderTest.java       |  4 +-
 .../encoding/impl/HTTPSOAP11EncoderTest.java       |  6 +-
 .../saml/saml1/core/impl/AssertionTest.java        |  3 +-
 .../AddDoNotCacheConditionToAssertionsTest.java    | 30 +++++++--
 .../binding/decoding/impl/HTTPPostDecoderTest.java |  6 +-
 .../decoding/impl/HTTPSOAP11DecoderTest.java       |  4 +-
 .../binding/encoding/impl/HTTPPostEncoderTest.java |  4 +-
 .../impl/HTTPPostSimpleSignEncoderTest.java        |  4 +-
 .../impl/HTTPRedirectDeflateEncoderTest.java       | 12 ++--
 .../encoding/impl/HTTPSOAP11EncoderTest.java       |  4 +-
 .../impl/AddConsentToResponseHandlerTest.java      | 16 ++++-
 .../impl/AddECPResponseHeaderHandlerTest.java      | 23 +++++--
 .../impl/AddGeneratedKeyHeaderHandlerTest.java     | 24 +++++--
 .../impl/AddRelayStateHeaderHandlerTest.java       | 20 ++++--
 .../AddRequestAuthenticatedHeaderHandlerTest.java  | 23 +++++--
 .../impl/ExtractConsentFromRequestHandlerTest.java | 16 ++++-
 .../impl/ExtractProxiedRequestersHandlerTest.java  | 16 ++++-
 ...xtractChannelBindingsExtensionsHandlerTest.java | 26 ++++++--
 .../ExtractChannelBindingsHeadersHandlerTest.java  | 30 +++++++--
 ...AML2AuthnRequestsSignedSecurityHandlerTest.java | 17 +++--
 ...SAML2HTTPPostSimpleSignSecurityHandlerTest.java | 35 ++++++----
 ...edirectDeflateSignatureSecurityHandlerTest.java | 26 +++++---
 .../org/opensaml/saml/saml2/core/MockBaseID.java   |  6 +-
 .../saml/saml2/core/SignedAssertionTest.java       |  9 ++-
 .../saml/saml2/core/impl/RequestTestBase.java      |  9 ++-
 .../saml2/core/impl/StatusResponseTestBase.java    |  7 +-
 .../encryption/DecryptionPlusSigningTest.java      | 12 ++--
 .../saml2/encryption/SimpleDecryptionTest.java     |  7 +-
 .../opensaml/saml/saml2/metadata/MetadataTest.java | 12 +---
 .../impl/AddProxyRestrictionToAssertionsTest.java  | 26 +++++---
 .../saml2/profile/impl/DecryptNameIDsTest.java     | 14 ++--
 .../impl/MetadataCredentialResolverTest.java       | 54 +++++++--------
 .../opensaml/security/crypto/KeySupportTest.java   | 72 ++++++++++++++++----
 .../opensaml/security/x509/X509SupportTest.java    | 59 +++++++++++------
 57 files changed, 746 insertions(+), 324 deletions(-)

diff --git a/opensaml-profile-api/src/test/java/org/opensaml/profile/action/AbstractProfileActionTest.java b/opensaml-profile-api/src/test/java/org/opensaml/profile/action/AbstractProfileActionTest.java
index 5577d35..76e6d7b 100644
--- a/opensaml-profile-api/src/test/java/org/opensaml/profile/action/AbstractProfileActionTest.java
+++ b/opensaml-profile-api/src/test/java/org/opensaml/profile/action/AbstractProfileActionTest.java
@@ -28,7 +28,11 @@ import org.testng.annotations.Test;
 public class AbstractProfileActionTest {
 
 
-    /** Test a successful action run. */
+    /**
+     * Test a successful action run.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test
     public void testSuccess() throws Exception {
 
@@ -41,7 +45,11 @@ public class AbstractProfileActionTest {
         Assert.assertTrue(action.didPost);
     }
 
-    /** Test a failure in the preexec step. */
+    /**
+     * Test a failure in the preexec step.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test
     public void testPreFailure() throws Exception {
 
@@ -57,7 +65,11 @@ public class AbstractProfileActionTest {
         }
     }
 
-    /** Test a failure in the exec step. */
+    /**
+     * Test a failure in the exec step.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test
     public void testExecFailure() throws Exception {
 
@@ -74,7 +86,11 @@ public class AbstractProfileActionTest {
         }
     }
 
-    /** Test an unchecked error in the exec step. */
+    /**
+     * Test an unchecked error in the exec step.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test
     public void testExecUnchecked() throws Exception {
 
@@ -91,7 +107,11 @@ public class AbstractProfileActionTest {
         }
     }
 
-    /** Test a failure in the post step. */
+    /**
+     * Test a failure in the post step.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test
     public void testPostFailure() throws Exception {
 
@@ -162,4 +182,4 @@ public class AbstractProfileActionTest {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/DecodeMessageTest.java b/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/DecodeMessageTest.java
index 221cdf8..f8b21fc 100644
--- a/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/DecodeMessageTest.java
+++ b/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/DecodeMessageTest.java
@@ -53,7 +53,7 @@ public class DecodeMessageTest {
     /**
      * Test that the action proceeds properly if the message can be decoded.
      *  
-     * @throws ComponentInitializationException 
+     * @throws ComponentInitializationException if something goes wrong
      */
     @Test public void testDecodeMessage() throws ComponentInitializationException {
         final DecodeMessage action = new DecodeMessage(decoder);
@@ -70,7 +70,7 @@ public class DecodeMessageTest {
     /**
      * Test that the action errors out properly if the message can not be decoded.
      * 
-     * @throws ComponentInitializationException 
+     * @throws ComponentInitializationException if something goes wrong
      */
     @Test public void testFailure() throws ComponentInitializationException {
         decoder.setThrowException(true);
@@ -84,7 +84,7 @@ public class DecodeMessageTest {
     }
 
     /**
-     * Mock implementation of {@link MessageDecoder } which either returns a  
+     * Mock implementation of {@link MessageDecoder} which either returns a  
      * {@link MessageContext} with a mock message or throws a {@link MessageDecodingException}.
      */
     class MockMessageDecoder extends AbstractMessageDecoder {
@@ -98,6 +98,7 @@ public class DecodeMessageTest {
         /**
          * Constructor.
          *
+         * @param mockMessage the mock message to produce
          */
         public MockMessageDecoder(MockMessage mockMessage) {
             message = mockMessage;
diff --git a/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/EncodeMessageTest.java b/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/EncodeMessageTest.java
index 4b67d1c..c4929a2 100644
--- a/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/EncodeMessageTest.java
+++ b/opensaml-profile-impl/src/test/java/org/opensaml/profile/action/impl/EncodeMessageTest.java
@@ -76,7 +76,11 @@ public class EncodeMessageTest {
         action.initialize();
     }
     
-    /** Test that the action proceeds properly if the message can be decoded. */
+    /**
+     * Test that the action proceeds properly if the message can be decoded.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test public void testDecodeMessage() throws Exception {
         EncodeMessage action = new EncodeMessage();
         action.setMessageEncoderFactory(new MockEncoderFactory());
@@ -88,7 +92,11 @@ public class EncodeMessageTest {
         Assert.assertEquals(encoder.getEncodedMessage(), expectedMessage);
     }
 
-    /** Test that the action errors out properly if the message can not be decoded. */
+    /**
+     * Test that the action errors out properly if the message can not be decoded.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test public void testThrowException() throws Exception {
         encoder.setThrowException(true);
 
diff --git a/opensaml-saml-api/src/test/java/org/opensaml/saml/saml2/profile/SAML2ActionTestingSupport.java b/opensaml-saml-api/src/test/java/org/opensaml/saml/saml2/profile/SAML2ActionTestingSupport.java
index 0ace62c..6757227 100644
--- a/opensaml-saml-api/src/test/java/org/opensaml/saml/saml2/profile/SAML2ActionTestingSupport.java
+++ b/opensaml-saml-api/src/test/java/org/opensaml/saml/saml2/profile/SAML2ActionTestingSupport.java
@@ -316,7 +316,7 @@ public class SAML2ActionTestingSupport {
     }
     
     /**
-     * Build a {@Scoping}.
+     * Build a {@link Scoping}.
      * 
      * @param count proxy count
      * @param idplist list of IdP entityIDs
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 17d6c3b..94e1763 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
@@ -59,7 +59,11 @@ public class AddChannelBindingsHeaderHandlerTest extends OpenSAMLInitBaseTestCas
         handler.initialize();
     }
     
-    /** Test that the handler does nothing on a missing CB context. */
+    /**
+     * Test that the handler does nothing on a missing CB context.
+     * 
+     * @throws MessageHandlerException ...
+     */
     @Test public void testNoBindings() throws MessageHandlerException {
         
         handler.invoke(messageCtx);
@@ -70,7 +74,12 @@ public class AddChannelBindingsHeaderHandlerTest extends OpenSAMLInitBaseTestCas
         Assert.assertTrue(headers.isEmpty());
     }
     
-    /** Test that the handler errors on a missing SOAP context. */
+    /**
+     * Test that the handler errors on a missing SOAP context.
+     * 
+     * @throws MessageHandlerException ...
+     * @throws ComponentInitializationException ...
+     */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testMissingEnvelope() throws MessageHandlerException, ComponentInitializationException {
         messageCtx.addSubcontext(cbc);
@@ -78,7 +87,12 @@ public class AddChannelBindingsHeaderHandlerTest extends OpenSAMLInitBaseTestCas
         handler.invoke(messageCtx);
     }
 
-    /** Test that the handler works. */
+    /**
+     * Test that the handler works.
+     * 
+     * @throws MessageHandlerException ...
+     * @throws ComponentInitializationException ...
+     */
     @Test public void testSuccess() throws MessageHandlerException, ComponentInitializationException {
         messageCtx.addSubcontext(cbc);
 
@@ -95,4 +109,4 @@ public class AddChannelBindingsHeaderHandlerTest extends OpenSAMLInitBaseTestCas
         Assert.assertEquals(((ChannelBindings) headers.get(0)).getType(), "foo");
     }
     
-}
\ No newline at end of file
+}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/CheckMessageVersionHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/CheckMessageVersionHandlerTest.java
index c3c93b2..358aca9 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/CheckMessageVersionHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/impl/CheckMessageVersionHandlerTest.java
@@ -80,7 +80,12 @@ public class CheckMessageVersionHandlerTest extends OpenSAMLInitBaseTestCase {
         handler.invoke(messageCtx);
     }
     
-    /** Test that the handler accepts SAML 1.0 and 1.1 messages. */
+    /**
+     * Test that the handler accepts SAML 1.0 and 1.1 messages.
+     *
+     * @throws MessageHandlerException ...
+     * @throws ComponentInitializationException ...
+     */
     @Test
     public void testSaml1Message() throws MessageHandlerException, ComponentInitializationException {
         final MessageContext messageCtx = new MessageContext();
@@ -93,7 +98,12 @@ public class CheckMessageVersionHandlerTest extends OpenSAMLInitBaseTestCase {
         handler.invoke(messageCtx);
     }
 
-    /** Test that the handler errors out on SAML 2 messages. */
+    /**
+     * Test that the handler errors out on SAML 2 messages.
+     * 
+     * @throws MessageHandlerException ...
+     * @throws ComponentInitializationException ...
+     */
     @Test(expectedExceptions = MessageHandlerException.class)
     public void testSaml2MessageFail() throws MessageHandlerException, ComponentInitializationException {
         final MessageContext messageCtx = new MessageContext();
@@ -107,7 +117,12 @@ public class CheckMessageVersionHandlerTest extends OpenSAMLInitBaseTestCase {
         handler.invoke(messageCtx);
     }
  
-    /** Test that the handler accepts SAML 2.0 messages. */
+    /**
+     * Test that the handler accepts SAML 2.0 messages.
+     * 
+     * @throws MessageHandlerException ...
+     * @throws ComponentInitializationException ...
+     */
     @Test
     public void testSaml2Message() throws MessageHandlerException, ComponentInitializationException {
         final MessageContext messageCtx = new MessageContext();
@@ -120,7 +135,12 @@ public class CheckMessageVersionHandlerTest extends OpenSAMLInitBaseTestCase {
         handler.invoke(messageCtx);
     }
 
-    /** Test that the handler errors out on SAML 1 messages. */
+    /**
+     * Test that the handler errors out on SAML 1 messages.
+     * 
+     * @throws MessageHandlerException ...
+     * @throws ComponentInitializationException ...
+     */
     @Test(expectedExceptions = MessageHandlerException.class)
     public void testSaml1MessageFail() throws MessageHandlerException, ComponentInitializationException {
         final MessageContext messageCtx = new MessageContext();
@@ -134,4 +154,4 @@ public class CheckMessageVersionHandlerTest extends OpenSAMLInitBaseTestCase {
         handler.invoke(messageCtx);
     }
 
-}
\ No newline at end of file
+}
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 69d7b27..3871beb 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
@@ -96,7 +96,11 @@ public class DefaultEndpointResolverTest extends XMLObjectBaseTestCase {
         Assert.assertSame(ep, endpointCrit.getEndpoint());
     }
 
-    /** SP requests an endpoint but we don't support the binding. */
+    /**
+     * SP requests an endpoint but we don't support the binding.
+     * 
+     * @throws ResolverException ...
+     */
     @Test
     public void testSignedRequestBadBinding() throws ResolverException {
         final CriteriaSet crits = new CriteriaSet(new EndpointCriterion<>(endpointCrit.getEndpoint(), true),
@@ -105,7 +109,12 @@ public class DefaultEndpointResolverTest extends XMLObjectBaseTestCase {
         Assert.assertNull(ep);
     }
     
-    /** An SP with no endpoints in metadata. */
+    /**
+     * An SP with no endpoints in metadata.
+     * 
+     * @throws UnmarshallingException ...
+     * @throws ResolverException ...
+     */
     @Test
     public void testNoEndpoints() throws UnmarshallingException, ResolverException {
         final RoleDescriptorCriterion roleCrit =
@@ -114,7 +123,12 @@ public class DefaultEndpointResolverTest extends XMLObjectBaseTestCase {
         Assert.assertNull(ep);
     }
 
-    /** No endpoint with the location requested. */
+    /**
+     * No endpoint with the location requested.
+     * 
+     * @throws UnmarshallingException ...
+     * @throws ResolverException ...
+     */
     @Test
     public void testBadLocation() throws UnmarshallingException, ResolverException {
         final RoleDescriptorCriterion roleCrit =
@@ -124,7 +138,12 @@ public class DefaultEndpointResolverTest extends XMLObjectBaseTestCase {
         Assert.assertNull(ep);
     }
 
-    /** No endpoint at a location with the right binding requested. */
+    /**
+     * No endpoint at a location with the right binding requested.
+     * 
+     * @throws UnmarshallingException ...
+     * @throws ResolverException ...
+     */
     @Test
     public void testBadBinding() throws UnmarshallingException, ResolverException {
         endpointCrit.getEndpoint().setLocation(LOCATION_POST);
@@ -136,7 +155,12 @@ public class DefaultEndpointResolverTest extends XMLObjectBaseTestCase {
         Assert.assertNull(ep);
     }
 
-    /** Endpoint matches but we don't support the binding. */
+    /**
+     * Endpoint matches but we don't support the binding.
+     * 
+     * @throws UnmarshallingException ...
+     * @throws ResolverException ...
+     */
     @Test
     public void testUnsupportedBinding() throws UnmarshallingException, ResolverException {
         endpointCrit.getEndpoint().setLocation(LOCATION_POST);
@@ -148,7 +172,12 @@ public class DefaultEndpointResolverTest extends XMLObjectBaseTestCase {
         Assert.assertNull(ep);
     }
     
-    /** No endpoint with a requested index. */
+    /**
+     * No endpoint with a requested index.
+     * 
+     * @throws UnmarshallingException ...
+     * @throws ResolverException ...
+     */
     @Test
     public void testBadIndex() throws UnmarshallingException, ResolverException {
         endpointCrit.getEndpoint().setLocation(null);
@@ -161,7 +190,12 @@ public class DefaultEndpointResolverTest extends XMLObjectBaseTestCase {
         Assert.assertNull(ep);
     }
     
-    /** Requested location/binding are in metadata. */
+    /**
+     * Requested location/binding are in metadata.
+     * 
+     * @throws UnmarshallingException ...
+     * @throws ResolverException ...
+     */
     @Test
     public void testInMetadata() throws UnmarshallingException, ResolverException {
         endpointCrit.getEndpoint().setLocation(LOCATION_POST);
@@ -175,7 +209,12 @@ public class DefaultEndpointResolverTest extends XMLObjectBaseTestCase {
         Assert.assertEquals(ep.getIndex(), Integer.valueOf(2));
     }
 
-    /** Get the default endpoint. */
+    /**
+     * Get the default endpoint.
+     * 
+     * @throws UnmarshallingException ...
+     * @throws ResolverException ...
+     */
     @Test
     public void testDefault() throws UnmarshallingException, ResolverException {
         endpointCrit.getEndpoint().setLocation(null);
@@ -190,7 +229,12 @@ public class DefaultEndpointResolverTest extends XMLObjectBaseTestCase {
         Assert.assertEquals(ep.getIndex(), Integer.valueOf(4));
     }
 
-    /** Get the default endpoint with a binding. */
+    /**
+     * Get the default endpoint with a binding.
+     * 
+     * @throws UnmarshallingException ...
+     * @throws ResolverException ...
+     */
     @Test
     public void testDefaultForBinding() throws UnmarshallingException, ResolverException {
         endpointCrit.getEndpoint().setLocation(null);
@@ -206,7 +250,12 @@ public class DefaultEndpointResolverTest extends XMLObjectBaseTestCase {
         Assert.assertEquals(ep.getIndex(), Integer.valueOf(1));
     }
     
-    /** All endpoints of the right type. */
+    /**
+     * All endpoints of the right type.
+     * 
+     * @throws UnmarshallingException ...
+     * @throws ResolverException ...
+     */
     @Test
     public void testMultiple() throws UnmarshallingException, ResolverException {
         endpointCrit.getEndpoint().setLocation(null);
@@ -221,7 +270,11 @@ public class DefaultEndpointResolverTest extends XMLObjectBaseTestCase {
         Assert.assertEquals(eps.size(), 4);
     }
 
-    /** All endpoints of the right type and binding. */
+    /**
+     * All endpoints of the right type and binding.
+     * @throws UnmarshallingException ...
+     * @throws ResolverException ...
+     */
     @Test
     public void testMultipleWithBinding() throws UnmarshallingException, ResolverException {
         endpointCrit.getEndpoint().setLocation(null);
@@ -247,4 +300,4 @@ public class DefaultEndpointResolverTest extends XMLObjectBaseTestCase {
         }
     }
     
-}
\ No newline at end of file
+}
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 48105c1..f4d7a57 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
@@ -59,8 +59,9 @@ public class MessageLifetimeSecurityHandlerTest extends XMLObjectBaseTestCase {
     }
     
     /**
-     *  Test valid issue instant.
-     * @throws MessageHandlerException 
+     * Test valid issue instant.
+     *  
+     * @throws MessageHandlerException ...
      */
     @Test
     public void testValid() throws MessageHandlerException {
@@ -69,7 +70,8 @@ public class MessageLifetimeSecurityHandlerTest extends XMLObjectBaseTestCase {
     
     /**
      * Test invalid when issued in future, beyond allowed clock skew.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testInvalidIssuedInFuture() throws MessageHandlerException {
@@ -78,8 +80,9 @@ public class MessageLifetimeSecurityHandlerTest extends XMLObjectBaseTestCase {
     }
     
     /**
-     *  Test valid when issued in future, but within allowed clock skew.
-     * @throws MessageHandlerException 
+     * Test valid when issued in future, but within allowed clock skew.
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test
     public void testValidIssuedInFutureWithinClockSkew() throws MessageHandlerException {
@@ -89,7 +92,8 @@ public class MessageLifetimeSecurityHandlerTest extends XMLObjectBaseTestCase {
     
     /**
      * Test invalid when expired, beyond allowed clock skew.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testInvalidExpired() throws MessageHandlerException {
@@ -98,8 +102,9 @@ public class MessageLifetimeSecurityHandlerTest extends XMLObjectBaseTestCase {
     }
     
     /**
-     *  Test valid when expired, but within allowed clock skew.
-     * @throws MessageHandlerException 
+     * Test valid when expired, but within allowed clock skew.
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test
     public void testValidExpiredWithinClockSkew() throws MessageHandlerException {
@@ -107,4 +112,4 @@ public class MessageLifetimeSecurityHandlerTest extends XMLObjectBaseTestCase {
         handler.invoke(messageContext);
     }
  
-}
\ No newline at end of file
+}
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 b5555f9..15a5616 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
@@ -83,7 +83,8 @@ public class MessageReplaySecurityHandlerTest extends XMLObjectBaseTestCase {
     
     /**
      * Test valid message ID.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test
     public void testNoReplay() throws MessageHandlerException {
@@ -92,7 +93,8 @@ public class MessageReplaySecurityHandlerTest extends XMLObjectBaseTestCase {
 
     /**
      * Test valid message ID, distinct ID.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test
     public void testNoReplayDistinctIDs() throws MessageHandlerException {
@@ -104,7 +106,8 @@ public class MessageReplaySecurityHandlerTest extends XMLObjectBaseTestCase {
 
     /**
      * Test invalid replay of message ID.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testReplay() throws MessageHandlerException {
@@ -115,9 +118,9 @@ public class MessageReplaySecurityHandlerTest extends XMLObjectBaseTestCase {
     /**
      * Test valid replay of message ID due to replay cache expiration.
      * 
-     * @throws InterruptedException
-     * @throws MessageHandlerException 
-     * @throws ComponentInitializationException 
+     * @throws InterruptedException ...
+     * @throws MessageHandlerException ...
+     * @throws ComponentInitializationException ...
      */
     @Test
     public void testReplayValidWithExpiration() throws InterruptedException, MessageHandlerException, ComponentInitializationException {
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 ecbcb2c..10a3254 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
@@ -171,7 +171,8 @@ public class SAMLMDClientCertAuthSecurityHandlerTest extends XMLObjectBaseTestCa
     
     /**
      * Test context issuer set, request with trusted credential.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test
     public void testSuccess() throws MessageHandlerException {
@@ -188,8 +189,9 @@ public class SAMLMDClientCertAuthSecurityHandlerTest extends XMLObjectBaseTestCa
     
     /**
      * Test context issuer set, with non-default entity context class, request with trusted credential.
-     * @throws MessageHandlerException 
-     * @throws ComponentInitializationException 
+     * 
+     * @throws MessageHandlerException ...
+     * @throws ComponentInitializationException ...
      */
     @Test
     public void testSuccessNonDefaultEntityContextClass() throws MessageHandlerException, ComponentInitializationException {
@@ -216,7 +218,8 @@ public class SAMLMDClientCertAuthSecurityHandlerTest extends XMLObjectBaseTestCa
     
     /**
      * Test context issuer set, request with untrusted credential.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testUntrustedCredential() throws MessageHandlerException {
@@ -225,8 +228,12 @@ public class SAMLMDClientCertAuthSecurityHandlerTest extends XMLObjectBaseTestCa
     
     /**
      * Test context issuer not set, request with trusted credential.
+     * 
+     * <p>
      * Use a SAML 1 Request AttributeQuery, with no resource attrib containing the entityID.
-     * @throws MessageHandlerException 
+     * </p>
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test
     public void testNoContextIssuer() throws MessageHandlerException {
@@ -253,7 +260,8 @@ public class SAMLMDClientCertAuthSecurityHandlerTest extends XMLObjectBaseTestCa
     /**
      * Test context issuer not set explicitly, resolved dynamically by SAMLPeerEntityContext from SAML 2 message, 
      * request with trusted credential.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test
     public void testDynamicContextIssuer() throws MessageHandlerException {
@@ -278,7 +286,8 @@ public class SAMLMDClientCertAuthSecurityHandlerTest extends XMLObjectBaseTestCa
     
     /**
      * Test case of no trust engine supplied.
-     * @throws MessageHandlerException
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testNoTrustEngine() throws MessageHandlerException {
@@ -292,7 +301,8 @@ public class SAMLMDClientCertAuthSecurityHandlerTest extends XMLObjectBaseTestCa
 
     /**
      * Test case of no cert name options supplied.
-     * @throws MessageHandlerException
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testNoNameOptions() throws MessageHandlerException {
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 d61848f..ab1631b 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
@@ -156,7 +156,8 @@ public class SAMLProtocolMessageXMLSignatureSecurityHandlerTest extends XMLObjec
     
     /**
      * Test context issuer set, valid signature with trusted credential.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test
     public void testSuccess() throws MessageHandlerException {
@@ -172,9 +173,9 @@ public class SAMLProtocolMessageXMLSignatureSecurityHandlerTest extends XMLObjec
     }
     
     /**
-     * 
      * Test blacklisted signature algorithm.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testBlacklistedSigntureAlgorithm() throws MessageHandlerException {
@@ -187,7 +188,8 @@ public class SAMLProtocolMessageXMLSignatureSecurityHandlerTest extends XMLObjec
     
     /**
      * Test context issuer set, valid signature with untrusted credential.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testUntrustedCredential() throws MessageHandlerException {
@@ -196,7 +198,8 @@ public class SAMLProtocolMessageXMLSignatureSecurityHandlerTest extends XMLObjec
     
     /**
      * Test context issuer set, invalid signature with trusted credential.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testInvalidSignature() throws MessageHandlerException {
@@ -211,7 +214,8 @@ public class SAMLProtocolMessageXMLSignatureSecurityHandlerTest extends XMLObjec
     
     /**
      * Test context issuer set, valid signature with untrusted credential.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testNoContextIssuer() throws MessageHandlerException {
@@ -222,7 +226,8 @@ public class SAMLProtocolMessageXMLSignatureSecurityHandlerTest extends XMLObjec
     
     /**
      * Test no trust engine supplied.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testNoTrustEngine() throws MessageHandlerException {
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddAudienceRestrictionToAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddAudienceRestrictionToAssertionsTest.java
index c0f2bb0..3f7a5ed 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddAudienceRestrictionToAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddAudienceRestrictionToAssertionsTest.java
@@ -55,7 +55,11 @@ public class AddAudienceRestrictionToAssertionsTest extends OpenSAMLInitBaseTest
         action.initialize();
     }
     
-    /** Test that action errors out properly if there is no response. */
+    /**
+     * Test that action errors out properly if there is no response.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test public void testNoResponse() throws Exception {
         final ProfileRequestContext prc = new RequestContextBuilder().buildProfileRequestContext();
         
@@ -63,7 +67,11 @@ public class AddAudienceRestrictionToAssertionsTest extends OpenSAMLInitBaseTest
         ActionTestingSupport.assertEvent(prc, EventIds.INVALID_MSG_CTX);
     }
 
-    /** Test that action behaves properly if there is no assertion in the response. */
+    /**
+     * Test that action behaves properly if there is no assertion in the response.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test public void testNoAssertion() throws Exception {
         final ProfileRequestContext prc = new RequestContextBuilder().setOutboundMessage(
                 SAML1ActionTestingSupport.buildResponse()).buildProfileRequestContext();
@@ -75,6 +83,8 @@ public class AddAudienceRestrictionToAssertionsTest extends OpenSAMLInitBaseTest
     /**
      * Test that the condition is properly added if there is a single assertion, without a Conditions element, in the
      * response.
+     * 
+     * @throws Exception if something goes wrong
      */
     @Test public void testSingleAssertion() throws Exception {
         final Assertion assertion = SAML1ActionTestingSupport.buildAssertion();
@@ -101,6 +111,8 @@ public class AddAudienceRestrictionToAssertionsTest extends OpenSAMLInitBaseTest
     /**
      * Test that the condition is properly added if there is a single assertion, with a Conditions element, in the
      * response.
+     * 
+     * @throws Exception if something goes wrong
      */
     @Test public void testSingleAssertionWithExistingCondition() throws Exception {
         final SAMLObjectBuilder<Conditions> conditionsBuilder = (SAMLObjectBuilder<Conditions>)
@@ -127,7 +139,11 @@ public class AddAudienceRestrictionToAssertionsTest extends OpenSAMLInitBaseTest
         Assert.assertEquals(audcond.getAudiences().get(1).getURI(), AUDIENCE2);
     }
 
-    /** Test that an addition condition is not added if an assertion already contains one. */
+    /**
+     * Test that an addition condition is not added if an assertion already contains one.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test public void testSingleAssertionWithExistingAudienceCondition() throws Exception {
         final SAMLObjectBuilder<AudienceRestrictionCondition> conditionBuilder = (SAMLObjectBuilder<AudienceRestrictionCondition>)
                 XMLObjectProviderRegistrySupport.getBuilderFactory().<AudienceRestrictionCondition>getBuilderOrThrow(
@@ -159,7 +175,11 @@ public class AddAudienceRestrictionToAssertionsTest extends OpenSAMLInitBaseTest
         Assert.assertEquals(audcond.getAudiences().get(1).getURI(), AUDIENCE2);
     }
 
-    /** Test that the condition is properly added if there are multiple assertions in the response. */
+    /**
+     * Test that the condition is properly added if there are multiple assertions in the response.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test public void testMultipleAssertion() throws Exception {
         final Response response = SAML1ActionTestingSupport.buildResponse();
         response.getAssertions().add(SAML1ActionTestingSupport.buildAssertion());
@@ -187,6 +207,8 @@ public class AddAudienceRestrictionToAssertionsTest extends OpenSAMLInitBaseTest
     /**
      * Test that the condition is properly added if there is a single assertion, without a Conditions element, in the
      * response.
+     * 
+     * @throws Exception if something goes wrong
      */
     @Test public void testSAML2Assertion() throws Exception {
         final org.opensaml.saml.saml2.core.Assertion assertion = SAML2ActionTestingSupport.buildAssertion();
@@ -209,4 +231,4 @@ public class AddAudienceRestrictionToAssertionsTest extends OpenSAMLInitBaseTest
         Assert.assertEquals(audcond.getAudiences().get(1).getURI(), AUDIENCE2);
     }
 
-}
\ No newline at end of file
+}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponseTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponseTest.java
index b824ecd..769d5e8 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponseTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponseTest.java
@@ -44,7 +44,11 @@ public class AddInResponseToToResponseTest  extends OpenSAMLInitBaseTestCase {
                 SAML1ActionTestingSupport.buildAttributeQueryRequest(null)).buildProfileRequestContext();
     }
 
-    /** Test that action errors out properly if there is no response. */
+    /**
+     * Test that action errors out properly if there is no response.
+     * 
+     * @throws ComponentInitializationException ...
+     */
     @Test
     public void testNoResponse() throws ComponentInitializationException {
         final AddInResponseToToResponse action = new AddInResponseToToResponse();
@@ -54,7 +58,11 @@ public class AddInResponseToToResponseTest  extends OpenSAMLInitBaseTestCase {
         ActionTestingSupport.assertEvent(prc, EventIds.INVALID_MSG_CTX);
     }
 
-    /** Test that action proceeds properly if there is no request ID. */
+    /**
+     * Test that action proceeds properly if there is no request ID.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test
     public void testNoRequestID() throws Exception {
         ((RequestAbstractType) prc.getInboundMessageContext().getMessage()).setID(null);
@@ -95,4 +103,4 @@ public class AddInResponseToToResponseTest  extends OpenSAMLInitBaseTestCase {
         ActionTestingSupport.assertProceedEvent(prc);
         Assert.assertEquals(response.getInResponseTo(), SAML2ActionTestingSupport.REQUEST_ID);
     }
-}
\ No newline at end of file
+}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddNotOnOrAfterConditionToAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddNotOnOrAfterConditionToAssertionsTest.java
index 60a1a0c..4c39562 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddNotOnOrAfterConditionToAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/profile/impl/AddNotOnOrAfterConditionToAssertionsTest.java
@@ -99,6 +99,8 @@ public class AddNotOnOrAfterConditionToAssertionsTest  extends OpenSAMLInitBaseT
     /**
      * Test that the condition is properly added if there is a single assertion, with a Conditions element, in the
      * response.
+     * 
+     * @throws ComponentInitializationException ...
      */
     @Test
     public void testSingleAssertionWithExistingConditions() throws ComponentInitializationException {
@@ -128,7 +130,11 @@ public class AddNotOnOrAfterConditionToAssertionsTest  extends OpenSAMLInitBaseT
                 10 * 60 * 1000);
     }
 
-    /** Test that the condition is properly added if there are multiple assertions in the response. */
+    /**
+     * Test that the condition is properly added if there are multiple assertions in the response.
+     * 
+     * @throws ComponentInitializationException ...
+     */
     @Test
     public void testMultipleAssertion() throws ComponentInitializationException {
         final Response response = (Response) prc.getOutboundMessageContext().getMessage();
@@ -179,4 +185,4 @@ public class AddNotOnOrAfterConditionToAssertionsTest  extends OpenSAMLInitBaseT
                 5 * 60 * 1000);
     }
     
-}
\ No newline at end of file
+}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/ByReferenceMetadataFilterTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/ByReferenceMetadataFilterTest.java
index f257b7c..83da3b0 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/ByReferenceMetadataFilterTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/ByReferenceMetadataFilterTest.java
@@ -101,6 +101,10 @@ public class ByReferenceMetadataFilterTest extends XMLObjectBaseTestCase impleme
 
     /**
      * Validate whether the filter was or wasn't applied.
+     * 
+     * @param applied <code>true</code> if validating that the filter was applied, <code>false</code> otherwise
+     * 
+     * @throws ResolverException if something goes wrong
      */
     private void validate(final boolean applied) throws ResolverException {
         EntityIdCriterion key = new EntityIdCriterion("https://carmenwiki.osu.edu/shibboleth");
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolverTest.java
index 7fac4d5..f5bf8b6 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolverTest.java
@@ -139,11 +139,6 @@ public class AbstractDynamicHTTPMetadataResolverTest extends XMLObjectBaseTestCa
     
     public static class MockDynamicHTTPMetadataResolver extends AbstractDynamicHTTPMetadataResolver {
         
-        /**
-         * Constructor.
-         *
-         * @param client
-         */
         public MockDynamicHTTPMetadataResolver(HttpClient client) {
             super(null, client);
         }
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java
index 3a1d009..4c9ea9d 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java
@@ -93,8 +93,9 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
     
     /**
      * Tests the basic success case.
-     * @throws ComponentInitializationException 
-     * @throws ResolverException 
+     * 
+     * @throws ComponentInitializationException ...
+     * @throws ResolverException ...
      */
     @Test
     public void testGetEntityDescriptor() throws Exception {
@@ -112,6 +113,8 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
     
     /**
      * Test fail-fast = true with known bad metadata URL.
+     * 
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testFailFastBadURL() throws Exception {
@@ -130,6 +133,8 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
     
     /**
      * Test fail-fast = false with known bad metadata URL.
+     * 
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testNoFailFastBadURL() throws Exception {
@@ -150,7 +155,9 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
     }
     
     /**
-     *  Test fail-fast = true and bad backup file
+     * Test fail-fast = true and bad backup file
+     *  
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testFailFastBadBackupFile() throws Exception {
@@ -173,9 +180,9 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
     }
     
     /**
-     *  Test case of fail-fast = false and bad backup file
+     * Test case of fail-fast = false and bad backup file
      *  
-     * @throws ResolverException
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testNoFailFastBadBackupFile() throws Exception {
@@ -202,9 +209,8 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
     
     /**
      * Tests initialization from backup file, followed shortly by real refresh via HTTP.
-     * @throws ComponentInitializationException 
      * 
-     * @throws ResolverException, ComponentInitializationException
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testInitFromBackupFile() throws Exception {
@@ -250,9 +256,8 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
      * Tests initialization from backup file, followed shortly by real refresh via HTTP, for the special case
      * of a backup file that is already expired. See OSJ-261.  Issue there was the backupFileInitNextRefreshDelay
      * wasn't being honored.
-     * @throws ComponentInitializationException 
      * 
-     * @throws ResolverException, ComponentInitializationException
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testInitFromExpiredBackupFile() throws Exception {
@@ -296,9 +301,8 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
      * Tests initialization from backup file, followed shortly by real refresh via HTTP, for the special case
      * of a backup file that throws during processing when fail-fast=false. See OSJ-261.
      * Issue there was the backupFileInitNextRefreshDelay wasn't being honored.
-     * @throws ComponentInitializationException 
      * 
-     * @throws ResolverException, ComponentInitializationException
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testInitFromBadBackupFileNonFailFast() throws Exception {
@@ -340,9 +344,8 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
     
     /**
      * Tests that backup file is not loaded on a refresh when already have cached metadata.
-     * @throws ComponentInitializationException 
      * 
-     * @throws ResolverException, ComponentInitializationException
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testNoBackupFileLoadWhenMetadataCached() throws Exception {
@@ -565,4 +568,4 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FilesystemMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FilesystemMetadataResolverTest.java
index db8a868..3158b9f 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FilesystemMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FilesystemMetadataResolverTest.java
@@ -63,7 +63,8 @@ public class FilesystemMetadataResolverTest extends XMLObjectBaseTestCase {
 
     /**
      * Tests the {@link HTTPMetadataResolver#lookupEntityID(String)} method.
-     * @throws ResolverException 
+     * 
+     * @throws ResolverException ...
      */
     @Test
     public void testGetEntityDescriptor() throws ResolverException {
@@ -75,8 +76,8 @@ public class FilesystemMetadataResolverTest extends XMLObjectBaseTestCase {
     /**
      * Tests failure mode of an invalid metadata file that does not exist.
      * 
-     * @throws ResolverException
-     * @throws ComponentInitializationException 
+     * @throws ResolverException ...
+     * @throws ComponentInitializationException ...
      */
     @Test(expectedExceptions = {ComponentInitializationException.class})
     public void testNonexistentMetadataFile() throws ResolverException, ComponentInitializationException {
@@ -88,9 +89,9 @@ public class FilesystemMetadataResolverTest extends XMLObjectBaseTestCase {
     /**
      * Tests failure mode of an invalid metadata file that is actually a directory.
      * 
-     * @throws IOException 
-     * @throws ResolverException
-     * @throws ComponentInitializationException 
+     * @throws IOException ...
+     * @throws ResolverException ...
+     * @throws ComponentInitializationException ...
      */
     @Test(expectedExceptions = {ComponentInitializationException.class})
     public void testInvalidMetadataFile() throws IOException, ResolverException, ComponentInitializationException {
@@ -114,9 +115,9 @@ public class FilesystemMetadataResolverTest extends XMLObjectBaseTestCase {
     /**
      * Tests failure mode of an invalid metadata file that is unreadable.
      * 
-     * @throws IOException 
-     * @throws ResolverException
-     * @throws ComponentInitializationException 
+     * @throws IOException ...
+     * @throws ResolverException ...
+     * @throws ComponentInitializationException ...
      */
     @Test(expectedExceptions = {ComponentInitializationException.class})
     public void testUnreadableMetadataFile() throws IOException, ResolverException, ComponentInitializationException {
@@ -138,8 +139,8 @@ public class FilesystemMetadataResolverTest extends XMLObjectBaseTestCase {
     /**
      * Tests failure mode of a metadata file which disappears after initial creation of the provider.
      * 
-     * @throws IOException 
-     * @throws ResolverException
+     * @throws IOException ...
+     * @throws ResolverException ...
      */
     @Test(expectedExceptions = {ResolverException.class})
     public void testDisappearingMetadataFile() throws IOException, ResolverException {
@@ -168,8 +169,8 @@ public class FilesystemMetadataResolverTest extends XMLObjectBaseTestCase {
     /**
      * Tests failfast init of false, with graceful recovery when file later appears.
      * 
-     * @throws IOException 
-     * @throws InterruptedException 
+     * @throws IOException ...
+     * @throws InterruptedException ...
      */
     @Test
     public void testRecoveryFromNoFailFast() throws IOException, InterruptedException {
@@ -234,4 +235,4 @@ public class FilesystemMetadataResolverTest extends XMLObjectBaseTestCase {
         EntityDescriptor entity = metadataProvider.resolveSingle(new CriteriaSet(new EntityIdCriterion("https://idp.example.org")));
         Assert.assertNull(entity);
     }
-}
\ No newline at end of file
+}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java
index a3617b7..5f5494e 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java
@@ -98,6 +98,8 @@ public class HTTPMetadataResolverTest extends XMLObjectBaseTestCase {
     
     /**
      * Tests the {@link HTTPMetadataResolver#lookupEntityID(String)} method.
+     * 
+     * @throws ResolverException ...
      */
     @Test
     public void testGetEntityDescriptor() throws ResolverException {
@@ -108,6 +110,8 @@ public class HTTPMetadataResolverTest extends XMLObjectBaseTestCase {
     
     /**
      * Test fail-fast = true with known bad metadata URL.
+     * 
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testFailFastBadURL() throws Exception {
@@ -127,6 +131,8 @@ public class HTTPMetadataResolverTest extends XMLObjectBaseTestCase {
     
     /**
      * Test fail-fast = false with known bad metadata URL.
+     * 
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testNoFailFastBadURL() throws Exception {
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolverTest.java
index 6d01361..9f0dcd5 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolverTest.java
@@ -63,6 +63,8 @@ public class ResourceBackedMetadataResolverTest extends XMLObjectBaseTestCase {
 
     /**
      * Tests the {@link ResourceBackedMetadataResolver#lookupEntityID(String)} method.
+     * 
+     * @throws ResolverException ...
      */
     @Test
     public void testGetEntityDescriptor() throws ResolverException {
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/RoleMetadataIndexTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/RoleMetadataIndexTest.java
index 62bc23b..1c879ee 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/RoleMetadataIndexTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/index/impl/RoleMetadataIndexTest.java
@@ -129,13 +129,6 @@ public class RoleMetadataIndexTest extends XMLObjectBaseTestCase {
         
         public static final QName TYPE_NAME = new QName("urn:test:metadata", "MyCustomRoleType", "custom");
 
-        /**
-         * Constructor.
-         *
-         * @param namespaceURI
-         * @param elementLocalName
-         * @param namespacePrefix
-         */
         protected MyCustomRoleType(String namespaceURI, String elementLocalName, String namespacePrefix) {
             super(namespaceURI, elementLocalName, namespacePrefix);
         }
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/support/AttributeConsumingServiceSelectorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/support/AttributeConsumingServiceSelectorTest.java
index b35e270..e275eef 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/support/AttributeConsumingServiceSelectorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/support/AttributeConsumingServiceSelectorTest.java
@@ -73,7 +73,8 @@ public class AttributeConsumingServiceSelectorTest extends XMLObjectBaseTestCase
     
     /**
      * Test valid index.
-     * @throws ResolverException
+     * 
+     * @throws ResolverException ...
      */
     @Test
     public void testWithValidIndex() throws ResolverException {
@@ -94,7 +95,8 @@ public class AttributeConsumingServiceSelectorTest extends XMLObjectBaseTestCase
     
     /**
      * Test explicit isDefault="true".
-     * @throws ResolverException
+     * 
+     * @throws ResolverException ...
      */
     @Test
     public void testExplicitDefault() throws ResolverException {
@@ -113,7 +115,8 @@ public class AttributeConsumingServiceSelectorTest extends XMLObjectBaseTestCase
     
     /**
      * Test default as first missing default.
-     * @throws ResolverException
+     * 
+     * @throws ResolverException ...
      */
     @Test
     public void testFirstMissingDefault() throws ResolverException {
@@ -132,7 +135,8 @@ public class AttributeConsumingServiceSelectorTest extends XMLObjectBaseTestCase
     
     /**
      * Test default as first isDefault="false".
-     * @throws ResolverException
+     * 
+     * @throws ResolverException ...
      */
     @Test
     public void testFirstFalseDefault() throws ResolverException {
@@ -151,7 +155,8 @@ public class AttributeConsumingServiceSelectorTest extends XMLObjectBaseTestCase
     
     /**
      * Test AttributeQueryDescriptorType.
-     * @throws ResolverException
+     * 
+     * @throws ResolverException ...
      */
     @Test
     public void testAttributeQueryType() throws ResolverException {
@@ -172,7 +177,8 @@ public class AttributeConsumingServiceSelectorTest extends XMLObjectBaseTestCase
     
     /**
      * Test invalid index.
-     * @throws ResolverException
+     * 
+     * @throws ResolverException ...
      */
     @Test
     public void testInvalidIndex() throws ResolverException {
@@ -191,7 +197,8 @@ public class AttributeConsumingServiceSelectorTest extends XMLObjectBaseTestCase
     
     /**
      * Test invalid index with onBadIndexUseDefault of true.
-     * @throws ResolverException
+     * 
+     * @throws ResolverException ...
      */
     @Test
     public void testInvalidIndexWithUseDefault() throws ResolverException {
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPPostDecoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPPostDecoderTest.java
index 4fb50ff..1345668 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPPostDecoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPPostDecoderTest.java
@@ -57,7 +57,11 @@ public class HTTPPostDecoderTest extends XMLObjectBaseTestCase {
         decoder.initialize();
     }
 
-    /** Test decoding message. */
+    /**
+     * Test decoding message.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test
     public void testDecode() throws Exception {
         Response samlResponse = (Response) unmarshallElement("/org/opensaml/saml/saml1/binding/Response.xml");
@@ -103,4 +107,4 @@ public class HTTPPostDecoderTest extends XMLObjectBaseTestCase {
 
         return Base64Support.encode(messageStr.getBytes("UTF-8"), Base64Support.UNCHUNKED);
     }
-}
\ No newline at end of file
+}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPSOAP11DecoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPSOAP11DecoderTest.java
index 48fff37..f911284 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPSOAP11DecoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPSOAP11DecoderTest.java
@@ -54,6 +54,8 @@ public class HTTPSOAP11DecoderTest extends XMLObjectBaseTestCase {
 
     /**
      * Tests decoding a SOAP 1.1 message.
+     * 
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testDecoding() throws Exception {
@@ -74,4 +76,4 @@ public class HTTPSOAP11DecoderTest extends XMLObjectBaseTestCase {
         marshallerFactory.getMarshaller(message).marshall(message);
         return SerializeSupport.nodeToString(message.getDOM());
     }
-}
\ No newline at end of file
+}
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 ff2778b..8aaebc3 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
@@ -42,7 +42,11 @@ import org.testng.annotations.Test;
  */
 public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
 
-    /** Tests encoding a simple SAML message. */
+    /**
+     * Tests encoding a simple SAML message.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test
     @SuppressWarnings("unchecked")
     public void testEncoding() throws Exception {
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 421212f..aa4bbca 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
@@ -157,8 +157,7 @@ public class AssertionTest extends XMLObjectProviderBaseTestCase {
     }
 
     /**
-     * Test an XML file with Children
-     * @throws MarshallingException 
+     * Test an XML file with Children.
      */
     @Test
     public void testChildElementsMarshall() {
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddDoNotCacheConditionToAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddDoNotCacheConditionToAssertionsTest.java
index 1308bb6..52aa689 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddDoNotCacheConditionToAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddDoNotCacheConditionToAssertionsTest.java
@@ -35,7 +35,11 @@ import org.testng.annotations.Test;
 /** {@link AddDoNotCacheConditionToAssertions} unit test. */
 public class AddDoNotCacheConditionToAssertionsTest extends OpenSAMLInitBaseTestCase {
 
-    /** Test that action errors out properly if there is no response. */
+    /**
+     * Test that action errors out properly if there is no response.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test public void testNoResponse() throws Exception {
         final ProfileRequestContext prc = new RequestContextBuilder().buildProfileRequestContext();
         final AddDoNotCacheConditionToAssertions action = new AddDoNotCacheConditionToAssertions();
@@ -45,7 +49,11 @@ public class AddDoNotCacheConditionToAssertionsTest extends OpenSAMLInitBaseTest
         ActionTestingSupport.assertEvent(prc, EventIds.INVALID_MSG_CTX);
     }
 
-    /** Test that action errors out properly if there is no assertion in the response. */
+    /**
+     * Test that action errors out properly if there is no assertion in the response.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test public void testNoAssertion() throws Exception {
         final ProfileRequestContext prc = new RequestContextBuilder().setOutboundMessage(
                 SAML1ActionTestingSupport.buildResponse()).buildProfileRequestContext();
@@ -60,6 +68,8 @@ public class AddDoNotCacheConditionToAssertionsTest extends OpenSAMLInitBaseTest
     /**
      * Test that the condition is properly added if there is a single assertion, without a Conditions element, in the
      * response.
+     * 
+     * @throws Exception if something goes wrong
      */
     @Test public void testSingleAssertion() throws Exception {
         final Assertion assertion = SAML1ActionTestingSupport.buildAssertion();
@@ -86,6 +96,8 @@ public class AddDoNotCacheConditionToAssertionsTest extends OpenSAMLInitBaseTest
     /**
      * Test that the condition is properly added if there is a single assertion, with a Conditions element, in the
      * response.
+     * 
+     * @throws Exception if something goes wrong
      */
     @Test public void testSingleAssertionWithExistingCondition() throws Exception {
         final SAMLObjectBuilder<Conditions> conditionsBuilder = (SAMLObjectBuilder<Conditions>)
@@ -112,7 +124,11 @@ public class AddDoNotCacheConditionToAssertionsTest extends OpenSAMLInitBaseTest
         Assert.assertEquals(assertion.getConditions().getDoNotCacheConditions().size(), 1);
     }
 
-    /** Test that an addition DoNotCache is not added if an assertion already contains one. */
+    /**
+     * Test that an addition DoNotCache is not added if an assertion already contains one.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test public void testSingleAssertionWithExistingDoNotCacheCondition() throws Exception {
         final SAMLObjectBuilder<DoNotCacheCondition> dncConditionBuilder = (SAMLObjectBuilder<DoNotCacheCondition>)
                 XMLObjectProviderRegistrySupport.getBuilderFactory().<DoNotCacheCondition>getBuilderOrThrow(
@@ -144,7 +160,11 @@ public class AddDoNotCacheConditionToAssertionsTest extends OpenSAMLInitBaseTest
         Assert.assertEquals(assertion.getConditions().getDoNotCacheConditions().size(), 1);
     }
 
-    /** Test that the condition is properly added if there are multiple assertions in the response. */
+    /**
+     * Test that the condition is properly added if there are multiple assertions in the response.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test public void testMultipleAssertion() throws Exception {
         final Response response = SAML1ActionTestingSupport.buildResponse();
         response.getAssertions().add(SAML1ActionTestingSupport.buildAssertion());
@@ -169,4 +189,4 @@ public class AddDoNotCacheConditionToAssertionsTest extends OpenSAMLInitBaseTest
         }
     }
     
-}
\ No newline at end of file
+}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPPostDecoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPPostDecoderTest.java
index a26c3fb..dbc210e 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPPostDecoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPPostDecoderTest.java
@@ -55,7 +55,7 @@ public class HTTPPostDecoderTest extends XMLObjectBaseTestCase {
     /**
      * Test decoding a SAML httpRequest.
      * 
-     * @throws MessageDecodingException 
+     * @throws MessageDecodingException ...
      */
     @Test
     public void testRequestDecoding() throws MessageDecodingException {
@@ -73,7 +73,7 @@ public class HTTPPostDecoderTest extends XMLObjectBaseTestCase {
     /**
      * Test decoding a SAML response.
      * 
-     * @throws MessageDecodingException 
+     * @throws MessageDecodingException ...
      */
     @Test
     public void testResponseDecoding() throws MessageDecodingException {
@@ -90,4 +90,4 @@ public class HTTPPostDecoderTest extends XMLObjectBaseTestCase {
         Assert.assertEquals(SAMLBindingSupport.getRelayState(messageContext), expectedRelayValue);
     }
     
-}
\ No newline at end of file
+}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPSOAP11DecoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPSOAP11DecoderTest.java
index fd7d61e..5a6e1e9 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPSOAP11DecoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPSOAP11DecoderTest.java
@@ -54,6 +54,8 @@ public class HTTPSOAP11DecoderTest extends XMLObjectBaseTestCase {
 
     /**
      * Tests decoding a SOAP 1.1 message.
+     * 
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testDecoding() throws Exception {
@@ -75,4 +77,4 @@ public class HTTPSOAP11DecoderTest extends XMLObjectBaseTestCase {
         marshallerFactory.getMarshaller(message).marshall(message);
         return SerializeSupport.nodeToString(message.getDOM());
     }
-}
\ No newline at end of file
+}
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 6695338..031403e 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
@@ -71,7 +71,7 @@ public class HTTPPostEncoderTest extends XMLObjectBaseTestCase {
     /**
      * Tests encoding a SAML message to an servlet response.
      * 
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testResponseEncoding() throws Exception {
@@ -272,4 +272,4 @@ public class HTTPPostEncoderTest extends XMLObjectBaseTestCase {
         Assert.assertEquals(submit.val(), "Continue");
         
     }
-}
\ No newline at end of file
+}
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 1b85281..9f020ce 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
@@ -81,7 +81,7 @@ public class HTTPPostSimpleSignEncoderTest extends XMLObjectBaseTestCase {
     /**
      * Tests encoding a SAML message to an servlet response.
      * 
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testResponseEncoding() throws Exception {
@@ -395,4 +395,4 @@ public class HTTPPostSimpleSignEncoderTest extends XMLObjectBaseTestCase {
         // Need to verify that we're signing over the right data in the right byte[] encoded form.
     }
     
-}
\ No newline at end of file
+}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoderTest.java
index f621fb9..4662f35 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoderTest.java
@@ -59,7 +59,7 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
     /**
      * Tests encoding a SAML message to an servlet response.
      * 
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     @SuppressWarnings("unchecked")
@@ -136,7 +136,7 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
     /**
      * Tests encoding a SAML message to an servlet response.
      * 
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     @SuppressWarnings("unchecked")
@@ -217,7 +217,7 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
     /**
      * Tests encoding a SAML message to an servlet response.
      * 
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     @SuppressWarnings("unchecked")
@@ -302,7 +302,7 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
     /**
      * Tests encoding a SAML message to an servlet response with simple sign.
      * 
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     @SuppressWarnings("unchecked")
@@ -387,7 +387,7 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
      * Tests encoding a SAML message to an servlet response with simple sign, 
      * where the destination URL had existing non-disallowed query parameters.
      * 
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     @SuppressWarnings("unchecked")
@@ -528,4 +528,4 @@ public class HTTPRedirectDeflateEncoderTest extends XMLObjectBaseTestCase {
         Assert.assertEquals(signatureWithoutParams, signatureWithParams);
         
     }
-}
\ No newline at end of file
+}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPSOAP11EncoderTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPSOAP11EncoderTest.java
index 5709ab4..a30d5fd 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPSOAP11EncoderTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPSOAP11EncoderTest.java
@@ -47,7 +47,7 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
     /**
      * Tests encoding a SAML message to an servlet response.
      * 
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     @SuppressWarnings("unchecked")
@@ -113,4 +113,4 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
         }
         
     }
-}
\ No newline at end of file
+}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddConsentToResponseHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddConsentToResponseHandlerTest.java
index 7225af8..2860aaa 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddConsentToResponseHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddConsentToResponseHandlerTest.java
@@ -32,7 +32,12 @@ import org.testng.annotations.Test;
 /** {@link AddConsentToResponseHandler} unit test. */
 public class AddConsentToResponseHandlerTest extends OpenSAMLInitBaseTestCase {
     
-    /** Test that the handler errors on a missing context. */
+    /**
+     * Test that the handler errors on a missing context.
+     * 
+     * @throws MessageHandlerException ...
+     * @throws ComponentInitializationException ...
+     */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testMissingContext() throws MessageHandlerException, ComponentInitializationException {
         final MessageContext messageCtx = new MessageContext();
@@ -44,7 +49,12 @@ public class AddConsentToResponseHandlerTest extends OpenSAMLInitBaseTestCase {
         handler.invoke(messageCtx);
     }
 
-    /** Test that the handler works. */
+    /**
+     * Test that the handler works.
+     * 
+     * @throws MessageHandlerException ...
+     * @throws ComponentInitializationException ...
+     */
     @Test public void testSuccess() throws MessageHandlerException, ComponentInitializationException {
         final MessageContext messageCtx = new MessageContext();
         messageCtx.setMessage(SAML2ActionTestingSupport.buildResponse());
@@ -57,4 +67,4 @@ public class AddConsentToResponseHandlerTest extends OpenSAMLInitBaseTestCase {
         Assert.assertEquals(((StatusResponseType) messageCtx.getMessage()).getConsent(), StatusResponseType.EXPLICIT_CONSENT);
     }
     
-}
\ No newline at end of file
+}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddECPResponseHeaderHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddECPResponseHeaderHandlerTest.java
index ee953ed..4d06367 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddECPResponseHeaderHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddECPResponseHeaderHandlerTest.java
@@ -41,7 +41,12 @@ import org.testng.annotations.Test;
 /** {@link AddECPResponseHeaderHandler} unit test. */
 public class AddECPResponseHeaderHandlerTest extends OpenSAMLInitBaseTestCase {
     
-    /** Test that the handler does nothing on a missing Endpoint context. */
+    /**
+     * Test that the handler does nothing on a missing Endpoint context.
+     * 
+     * @throws MessageHandlerException ...
+     * @throws ComponentInitializationException ...
+     */
     @Test public void testMissingEndpointContext() throws MessageHandlerException, ComponentInitializationException {
         final MessageContext messageCtx = new MessageContext();
         messageCtx.setMessage(SAML2ActionTestingSupport.buildResponse());
@@ -57,7 +62,12 @@ public class AddECPResponseHeaderHandlerTest extends OpenSAMLInitBaseTestCase {
         Assert.assertTrue(headers.isEmpty());
     }
     
-    /** Test that the handler errors on a missing SOAP context. */
+    /**
+     * Test that the handler errors on a missing SOAP context.
+     * 
+     * @throws MessageHandlerException ...
+     * @throws ComponentInitializationException ...
+     */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testMissingEnvelope() throws MessageHandlerException, ComponentInitializationException {
         final MessageContext messageCtx = new MessageContext();
@@ -76,7 +86,12 @@ public class AddECPResponseHeaderHandlerTest extends OpenSAMLInitBaseTestCase {
         handler.invoke(messageCtx);
     }
 
-    /** Test that the handler works. */
+    /**
+     * Test that the handler works.
+     * 
+     * @throws MessageHandlerException ...
+     * @throws ComponentInitializationException ...
+     */
     @Test public void testSuccess() throws MessageHandlerException, ComponentInitializationException {
         final Envelope env = XMLObjectProviderRegistrySupport.getBuilderFactory().<Envelope>getBuilderOrThrow(
                 Envelope.DEFAULT_ELEMENT_NAME).buildObject(Envelope.DEFAULT_ELEMENT_NAME);
@@ -104,4 +119,4 @@ public class AddECPResponseHeaderHandlerTest extends OpenSAMLInitBaseTestCase {
         Assert.assertEquals(((Response) headers.get(0)).getAssertionConsumerServiceURL(), "foo");
     }
     
-}
\ No newline at end of file
+}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddGeneratedKeyHeaderHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddGeneratedKeyHeaderHandlerTest.java
index 9954ed8..8fafa2b 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddGeneratedKeyHeaderHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddGeneratedKeyHeaderHandlerTest.java
@@ -52,7 +52,11 @@ public class AddGeneratedKeyHeaderHandlerTest extends OpenSAMLInitBaseTestCase {
         handler.initialize();
     }
     
-    /** Test that the handler does nothing on a missing context. */
+    /**
+     * Test that the handler does nothing on a missing context.
+     * 
+     * @throws MessageHandlerException ...
+     */
     @Test public void testUnauthenticated() throws MessageHandlerException {
         
         handler.invoke(messageCtx);
@@ -69,8 +73,12 @@ public class AddGeneratedKeyHeaderHandlerTest extends OpenSAMLInitBaseTestCase {
         Assert.assertTrue(headers.isEmpty());
     }
     
-    /** Test that the handler errors on a missing SOAP context. 
-     * @throws NoSuchAlgorithmException */
+    /**
+     * Test that the handler errors on a missing SOAP context.
+     * 
+     * @throws MessageHandlerException ...
+     * @throws NoSuchAlgorithmException ...
+     */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testMissingEnvelope() throws MessageHandlerException, NoSuchAlgorithmException {
 
@@ -80,8 +88,12 @@ public class AddGeneratedKeyHeaderHandlerTest extends OpenSAMLInitBaseTestCase {
         handler.invoke(messageCtx);
     }
 
-    /** Test that the handler works. 
-     * @throws NoSuchAlgorithmException */
+    /**
+     * Test that the handler works.
+     * 
+     * @throws MessageHandlerException ...
+     * @throws NoSuchAlgorithmException ...
+     */
     @Test public void testSuccess() throws MessageHandlerException, NoSuchAlgorithmException {
 
         final byte[] key = new byte[32];
@@ -100,4 +112,4 @@ public class AddGeneratedKeyHeaderHandlerTest extends OpenSAMLInitBaseTestCase {
         Assert.assertEquals(((XSBase64Binary) headers.get(0)).getValue(), Base64Support.encode(key, false));
     }
     
-}
\ No newline at end of file
+}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddRelayStateHeaderHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddRelayStateHeaderHandlerTest.java
index 879ea67..3b10326 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddRelayStateHeaderHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddRelayStateHeaderHandlerTest.java
@@ -48,7 +48,11 @@ public class AddRelayStateHeaderHandlerTest extends OpenSAMLInitBaseTestCase {
         handler.initialize();
     }
     
-    /** Test that the handler does nothing on a missing Endpoint context. */
+    /**
+     * Test that the handler does nothing on a missing Endpoint context.
+     * 
+     * @throws MessageHandlerException ...
+     */
     @Test public void testMissingEndpointContext() throws MessageHandlerException {
 
         handler.invoke(messageCtx);
@@ -59,7 +63,11 @@ public class AddRelayStateHeaderHandlerTest extends OpenSAMLInitBaseTestCase {
         Assert.assertTrue(headers.isEmpty());
     }
     
-    /** Test that the handler errors on a missing SOAP context. */
+    /**
+     * Test that the handler errors on a missing SOAP context.
+     * 
+     * @throws MessageHandlerException ...
+     */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testMissingEnvelope() throws MessageHandlerException {
 
@@ -68,7 +76,11 @@ public class AddRelayStateHeaderHandlerTest extends OpenSAMLInitBaseTestCase {
         handler.invoke(messageCtx);
     }
 
-    /** Test that the handler works. */
+    /**
+     * Test that the handler works.
+     * 
+     * @throws MessageHandlerException ...
+     */
     @Test public void testSuccess() throws MessageHandlerException {
 
         final Envelope env = XMLObjectProviderRegistrySupport.getBuilderFactory().<Envelope>getBuilderOrThrow(
@@ -86,4 +98,4 @@ public class AddRelayStateHeaderHandlerTest extends OpenSAMLInitBaseTestCase {
         Assert.assertEquals(((RelayState) headers.get(0)).getValue(), "foo");
     }
     
-}
\ No newline at end of file
+}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddRequestAuthenticatedHeaderHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddRequestAuthenticatedHeaderHandlerTest.java
index 30eb0f5..db87c8a 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddRequestAuthenticatedHeaderHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/AddRequestAuthenticatedHeaderHandlerTest.java
@@ -37,7 +37,12 @@ import org.testng.annotations.Test;
 /** {@link AddRequestAuthenticatedHeaderHandler} unit test. */
 public class AddRequestAuthenticatedHeaderHandlerTest extends OpenSAMLInitBaseTestCase {
     
-    /** Test that the handler does nothing on a missing context. */
+    /**
+     * Test that the handler does nothing on a missing context.
+     * 
+     * @throws MessageHandlerException ...
+     * @throws ComponentInitializationException ...
+     */
     @Test public void testUnauthenticated() throws MessageHandlerException, ComponentInitializationException {
         final MessageContext messageCtx = new MessageContext();
 
@@ -58,7 +63,12 @@ public class AddRequestAuthenticatedHeaderHandlerTest extends OpenSAMLInitBaseTe
         Assert.assertTrue(headers.isEmpty());
     }
     
-    /** Test that the handler errors on a missing SOAP context. */
+    /**
+     * Test that the handler errors on a missing SOAP context.
+     * 
+     * @throws MessageHandlerException ...
+     * @throws ComponentInitializationException ...
+     */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testMissingEnvelope() throws MessageHandlerException, ComponentInitializationException {
         final MessageContext messageCtx = new MessageContext();
@@ -70,7 +80,12 @@ public class AddRequestAuthenticatedHeaderHandlerTest extends OpenSAMLInitBaseTe
         handler.invoke(messageCtx);
     }
 
-    /** Test that the handler works. */
+    /**
+     * Test that the handler works.
+     * 
+     * @throws MessageHandlerException ...
+     * @throws ComponentInitializationException ...
+     */
     @Test public void testSuccess() throws MessageHandlerException, ComponentInitializationException {
         final MessageContext messageCtx = new MessageContext();
         messageCtx.getSubcontext(ECPContext.class, true).setRequestAuthenticated(true);
@@ -89,4 +104,4 @@ public class AddRequestAuthenticatedHeaderHandlerTest extends OpenSAMLInitBaseTe
         Assert.assertEquals(headers.size(), 1);
     }
     
-}
\ No newline at end of file
+}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/ExtractConsentFromRequestHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/ExtractConsentFromRequestHandlerTest.java
index ae5c2b5..b226f25 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/ExtractConsentFromRequestHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/ExtractConsentFromRequestHandlerTest.java
@@ -33,7 +33,12 @@ import org.testng.annotations.Test;
 /** {@link ExtractConsentFromRequestHandler} unit test. */
 public class ExtractConsentFromRequestHandlerTest extends OpenSAMLInitBaseTestCase {
     
-    /** Test that the handler errors on a missing request. */
+    /**
+     * Test that the handler errors on a missing request.
+     * 
+     * @throws MessageHandlerException ...
+     * @throws ComponentInitializationException ...
+     */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testMissingContext() throws MessageHandlerException, ComponentInitializationException {
         final MessageContext messageCtx = new MessageContext();
@@ -44,7 +49,12 @@ public class ExtractConsentFromRequestHandlerTest extends OpenSAMLInitBaseTestCa
         handler.invoke(messageCtx);
     }
 
-    /** Test that the handler works. */
+    /**
+     * Test that the handler works.
+     * 
+     * @throws MessageHandlerException ...
+     * @throws ComponentInitializationException ...
+     */
     @Test public void testSuccess() throws MessageHandlerException, ComponentInitializationException {
         final MessageContext messageCtx = new MessageContext();
         messageCtx.setMessage(SAML2ActionTestingSupport.buildAttributeQueryRequest(null));
@@ -58,4 +68,4 @@ public class ExtractConsentFromRequestHandlerTest extends OpenSAMLInitBaseTestCa
                 StatusResponseType.IMPLICIT_CONSENT);
     }
     
-}
\ No newline at end of file
+}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/ExtractProxiedRequestersHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/ExtractProxiedRequestersHandlerTest.java
index 1aaafa7..7f46860 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/ExtractProxiedRequestersHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/impl/ExtractProxiedRequestersHandlerTest.java
@@ -52,7 +52,12 @@ public class ExtractProxiedRequestersHandlerTest extends OpenSAMLInitBaseTestCas
     }
     
     
-    /** Test that the handler errors on a missing request. */
+    /**
+     * Test that the handler errors on a missing request.
+     * 
+     * @throws MessageHandlerException ...
+     * @throws ComponentInitializationException ...
+     */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testMissingRequest() throws MessageHandlerException, ComponentInitializationException {
         final MessageContext messageCtx = new MessageContext();
@@ -63,7 +68,12 @@ public class ExtractProxiedRequestersHandlerTest extends OpenSAMLInitBaseTestCas
         handler.invoke(messageCtx);
     }
 
-    /** Test that the handler works. */
+    /**
+     * Test that the handler works.
+     * 
+     * @throws MessageHandlerException ...
+     * @throws ComponentInitializationException ...
+     */
     @Test public void testSuccess() throws MessageHandlerException, ComponentInitializationException {
         final MessageContext messageCtx = new MessageContext();
         messageCtx.setMessage(SAML2ActionTestingSupport.buildAuthnRequest());
@@ -90,4 +100,4 @@ public class ExtractProxiedRequestersHandlerTest extends OpenSAMLInitBaseTestCas
         Assert.assertFalse(ctx.getRequesters().contains("foo"));
     }
     
-}
\ No newline at end of file
+}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/ExtractChannelBindingsExtensionsHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/ExtractChannelBindingsExtensionsHandlerTest.java
index 94a54ac..66b605c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/ExtractChannelBindingsExtensionsHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/ExtractChannelBindingsExtensionsHandlerTest.java
@@ -49,7 +49,11 @@ public class ExtractChannelBindingsExtensionsHandlerTest extends OpenSAMLInitBas
         messageCtx.getSubcontext(SAMLBindingContext.class, true).setHasBindingSignature(true);
     }
     
-    /** Test that the handler returns nothing on a missing message. */
+    /**
+     * Test that the handler returns nothing on a missing message.
+     * 
+     * @throws MessageHandlerException ...
+     */
     @Test public void testMissingMessage() throws MessageHandlerException {
 
         handler.invoke(messageCtx);
@@ -60,7 +64,11 @@ public class ExtractChannelBindingsExtensionsHandlerTest extends OpenSAMLInitBas
         Assert.assertNull(messageCtx.getSubcontext(ChannelBindingsContext.class));
     }
 
-    /** Test that the handler does nothing when no extensions exist. */
+    /**
+     * Test that the handler does nothing when no extensions exist.
+     * 
+     * @throws MessageHandlerException ...
+     */
     @Test public void testNoExtensions() throws MessageHandlerException {
         messageCtx.setMessage(SAML2ActionTestingSupport.buildAuthnRequest());
         
@@ -68,7 +76,11 @@ public class ExtractChannelBindingsExtensionsHandlerTest extends OpenSAMLInitBas
         Assert.assertNull(messageCtx.getSubcontext(ChannelBindingsContext.class));
     }
     
-    /** Test that the handler ignores unsigned bindings. */
+    /**
+     * Test that the handler ignores unsigned bindings.
+     * 
+     * @throws MessageHandlerException ...
+     */
     @Test public void testUnsigned() throws MessageHandlerException {
         final Extensions ext = XMLObjectProviderRegistrySupport.getBuilderFactory().<Extensions>getBuilderOrThrow(
                 Extensions.DEFAULT_ELEMENT_NAME).buildObject(Extensions.DEFAULT_ELEMENT_NAME);
@@ -93,7 +105,11 @@ public class ExtractChannelBindingsExtensionsHandlerTest extends OpenSAMLInitBas
         Assert.assertNull(cbCtx);
     }
     
-    /** Test that the handler works. */
+    /**
+     * Test that the handler works.
+     * 
+     * @throws MessageHandlerException ...
+     */
     @Test public void testSuccess() throws MessageHandlerException {
         final Extensions ext = XMLObjectProviderRegistrySupport.getBuilderFactory().<Extensions>getBuilderOrThrow(
                 Extensions.DEFAULT_ELEMENT_NAME).buildObject(Extensions.DEFAULT_ELEMENT_NAME);
@@ -121,4 +137,4 @@ public class ExtractChannelBindingsExtensionsHandlerTest extends OpenSAMLInitBas
         Assert.assertTrue("foo".equals(array[1].getValue()) || "bar".equals(array[1].getValue()));
     }
 
-}
\ No newline at end of file
+}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/ExtractChannelBindingsHeadersHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/ExtractChannelBindingsHeadersHandlerTest.java
index aff66ce..66ecca2 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/ExtractChannelBindingsHeadersHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/ExtractChannelBindingsHeadersHandlerTest.java
@@ -37,7 +37,12 @@ import org.testng.annotations.Test;
 /** {@link ExtractChannelBindingsHeadersHandler} unit test. */
 public class ExtractChannelBindingsHeadersHandlerTest extends OpenSAMLInitBaseTestCase {
     
-    /** Test that the handler returns nothing on a missing SOAP context. */
+    /**
+     * Test that the handler returns nothing on a missing SOAP context.
+     * 
+     * @throws MessageHandlerException ...
+     * @throws ComponentInitializationException ...
+     */
     @Test public void testMissingEnvelope() throws MessageHandlerException, ComponentInitializationException {
         final MessageContext messageCtx = new MessageContext();
         messageCtx.setMessage(SAML2ActionTestingSupport.buildAuthnRequest());
@@ -49,7 +54,12 @@ public class ExtractChannelBindingsHeadersHandlerTest extends OpenSAMLInitBaseTe
         Assert.assertNull(messageCtx.getSubcontext(SOAP11Context.class));
     }
 
-    /** Test that the handler does nothing when no headers exist. */
+    /**
+     * Test that the handler does nothing when no headers exist.
+     * 
+     * @throws MessageHandlerException ...
+     * @throws ComponentInitializationException ...
+     */
     @Test public void testNoHeaders() throws MessageHandlerException, ComponentInitializationException {
         final Envelope env = XMLObjectProviderRegistrySupport.getBuilderFactory().<Envelope>getBuilderOrThrow(
                 Envelope.DEFAULT_ELEMENT_NAME).buildObject(Envelope.DEFAULT_ELEMENT_NAME);
@@ -67,7 +77,12 @@ public class ExtractChannelBindingsHeadersHandlerTest extends OpenSAMLInitBaseTe
         Assert.assertNull(cbCtx);
     }
     
-    /** Test that the handler works. */
+    /**
+     * Test that the handler works.
+     * 
+     * @throws MessageHandlerException ...
+     * @throws ComponentInitializationException ...
+     */
     @Test public void testSuccess() throws MessageHandlerException, ComponentInitializationException {
         final Envelope env = XMLObjectProviderRegistrySupport.getBuilderFactory().<Envelope>getBuilderOrThrow(
                 Envelope.DEFAULT_ELEMENT_NAME).buildObject(Envelope.DEFAULT_ELEMENT_NAME);
@@ -102,7 +117,12 @@ public class ExtractChannelBindingsHeadersHandlerTest extends OpenSAMLInitBaseTe
         Assert.assertTrue("foo".equals(array[1].getValue()) || "bar".equals(array[1].getValue()));
     }
 
-    /** Test that the handler works with non-default actor flags. */
+    /**
+     * Test that the handler works with non-default actor flags.
+     * 
+     * @throws MessageHandlerException ...
+     * @throws ComponentInitializationException ...
+     */
     @Test public void testActor() throws MessageHandlerException, ComponentInitializationException {
         final Envelope env = XMLObjectProviderRegistrySupport.getBuilderFactory().<Envelope>getBuilderOrThrow(
                 Envelope.DEFAULT_ELEMENT_NAME).buildObject(Envelope.DEFAULT_ELEMENT_NAME);
@@ -136,4 +156,4 @@ public class ExtractChannelBindingsHeadersHandlerTest extends OpenSAMLInitBaseTe
         final ChannelBindings[] array = cbCtx.getChannelBindings().toArray(new ChannelBindings[2]);
         Assert.assertTrue("bar".equals(array[0].getValue()));
     }
-}
\ No newline at end of file
+}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2AuthnRequestsSignedSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2AuthnRequestsSignedSecurityHandlerTest.java
index fe31ba4..31d5b75 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2AuthnRequestsSignedSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2AuthnRequestsSignedSecurityHandlerTest.java
@@ -59,7 +59,8 @@ public class SAML2AuthnRequestsSignedSecurityHandlerTest extends XMLObjectBaseTe
     
     /**
      * Test message not signed, signing not required.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test
     public void testNotSignedAndNotRequired() throws MessageHandlerException {
@@ -73,7 +74,8 @@ public class SAML2AuthnRequestsSignedSecurityHandlerTest extends XMLObjectBaseTe
     
     /**
      * Test message not signed, signing required.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testNotSignedAndRequired() throws MessageHandlerException {
@@ -88,7 +90,8 @@ public class SAML2AuthnRequestsSignedSecurityHandlerTest extends XMLObjectBaseTe
     
     /**
      * Test message XML signed, signing not required.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test
     public void testSignedAndNotRequired() throws MessageHandlerException {
@@ -101,7 +104,8 @@ public class SAML2AuthnRequestsSignedSecurityHandlerTest extends XMLObjectBaseTe
  
     /**
      * Test message XML signed, signing required.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test
     public void testSignedAndRequired() throws MessageHandlerException {
@@ -116,7 +120,8 @@ public class SAML2AuthnRequestsSignedSecurityHandlerTest extends XMLObjectBaseTe
     
     /**
      * Test message simple signed, signing not required.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test
     public void testSimpleSignedAndRequired() throws MessageHandlerException {
@@ -132,5 +137,3 @@ public class SAML2AuthnRequestsSignedSecurityHandlerTest extends XMLObjectBaseTe
     }
     
 }
-
-
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java
index 2a7ec5c..7f3e895 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandlerTest.java
@@ -177,7 +177,7 @@ public class SAML2HTTPPostSimpleSignSecurityHandlerTest extends XMLObjectBaseTes
     /**
      * Constructor.
      * 
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     public SAML2HTTPPostSimpleSignSecurityHandlerTest() throws Exception {
         issuer = "SomeCoolIssuer";
@@ -231,7 +231,8 @@ public class SAML2HTTPPostSimpleSignSecurityHandlerTest extends XMLObjectBaseTes
 
     /**
      * Test context issuer set, valid signature with trusted credential.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test
     public void testSuccess() throws MessageHandlerException {
@@ -248,7 +249,8 @@ public class SAML2HTTPPostSimpleSignSecurityHandlerTest extends XMLObjectBaseTes
 
     /**
      * Test blacklisted signature algorithm.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testBlacklistedSignatureAlgorithm() throws MessageHandlerException {
@@ -261,7 +263,8 @@ public class SAML2HTTPPostSimpleSignSecurityHandlerTest extends XMLObjectBaseTes
     
     /**
      * Test context issuer set, valid signature with untrusted credential.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testUntrustedCredential() throws MessageHandlerException {
@@ -270,7 +273,8 @@ public class SAML2HTTPPostSimpleSignSecurityHandlerTest extends XMLObjectBaseTes
 
     /**
      * Test context issuer set, invalid signature with trusted credential.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testInvalidSignature() throws MessageHandlerException {
@@ -284,7 +288,8 @@ public class SAML2HTTPPostSimpleSignSecurityHandlerTest extends XMLObjectBaseTes
 
     /**
      * Test context issuer set, valid signature with untrusted credential.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testNoContextIssuer() throws MessageHandlerException {
@@ -294,7 +299,8 @@ public class SAML2HTTPPostSimpleSignSecurityHandlerTest extends XMLObjectBaseTes
 
     /**
      * Test context issuer set, valid signature with trusted credential.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test
     public void testSuccessNoKeyInfo() throws MessageHandlerException {
@@ -314,7 +320,8 @@ public class SAML2HTTPPostSimpleSignSecurityHandlerTest extends XMLObjectBaseTes
 
     /**
      * Test context issuer set, valid signature with trusted credential.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testFailureNoKeyInfo() throws MessageHandlerException {
@@ -326,7 +333,8 @@ public class SAML2HTTPPostSimpleSignSecurityHandlerTest extends XMLObjectBaseTes
     
     /**
      * Test no trust engine supplied.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testNoTrustEngine() throws MessageHandlerException {
@@ -409,10 +417,11 @@ public class SAML2HTTPPostSimpleSignSecurityHandlerTest extends XMLObjectBaseTes
      * Populate the HTTP servlet request object with the parameter info. Would be nice if Spring mock object actually
      * did this for you from populating the content string.... Oh well.
      * 
-     * @param request
-     * @param htmlContentString
-     * @throws XMLParserException
-     * @throws ComponentInitializationException 
+     * @param request ...
+     * @param htmlContentString ...
+     * 
+     * @throws XMLParserException ...
+     * @throws ComponentInitializationException ...
      */
     private void populateRequest(MockHttpServletRequest request, String htmlContentString) throws XMLParserException, ComponentInitializationException {
         request.setContent(htmlContentString.getBytes());
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java
index 0387b56..de55737 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java
@@ -165,9 +165,11 @@ public class SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest extends XMLObj
     private SignatureValidationParameters sigValParams;
     
     
-    /** Constructor. 
-     * @throws CertificateException 
-     * @throws KeyException */
+    /** Constructor.
+     * 
+     * @throws CertificateException ...
+     * @throws KeyException ...
+     */
     public SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest() throws CertificateException, KeyException {
         issuer = "SomeCoolIssuer";
         signingCert = X509Support.decodeCertificate(signingCertBase64);
@@ -212,7 +214,8 @@ public class SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest extends XMLObj
     
     /**
      * Test context issuer set, valid signature with trusted credential.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test
     public void testSuccess() throws MessageHandlerException {
@@ -229,7 +232,8 @@ public class SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest extends XMLObj
     
     /**
      * Test blacklisted signature algorithm.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testBlacklistedSignatureAlgorithm() throws MessageHandlerException {
@@ -242,7 +246,8 @@ public class SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest extends XMLObj
     
     /**
      * Test context issuer set, valid signature with untrusted credential.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testUntrustedCredential() throws MessageHandlerException {
@@ -251,7 +256,8 @@ public class SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest extends XMLObj
     
     /**
      * Test context issuer set, invalid signature with trusted credential.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testInvalidSignature() throws MessageHandlerException {
@@ -268,7 +274,8 @@ public class SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest extends XMLObj
     
     /**
      * Test context issuer set, valid signature with untrusted credential.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testNoContextIssuer() throws MessageHandlerException {
@@ -279,7 +286,8 @@ public class SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest extends XMLObj
     
     /**
      * Test no trust engine supplied.
-     * @throws MessageHandlerException 
+     * 
+     * @throws MessageHandlerException ...
      */
     @Test(expectedExceptions=MessageHandlerException.class)
     public void testNoTrustEngine() throws MessageHandlerException {
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/MockBaseID.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/MockBaseID.java
index d24ca3c..aee89be 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/MockBaseID.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/MockBaseID.java
@@ -49,9 +49,9 @@ public class MockBaseID extends AbstractXMLObject implements BaseID, XSString {
     /**
      * Constructor.
      *
-     * @param namespaceURI
-     * @param elementLocalName
-     * @param namespacePrefix
+     * @param namespaceURI ...
+     * @param elementLocalName ...
+     * @param namespacePrefix ...
      */
     protected MockBaseID(String namespaceURI, String elementLocalName, String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/SignedAssertionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/SignedAssertionTest.java
index 6707b94..ee31df6 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/SignedAssertionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/SignedAssertionTest.java
@@ -97,14 +97,13 @@ public class SignedAssertionTest extends XMLObjectBaseTestCase {
      * Creates a simple Assertion, signs it and then verifies the signature.
      * 
      * @throws MarshallingException thrown if the Assertion can not be marshalled into a DOM
-     * @throws ValidationException thrown if the Signature does not validate
-     * @throws SignatureException 
-     * @throws UnmarshallingException 
-     * @throws SecurityException 
+     * @throws SignatureException ...
+     * @throws UnmarshallingException ...
+     * @throws SecurityException ...
      */
     @Test
     public void testAssertionSignature() 
-        throws MarshallingException, SignatureException, UnmarshallingException, SecurityException{
+        throws MarshallingException, SignatureException, UnmarshallingException, SecurityException {
         Instant now = Instant.now();
         
         Assertion assertion = assertionBuilder.buildObject();
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequestTestBase.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequestTestBase.java
index 5a9e53f..7d5a49d 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequestTestBase.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/RequestTestBase.java
@@ -87,7 +87,7 @@ public abstract class RequestTestBase extends XMLObjectProviderBaseTestCase {
     /**
      * Used by subclasses to populate the required attribute values that this test expects.
      * 
-     * @param samlObject
+     * @param samlObject ...
      */
     protected void populateRequiredAttributes(SAMLObject samlObject) {
         RequestAbstractType req = (RequestAbstractType) samlObject;
@@ -101,7 +101,7 @@ public abstract class RequestTestBase extends XMLObjectProviderBaseTestCase {
     /**
      * Used by subclasses to populate the optional attribute values that this test expects.
      * 
-     * @param samlObject
+     * @param samlObject ...
      */
     protected void populateOptionalAttributes(SAMLObject samlObject) {
         RequestAbstractType req = (RequestAbstractType) samlObject;
@@ -114,8 +114,7 @@ public abstract class RequestTestBase extends XMLObjectProviderBaseTestCase {
     /**
      * Used by subclasses to populate the child elements that this test expects.
      * 
-     * 
-     * @param samlObject
+     * @param samlObject ...
      */
     protected void populateChildElements(SAMLObject samlObject) {
         RequestAbstractType req = (RequestAbstractType) samlObject;
@@ -159,4 +158,4 @@ public abstract class RequestTestBase extends XMLObjectProviderBaseTestCase {
         Assert.assertNotNull(req.getIssuer(), "Issuer was null");
 
     }
-}
\ No newline at end of file
+}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusResponseTestBase.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusResponseTestBase.java
index ca2f190..08b6912 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusResponseTestBase.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/StatusResponseTestBase.java
@@ -102,7 +102,7 @@ public abstract class StatusResponseTestBase extends XMLObjectProviderBaseTestCa
      * Used by subclasses to populate the required attribute values
      * that this test expects.
      * 
-     * @param samlObject
+     * @param samlObject ...
      */
     protected void populateRequiredAttributes(SAMLObject samlObject) {
         StatusResponseType sr = (StatusResponseType) samlObject;
@@ -117,7 +117,7 @@ public abstract class StatusResponseTestBase extends XMLObjectProviderBaseTestCa
      * Used by subclasses to populate the optional attribute values
      * that this test expects. 
      * 
-     * @param samlObject
+     * @param samlObject ...
      */
     protected void populateOptionalAttributes(SAMLObject samlObject) {
         StatusResponseType sr = (StatusResponseType) samlObject;
@@ -131,8 +131,7 @@ public abstract class StatusResponseTestBase extends XMLObjectProviderBaseTestCa
     /**
      * Used by subclasses to populate the child elements that this test expects.
      * 
-     * 
-     * @param samlObject
+     * @param samlObject ...
      */
     protected void populateChildElements(SAMLObject samlObject) {
         StatusResponseType sr = (StatusResponseType) samlObject;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/DecryptionPlusSigningTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/DecryptionPlusSigningTest.java
index cc788e9..b4f6c50 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/DecryptionPlusSigningTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/DecryptionPlusSigningTest.java
@@ -104,12 +104,12 @@ public class DecryptionPlusSigningTest extends XMLObjectBaseTestCase {
      *  
      * @throws XMLParserException  thrown if there is an error parsing the control XML file
      * @throws EncryptionException  thrown if there is an error encrypting the control XML
-     * @throws NoSuchProviderException 
-     * @throws NoSuchAlgorithmException 
-     * @throws SecurityException 
-     * @throws MarshallingException 
-     * @throws SignatureException 
-     * @throws UnmarshallingException 
+     * @throws NoSuchProviderException ...
+     * @throws NoSuchAlgorithmException ...
+     * @throws SecurityException ...
+     * @throws MarshallingException ...
+     * @throws SignatureException ...
+     * @throws UnmarshallingException ...
      */
     @Test
     public void testEncryptedAssertionInResponse() throws XMLParserException, EncryptionException, 
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/SimpleDecryptionTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/SimpleDecryptionTest.java
index d24b759..39e3f8f 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/SimpleDecryptionTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/SimpleDecryptionTest.java
@@ -232,14 +232,13 @@ public class SimpleDecryptionTest extends XMLObjectBaseTestCase {
     }
     
     /**
-     *  Test error condition of invalid data decryption key.
-     * @throws EncryptionException 
-     *  
+     * Test error condition of invalid data decryption key.
+     * 
      * @throws XMLParserException  thrown if there is an error parsing the control XML file
      * @throws EncryptionException  thrown if there is an error encrypting the control XML
      * @throws NoSuchProviderException security provider was invalid
      * @throws NoSuchAlgorithmException security/key algorithm was invalid
-     * @throws KeyException 
+     * @throws KeyException ...
      */
     @Test
     public void testErrorInvalidDataDecryptionKey() 
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/MetadataTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/MetadataTest.java
index 5ae7b4d..1159f07 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/MetadataTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/MetadataTest.java
@@ -46,8 +46,8 @@ public class MetadataTest extends XMLObjectBaseTestCase {
     /**
      * Tests unmarshalling an InCommon metadata document.
      * 
-     * @throws XMLParserException
-     * @throws UnmarshallingException
+     * @throws XMLParserException ...
+     * @throws UnmarshallingException ...
      */
     @Test
     public void testInCommonUnmarshall() throws XMLParserException, UnmarshallingException {
@@ -72,9 +72,6 @@ public class MetadataTest extends XMLObjectBaseTestCase {
 
     /**
      * Tests unmarshalling an SWITCH metadata document.
-     * 
-     * @throws XMLParserException
-     * @throws UnmarshallingException
      */
     @Test
     public void testSWITCHUnmarshall() {
@@ -99,9 +96,6 @@ public class MetadataTest extends XMLObjectBaseTestCase {
     
     /**
      * Tests unmarshalling an SWITCH metadata document.
-     * 
-     * @throws XMLParserException
-     * @throws UnmarshallingException
      */
     @Test
     public void testUKFedUnmarshall() {
@@ -122,4 +116,4 @@ public class MetadataTest extends XMLObjectBaseTestCase {
             Assert.fail("Unable to unmarshall XML: " + ue);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddProxyRestrictionToAssertionsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddProxyRestrictionToAssertionsTest.java
index d14b227..8b12e27 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddProxyRestrictionToAssertionsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddProxyRestrictionToAssertionsTest.java
@@ -54,7 +54,11 @@ public class AddProxyRestrictionToAssertionsTest extends OpenSAMLInitBaseTestCas
         action.setProxyRestrictionLookupStrategy(FunctionSupport.constant(new Pair<>(1,Set.of(AUDIENCE1, AUDIENCE2))));
     }
     
-    /** Test that action errors out properly if there is no response. */
+    /**
+     * Test that action errors out properly if there is no response.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test public void testNoResponse() throws Exception {
         final ProfileRequestContext prc = new RequestContextBuilder().buildProfileRequestContext();
         
@@ -63,7 +67,11 @@ public class AddProxyRestrictionToAssertionsTest extends OpenSAMLInitBaseTestCas
         ActionTestingSupport.assertEvent(prc, EventIds.INVALID_MSG_CTX);
     }
 
-    /** Test that action behaves properly if there is no assertion in the response. */
+    /**
+     * Test that action behaves properly if there is no assertion in the response.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test public void testNoAssertion() throws Exception {
         final ProfileRequestContext prc = new RequestContextBuilder().setOutboundMessage(
                 SAML2ActionTestingSupport.buildResponse()).buildProfileRequestContext();
@@ -77,7 +85,7 @@ public class AddProxyRestrictionToAssertionsTest extends OpenSAMLInitBaseTestCas
      * Test that the condition is properly added if there is a single assertion, without a Conditions element, in the
      * response with a count of zero.
      * 
-     * @throws ComponentInitializationException 
+     * @throws ComponentInitializationException ...
      */
     @Test public void testZeroCount() throws ComponentInitializationException {
         final Assertion assertion = SAML2ActionTestingSupport.buildAssertion();
@@ -106,7 +114,7 @@ public class AddProxyRestrictionToAssertionsTest extends OpenSAMLInitBaseTestCas
      * Test that the condition is properly added if there is a single assertion, without a Conditions element, in the
      * response with no audiences.
      * 
-     * @throws ComponentInitializationException 
+     * @throws ComponentInitializationException ...
      */
     @Test public void testCountOnly() throws ComponentInitializationException {
         final Assertion assertion = SAML2ActionTestingSupport.buildAssertion();
@@ -135,7 +143,7 @@ public class AddProxyRestrictionToAssertionsTest extends OpenSAMLInitBaseTestCas
      * Test that the condition is properly added if there is a single assertion, without a Conditions element, in the
      * response with no count.
      * 
-     * @throws ComponentInitializationException 
+     * @throws ComponentInitializationException ...
      */
     @Test public void testAudiencesOnly() throws ComponentInitializationException {
         final Assertion assertion = SAML2ActionTestingSupport.buildAssertion();
@@ -165,7 +173,7 @@ public class AddProxyRestrictionToAssertionsTest extends OpenSAMLInitBaseTestCas
      * Test that the condition is properly added if there is a single assertion, without a Conditions element, in the
      * response.
      * 
-     * @throws ComponentInitializationException 
+     * @throws ComponentInitializationException ...
      */
     @Test public void testSingleAssertion() throws ComponentInitializationException {
         final Assertion assertion = SAML2ActionTestingSupport.buildAssertion();
@@ -194,7 +202,7 @@ public class AddProxyRestrictionToAssertionsTest extends OpenSAMLInitBaseTestCas
      * Test that the condition is properly added if there is a single assertion, with a Conditions element, in the
      * response.
      * 
-     * @throws ComponentInitializationException 
+     * @throws ComponentInitializationException ...
      */
     @Test public void testSingleAssertionWithExistingCondition() throws ComponentInitializationException {
         final SAMLObjectBuilder<Conditions> conditionsBuilder = (SAMLObjectBuilder<Conditions>)
@@ -224,7 +232,7 @@ public class AddProxyRestrictionToAssertionsTest extends OpenSAMLInitBaseTestCas
 
     /** Test that the condition is properly added if there are multiple assertions in the response.
      * 
-     * @throws ComponentInitializationException
+     * @throws ComponentInitializationException ...
      */
     @Test public void testMultipleAssertion() throws ComponentInitializationException {
         final Response response = SAML2ActionTestingSupport.buildResponse();
@@ -251,4 +259,4 @@ public class AddProxyRestrictionToAssertionsTest extends OpenSAMLInitBaseTestCas
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/DecryptNameIDsTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/DecryptNameIDsTest.java
index 10edd2a..ac67cdc 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/DecryptNameIDsTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/DecryptNameIDsTest.java
@@ -108,8 +108,8 @@ public class DecryptNameIDsTest extends OpenSAMLInitBaseTestCase {
     /**
      * Test decryption of an NameID as an EncryptedID.
      *  
-     * @throws EncryptionException
-     * @throws ComponentInitializationException 
+     * @throws EncryptionException ...
+     * @throws ComponentInitializationException ...
      */
     @Test
     public void testEncryptedNameIDNoParams() throws EncryptionException, ComponentInitializationException {
@@ -146,8 +146,8 @@ public class DecryptNameIDsTest extends OpenSAMLInitBaseTestCase {
     /**
      * Test decryption of an NameID as an EncryptedID.
      *  
-     * @throws EncryptionException
-     * @throws ComponentInitializationException 
+     * @throws EncryptionException ...
+     * @throws ComponentInitializationException ...
      */
     @Test
     public void testEncryptedNameID() throws EncryptionException, ComponentInitializationException {
@@ -174,6 +174,8 @@ public class DecryptNameIDsTest extends OpenSAMLInitBaseTestCase {
 
     /**
      * Test failed decryption of an NameID as an EncryptedID.
+     * 
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testWrongKeyFatal() throws Exception {
@@ -204,6 +206,8 @@ public class DecryptNameIDsTest extends OpenSAMLInitBaseTestCase {
 
     /**
      * Test failed decryption of an NameID as an EncryptedID.
+     * 
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testWrongKeyNonFatal() throws Exception {
@@ -233,4 +237,4 @@ public class DecryptNameIDsTest extends OpenSAMLInitBaseTestCase {
         Assert.assertNull(authnRequest.getSubject().getNameID());
     }
     
-}
\ No newline at end of file
+}
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/MetadataCredentialResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/MetadataCredentialResolverTest.java
index 02cfd88..66c0587 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/MetadataCredentialResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/impl/MetadataCredentialResolverTest.java
@@ -193,8 +193,8 @@ public class MetadataCredentialResolverTest extends XMLObjectBaseTestCase {
      * Test protocol null, and no usage.
      * Should get 3 credentials, 2 from protocolFoo and 1 from protocolBar.
      * 
-     * @throws SecurityException 
-     * @throws ResolverException 
+     * @throws SecurityException ...
+     * @throws ResolverException ...
      */
     @Test
     public void testNoProtocolNoUsage() throws SecurityException, ResolverException {
@@ -231,8 +231,8 @@ public class MetadataCredentialResolverTest extends XMLObjectBaseTestCase {
      * Test protocol null, and usage = encryption.
      * Should get 2 credentials, 1 from protocolFoo and 1 from protocolBar.
      * 
-     * @throws SecurityException 
-     * @throws ResolverException 
+     * @throws SecurityException ...
+     * @throws ResolverException ...
      */
     @Test
     public void testNoProtocolUsageEncryption() throws SecurityException, ResolverException {
@@ -270,8 +270,8 @@ public class MetadataCredentialResolverTest extends XMLObjectBaseTestCase {
      * Test protocol null, and usage = signing.
      * Should get 2 credentials, 1 from protocolFoo and 1 from protocolBar.
      * 
-     * @throws SecurityException 
-     * @throws ResolverException 
+     * @throws SecurityException ...
+     * @throws ResolverException ...
      */
     @Test
     public void testNoProtocolUsageSigning() throws SecurityException, ResolverException {
@@ -308,8 +308,8 @@ public class MetadataCredentialResolverTest extends XMLObjectBaseTestCase {
      * Test 1 protocol (FOO), and no usage .
      * Should get 2 credentials.
      * 
-     * @throws SecurityException 
-     * @throws ResolverException 
+     * @throws SecurityException ...
+     * @throws ResolverException ...
      */
     @Test
     public void testProtocolFOONoUsage() throws SecurityException, ResolverException {
@@ -347,8 +347,8 @@ public class MetadataCredentialResolverTest extends XMLObjectBaseTestCase {
      * Test 1 protocol (FOO), and usage = signing.
      * Should get 1 credentials.
      * 
-     * @throws SecurityException 
-     * @throws ResolverException 
+     * @throws SecurityException ...
+     * @throws ResolverException ...
      */
     @Test
     public void testProtocolFOOUsageSigning() throws SecurityException, ResolverException {
@@ -385,8 +385,8 @@ public class MetadataCredentialResolverTest extends XMLObjectBaseTestCase {
      * Test 1 protocol (FOO), and usage encryption.
      * Should get 1 credentials.
      * 
-     * @throws SecurityException 
-     * @throws ResolverException 
+     * @throws SecurityException ...
+     * @throws ResolverException ...
      */
     @Test
     public void testProtocolFOOUsageEncryption() throws SecurityException, ResolverException {
@@ -423,8 +423,8 @@ public class MetadataCredentialResolverTest extends XMLObjectBaseTestCase {
      * Test 1 protocol (BAR), and no usage.
      * Should get 1 credentials.
      * 
-     * @throws SecurityException 
-     * @throws ResolverException 
+     * @throws SecurityException ...
+     * @throws ResolverException ...
      */
     @Test
     public void testProtocolBARNoUsage() throws SecurityException, ResolverException {
@@ -460,8 +460,8 @@ public class MetadataCredentialResolverTest extends XMLObjectBaseTestCase {
      * Test 1 protocol (BAR), and usage = signing.
      * Should get 1 credentials.
      * 
-     * @throws SecurityException 
-     * @throws ResolverException 
+     * @throws SecurityException ...
+     * @throws ResolverException ...
      */
     @Test
     public void testProtocolBARUsageSigning() throws SecurityException, ResolverException {
@@ -498,8 +498,8 @@ public class MetadataCredentialResolverTest extends XMLObjectBaseTestCase {
      * Test 1 protocol (BAR), and usage = encryption.
      * Should get 1 credentials.
      * 
-     * @throws SecurityException 
-     * @throws ResolverException 
+     * @throws SecurityException ...
+     * @throws ResolverException ...
      */
     @Test
     public void testProtocolBARUsageEncryption() throws SecurityException, ResolverException {
@@ -535,8 +535,8 @@ public class MetadataCredentialResolverTest extends XMLObjectBaseTestCase {
     /**
      * Test caching behavior across 2 resolutions.
      * 
-     * @throws SecurityException 
-     * @throws ResolverException 
+     * @throws SecurityException ...
+     * @throws ResolverException ...
      */
     @Test
     public void testCaching() throws SecurityException, ResolverException {
@@ -563,9 +563,9 @@ public class MetadataCredentialResolverTest extends XMLObjectBaseTestCase {
     /**
      * Test resolving directly from a RoleDescriptor input.
      * 
-     * @throws ComponentInitializationException 
-     * @throws ResolverException 
-     * @throws CertificateEncodingException 
+     * @throws ComponentInitializationException ...
+     * @throws ResolverException ...
+     * @throws CertificateEncodingException ...
      */
     @Test 
     public void testDirectResolutionFromRoleDescriptor() throws ComponentInitializationException, ResolverException, CertificateEncodingException {
@@ -629,7 +629,7 @@ public class MetadataCredentialResolverTest extends XMLObjectBaseTestCase {
     /**
      * Test fails correctly when required inputs are missing.
      * 
-     * @throws ResolverException
+     * @throws ResolverException ...
      */
     @Test(expectedExceptions=ResolverException.class)
     public void testMissingRequiredInputs() throws ResolverException {
@@ -639,7 +639,7 @@ public class MetadataCredentialResolverTest extends XMLObjectBaseTestCase {
     /**
      * Test fails correctly when required KeyInfo credential resolver is not configured
      * 
-     * @throws ComponentInitializationException 
+     * @throws ComponentInitializationException ...
      */
     @Test(expectedExceptions=ComponentInitializationException.class)
     public void testMissingKeyInfoCredentialResolver() throws ComponentInitializationException {
@@ -650,8 +650,8 @@ public class MetadataCredentialResolverTest extends XMLObjectBaseTestCase {
     /**
      * Test that fails when entityID+role name are supplied, but no role descriptor resolver was configured.
      * 
-     * @throws ComponentInitializationException
-     * @throws ResolverException
+     * @throws ComponentInitializationException ...
+     * @throws ResolverException ...
      */
     @Test(expectedExceptions=ResolverException.class)
     public void testMissingRequiredRoleDescriptorResolver() throws ComponentInitializationException, ResolverException {
diff --git a/opensaml-security-api/src/test/java/org/opensaml/security/crypto/KeySupportTest.java b/opensaml-security-api/src/test/java/org/opensaml/security/crypto/KeySupportTest.java
index 0d81051..382e6b3 100644
--- a/opensaml-security-api/src/test/java/org/opensaml/security/crypto/KeySupportTest.java
+++ b/opensaml-security-api/src/test/java/org/opensaml/security/crypto/KeySupportTest.java
@@ -67,50 +67,82 @@ public class KeySupportTest {
     /** Location of non-encrypted, PEM formatted, EC private key. */
     private String ecPrivKeyPEMNoEncrypt = "/data/ec-privkey-nopass.pem";
 
-    /** Test decoding an RSA private key, in PEM format, without encryption. */
+    /**
+     * Test decoding an RSA private key, in PEM format, without encryption.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test
     public void testDecodeRSAPrivateKeyPEMNoEncrypt() throws Exception {
         testPrivKey(rsaPrivKeyPEMNoEncrypt, null, "RSA");
     }
 
-    /** Test decoding an RSA private key, in PEM format, with encryption. */
+    /**
+     * Test decoding an RSA private key, in PEM format, with encryption.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test
     public void testDecodeRSAPrivateKeyPEMEncrypt() throws Exception {
         testPrivKey(rsaPrivKeyPEMEncrypt, privKeyPassword, "RSA");
     }
 
-    /** Test decoding an RSA private key, in DER format, without encryption. */
+    /**
+     * Test decoding an RSA private key, in DER format, without encryption.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test
     public void testDecodeRSAPrivateKeyDERNoEncrypt() throws Exception {
         testPrivKey(rsaPrivKeyDERNoEncrypt, null, "RSA");
     }
     
-    /** Test decoding an DSA private key, in PEM format, without encryption. */
+    /**
+     * Test decoding an DSA private key, in PEM format, without encryption.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test
     public void testDecodeDSAPrivateKeyPEMNoEncrypt() throws Exception {
         testPrivKey(dsaPrivKeyPEMNoEncrypt, null, "DSA");
     }
 
-    /** Test decoding an DSA private key, in PEM format, with encryption. */
+    /**
+     * Test decoding an DSA private key, in PEM format, with encryption.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test
     public void testDecodeDSAPrivateKeyPEMEncrypt() throws Exception {
         testPrivKey(dsaPrivKeyPEMEncrypt, privKeyPassword, "DSA");
     }
 
-    /** Test decoding an DSA private key, in DER format, without encryption. */
+    /**
+     * Test decoding an DSA private key, in DER format, without encryption.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test
     public void testDecodeDSAPrivateKeyDERNoEncrypt() throws Exception {
         testPrivKey(dsaPrivKeyDERNoEncrypt, null, "DSA");
     }    
     
-    /** Test decoding an EC private key, in PEM format, without encryption. */
+    /**
+     * Test decoding an EC private key, in PEM format, without encryption.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test
     public void testDecodeECPrivateKeyPEMNoEncrypt() throws Exception {
         testPrivKey(ecPrivKeyPEMNoEncrypt, null, "EC");
     }
     
     
-    /** Test deriving a public key from an RSA and DSA private key. */
+    /**
+     * Test deriving a public key from an RSA and DSA private key.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test
     public void testDerivePublicKey() throws Exception{
         PrivateKey privKey = testPrivKey(rsaPrivKeyPEMNoEncrypt, null, "RSA");
@@ -128,11 +160,13 @@ public class KeySupportTest {
     }
 
     
-    /** Test the evaluation that 2 keys are members of the same key pair. 
+    /**
+     * Test the evaluation that 2 keys are members of the same key pair. 
      * 
-     * @throws NoSuchProviderException 
-     * @throws NoSuchAlgorithmException 
-     * @throws SecurityException */
+     * @throws NoSuchProviderException ...
+     * @throws NoSuchAlgorithmException ...
+     * @throws SecurityException ...
+     */
     @Test
     public void testKeyPairMatching() throws NoSuchAlgorithmException, NoSuchProviderException, SecurityException {
         final KeyPair kp1rsa = KeySupport.generateKeyPair("RSA", 1024, null);
@@ -269,7 +303,17 @@ public class KeySupportTest {
         Assert.assertEquals(secretKey.getEncoded(), key);
     }
 
-    /** Generic key testing. */
+    /**
+     * Generic key testing.
+     * 
+     * @param keyFile ...
+     * @param password ...
+     * @param algo ...
+     * 
+     * @return the private key
+     * 
+     * @throws Exception if something goes wrong
+     */
     protected PrivateKey testPrivKey(final String keyFile, final char[] password, final String algo) throws Exception {
         final InputStream keyInS = KeySupportTest.class.getResourceAsStream(keyFile);
 
@@ -286,4 +330,4 @@ public class KeySupportTest {
         
         return key;
     }
-}
\ No newline at end of file
+}
diff --git a/opensaml-security-api/src/test/java/org/opensaml/security/x509/X509SupportTest.java b/opensaml-security-api/src/test/java/org/opensaml/security/x509/X509SupportTest.java
index 25c02dd..c183156 100644
--- a/opensaml-security-api/src/test/java/org/opensaml/security/x509/X509SupportTest.java
+++ b/opensaml-security-api/src/test/java/org/opensaml/security/x509/X509SupportTest.java
@@ -352,8 +352,9 @@ public class X509SupportTest {
     }
     
     /**
-     *  Test Subject Key Identifier (SKI) extraction from certificate.
-     * @throws DecoderException 
+     * Test Subject Key Identifier (SKI) extraction from certificate.
+     * 
+     * @throws DecoderException ...
      */
     @Test
     public void testGetSubjectKeyIdentifier() throws DecoderException {
@@ -367,7 +368,7 @@ public class X509SupportTest {
     /**
      * Tests that the entity cert is correctly identified in the collection.
      * 
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
     public void testDetermineEntityCertificate() throws Exception {
@@ -382,8 +383,8 @@ public class X509SupportTest {
     /**
      * Test 1 alt name: DNS.
      * 
-     * @throws SecurityException
-     * @throws CertificateParsingException
+     * @throws SecurityException ...
+     * @throws CertificateParsingException ...
      */
     @Test
     public void testGetSubjectAltNames1NameDNS() throws SecurityException, CertificateParsingException {
@@ -405,8 +406,8 @@ public class X509SupportTest {
     /**
      * Test 1 alt name: URI (URN).
      * 
-     * @throws SecurityException
-     * @throws CertificateParsingException
+     * @throws SecurityException ...
+     * @throws CertificateParsingException ...
      */
     @Test
     public void testGetSubjectAltNames1NameURN() throws SecurityException, CertificateParsingException {
@@ -428,8 +429,8 @@ public class X509SupportTest {
     /**
      * Test 1 alt name: URI (URL).
      * 
-     * @throws SecurityException
-     * @throws CertificateParsingException
+     * @throws SecurityException ...
+     * @throws CertificateParsingException ...
      */
     @Test
     public void testGetSubjectAltNames1NameURL() throws SecurityException, CertificateParsingException {
@@ -451,8 +452,8 @@ public class X509SupportTest {
     /**
      * Test 1 alt name: IP.
      * 
-     * @throws SecurityException
-     * @throws CertificateParsingException
+     * @throws SecurityException ...
+     * @throws CertificateParsingException ...
      */
     @Test
     public void testGetSubjectAltNames1NameIP() throws SecurityException, CertificateParsingException {
@@ -474,8 +475,8 @@ public class X509SupportTest {
     /**
      * Test 3 alt names: DNS, URI (URL), IP.
      * 
-     * @throws SecurityException
-     * @throws CertificateParsingException
+     * @throws SecurityException ...
+     * @throws CertificateParsingException ...
      */
     @Test
     public void testGetSubjectAltNames3NamesDNS_URL_IP() throws SecurityException, CertificateParsingException {
@@ -501,8 +502,8 @@ public class X509SupportTest {
     /**
      * Test 3 alt names: DNS, URI (URN), IP.
      * 
-     * @throws SecurityException
-     * @throws CertificateParsingException
+     * @throws SecurityException ...
+     * @throws CertificateParsingException ...
      */
     @Test
     public void testGetSubjectAltNames3NamesDNS_URN_IP() throws SecurityException, CertificateParsingException {
@@ -525,7 +526,11 @@ public class X509SupportTest {
         Assert.assertTrue(altNames.contains(altNameIP), "Failed to find expected KeyName value");
     }
 
-    /** Test decoding a PEM encoded cert. */
+    /**
+     * Test decoding a PEM encoded cert.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test
     public void testDecodeCertPEM() throws Exception {
         InputStream certInS = X509SupportTest.class.getResourceAsStream(certPEM);
@@ -538,7 +543,11 @@ public class X509SupportTest {
         Assert.assertEquals(certs.size(), 2);
     }
 
-    /** Test decoding a DER encoded cert. */
+    /**
+     * Test decoding a DER encoded cert.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test
     public void testDecodeCertDER() throws Exception {
         InputStream certInS = X509SupportTest.class.getResourceAsStream(certDER);
@@ -554,7 +563,11 @@ public class X509SupportTest {
         Assert.assertNotNull(cert);
     }
 
-    /** Test decoding a PEM encoded CRL. */
+    /**
+     * Test decoding a PEM encoded CRL.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test
     public void testDecodeCRLPEM() throws Exception {
         InputStream crlInS = X509SupportTest.class.getResourceAsStream(crlPEM);
@@ -567,7 +580,11 @@ public class X509SupportTest {
         Assert.assertEquals(crls.size(), 1);
     }
 
-    /** Test decoding a DER encoded CRL. */
+    /**
+     * Test decoding a DER encoded CRL.
+     * 
+     * @throws Exception if something goes wrong
+     */
     @Test
     public void testDecodeCRLDER() throws Exception {
         InputStream crlInS = X509SupportTest.class.getResourceAsStream(crlDER);
@@ -584,6 +601,8 @@ public class X509SupportTest {
      * Test decoding and matching EC keypair.
      * 
      * TODO: enable once OpenJDK7/8 are unneeded.
+     * 
+     * @throws Exception if something goes wrong
      */
     @Test(enabled=false)
     public void testEC() throws Exception {
@@ -618,4 +637,4 @@ public class X509SupportTest {
         nameTypes.toArray(array);
         return X509Support.getAltNames(cert, array);
     }
-}
\ No newline at end of file
+}

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list