[java-opensaml] branch master updated: JPAR-131 - Fix doclint issues in test javadoc
Ian Young
ian at iay.org.uk
Sun Dec 29 16:10:10 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=b57cb93ee29233944002653d100faee08277a0e9
The following commit(s) were added to refs/heads/master by this push:
new b57cb93 JPAR-131 - Fix doclint issues in test javadoc
b57cb93 is described below
commit b57cb93ee29233944002653d100faee08277a0e9
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Sun Dec 29 21:10:02 2019 +0000
JPAR-131 - Fix doclint issues in test javadoc
https://issues.shibboleth.net/jira/browse/JPAR-131
---
.../impl/ChainingCredentialResolverTest.java | 24 ++++--
...ateHttpClientSecurityParametersHandlerTest.java | 2 +-
.../impl/TrustEngineX509TrustManagerTest.java | 24 ++++--
.../impl/BasicX509CredentialNameEvaluatorTest.java | 8 +-
.../x509/impl/CertPathPKIXTrustEvaluatorTest.java | 6 +-
.../impl/PKIXX509CredentialTrustEngineTest.java | 6 +-
.../java/org/opensaml/soap/soap11/SOAPTest.java | 2 +-
.../decoder/http/impl/HTTPSOAP11DecoderTest.java | 36 ++++-----
.../encoder/http/impl/HTTPSOAP11EncoderTest.java | 40 +++++-----
.../storage/impl/JPAStorageServiceTest.java | 4 +
.../org/opensaml/storage/impl/ReplayCacheTest.java | 2 +-
.../provider/impl/BaseObligationHandlerTest.java | 5 --
.../support/DecryptionSignedContentTest.java | 23 ++++--
.../encryption/support/SimpleDecryptionTest.java | 92 ++++++++++++----------
.../encryption/support/SimpleEncryptionTest.java | 43 +++++-----
.../xmlsec/keyinfo/KeyInfoSupportTest.java | 22 +++---
.../keyinfo/impl/BasicKeyInfoGeneratorTest.java | 19 +++--
.../ChainingKeyInfoCredentialResolverTest.java | 24 ++++--
.../keyinfo/impl/KeyInfoGeneratorManagerTest.java | 11 +--
.../impl/NamedKeyInfoGeneratorManagerTest.java | 10 ++-
.../keyinfo/impl/StaticKeyInfoGeneratorTest.java | 14 ++--
.../keyinfo/impl/X509KeyInfoGeneratorTest.java | 46 +++++------
.../xmlsec/mock/SignableSimpleXMLObject.java | 3 +
.../signature/support/DetachedSignatureTest.java | 10 +--
.../signature/support/EnvelopedSignatureTest.java | 10 +--
.../signature/support/HMACSignatureTest.java | 7 +-
.../impl/ExplicitKeySignatureTrustEngineTest.java | 25 +++---
.../support/impl/PKIXSignatureTrustEngineTest.java | 6 +-
28 files changed, 290 insertions(+), 234 deletions(-)
diff --git a/opensaml-security-impl/src/test/java/org/opensaml/security/credential/impl/ChainingCredentialResolverTest.java b/opensaml-security-impl/src/test/java/org/opensaml/security/credential/impl/ChainingCredentialResolverTest.java
index 25cebb8..0a45d05 100644
--- a/opensaml-security-impl/src/test/java/org/opensaml/security/credential/impl/ChainingCredentialResolverTest.java
+++ b/opensaml-security-impl/src/test/java/org/opensaml/security/credential/impl/ChainingCredentialResolverTest.java
@@ -83,7 +83,8 @@ public class ChainingCredentialResolverTest {
/**
* Test a single chain member, which returns no credentials.
- * @throws ResolverException
+ *
+ * @throws ResolverException ...
*/
@Test
public void testOneEmptyMember() throws ResolverException {
@@ -95,7 +96,8 @@ public class ChainingCredentialResolverTest {
/**
* Test multiple chain members, all of which return no credentials.
- * @throws ResolverException
+ *
+ * @throws ResolverException ...
*/
@Test
public void testMultipleEmptyMember() throws ResolverException {
@@ -107,7 +109,8 @@ public class ChainingCredentialResolverTest {
/**
* Test one chain member, returning credentials.
- * @throws ResolverException
+ *
+ * @throws ResolverException ...
*/
@Test
public void testOneMember() throws ResolverException {
@@ -119,7 +122,8 @@ public class ChainingCredentialResolverTest {
/**
* Test multiple chain members, returning credentials.
- * @throws ResolverException
+ *
+ * @throws ResolverException ...
*/
@Test
public void testMultipleMembers() throws ResolverException {
@@ -133,7 +137,8 @@ public class ChainingCredentialResolverTest {
/**
* Test that order of returned credentials is the expected ordering,
* based on the ordering in the resolver chain.
- * @throws ResolverException
+ *
+ * @throws ResolverException ...
*/
@Test
public void testOrderingMultipleMembers() throws ResolverException {
@@ -152,7 +157,8 @@ public class ChainingCredentialResolverTest {
/**
* Test empty resolver chain, i.e. no underlying resolver members.
- * @throws ResolverException
+ *
+ * @throws ResolverException ...
*/
@Test(expectedExceptions=IllegalStateException.class)
public void testEmptyResolverChain() throws ResolverException {
@@ -162,7 +168,8 @@ public class ChainingCredentialResolverTest {
/**
* Test exception on attempt to call remove() on iterator.
- * @throws ResolverException
+ *
+ * @throws ResolverException ...
*/
@Test(expectedExceptions=UnsupportedOperationException.class)
public void testRemove() throws ResolverException {
@@ -176,7 +183,8 @@ public class ChainingCredentialResolverTest {
/**
* Test exception on attempt to call next() on iterator when no more members.
- * @throws ResolverException
+ *
+ * @throws ResolverException ...
*/
@Test(expectedExceptions=NoSuchElementException.class)
public void testNoMoreMembers() throws ResolverException {
diff --git a/opensaml-security-impl/src/test/java/org/opensaml/security/messaging/impl/PopulateHttpClientSecurityParametersHandlerTest.java b/opensaml-security-impl/src/test/java/org/opensaml/security/messaging/impl/PopulateHttpClientSecurityParametersHandlerTest.java
index 0454831..14dcf92 100644
--- a/opensaml-security-impl/src/test/java/org/opensaml/security/messaging/impl/PopulateHttpClientSecurityParametersHandlerTest.java
+++ b/opensaml-security-impl/src/test/java/org/opensaml/security/messaging/impl/PopulateHttpClientSecurityParametersHandlerTest.java
@@ -49,7 +49,7 @@ import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
-/** Unit test for {@link PopulateSignatureValidationParameters}. */
+/** Unit test for {@link PopulateHttpClientSecurityParametersHandler}. */
public class PopulateHttpClientSecurityParametersHandlerTest extends OpenSAMLInitBaseTestCase {
private MessageContext messageContext;
diff --git a/opensaml-security-impl/src/test/java/org/opensaml/security/trust/impl/TrustEngineX509TrustManagerTest.java b/opensaml-security-impl/src/test/java/org/opensaml/security/trust/impl/TrustEngineX509TrustManagerTest.java
index 7d68bfb..3f77bb0 100644
--- a/opensaml-security-impl/src/test/java/org/opensaml/security/trust/impl/TrustEngineX509TrustManagerTest.java
+++ b/opensaml-security-impl/src/test/java/org/opensaml/security/trust/impl/TrustEngineX509TrustManagerTest.java
@@ -60,7 +60,7 @@ public class TrustEngineX509TrustManagerTest {
* Creates an UnboundID in-memory directory server. Leverages LDIF found in test resources.
*
* @throws LDAPException if the in-memory directory server cannot be created
- * @throws IOException
+ * @throws IOException ...
*/
@BeforeTest public void setupDirectoryServer() throws IOException, LDAPException {
directoryServer = new InMemoryDirectory(new File(DATA_PATH + "test-ldap.ldif"), new File(DATA_PATH + "test-ldap.keystore"));
@@ -74,7 +74,11 @@ public class TrustEngineX509TrustManagerTest {
directoryServer.stop();
}
- /** Make sure default trust fails. */
+ /**
+ * Make sure default trust fails.
+ *
+ * @throws LdapException ...
+ */
@Test(expectedExceptions=LdapException.class)
public void testDefaultTrust() throws LdapException {
final ConnectionConfig config = new ConnectionConfig();
@@ -89,7 +93,11 @@ public class TrustEngineX509TrustManagerTest {
}
}
- /** No trust engine. */
+ /**
+ * No trust engine.
+ *
+ * @throws LdapException ...
+ */
@Test(expectedExceptions=LdapException.class)
public void testNullTrust() throws LdapException {
final TrustEngineX509TrustManager trustManager = new TrustEngineX509TrustManager();
@@ -108,7 +116,13 @@ public class TrustEngineX509TrustManagerTest {
}
}
- /** Static trust engine. */
+ /**
+ * Static trust engine.
+ *
+ * @throws LdapException ...
+ * @throws FileNotFoundException ...
+ * @throws IOException ...
+ */
@Test
public void testStaticTrust() throws LdapException, FileNotFoundException, IOException {
final StaticCredentialResolver resolver;
@@ -141,4 +155,4 @@ public class TrustEngineX509TrustManagerTest {
Assert.assertEquals(result.getResultCode(), ResultCode.SUCCESS);
}
-}
\ No newline at end of file
+}
diff --git a/opensaml-security-impl/src/test/java/org/opensaml/security/x509/impl/BasicX509CredentialNameEvaluatorTest.java b/opensaml-security-impl/src/test/java/org/opensaml/security/x509/impl/BasicX509CredentialNameEvaluatorTest.java
index 30984bb..e65481a 100644
--- a/opensaml-security-impl/src/test/java/org/opensaml/security/x509/impl/BasicX509CredentialNameEvaluatorTest.java
+++ b/opensaml-security-impl/src/test/java/org/opensaml/security/x509/impl/BasicX509CredentialNameEvaluatorTest.java
@@ -255,9 +255,9 @@ public class BasicX509CredentialNameEvaluatorTest extends XMLObjectBaseTestCase
testEvaluateFailure("Trusted name set was null", null, cred);
}
- /********************
- * Helper methods. *
- ********************/
+ //********************
+ //* Helper methods. *
+ //********************
@Test(enabled = false)
private void testEvaluateSuccess(String message, Set<String> trustedNames, X509Credential untrustedCred) {
@@ -280,4 +280,4 @@ public class BasicX509CredentialNameEvaluatorTest extends XMLObjectBaseTestCase
Assert.fail("Evaluation failed due to processing exception: " + e.getMessage());
}
}
-}
\ No newline at end of file
+}
diff --git a/opensaml-security-impl/src/test/java/org/opensaml/security/x509/impl/CertPathPKIXTrustEvaluatorTest.java b/opensaml-security-impl/src/test/java/org/opensaml/security/x509/impl/CertPathPKIXTrustEvaluatorTest.java
index fe81569..52f52fe 100644
--- a/opensaml-security-impl/src/test/java/org/opensaml/security/x509/impl/CertPathPKIXTrustEvaluatorTest.java
+++ b/opensaml-security-impl/src/test/java/org/opensaml/security/x509/impl/CertPathPKIXTrustEvaluatorTest.java
@@ -372,9 +372,9 @@ public class CertPathPKIXTrustEvaluatorTest extends XMLObjectBaseTestCase {
testValidateFailure("Intermediate CA with policy mapping, but mapping is inhibited", info, cred, opts);
}
- /********************
- * Helper methods. *
- ********************/
+ //********************
+ //* Helper methods. *
+ //********************
@Test(enabled = false)
private void testValidateSuccess(String message, PKIXValidationInformation info, X509Credential cred) {
diff --git a/opensaml-security-impl/src/test/java/org/opensaml/security/x509/impl/PKIXX509CredentialTrustEngineTest.java b/opensaml-security-impl/src/test/java/org/opensaml/security/x509/impl/PKIXX509CredentialTrustEngineTest.java
index 2d2af4f..dc371d9 100644
--- a/opensaml-security-impl/src/test/java/org/opensaml/security/x509/impl/PKIXX509CredentialTrustEngineTest.java
+++ b/opensaml-security-impl/src/test/java/org/opensaml/security/x509/impl/PKIXX509CredentialTrustEngineTest.java
@@ -169,9 +169,9 @@ public class PKIXX509CredentialTrustEngineTest extends XMLObjectBaseTestCase {
}
- /********************
- * Helper methods. *
- ********************/
+ //********************
+ //* Helper methods. *
+ //********************
@Test(enabled = false)
private void testValidateSuccess(String message) {
diff --git a/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/SOAPTest.java b/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/SOAPTest.java
index 0850bef..6faa8f4 100644
--- a/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/SOAPTest.java
+++ b/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/SOAPTest.java
@@ -151,7 +151,7 @@ public class SOAPTest extends XMLObjectBaseTestCase {
* Test constructing and marshalling a SOAP fault message.
*
* @throws MarshallingException if the DOM can not b marshalled
- * @throws XMLParserException
+ * @throws XMLParserException ...
*/
@Test
public void testSOAPFaultConstructAndMarshall() throws MarshallingException, XMLParserException {
diff --git a/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/decoder/http/impl/HTTPSOAP11DecoderTest.java b/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/decoder/http/impl/HTTPSOAP11DecoderTest.java
index d666d37..22bd23b 100644
--- a/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/decoder/http/impl/HTTPSOAP11DecoderTest.java
+++ b/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/decoder/http/impl/HTTPSOAP11DecoderTest.java
@@ -61,10 +61,9 @@ public class HTTPSOAP11DecoderTest extends XMLObjectBaseTestCase {
/**
* Test basic no header case. Message will be an Envelope.
*
- * @throws ComponentInitializationException
- * @throws MessageDecodingException
- * @throws IOException
- * @throws SecurityException
+ * @throws ComponentInitializationException ...
+ * @throws MessageDecodingException ...
+ * @throws IOException ...
*/
@Test
public void testDecodeToEnvelope() throws ComponentInitializationException, MessageDecodingException, IOException {
@@ -85,10 +84,9 @@ public class HTTPSOAP11DecoderTest extends XMLObjectBaseTestCase {
/**
* Test basic no header case. Message will be an non-Envelope payload.
*
- * @throws ComponentInitializationException
- * @throws MessageDecodingException
- * @throws IOException
- * @throws SecurityException
+ * @throws ComponentInitializationException ...
+ * @throws MessageDecodingException ...
+ * @throws IOException ...
*/
@Test
public void testDecodeToPayload() throws ComponentInitializationException, MessageDecodingException, IOException {
@@ -109,10 +107,9 @@ public class HTTPSOAP11DecoderTest extends XMLObjectBaseTestCase {
/**
* Test missing content type.
*
- * @throws ComponentInitializationException
- * @throws MessageDecodingException
- * @throws IOException
- * @throws SecurityException
+ * @throws ComponentInitializationException ...
+ * @throws MessageDecodingException ...
+ * @throws IOException ...
*/
@Test(expectedExceptions=MessageDecodingException.class)
public void testmissingContentType() throws ComponentInitializationException, MessageDecodingException, IOException {
@@ -129,10 +126,9 @@ public class HTTPSOAP11DecoderTest extends XMLObjectBaseTestCase {
/**
* Test invalid content type.
*
- * @throws ComponentInitializationException
- * @throws MessageDecodingException
- * @throws IOException
- * @throws SecurityException
+ * @throws ComponentInitializationException ...
+ * @throws MessageDecodingException ...
+ * @throws IOException ...
*/
@Test(expectedExceptions=MessageDecodingException.class)
public void testInvalidContentType() throws ComponentInitializationException, MessageDecodingException, IOException {
@@ -153,9 +149,11 @@ public class HTTPSOAP11DecoderTest extends XMLObjectBaseTestCase {
/**
* Get a resource relative to a class.
*
- * @param resourceName
- * @return resource content
- * @throws IOException
+ * @param resourceName ...
+ *
+ * @return resource content
+ *
+ * @throws IOException ...
*/
private byte[] getServletRequestContent(String resourceName) throws IOException {
return Resources.toByteArray(getClass().getResource(resourceName));
diff --git a/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/encoder/http/impl/HTTPSOAP11EncoderTest.java b/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/encoder/http/impl/HTTPSOAP11EncoderTest.java
index c36e495..0341a22 100644
--- a/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/encoder/http/impl/HTTPSOAP11EncoderTest.java
+++ b/opensaml-soap-impl/src/test/java/org/opensaml/soap/soap11/encoder/http/impl/HTTPSOAP11EncoderTest.java
@@ -61,11 +61,11 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
/**
* Test basic encoding of a message in an envelope, using payload-oriented messaging.
*
- * @throws ComponentInitializationException
- * @throws XMLParserException
- * @throws UnmarshallingException
- * @throws MessageEncodingException
- * @throws UnsupportedEncodingException
+ * @throws ComponentInitializationException ...
+ * @throws XMLParserException ...
+ * @throws UnmarshallingException ...
+ * @throws MessageEncodingException ...
+ * @throws UnsupportedEncodingException ...
*/
@Test
public void testBasicEncodingAsPayload() throws ComponentInitializationException, MessageEncodingException, UnsupportedEncodingException, XMLParserException, UnmarshallingException {
@@ -107,11 +107,11 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
/**
* Test basic encoding of a message in an envelope, using SOAP-message oriented messaging.
*
- * @throws ComponentInitializationException
- * @throws XMLParserException
- * @throws UnmarshallingException
- * @throws MessageEncodingException
- * @throws UnsupportedEncodingException
+ * @throws ComponentInitializationException ...
+ * @throws XMLParserException ...
+ * @throws UnmarshallingException ...
+ * @throws MessageEncodingException ...
+ * @throws UnsupportedEncodingException ...
*/
@Test
public void testBasicEncodingAsSOAPEnvelope() throws ComponentInitializationException, MessageEncodingException, UnsupportedEncodingException, XMLParserException, UnmarshallingException {
@@ -161,11 +161,11 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
* Test basic encoding of a message in an envelope, using payload-oriented messaging.
* Supply an Envelope and header via SOAP subcontext.
*
- * @throws ComponentInitializationException
- * @throws XMLParserException
- * @throws UnmarshallingException
- * @throws MessageEncodingException
- * @throws UnsupportedEncodingException
+ * @throws ComponentInitializationException ...
+ * @throws XMLParserException ...
+ * @throws UnmarshallingException ...
+ * @throws MessageEncodingException ...
+ * @throws UnsupportedEncodingException ...
*/
@Test
public void testEncodingAsPayloadWithHeader() throws ComponentInitializationException, MessageEncodingException, UnsupportedEncodingException, XMLParserException, UnmarshallingException {
@@ -218,11 +218,11 @@ public class HTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
/**
* Test basic encoding of a message in an envelope, using payload-oriented messaging.
*
- * @throws ComponentInitializationException
- * @throws XMLParserException
- * @throws UnmarshallingException
- * @throws MessageEncodingException
- * @throws UnsupportedEncodingException
+ * @throws ComponentInitializationException ...
+ * @throws XMLParserException ...
+ * @throws UnmarshallingException ...
+ * @throws MessageEncodingException ...
+ * @throws UnsupportedEncodingException ...
*/
@Test
public void testEncodingWithAction() throws ComponentInitializationException, MessageEncodingException, UnsupportedEncodingException, XMLParserException, UnmarshallingException {
diff --git a/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/JPAStorageServiceTest.java b/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/JPAStorageServiceTest.java
index 7bc74cd..1b182c6 100644
--- a/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/JPAStorageServiceTest.java
+++ b/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/JPAStorageServiceTest.java
@@ -74,6 +74,10 @@ public class JPAStorageServiceTest extends StorageServiceTest {
/**
* Creates an entity manager factory instance.
+ *
+ * @return an entity manager factory instance
+ *
+ * @throws ComponentInitializationException ...
*/
private EntityManagerFactory createEntityManagerFactory() throws ComponentInitializationException
{
diff --git a/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/ReplayCacheTest.java b/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/ReplayCacheTest.java
index 15bb441..416ce4b 100644
--- a/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/ReplayCacheTest.java
+++ b/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/ReplayCacheTest.java
@@ -118,7 +118,7 @@ public class ReplayCacheTest {
/**
* Test valid replayed message ID, setting expiration by short duration.
*
- * @throws InterruptedException
+ * @throws InterruptedException ...
*/
@Test
public void testNonReplayValidByMillisecondExpiriation() throws InterruptedException {
diff --git a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/provider/impl/BaseObligationHandlerTest.java b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/provider/impl/BaseObligationHandlerTest.java
index 7fc3c36..f1e7d71 100644
--- a/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/provider/impl/BaseObligationHandlerTest.java
+++ b/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/provider/impl/BaseObligationHandlerTest.java
@@ -60,11 +60,6 @@ public class BaseObligationHandlerTest {
super(obligationId, handlerPrecedence);
}
- /**
- * Constructor.
- *
- * @param obligationId
- */
protected TestClass(String obligationId) {
super(obligationId);
}
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/DecryptionSignedContentTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/DecryptionSignedContentTest.java
index 9c41a2b..3a6d732 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/DecryptionSignedContentTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/DecryptionSignedContentTest.java
@@ -87,8 +87,13 @@ public class DecryptionSignedContentTest extends XMLObjectBaseTestCase {
/**
* Test decryption of signed object and then verify signature.
*
- * @throws IOException
- * @throws SignatureException
+ * @throws MarshallingException ...
+ * @throws UnmarshallingException ...
+ * @throws EncryptionException ...
+ * @throws DecryptionException ...
+ * @throws XMLParserException ...
+ * @throws IOException ...
+ * @throws SignatureException ...
*/
@Test
public void testDecryptAndVerifySignedElement() throws MarshallingException,
@@ -139,8 +144,13 @@ public class DecryptionSignedContentTest extends XMLObjectBaseTestCase {
SignatureValidator.validate(decryptedSignature, signingCredential);
}
- /** Just a sanity check that unit test is set up correctly.
- * @throws SignatureException */
+ /**
+ * Just a sanity check that unit test is set up correctly.
+ *
+ * @throws MarshallingException ...
+ * @throws UnmarshallingException ...
+ * @throws SignatureException ...
+ */
@Test
public void testPlainRoundTripSignature() throws MarshallingException, UnmarshallingException, SignatureException {
Element signedElement = getSignedElement();
@@ -160,8 +170,9 @@ public class DecryptionSignedContentTest extends XMLObjectBaseTestCase {
* Creates a signed SimpleXMLObject element.
*
* @return a XMLObject that has a Signature child element
- * @throws MarshallingException
- * @throws SignatureException
+ *
+ * @throws MarshallingException ...
+ * @throws SignatureException ...
*/
private Element getSignedElement() throws MarshallingException, SignatureException {
SignableSimpleXMLObject sxo = (SignableSimpleXMLObject) buildXMLObject(SignableSimpleXMLObject.ELEMENT_NAME);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleDecryptionTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleDecryptionTest.java
index 13a4ec7..9113e9d 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleDecryptionTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleDecryptionTest.java
@@ -156,8 +156,9 @@ public class SimpleDecryptionTest extends XMLObjectBaseTestCase {
}
/**
- * Test EncryptedData decryption which should fail due to blacklist validation.
- * @throws DecryptionException
+ * Test EncryptedData decryption which should fail due to blacklist validation.
+ *
+ * @throws DecryptionException ...
*/
@Test(expectedExceptions=DecryptionException.class)
public void testEncryptedDataAlgorithmBlacklistFail() throws DecryptionException {
@@ -166,8 +167,9 @@ public class SimpleDecryptionTest extends XMLObjectBaseTestCase {
}
/**
- * Test EncryptedData decryption which should fail due to whitelist validation.
- * @throws DecryptionException
+ * Test EncryptedData decryption which should fail due to whitelist validation.
+ *
+ * @throws DecryptionException ...
*/
@Test(expectedExceptions=DecryptionException.class)
public void testEncryptedDataAlgorithmWhitelistFail() throws DecryptionException {
@@ -176,9 +178,10 @@ public class SimpleDecryptionTest extends XMLObjectBaseTestCase {
}
/**
- * Test EncryptedData decryption which should pass the whitelist validation b/c the list specifies
- * the algorithm in use.
- * @throws DecryptionException
+ * Test EncryptedData decryption which should pass the whitelist validation b/c the list specifies
+ * the algorithm in use.
+ *
+ * @throws DecryptionException ...
*/
@Test()
public void testEncryptedDataAlgorithmWhitelistPass() throws DecryptionException {
@@ -187,8 +190,9 @@ public class SimpleDecryptionTest extends XMLObjectBaseTestCase {
}
/**
- * Test EncryptedKey decryption which should fail due to blacklist validation.
- * @throws DecryptionException
+ * Test EncryptedKey decryption which should fail due to blacklist validation.
+ *
+ * @throws DecryptionException ...
*/
@Test(expectedExceptions=DecryptionException.class)
public void testEncryptedKeyAlgorithmBlacklistFail() throws DecryptionException {
@@ -198,10 +202,11 @@ public class SimpleDecryptionTest extends XMLObjectBaseTestCase {
}
/**
- * Test EncryptedKey decryption which should fail due to whitelist validation.
- * @throws DecryptionException
- * @throws XMLParserException
- * @throws EncryptionException
+ * Test EncryptedKey decryption which should fail due to whitelist validation.
+ *
+ * @throws DecryptionException ...
+ * @throws XMLParserException ...
+ * @throws EncryptionException ...
*/
@Test(expectedExceptions=DecryptionException.class)
public void testEncryptedKeyDigestMethodBlacklistFail() throws DecryptionException, EncryptionException, XMLParserException {
@@ -225,10 +230,11 @@ public class SimpleDecryptionTest extends XMLObjectBaseTestCase {
}
/**
- * Test EncryptedKey decryption which should fail due to whitelist validation.
- * @throws DecryptionException
- * @throws XMLParserException
- * @throws EncryptionException
+ * Test EncryptedKey decryption which should fail due to whitelist validation.
+ *
+ * @throws DecryptionException ...
+ * @throws XMLParserException ...
+ * @throws EncryptionException ...
*/
@Test(expectedExceptions=DecryptionException.class)
public void testEncryptedKeyMGFBlacklistFail() throws DecryptionException, EncryptionException, XMLParserException {
@@ -252,10 +258,11 @@ public class SimpleDecryptionTest extends XMLObjectBaseTestCase {
}
/**
- * Test EncryptedKey decryption which should fail due to whitelist validation.
- * @throws DecryptionException
- * @throws XMLParserException
- * @throws EncryptionException
+ * Test EncryptedKey decryption which should fail due to whitelist validation.
+ *
+ * @throws DecryptionException ...
+ * @throws XMLParserException ...
+ * @throws EncryptionException ...
*/
@Test(expectedExceptions=DecryptionException.class)
public void testEncryptedKeyAlgorithmWhitelistFail() throws DecryptionException, EncryptionException, XMLParserException {
@@ -265,10 +272,11 @@ public class SimpleDecryptionTest extends XMLObjectBaseTestCase {
}
/**
- * Test EncryptedKey decryption which should fail due to whitelist validation.
- * @throws DecryptionException
- * @throws XMLParserException
- * @throws EncryptionException
+ * Test EncryptedKey decryption which should fail due to whitelist validation.
+ *
+ * @throws DecryptionException ...
+ * @throws XMLParserException ...
+ * @throws EncryptionException ...
*/
@Test(expectedExceptions=DecryptionException.class)
public void testEncryptedKeyDigestMethodWhitelistFail() throws DecryptionException, EncryptionException, XMLParserException {
@@ -296,10 +304,11 @@ public class SimpleDecryptionTest extends XMLObjectBaseTestCase {
}
/**
- * Test EncryptedKey decryption which should fail due to whitelist validation.
- * @throws DecryptionException
- * @throws XMLParserException
- * @throws EncryptionException
+ * Test EncryptedKey decryption which should fail due to whitelist validation.
+ *
+ * @throws DecryptionException ...
+ * @throws XMLParserException ...
+ * @throws EncryptionException ...
*/
@Test(expectedExceptions=DecryptionException.class)
public void testEncryptedKeyMGFWhitelistFail() throws DecryptionException, EncryptionException, XMLParserException {
@@ -327,11 +336,12 @@ public class SimpleDecryptionTest extends XMLObjectBaseTestCase {
}
/**
- * Test EncryptedKey decryption which should pass the whitelist validation b/c the list specifies
- * the algorithms in use.
- * @throws DecryptionException
- * @throws XMLParserException
- * @throws EncryptionException
+ * Test EncryptedKey decryption which should pass the whitelist validation b/c the list specifies
+ * the algorithms in use.
+ *
+ * @throws DecryptionException ...
+ * @throws XMLParserException ...
+ * @throws EncryptionException ...
*/
@Test()
public void testEncryptedKeyAlgorithmWhitelistPass() throws DecryptionException, EncryptionException, XMLParserException {
@@ -406,11 +416,11 @@ public class SimpleDecryptionTest extends XMLObjectBaseTestCase {
}
/**
- * Test error condition of invalid data decryption key.
+ * Test error condition of invalid data decryption key.
*
- * @throws NoSuchProviderException
- * @throws NoSuchAlgorithmException
- * @throws KeyException
+ * @throws NoSuchProviderException ...
+ * @throws NoSuchAlgorithmException ...
+ * @throws KeyException ...
*/
@Test
public void testErrorInvalidDataDecryptionKey() throws NoSuchAlgorithmException, NoSuchProviderException, KeyException {
@@ -430,10 +440,10 @@ public class SimpleDecryptionTest extends XMLObjectBaseTestCase {
}
/**
- * Test error condition of invalid key decryption key.
+ * Test error condition of invalid key decryption key.
*
- * @throws NoSuchProviderException
- * @throws NoSuchAlgorithmException
+ * @throws NoSuchProviderException ...
+ * @throws NoSuchAlgorithmException ...
*/
@Test
public void testErrorInvalidKeyDecryptionKey() throws NoSuchAlgorithmException, NoSuchProviderException {
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleEncryptionTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleEncryptionTest.java
index ce66e63..e5f7b46 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleEncryptionTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleEncryptionTest.java
@@ -304,12 +304,13 @@ public class SimpleEncryptionTest extends XMLObjectBaseTestCase {
}
/**
- * Test basic encryption of a symmetric key into an EncryptedKey,
- * set key encrypting key name in passed KeyInfo object.
+ * Test basic encryption of a symmetric key into an EncryptedKey,
+ * set key encrypting key name in passed KeyInfo object.
+ *
* @throws NoSuchProviderException bad JCA provider
* @throws NoSuchAlgorithmException bad JCA algorithm
* @throws XMLParserException error creating new Document from pool
- * @throws KeyException
+ * @throws KeyException ...
*/
@Test
public void testEncryptKeySingleKEK() throws NoSuchAlgorithmException, NoSuchProviderException,
@@ -331,12 +332,13 @@ public class SimpleEncryptionTest extends XMLObjectBaseTestCase {
}
/**
- * Test basic encryption of a symmetric key into an EncryptedKey,
- * set key encrypting key name in passed KeyInfo object.
+ * Test basic encryption of a symmetric key into an EncryptedKey,
+ * set key encrypting key name in passed KeyInfo object.
+ *
* @throws NoSuchProviderException bad JCA provider
* @throws NoSuchAlgorithmException bad JCA algorithm
* @throws XMLParserException error creating new Document from pool
- * @throws KeyException
+ * @throws KeyException ...
*/
@Test
public void testEncryptKeyMultipleKEK() throws NoSuchAlgorithmException, NoSuchProviderException,
@@ -365,10 +367,7 @@ public class SimpleEncryptionTest extends XMLObjectBaseTestCase {
}
/**
- * Test basic encryption with auto-generated symmetric key.
- *
- * @throws NoSuchProviderException
- * @throws NoSuchAlgorithmException
+ * Test basic encryption with auto-generated symmetric key.
*/
@Test
public void testAutoKeyGen() {
@@ -398,10 +397,7 @@ public class SimpleEncryptionTest extends XMLObjectBaseTestCase {
}
/**
- * Test failure with auto-generated symmetric key and no KEK(s).
- *
- * @throws NoSuchProviderException
- * @throws NoSuchAlgorithmException
+ * Test failure with auto-generated symmetric key and no KEK(s).
*/
@Test
public void testAutoKeyGenNoKEK() {
@@ -436,7 +432,7 @@ public class SimpleEncryptionTest extends XMLObjectBaseTestCase {
* @throws NoSuchProviderException bad JCA provider
* @throws NoSuchAlgorithmException bad JCA algorithm
* @throws XMLParserException error creating new Document from pool
- * @throws KeyException
+ * @throws KeyException ...
*/
@Test
public void testEncryptKeyDigestMethodsRSAOAEP() throws NoSuchAlgorithmException, NoSuchProviderException,
@@ -471,7 +467,7 @@ public class SimpleEncryptionTest extends XMLObjectBaseTestCase {
* @throws NoSuchProviderException bad JCA provider
* @throws NoSuchAlgorithmException bad JCA algorithm
* @throws XMLParserException error creating new Document from pool
- * @throws KeyException
+ * @throws KeyException ...
*/
@Test
public void testEncryptKeyDigestMethodsRSAv15() throws NoSuchAlgorithmException, NoSuchProviderException,
@@ -494,10 +490,10 @@ public class SimpleEncryptionTest extends XMLObjectBaseTestCase {
}
/**
- * Test proper error handling of attempt to encrypt with a DSA key.
+ * Test proper error handling of attempt to encrypt with a DSA key.
*
- * @throws NoSuchProviderException
- * @throws NoSuchAlgorithmException
+ * @throws NoSuchProviderException ...
+ * @throws NoSuchAlgorithmException ...
*/
@Test
public void testEncryptDataBadKEKDSA() throws NoSuchAlgorithmException, NoSuchProviderException {
@@ -516,13 +512,14 @@ public class SimpleEncryptionTest extends XMLObjectBaseTestCase {
}
/**
- * Test encryption of a symmetric key into an EncryptedKey,
- * using various RSAOAEPParameters options.
+ * Test encryption of a symmetric key into an EncryptedKey,
+ * using various RSAOAEPParameters options.
+ *
* @throws NoSuchProviderException bad JCA provider
* @throws NoSuchAlgorithmException bad JCA algorithm
* @throws XMLParserException error creating new Document from pool
- * @throws KeyException
- * @throws EncryptionException
+ * @throws KeyException ...
+ * @throws EncryptionException ...
*/
@Test
public void testRSAOAEPParameters() throws NoSuchAlgorithmException, NoSuchProviderException,
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupportTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupportTest.java
index 8dd303d..0bf9050 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupportTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupportTest.java
@@ -275,7 +275,7 @@ public class KeyInfoSupportTest extends XMLObjectBaseTestCase {
/**
* Test converting XML X509Certificate to java.security.cert.X509Certificate.
*
- * @throws CertificateException
+ * @throws CertificateException ...
*/
@Test
public void testCertConversionXMLtoJava() throws CertificateException {
@@ -319,8 +319,8 @@ public class KeyInfoSupportTest extends XMLObjectBaseTestCase {
/**
* Test converting XML X509CRL to java.security.cert.X509CRL.
*
- * @throws CRLException
- * @throws CertificateException
+ * @throws CRLException ...
+ * @throws CertificateException ...
*/
@Test
public void testCRLConversionXMLtoJava() throws CertificateException, CRLException {
@@ -360,7 +360,7 @@ public class KeyInfoSupportTest extends XMLObjectBaseTestCase {
/**
* Test converting java.security.cert.X509Certificate to XML X509Certificate.
*
- * @throws CertificateException
+ * @throws CertificateException ...
*/
@Test
public void testCertConversionJavaToXML() throws CertificateException {
@@ -378,8 +378,8 @@ public class KeyInfoSupportTest extends XMLObjectBaseTestCase {
/**
* Test converting java.security.cert.X509CRL to XML X509CRL.
*
- * @throws CRLException
- * @throws CertificateException
+ * @throws CRLException ...
+ * @throws CertificateException ...
*/
@Test
public void testCRLConversionJavaToXML() throws CertificateException, CRLException {
@@ -611,7 +611,7 @@ public class KeyInfoSupportTest extends XMLObjectBaseTestCase {
/**
* Tests adding a certificate as a X509Data/X509Certificate to KeyInfo.
*
- * @throws CertificateException
+ * @throws CertificateException ...
*/
@Test
public void testAddX509Certificate() throws CertificateException {
@@ -634,7 +634,7 @@ public class KeyInfoSupportTest extends XMLObjectBaseTestCase {
/**
* Tests adding a CRL as a X509Data/X509CRL to KeyInfo.
*
- * @throws CRLException
+ * @throws CRLException ...
*/
@Test
public void testAddX509CRL() throws CRLException {
@@ -681,7 +681,7 @@ public class KeyInfoSupportTest extends XMLObjectBaseTestCase {
/**
* Tests building a new X509SKI from a certificate containing an SKI value.
*
- * @throws CertificateException
+ * @throws CertificateException ...
*/
@Test
public void testBuildSubjectKeyIdentifier() throws CertificateException {
@@ -702,8 +702,8 @@ public class KeyInfoSupportTest extends XMLObjectBaseTestCase {
/**
* Tests building a new X509Digest from a certificate.
- * @throws CertificateException
- * @throws NoSuchAlgorithmException
+ *
+ * @throws CertificateException ...
*/
@Test
public void testBuildDigest() throws CertificateException {
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/BasicKeyInfoGeneratorTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/BasicKeyInfoGeneratorTest.java
index 8119a2d..e9e2fcc 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/BasicKeyInfoGeneratorTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/BasicKeyInfoGeneratorTest.java
@@ -72,7 +72,8 @@ public class BasicKeyInfoGeneratorTest extends XMLObjectBaseTestCase {
/**
* Test no options - should produce null KeyInfo.
- * @throws SecurityException
+ *
+ * @throws SecurityException ...
*/
@Test
public void testNoOptions() throws SecurityException {
@@ -85,7 +86,9 @@ public class BasicKeyInfoGeneratorTest extends XMLObjectBaseTestCase {
/**
* Test emit public key.
- * @throws SecurityException
+ *
+ * @throws SecurityException ...
+ * @throws KeyException ...
*/
@Test
public void testEmitPublicKey() throws SecurityException, KeyException {
@@ -110,7 +113,8 @@ public class BasicKeyInfoGeneratorTest extends XMLObjectBaseTestCase {
/**
* Test emit credential key names.
- * @throws SecurityException
+ *
+ * @throws SecurityException ...
*/
@Test
public void testEmitKeynames() throws SecurityException {
@@ -130,7 +134,8 @@ public class BasicKeyInfoGeneratorTest extends XMLObjectBaseTestCase {
/**
* Test emit entity ID as key name.
- * @throws SecurityException
+ *
+ * @throws SecurityException ...
*/
@Test
public void testEmitEntityIDAsKeyName() throws SecurityException {
@@ -151,7 +156,9 @@ public class BasicKeyInfoGeneratorTest extends XMLObjectBaseTestCase {
* Test that the options passed to the generator are really cloned.
* After newInstance() is called, changes to the factory options should not be
* reflected in the generator.
- * @throws SecurityException */
+ *
+ * @throws SecurityException ...
+ */
@Test
public void testProperOptionsCloning() throws SecurityException {
generator = factory.newInstance();
@@ -176,4 +183,4 @@ public class BasicKeyInfoGeneratorTest extends XMLObjectBaseTestCase {
Assert.assertEquals(keyInfo.getOrderedChildren().size(), 5, "Unexpected # of KeyInfo children found");
}
-}
\ No newline at end of file
+}
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/ChainingKeyInfoCredentialResolverTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/ChainingKeyInfoCredentialResolverTest.java
index 6174da7..cb54a0c 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/ChainingKeyInfoCredentialResolverTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/ChainingKeyInfoCredentialResolverTest.java
@@ -89,7 +89,8 @@ public class ChainingKeyInfoCredentialResolverTest extends XMLObjectBaseTestCase
/**
* Test a single chain member, which returns no credentials.
- * @throws ResolverException
+ *
+ * @throws ResolverException ...
*/
@Test
public void testOneEmptyMember() throws ResolverException {
@@ -101,7 +102,8 @@ public class ChainingKeyInfoCredentialResolverTest extends XMLObjectBaseTestCase
/**
* Test multiple chain members, all of which return no credentials.
- * @throws ResolverException
+ *
+ * @throws ResolverException ...
*/
@Test
public void testMultipleEmptyMember() throws ResolverException {
@@ -114,7 +116,8 @@ public class ChainingKeyInfoCredentialResolverTest extends XMLObjectBaseTestCase
/**
* Test one chain member, returning credentials.
- * @throws ResolverException
+ *
+ * @throws ResolverException ...
*/
@Test
public void testOneMember() throws ResolverException {
@@ -126,7 +129,8 @@ public class ChainingKeyInfoCredentialResolverTest extends XMLObjectBaseTestCase
/**
* Test multiple chain members, returning credentials.
- * @throws ResolverException
+ *
+ * @throws ResolverException ...
*/
@Test
public void testMultipleMembers() throws ResolverException {
@@ -140,7 +144,8 @@ public class ChainingKeyInfoCredentialResolverTest extends XMLObjectBaseTestCase
/**
* Test that order of returned credentials is the expected ordering,
* based on the ordering in the resolver chain.
- * @throws ResolverException
+ *
+ * @throws ResolverException ...
*/
@Test
public void testOrderingMultipleMembers() throws ResolverException {
@@ -159,7 +164,8 @@ public class ChainingKeyInfoCredentialResolverTest extends XMLObjectBaseTestCase
/**
* Test empty resolver chain, i.e. no underlying resolver members.
- * @throws ResolverException
+ *
+ * @throws ResolverException ...
*/
@Test(expectedExceptions=IllegalStateException.class)
public void testEmptyResolverChain() throws ResolverException {
@@ -169,7 +175,8 @@ public class ChainingKeyInfoCredentialResolverTest extends XMLObjectBaseTestCase
/**
* Test exception on attempt to call remove() on iterator.
- * @throws ResolverException
+ *
+ * @throws ResolverException ...
*/
@Test(expectedExceptions=UnsupportedOperationException.class)
public void testRemove() throws ResolverException {
@@ -183,7 +190,8 @@ public class ChainingKeyInfoCredentialResolverTest extends XMLObjectBaseTestCase
/**
* Test exception on attempt to call next() on iterator when no more members.
- * @throws ResolverException
+ *
+ * @throws ResolverException ...
*/
@Test(expectedExceptions=NoSuchElementException.class)
public void testNoMoreMembers() throws ResolverException {
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/KeyInfoGeneratorManagerTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/KeyInfoGeneratorManagerTest.java
index 126e682..fda3290 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/KeyInfoGeneratorManagerTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/KeyInfoGeneratorManagerTest.java
@@ -121,11 +121,12 @@ public class KeyInfoGeneratorManagerTest extends XMLObjectBaseTestCase {
}
}
- /** Test lookup of factory from manager based on a credential instance.
- * @throws NoSuchProviderException
- * @throws NoSuchAlgorithmException
- * @throws CryptException
- * @throws IOException */
+ /** Test lookup of factory from manager based on a credential instance.
+ *
+ * @throws NoSuchProviderException ...
+ * @throws NoSuchAlgorithmException ...
+ * @throws IOException ...
+ */
@Test
public void testLookupFactory() throws NoSuchAlgorithmException, NoSuchProviderException, IOException {
manager.registerFactory(basicFactory);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/NamedKeyInfoGeneratorManagerTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/NamedKeyInfoGeneratorManagerTest.java
index b4500c2..3f5cb8c 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/NamedKeyInfoGeneratorManagerTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/NamedKeyInfoGeneratorManagerTest.java
@@ -190,8 +190,9 @@ public class NamedKeyInfoGeneratorManagerTest extends XMLObjectBaseTestCase {
}
/** Test lookup of factory from manager based on a credential instance.
- * @throws CryptException
- * @throws IOException */
+ *
+ * @throws IOException ...
+ */
@Test
public void testLookupFactory() throws IOException {
manager.registerFactory(nameFoo, basicFactoryFoo);
@@ -238,8 +239,9 @@ public class NamedKeyInfoGeneratorManagerTest extends XMLObjectBaseTestCase {
}
/** Test proper functioning of option to use the default manager for unnamed factories.
- * @throws CryptException
- * @throws IOException */
+ *
+ * @throws IOException ...
+ */
@Test
public void testFallThroughToDefaultManager() throws IOException {
KeyInfoGeneratorFactory defaultX509Factory = new X509KeyInfoGeneratorFactory();
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/StaticKeyInfoGeneratorTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/StaticKeyInfoGeneratorTest.java
index f2e5990..3d652a4 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/StaticKeyInfoGeneratorTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/StaticKeyInfoGeneratorTest.java
@@ -80,8 +80,8 @@ public class StaticKeyInfoGeneratorTest extends XMLObjectBaseTestCase {
/**
* Simple test, should return the same instance every time.
*
- * @throws SecurityException
- * @throws KeyException
+ * @throws SecurityException ...
+ * @throws KeyException ...
*/
@Test
public void testSimple() throws SecurityException, KeyException {
@@ -103,8 +103,8 @@ public class StaticKeyInfoGeneratorTest extends XMLObjectBaseTestCase {
/**
* Test with cloning, original KeyInfo has no cached DOM.
*
- * @throws SecurityException
- * @throws KeyException
+ * @throws SecurityException ...
+ * @throws KeyException ...
*/
@Test
public void testWithCloningNoDOMCache() throws SecurityException, KeyException {
@@ -130,9 +130,9 @@ public class StaticKeyInfoGeneratorTest extends XMLObjectBaseTestCase {
/**
* Test with cloning, original KeyInfo has a cached DOM.
*
- * @throws SecurityException
- * @throws KeyException
- * @throws MarshallingException
+ * @throws SecurityException ...
+ * @throws KeyException ...
+ * @throws MarshallingException ...
*/
@Test
public void testWithCloningWithDOMCache() throws SecurityException, KeyException, MarshallingException {
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorTest.java
index 26a76ea..84af739 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorTest.java
@@ -189,7 +189,7 @@ public class X509KeyInfoGeneratorTest extends XMLObjectBaseTestCase {
/**
* Test no options - should produce null KeyInfo.
*
- * @throws SecurityException
+ * @throws SecurityException ...
*/
@Test
public void testNoOptions() throws SecurityException {
@@ -203,7 +203,8 @@ public class X509KeyInfoGeneratorTest extends XMLObjectBaseTestCase {
/**
* Test emit public key.
*
- * @throws SecurityException
+ * @throws SecurityException ...
+ * @throws KeyException ...
*/
@Test
public void testEmitPublicKey() throws SecurityException, KeyException {
@@ -224,7 +225,7 @@ public class X509KeyInfoGeneratorTest extends XMLObjectBaseTestCase {
/**
* Test emit credential key names.
*
- * @throws SecurityException
+ * @throws SecurityException ...
*/
@Test
public void testEmitKeynames() throws SecurityException {
@@ -245,7 +246,7 @@ public class X509KeyInfoGeneratorTest extends XMLObjectBaseTestCase {
/**
* Test emit entity ID as key name.
*
- * @throws SecurityException
+ * @throws SecurityException ...
*/
@Test
public void testEmitEntityIDAsKeyName() throws SecurityException {
@@ -265,8 +266,8 @@ public class X509KeyInfoGeneratorTest extends XMLObjectBaseTestCase {
/**
* Test emit entity cert.
*
- * @throws SecurityException
- * @throws CertificateException
+ * @throws SecurityException ...
+ * @throws CertificateException ...
*/
@Test
public void testEmitEntityCert() throws SecurityException, CertificateException {
@@ -288,8 +289,8 @@ public class X509KeyInfoGeneratorTest extends XMLObjectBaseTestCase {
/**
* Test emit entity cert chain in X509Data.
*
- * @throws SecurityException
- * @throws CertificateException
+ * @throws SecurityException ...
+ * @throws CertificateException ...
*/
@Test
public void testEmitEntityCertChain() throws SecurityException, CertificateException {
@@ -312,8 +313,8 @@ public class X509KeyInfoGeneratorTest extends XMLObjectBaseTestCase {
/**
* Test combo options of cert and chain - don't emit duplicate of entity cert.
*
- * @throws SecurityException
- * @throws CertificateException
+ * @throws SecurityException ...
+ * @throws CertificateException ...
*/
@Test
public void testEmitCertAndChainCombo() throws SecurityException, CertificateException {
@@ -337,8 +338,8 @@ public class X509KeyInfoGeneratorTest extends XMLObjectBaseTestCase {
/**
* Test emit CRLs.
*
- * @throws SecurityException
- * @throws CRLException
+ * @throws SecurityException ...
+ * @throws CRLException ...
*/
@Test
public void testEmitCRLs() throws SecurityException, CRLException {
@@ -360,7 +361,7 @@ public class X509KeyInfoGeneratorTest extends XMLObjectBaseTestCase {
/**
* Test emit subject name in X509Data.
*
- * @throws SecurityException
+ * @throws SecurityException ...
*/
@Test
public void testEmitX509SubjectName() throws SecurityException {
@@ -382,7 +383,7 @@ public class X509KeyInfoGeneratorTest extends XMLObjectBaseTestCase {
/**
* Test emit issuer name and serial number in X509Data.
*
- * @throws SecurityException
+ * @throws SecurityException ...
*/
@Test
public void testEmitX509IssuerSerial() throws SecurityException {
@@ -409,7 +410,7 @@ public class X509KeyInfoGeneratorTest extends XMLObjectBaseTestCase {
/**
* Test emit subject key identifier in X509Data.
*
- * @throws SecurityException
+ * @throws SecurityException ...
*/
@Test
public void testEmitX509SKI() throws SecurityException {
@@ -431,7 +432,8 @@ public class X509KeyInfoGeneratorTest extends XMLObjectBaseTestCase {
/**
* Test emit X509Digest in X509Data.
- * @throws SecurityException
+ *
+ * @throws SecurityException ...
*/
@Test
public void testEmitX509Digest() throws SecurityException {
@@ -456,7 +458,7 @@ public class X509KeyInfoGeneratorTest extends XMLObjectBaseTestCase {
/**
* Test emit subject DN as key name.
*
- * @throws SecurityException
+ * @throws SecurityException ...
*/
@Test
public void testEmitSubjectDNAsKeyName() throws SecurityException {
@@ -477,7 +479,7 @@ public class X509KeyInfoGeneratorTest extends XMLObjectBaseTestCase {
/**
* Test emit subject CN as key name.
*
- * @throws SecurityException
+ * @throws SecurityException ...
*/
@Test
public void testEmitSubjectCNAsKeyName() throws SecurityException {
@@ -497,8 +499,8 @@ public class X509KeyInfoGeneratorTest extends XMLObjectBaseTestCase {
/**
* Test emit subject alt names as key names.
*
- * @throws SecurityException
- * @throws CertificateParsingException
+ * @throws SecurityException ...
+ * @throws CertificateParsingException ...
*/
@Test
public void testEmitSubjectAltNamesAsKeyNames() throws SecurityException, CertificateParsingException {
@@ -546,7 +548,7 @@ public class X509KeyInfoGeneratorTest extends XMLObjectBaseTestCase {
/**
* Test emitting combinations of key names.
*
- * @throws SecurityException
+ * @throws SecurityException ...
*/
@Test
public void testEmitKeyNamesCombo() throws SecurityException {
@@ -580,7 +582,7 @@ public class X509KeyInfoGeneratorTest extends XMLObjectBaseTestCase {
* Test that the options passed to the generator are really cloned. After newInstance() is called, changes to the
* factory options should not be reflected in the generator.
*
- * @throws SecurityException
+ * @throws SecurityException ...
*/
@Test
public void testProperOptionsCloning() throws SecurityException {
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/mock/SignableSimpleXMLObject.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/mock/SignableSimpleXMLObject.java
index a1504fe..747c5e8 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/mock/SignableSimpleXMLObject.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/mock/SignableSimpleXMLObject.java
@@ -79,6 +79,9 @@ public class SignableSimpleXMLObject extends AbstractSignableXMLObject implement
/**
* Constructor
+ * @param namspaceURI ...
+ * @param localName ...
+ * @param namespacePrefix ...
*/
public SignableSimpleXMLObject(String namspaceURI, String localName, String namespacePrefix) {
super(namspaceURI, localName, namespacePrefix);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/DetachedSignatureTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/DetachedSignatureTest.java
index 6de5d0c..eb14376 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/DetachedSignatureTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/DetachedSignatureTest.java
@@ -19,8 +19,6 @@ package org.opensaml.xmlsec.signature.support;
import java.security.KeyPair;
-import javax.xml.bind.ValidationException;
-
import org.opensaml.core.xml.XMLObjectBaseTestCase;
import org.opensaml.core.xml.XMLObjectBuilder;
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
@@ -88,9 +86,8 @@ public class DetachedSignatureTest extends XMLObjectBaseTestCase {
* Tests creating a detached signature within the same document as the element signed and then verifying it.
*
* @throws MarshallingException thrown if the XMLObject tree can not be marshalled
- * @throws ValidationException thrown if there is a problem attempting to validate the signature
* @throws UnmarshallingException thrown if the signature can not be unmarshalled
- * @throws SignatureException
+ * @throws SignatureException ...
*/
@Test
public void testInternalSignatureAndVerification() throws MarshallingException, UnmarshallingException,
@@ -125,8 +122,7 @@ public class DetachedSignatureTest extends XMLObjectBaseTestCase {
* external references used are the InCommon and InQueue metadata files.
*
* @throws MarshallingException thrown if the XMLObject tree can not be marshalled
- * @throws ValidationException thrown if the signature verification fails
- * @throws SignatureException
+ * @throws SignatureException ...
*/
@Test
public void testExternalSignatureAndVerification() throws MarshallingException, SignatureException {
@@ -209,4 +205,4 @@ public class DetachedSignatureTest extends XMLObjectBaseTestCase {
rootSXO.setSignature(sig);
return rootSXO;
}
-}
\ No newline at end of file
+}
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/EnvelopedSignatureTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/EnvelopedSignatureTest.java
index 966915e..76c3a7d 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/EnvelopedSignatureTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/EnvelopedSignatureTest.java
@@ -90,11 +90,11 @@ public class EnvelopedSignatureTest extends XMLObjectBaseTestCase {
* Tests creating an enveloped signature and then verifying it.
*
* @throws MarshallingException thrown if the XMLObject tree can not be marshalled
- * @throws ValidationException
- * @throws SignatureException
+ * @throws ValidationException ...
+ * @throws SignatureException ...
*/
@Test
- public void testSigningAndVerification() throws MarshallingException, ValidationException, SignatureException{
+ public void testSigningAndVerification() throws MarshallingException, ValidationException, SignatureException {
SignableSimpleXMLObject sxo = getXMLObjectWithSignature();
Signature signature = sxo.getSignature();
@@ -122,7 +122,7 @@ public class EnvelopedSignatureTest extends XMLObjectBaseTestCase {
*
* @throws XMLParserException thrown if the XML can not be parsed
* @throws UnmarshallingException thrown if the DOM can not be unmarshalled
- * @throws GeneralSecurityException
+ * @throws GeneralSecurityException ...
*/
@Test
public void testUnmarshall() throws XMLParserException, UnmarshallingException, GeneralSecurityException {
@@ -169,4 +169,4 @@ public class EnvelopedSignatureTest extends XMLObjectBaseTestCase {
sxo.setSignature(sig);
return sxo;
}
-}
\ No newline at end of file
+}
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/HMACSignatureTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/HMACSignatureTest.java
index 23ec37e..8c558c1 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/HMACSignatureTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/HMACSignatureTest.java
@@ -110,7 +110,7 @@ public class HMACSignatureTest extends XMLObjectBaseTestCase {
*
* @throws MarshallingException thrown if the XMLObject tree can not be marshalled
* @throws ValidationException thrown if signature validator fails to validate the signature
- * @throws SignatureException
+ * @throws SignatureException ...
*/
@Test
public void testSigningAndVerificationNoOutputLength() throws MarshallingException, ValidationException, SignatureException {
@@ -140,8 +140,7 @@ public class HMACSignatureTest extends XMLObjectBaseTestCase {
* Tests creating an enveloped signature and then verifying it.
*
* @throws MarshallingException thrown if the XMLObject tree can not be marshalled
- * @throws ValidationException thrown if signature validator fails to validate the signature
- * @throws SignatureException
+ * @throws SignatureException ...
*/
@Test
public void testSigningAndVerificationWithOutputLength() throws MarshallingException, SignatureException {
@@ -316,4 +315,4 @@ public class HMACSignatureTest extends XMLObjectBaseTestCase {
sxo.setSignature(sig);
return sxo;
}
-}
\ No newline at end of file
+}
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/ExplicitKeySignatureTrustEngineTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/ExplicitKeySignatureTrustEngineTest.java
index a469019..55cbae3 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/ExplicitKeySignatureTrustEngineTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/ExplicitKeySignatureTrustEngineTest.java
@@ -189,7 +189,7 @@ public class ExplicitKeySignatureTrustEngineTest extends XMLObjectBaseTestCase {
/**
* Test valid signature.
*
- * @throws SecurityException
+ * @throws SecurityException ...
*/
@Test
public void testSuccess() throws SecurityException {
@@ -203,7 +203,7 @@ public class ExplicitKeySignatureTrustEngineTest extends XMLObjectBaseTestCase {
/**
* Test valid signature, untrusted signing credential.
*
- * @throws SecurityException
+ * @throws SecurityException ...
*/
@Test
public void testUntrustedCredential() throws SecurityException {
@@ -215,7 +215,7 @@ public class ExplicitKeySignatureTrustEngineTest extends XMLObjectBaseTestCase {
/**
* Test invalid signature, trusted signing credential.
*
- * @throws SecurityException
+ * @throws SecurityException ...
*/
@Test
public void testInvalidSignature() throws SecurityException {
@@ -230,7 +230,7 @@ public class ExplicitKeySignatureTrustEngineTest extends XMLObjectBaseTestCase {
/**
* Test whitelisted signature and digest method algorithm URIs.
*
- * @throws SecurityException
+ * @throws SecurityException ...
*/
@Test
public void testWhitelistedAlgorithms() throws SecurityException {
@@ -251,7 +251,7 @@ public class ExplicitKeySignatureTrustEngineTest extends XMLObjectBaseTestCase {
/**
* Test blacklisted signature method algorithm URI.
*
- * @throws SecurityException
+ * @throws SecurityException ...
*/
public void testBlacklistedSignatureAlgorithm() throws SecurityException {
trustedCredentials.add(signingX509Cred);
@@ -270,7 +270,7 @@ public class ExplicitKeySignatureTrustEngineTest extends XMLObjectBaseTestCase {
/**
* Test blacklisted digest method algorithm URI.
*
- * @throws SecurityException
+ * @throws SecurityException ...
*/
public void testBlacklistedDigestAlgorithm() throws SecurityException {
trustedCredentials.add(signingX509Cred);
@@ -289,7 +289,7 @@ public class ExplicitKeySignatureTrustEngineTest extends XMLObjectBaseTestCase {
/**
* Test valid raw signature, trusted signing credential.
*
- * @throws SecurityException
+ * @throws SecurityException ...
*/
@Test
public void testRawSuccess() throws SecurityException {
@@ -307,7 +307,7 @@ public class ExplicitKeySignatureTrustEngineTest extends XMLObjectBaseTestCase {
/**
* Test valid raw signature, untrusted signing credential.
*
- * @throws SecurityException
+ * @throws SecurityException ...
*/
@Test
public void testRawUntrustedCredential() throws SecurityException {
@@ -324,7 +324,7 @@ public class ExplicitKeySignatureTrustEngineTest extends XMLObjectBaseTestCase {
/**
* Test invalid raw signature, trusted signing credential.
*
- * @throws SecurityException
+ * @throws SecurityException ...
*/
@Test
public void testRawInvalidSignature() throws SecurityException {
@@ -340,7 +340,7 @@ public class ExplicitKeySignatureTrustEngineTest extends XMLObjectBaseTestCase {
/**
* Test valid raw signature with whitelisted signature algorithm.
*
- * @throws SecurityException
+ * @throws SecurityException ...
*/
@Test
public void testRawWhitelistedAlgorithm() throws SecurityException {
@@ -360,7 +360,7 @@ public class ExplicitKeySignatureTrustEngineTest extends XMLObjectBaseTestCase {
/**
* Test valid raw signature with whitelisted signature algorithm.
*
- * @throws SecurityException
+ * @throws SecurityException ...
*/
@Test
public void testRawBlacklistedAlgorithm() throws SecurityException {
@@ -402,7 +402,8 @@ public class ExplicitKeySignatureTrustEngineTest extends XMLObjectBaseTestCase {
* Build a signed object.
*
* @return a signed object
- * @throws SignatureException
+ *
+ * @throws SignatureException ...
*/
protected SignableXMLObject buildSignedObject() throws SignatureException {
SignableSimpleXMLObject sxo = (SignableSimpleXMLObject) buildXMLObject(SignableSimpleXMLObject.ELEMENT_NAME);
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/PKIXSignatureTrustEngineTest.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/PKIXSignatureTrustEngineTest.java
index 73c3f58..2ce4303 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/PKIXSignatureTrustEngineTest.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/PKIXSignatureTrustEngineTest.java
@@ -494,9 +494,9 @@ public class PKIXSignatureTrustEngineTest extends XMLObjectBaseTestCase {
- /********************
- * Helper methods. *
- ********************/
+ //*******************
+ //* Helper methods. *
+ //*******************
@Test(enabled = false)
private void testValidateSuccess(String message) {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list