[java-identity-provider] branch master updated: JPAR-131 - Fix doclint issues
Ian Young
ian at iay.org.uk
Mon Dec 30 08:40:36 EST 2019
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=fa325744ca9538c508ebb96ac804eb1e2d913f9d
The following commit(s) were added to refs/heads/master by this push:
new fa32574 JPAR-131 - Fix doclint issues
fa32574 is described below
commit fa325744ca9538c508ebb96ac804eb1e2d913f9d
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Mon Dec 30 13:40:29 2019 +0000
JPAR-131 - Fix doclint issues
https://issues.shibboleth.net/jira/browse/JPAR-131
---
.../idp/attribute/AttributeContextTest.java | 7 +-
.../impl/BaseComplexAttributeFilterTestCase.java | 6 +-
.../impl/TargettedAttributeValueFilterTest.java | 79 +++++++++++--------
.../impl/UntargettedAttributeValueFilterTest.java | 48 +++++++-----
.../filter/impl/AttributeFilterImplTest.java | 18 ++++-
.../matcher/impl/MockValuePredicateMatcher.java | 5 +-
.../logic/impl/AbstractComposedMatcherTest.java | 2 +-
.../impl/PredicatePolicyRuleTest.java | 1 -
.../logic/impl/AbstractComposedPolicyRuleTest.java | 2 +-
.../filter/spring/AttributeFilterServiceTest.java | 4 +-
.../spring/BaseAttributeFilterParserTest.java | 6 +-
.../policy/AttributeRequesterRuleParserTest.java | 19 +++--
...teIssuerEntityAttributeExactRuleParserTest.java | 5 +-
...teIssuerEntityAttributeRegexRuleParserTest.java | 2 +-
...equesterEntityAttributeExactRuleParserTest.java | 2 +-
...questerRegistrationAuthorityRuleParserTest.java | 2 +-
.../resolver/AbstractAttributeDefinitionTest.java | 8 +-
.../resolver/AbstractDataConnectorTest.java | 6 +-
.../resolver/AbstractResolverPluginTest.java | 6 +-
.../resolver/AttributeResolverWorkContextTest.java | 14 +++-
.../resolver/MockAttributeDefinition.java | 3 +-
.../idp/attribute/resolver/MockDataConnector.java | 9 ++-
.../resolver/ad/impl/ScriptedAttributeTest.java | 37 +++++----
.../dc/ldap/impl/LDAPDataConnectorTest.java | 18 ++++-
.../resolver/dc/ldap/impl/Regressions.java | 4 +-
.../dc/rdbms/impl/RDBMSDataConnectorTest.java | 7 +-
.../resolver/impl/AttributeResolverImplTest.java | 91 ++++++++++++++++++----
.../resolver/spring/dc/ManagedConnectionTest.java | 4 +-
.../authn/AuthenticationFlowDescriptorTest.java | 8 +-
.../idp/authn/AuthenticationResultTest.java | 8 +-
.../MockAuthenticationProfileConfiguration.java | 1 +
.../authn/context/AuthenticationContextTest.java | 44 +++++++++--
.../authn/spnego/impl/SPNEGOAuthnController.java | 28 +++----
.../FinalizeMultiFactorAuthenticationTest.java | 26 +++++--
.../InitializeRequestedPrincipalContextTest.java | 38 +++++++--
.../impl/PopulateAuthenticationContextTest.java | 20 ++++-
...PopulateSubjectCanonicalizationContextTest.java | 8 +-
.../idp/cas/flow/impl/AbstractFlowActionTest.java | 2 +-
.../service/impl/MetadataServiceRegistryTest.java | 2 +-
.../idp/test/flows/AbstractFlowTest.java | 3 +-
.../flows/saml1/SAML1AttributeQueryFlowTest.java | 2 +
.../flows/saml1/SAML1TestResponseValidator.java | 5 +-
.../flows/saml2/SAML2AttributeQueryFlowTest.java | 2 +
.../idp/test/flows/saml2/SAML2POSTSSOFlowTest.java | 2 +
.../saml2/SAML2POSTSimpleSignSSOFlowTest.java | 4 +-
.../test/flows/saml2/SAML2RedirectSSOFlowTest.java | 2 +-
.../flows/saml2/SAML2TestResponseValidator.java | 5 +-
.../flows/saml2/SAML2UnsolicitedSSOFlowTest.java | 6 +-
.../idp/installer/CurrentInstallState.java | 5 +-
.../java/net/shibboleth/idp/installer/Test.java | 7 +-
.../net/shibboleth/idp/profile/ScriptedAction.java | 2 +-
.../idp/profile/ActionTestingSupport.java | 3 +-
.../idp/profile/RequestContextBuilder.java | 13 +++-
.../audit/impl/PopulateAuditContextTest.java | 8 +-
.../idp/profile/impl/FilterAttributesTest.java | 38 +++++++--
.../idp/profile/impl/ResolveAttributesTest.java | 20 ++++-
.../impl/SelectProfileConfigurationTest.java | 26 +++++--
.../impl/SelectRelyingPartyConfigurationTest.java | 26 +++++--
.../PopulateProfileInterceptorContextTest.java | 14 +++-
.../FileBackedHTTPMetadataProviderParserTest.java | 6 +-
.../security/trustengine/MockTrustEngine.java | 8 +-
.../AuthenticationMethodPrincipalTest.java | 7 +-
.../AuthnContextClassRefPrincipalTest.java | 6 +-
.../AuthnContextDeclRefPrincipalTest.java | 6 +-
.../saml1/profile/SAML1ActionTestingSupport.java | 3 +-
.../saml2/profile/SAML2ActionTestingSupport.java | 3 +-
.../idp/saml/session/SAML2SPSessionTest.java | 6 +-
.../impl/CryptoTransientNameIDDecoderTest.java | 6 +-
.../CryptoTransientNameIdentifierDecoderTest.java | 7 +-
.../impl/InitializeAuthenticationContextTest.java | 27 +++++--
.../PopulateBindingAndEndpointContextsTest.java | 74 ++++++++++++++----
.../impl/AddAttributeStatementToAssertionTest.java | 46 +++++++++--
.../AddAuthenticationStatementToAssertionTest.java | 38 +++++++--
.../impl/LibertyHTTPSOAP11DecoderTest.java | 4 +-
.../impl/LibertyHTTPSOAP11EncoderTest.java | 4 +-
.../impl/AddAttributeStatementToAssertionTest.java | 48 ++++++++++--
.../impl/AddAuthnStatementToAssertionTest.java | 17 ++--
.../shibboleth/idp/session/BasicSPSessionTest.java | 8 +-
.../net/shibboleth/idp/session/IdPSessionTest.java | 45 ++++++++---
.../session/impl/SessionManagerBaseTestCase.java | 7 +-
.../impl/UpdateSessionWithSPSessionTest.java | 7 +-
.../net/shibboleth/idp/ui/csrf/BaseCSRFTest.java | 1 -
.../impl/CSRFTokenFlowExecutionListenerTest.java | 85 ++++++++++++++------
83 files changed, 919 insertions(+), 343 deletions(-)
diff --git a/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeContextTest.java b/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeContextTest.java
index 16a006b..9120160 100644
--- a/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeContextTest.java
+++ b/idp-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeContextTest.java
@@ -31,9 +31,12 @@ public class AttributeContextTest {
/**
* Test that the attributes from the supplied context cannot be modified
- * and that there as many as we expected.
+ * and that there as many as we expected.
+ *
+ * @param context ...
+ * @param expectedSize ...
*/
- private void contextAttributes( AttributeContext context, int expectedSize) {
+ private void contextAttributes(AttributeContext context, int expectedSize) {
Assert.assertEquals(context.getIdPAttributes().size(), expectedSize);
try {
context.getIdPAttributes().put("attr", new IdPAttribute("attr") );
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/BaseComplexAttributeFilterTestCase.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/BaseComplexAttributeFilterTestCase.java
index 6c73f40..60f27a0 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/BaseComplexAttributeFilterTestCase.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/BaseComplexAttributeFilterTestCase.java
@@ -43,9 +43,11 @@ public class BaseComplexAttributeFilterTestCase extends XMLObjectBaseTestCase {
* single <mdattr:EntityAttributes/> statement.
*
* @param xmlFileName the file within the test directory.
+ *
* @return the att
- * @throws ComponentInitializationException
- * @throws ResolutionException
+ *
+ * @throws ComponentInitializationException ...
+ * @throws ResolutionException ...
*/
protected Map<String, IdPAttribute> getIdPAttributes(String xmlFileName) throws ComponentInitializationException,
ResolutionException {
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/TargettedAttributeValueFilterTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/TargettedAttributeValueFilterTest.java
index 4f5217b..ba3c277 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/TargettedAttributeValueFilterTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/TargettedAttributeValueFilterTest.java
@@ -67,17 +67,22 @@ public class TargettedAttributeValueFilterTest extends BaseComplexAttributeFilte
}
/**
- * test the following policy.
- */
- /* Javadoc whines.
- <code>
- AttributeFilterPolicy id="targettedValueInEPA">
- <PolicyRequirementRule xsi:type="basic:ANY" />
- <AttributeRule attributeID="eduPersonAffiliation">
- <PermitValueRule xsi:type="basic:AttributeValueString" value="jsmith" attributeId="uid" ignoreCase="true"/>
- </AttributeRule>
- <AttributeFilterPolicy/>
- </code> which should return all values of eduPersonAffiliation when uid has a "jsmith"
+ * Test the following policy.
+ *
+ * <pre>
+ * <AttributeFilterPolicy id="targettedValueInEPA">
+ * <PolicyRequirementRule xsi:type="basic:ANY" />
+ * <AttributeRule attributeID="eduPersonAffiliation">
+ * <PermitValueRule xsi:type="basic:AttributeValueString" value="jsmith" attributeId="uid" ignoreCase="true"/>
+ * </AttributeRule>
+ * </AttributeFilterPolicy>
+ * </pre>
+ *
+ * which should return all values of eduPersonAffiliation when uid has a "jsmith"
+ *
+ * @throws ComponentInitializationException ...
+ * @throws ResolutionException ...
+ * @throws AttributeFilterException ...
*/
@Test public void testTargettedPolicyRequirement() throws ComponentInitializationException, ResolutionException,
AttributeFilterException {
@@ -125,20 +130,24 @@ public class TargettedAttributeValueFilterTest extends BaseComplexAttributeFilte
}
/**
- * test the following policy.
- */
- /*
- <code>
- <AttributeFilterPolicy id="targettedValueInEPA">
- <PolicyRequirementRule xsi:type="basic:ANY" />
- <AttributeRule attributeID="eduPersonAffiliation">
- <PermitValueRule xsi:type="basic:Not">
- <basic:Rule xsi:type="basic:AttributeValueString" value="jsmith" attributeId="uid" ignoreCase="true"/>
- </PermitValueRule>
- </AttributeRule>
- <AttributeFilterPolicy/>
- </code> which should return all values of eduPersonAffiliation when uid has a "jsmith"
+ * Test the following policy.
+ *
+ * <pre>
+ * <AttributeFilterPolicy id="targettedValueInEPA">
+ * <PolicyRequirementRule xsi:type="basic:ANY" />
+ * <AttributeRule attributeID="eduPersonAffiliation">
+ * <PermitValueRule xsi:type="basic:Not">
+ * <basic:Rule xsi:type="basic:AttributeValueString" value="jsmith" attributeId="uid" ignoreCase="true"/>
+ * </PermitValueRule>
+ * </AttributeRule>
+ * </AttributeFilterPolicy>
+ * </pre>
*
+ * which should return all values of eduPersonAffiliation when uid has a "jsmith"
+ *
+ * @throws ComponentInitializationException ...
+ * @throws ResolutionException ...
+ * @throws AttributeFilterException ...
*/
@Test public void testTargettedNotPolicyRequirement() throws ComponentInitializationException, ResolutionException,
AttributeFilterException {
@@ -190,18 +199,22 @@ public class TargettedAttributeValueFilterTest extends BaseComplexAttributeFilte
}
/**
- * test the following policy.
- <code>
- <AttributeFilterPolicy id="targettedValueInEPA">
- <PolicyRequirementRule xsi:type="basic:AttributeValueString" value="jsmith" attributeId="uid" ignoreCase="true"/>
- <AttributeRule attributeID="eduPersonAffiliation">
- <PermitValueRule xsi:type="basic:ANY" />
- </AttributeRul>
- <AttributeFilterPolicy/>
- </code>
+ * Test the following policy.
+ *
+ * <pre>
+ * <AttributeFilterPolicy id="targettedValueInEPA">
+ * <PolicyRequirementRule xsi:type="basic:AttributeValueString" value="jsmith" attributeId="uid" ignoreCase="true"/>
+ * <AttributeRule attributeID="eduPersonAffiliation">
+ * <PermitValueRule xsi:type="basic:ANY" />
+ * </AttributeRule>
+ * <AttributeFilterPolicy/>
+ * </pre>
*
* which should return all values of eduPersonAffiliation when uid has a "jsmith"
*
+ * @throws ComponentInitializationException ...
+ * @throws ResolutionException ...
+ * @throws AttributeFilterException ...
*/
@Test public void testTargettedPolicyValue() throws ComponentInitializationException, ResolutionException,
AttributeFilterException {
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/UntargettedAttributeValueFilterTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/UntargettedAttributeValueFilterTest.java
index 3b9f061..e9b2859 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/UntargettedAttributeValueFilterTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/complex/impl/UntargettedAttributeValueFilterTest.java
@@ -65,17 +65,22 @@ public class UntargettedAttributeValueFilterTest extends BaseComplexAttributeFil
}
/**
- * test the following policy.
+ * Test the following policy.
*
- <code>
- <AttributeFilterPolicy id="targettedValueInEPA">
- <PolicyRequirementRule xsi:type="basic:ANY" />
- <AttributeRule attributeID="eduPersonAffiliation">
- <PermitValueRule xsi:type="basic:AttributeValueString" value="jsmith" ignoreCase="true"/>
- </AttributeRule>
- <AttributeFilterPolicy/>
- </code> which should return One values of eduPersonAffiliation when eduPersonAffiliation attribute has a value of "jsmith"
+ * <pre>
+ * <AttributeFilterPolicy id="targettedValueInEPA">
+ * <PolicyRequirementRule xsi:type="basic:ANY" />
+ * <AttributeRule attributeID="eduPersonAffiliation">
+ * <PermitValueRule xsi:type="basic:AttributeValueString" value="jsmith" ignoreCase="true"/>
+ * </AttributeRule>
+ * <AttributeFilterPolicy/>
+ * </pre>
*
+ * which should return One values of eduPersonAffiliation when eduPersonAffiliation attribute has a value of "jsmith"
+ *
+ * @throws ComponentInitializationException ...
+ * @throws ResolutionException ...
+ * @throws AttributeFilterException ...
*/
@Test public void testUntargettedPolicyRequirement() throws ComponentInitializationException, ResolutionException,
AttributeFilterException {
@@ -117,19 +122,22 @@ public class UntargettedAttributeValueFilterTest extends BaseComplexAttributeFil
}
/**
- * test the following policy.
+ * Test the following policy.
+ *
+ * <pre>
+ * <AttributeFilterPolicy id="targettedValueInEPA">
+ * <PolicyRequirementRule xsi:type="basic:AttributeValueString" value="jsmith" ignoreCase="true"/>
+ * <AttributeRule attributeID="eduPersonAffiliation">
+ * <PermitValueRule xsi:type="basic:ANY" />
+ * </AttributeRule>
+ * <AttributeFilterPolicy/>
+ * </pre>
*
- <code>
- <AttributeFilterPolicy id="targettedValueInEPA">
- <PolicyRequirementRule xsi:type="basic:AttributeValueString" value="jsmith" ignoreCase="true"/>
- <AttributeRule attributeID="eduPersonAffiliation">
- <PermitValueRule xsi:type="basic:ANY" />
- </AttributeRul>
- <AttributeFilterPolicy/>
- </code>
-
- * which should return all values of eduPersonAffiliation when any attribute has a value of "jsmith"
+ * which should return all values of eduPersonAffiliation when any attribute has a value of "jsmith"
*
+ * @throws ComponentInitializationException ...
+ * @throws ResolutionException ...
+ * @throws AttributeFilterException ...
*/
@Test public void testUntargettedPolicyValue() throws ComponentInitializationException, ResolutionException,
AttributeFilterException {
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImplTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImplTest.java
index f57de87..ac3cfdc 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImplTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImplTest.java
@@ -44,7 +44,11 @@ import org.testng.annotations.Test;
/** Unit test for {@link AttributeFilter}. */
public class AttributeFilterImplTest {
- /** Test that post-construction state is what is expected. */
+ /**
+ * Test that post-construction state is what is expected.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testPostConstructionState() throws Exception {
AttributeFilter filter = new AttributeFilterImpl("engine", Collections.EMPTY_LIST);
Assert.assertNotNull(filter.getFilterPolicies());
@@ -73,7 +77,11 @@ public class AttributeFilterImplTest {
}
}
- /** Test setting and retrieving filter policies. */
+ /**
+ * Test setting and retrieving filter policies.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testFilterPolicies() throws Exception {
AttributeFilterPolicy policy1 = new AttributeFilterPolicy("policy1", PolicyRequirementRule.MATCHES_NONE, null);
AttributeFilterPolicy policy2 = new AttributeFilterPolicy("policy2", PolicyRequirementRule.MATCHES_NONE, null);
@@ -111,7 +119,11 @@ public class AttributeFilterImplTest {
}
}
- /** Test filtering attributes. */
+ /**
+ * Test filtering attributes.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testFilterAttributes() throws Exception {
MockMatcher attribute1Matcher = new MockMatcher();
attribute1Matcher.setMatchingAttribute("attribute1");
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/MockValuePredicateMatcher.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/MockValuePredicateMatcher.java
index 895d1bd..e907c06 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/MockValuePredicateMatcher.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/impl/MockValuePredicateMatcher.java
@@ -30,8 +30,9 @@ public class MockValuePredicateMatcher extends AbstractMatcher {
/**
* Constructor.
*
- * @param valueMatchingPredicate
- * @throws ComponentInitializationException
+ * @param valueMatchingPredicate ...
+ *
+ * @throws ComponentInitializationException ...
*/
public MockValuePredicateMatcher(Predicate<IdPAttributeValue> valueMatchingPredicate) throws ComponentInitializationException {
valuePredicate = valueMatchingPredicate;
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AbstractComposedMatcherTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AbstractComposedMatcherTest.java
index 48fb215..dad2928 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AbstractComposedMatcherTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/logic/impl/AbstractComposedMatcherTest.java
@@ -119,7 +119,7 @@ public class AbstractComposedMatcherTest {
/**
* Constructor.
*
- * @param composedMatchers
+ * @param composedMatchers ...
*/
public ComposedMatcher(final Collection<Matcher> composedMatchers) {
super();
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PredicatePolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PredicatePolicyRuleTest.java
index 57abb0c..57c5c40 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PredicatePolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PredicatePolicyRuleTest.java
@@ -79,7 +79,6 @@ public class PredicatePolicyRuleTest {
private final boolean what;
- /** Constructor. */
public TestPred(boolean value) {
what = value;
}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AbstractComposedPolicyRuleTest.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AbstractComposedPolicyRuleTest.java
index 2934ee9..eb20b0c 100644
--- a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AbstractComposedPolicyRuleTest.java
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/policyrule/logic/impl/AbstractComposedPolicyRuleTest.java
@@ -123,7 +123,7 @@ public class AbstractComposedPolicyRuleTest {
/**
* Constructor.
*
- * @param composedMatchers
+ * @param composedMatchers ...
*/
public ComposedPolicyRule(final Collection<PolicyRequirementRule> composedMatchers) {
super();
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
index f4f289c..776a452 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/AttributeFilterServiceTest.java
@@ -68,9 +68,11 @@ public class AttributeFilterServiceTest {
*
* @param name service bean name
* @param nativeSpring whether native syntax is used
+ *
* @return the service
+ *
* @throws ServiceException if an error occurs loading the service
- * @throws ComponentInitializationException
+ * @throws ComponentInitializationException ...
*/
private AttributeFilter getFilter(String name, boolean nativeSpring) throws ServiceException,
ComponentInitializationException {
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java
index 1026465..c6af05b 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java
@@ -77,9 +77,11 @@ public class BaseAttributeFilterParserTest extends XMLObjectBaseTestCase {
* single <mdattr:EntityAttributes/> statement.
*
* @param xmlFileName the file within the test directory.
+ *
* @return the att
- * @throws ComponentInitializationException
- * @throws ResolutionException
+ *
+ * @throws ComponentInitializationException ...
+ * @throws ResolutionException ...
*/
protected Map<String, IdPAttribute> getAttributes(String xmlFileName) throws ComponentInitializationException,
ResolutionException {
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeRequesterRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeRequesterRuleParserTest.java
index 2313e2c..c20930e 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeRequesterRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/AttributeRequesterRuleParserTest.java
@@ -41,14 +41,17 @@ import net.shibboleth.idp.attribute.resolver.ResolutionException;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * This tests not just the parsing of the rule, but also the construction of the complex tests.<br/>
- * <code>
- * <PermitValueRule xsi:type="basic:AttributeRequesterString" value="https://service.example.edu/shibboleth-sp" />
- * </code><br/>
- * vs<br/>
- * <code>
- * <afp:PolicyRequirementRule xsi:type="basic:AttributeRequesterString" value="https://service.example.edu/shibboleth-sp" />
- * </code><br/>
+ * This tests not just the parsing of the rule, but also the construction of the complex tests.
+ *
+ * <pre>
+ * <PermitValueRule xsi:type="basic:AttributeRequesterString" value="https://service.example.edu/shibboleth-sp" />
+ * </pre>
+ *
+ * <p>vs</p>
+ *
+ * <pre>
+ * <afp:PolicyRequirementRule xsi:type="basic:AttributeRequesterString" value="https://service.example.edu/shibboleth-sp" />
+ * </pre>
*/
public class AttributeRequesterRuleParserTest extends BaseAttributeFilterParserTest {
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerEntityAttributeExactRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerEntityAttributeExactRuleParserTest.java
index 47845d7..6a95860 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerEntityAttributeExactRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerEntityAttributeExactRuleParserTest.java
@@ -27,7 +27,7 @@ import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * test for {@link AttributeIssuerEntityAttributeExactRuleParser}.
+ * test for {@link AttributeIssuerEntityAttributeExactPolicyRule}.
*/
public class AttributeIssuerEntityAttributeExactRuleParserTest extends BaseAttributeFilterParserTest {
@@ -49,5 +49,4 @@ public class AttributeIssuerEntityAttributeExactRuleParserTest extends BaseAttri
assertFalse(rule.getIgnoreUnmappedEntityAttributes());
}
-
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerEntityAttributeRegexRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerEntityAttributeRegexRuleParserTest.java
index 5948492..0aae4f4 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerEntityAttributeRegexRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeIssuerEntityAttributeRegexRuleParserTest.java
@@ -26,7 +26,7 @@ import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * test for {@link AttributeIssuerEntityAttributeRegexRuleParser}.
+ * test for {@link AttributeIssuerEntityAttributeRegexPolicyRule}.
*/
public class AttributeIssuerEntityAttributeRegexRuleParserTest extends BaseAttributeFilterParserTest {
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterEntityAttributeExactRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterEntityAttributeExactRuleParserTest.java
index 9899b1b..4a79718 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterEntityAttributeExactRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterEntityAttributeExactRuleParserTest.java
@@ -26,7 +26,7 @@ import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * test for {@link AttributeRequesterEntityAttributeExactRuleParser}.
+ * test for {@link AttributeRequesterEntityAttributeExactPolicyRule}.
*/
public class AttributeRequesterEntityAttributeExactRuleParserTest extends BaseAttributeFilterParserTest {
diff --git a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterRegistrationAuthorityRuleParserTest.java b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterRegistrationAuthorityRuleParserTest.java
index 3a1d4ac..53661fd 100644
--- a/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterRegistrationAuthorityRuleParserTest.java
+++ b/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeRequesterRegistrationAuthorityRuleParserTest.java
@@ -29,7 +29,7 @@ import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * test for {@link AttributeRequesterRegistrationAuthorityRuleParser}.
+ * test for {@link AttributeRequesterRegistrationAuthorityPolicyRule}.
*/
public class AttributeRequesterRegistrationAuthorityRuleParserTest extends BaseAttributeFilterParserTest {
diff --git a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinitionTest.java b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinitionTest.java
index 5323348..2d35c25 100644
--- a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinitionTest.java
+++ b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinitionTest.java
@@ -68,7 +68,11 @@ public class AbstractAttributeDefinitionTest {
Assert.assertFalse(definition.isPreRequested());
}
- /** Test resolve an attribute. */
+ /**
+ * Test resolve an attribute.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test
public void resolve() throws Exception {
AttributeResolutionContext context = new AttributeResolutionContext();
@@ -156,4 +160,4 @@ public class AbstractAttributeDefinitionTest {
return staticAttribute;
}
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractDataConnectorTest.java b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractDataConnectorTest.java
index 223a2f5..27f9511 100644
--- a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractDataConnectorTest.java
+++ b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractDataConnectorTest.java
@@ -65,7 +65,11 @@ public class AbstractDataConnectorTest {
assertNull(connector.getFailoverDataConnectorId());
}
- /** Test the resolution of the data connector. */
+ /**
+ * Test the resolution of the data connector.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void resolve() throws Exception {
AttributeResolutionContext context = new AttributeResolutionContext();
context.getSubcontext(AttributeResolverWorkContext.class, true);
diff --git a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPluginTest.java b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPluginTest.java
index ffae1f9..4807b31 100644
--- a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPluginTest.java
+++ b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPluginTest.java
@@ -148,7 +148,11 @@ public class AbstractResolverPluginTest {
}
}
- /** Test {@link ResolverPlugin#resolve(AttributeResolutionContext)}. */
+ /**
+ * Test {@link ResolverPlugin#resolve(AttributeResolutionContext)}.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void resolver() throws Exception {
AttributeResolutionContext context = new AttributeResolutionContext();
context.getSubcontext(AttributeResolverWorkContext.class, true);
diff --git a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverWorkContextTest.java b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverWorkContextTest.java
index cebdb28..0f6055e 100644
--- a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverWorkContextTest.java
+++ b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverWorkContextTest.java
@@ -41,7 +41,11 @@ public class AttributeResolverWorkContextTest {
Assert.assertTrue(context.getResolvedDataConnectors().isEmpty());
}
- /** Test adding and retrieving attribute definitions. */
+ /**
+ * Test adding and retrieving attribute definitions.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void resolvedAttributeDefinitions() throws Exception {
AttributeResolutionContext parent = new AttributeResolutionContext();
AttributeResolverWorkContext context = new AttributeResolverWorkContext();
@@ -80,7 +84,11 @@ public class AttributeResolverWorkContextTest {
Assert.assertNull(context.getResolvedIdPAttributeDefinitions().get("bar").resolve(parent));
}
- /** Test adding and retrieving data connectors. */
+ /**
+ * Test adding and retrieving data connectors.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void resolvedDataConnectors() throws Exception {
AttributeResolutionContext parent = new AttributeResolutionContext();
AttributeResolverWorkContext context = new AttributeResolverWorkContext();
@@ -133,4 +141,4 @@ public class AttributeResolverWorkContextTest {
//OK
}
}
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockAttributeDefinition.java b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockAttributeDefinition.java
index 55411b9..f359ed8 100644
--- a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockAttributeDefinition.java
+++ b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockAttributeDefinition.java
@@ -47,7 +47,8 @@ public class MockAttributeDefinition extends AbstractAttributeDefinition {
*
* @param id unique ID of this attribute definition
* @param value static value returned by this definition
- * @throws ComponentInitializationException
+ *
+ * @throws ComponentInitializationException ...
*/
public MockAttributeDefinition(final String id, final IdPAttribute value) throws ComponentInitializationException {
setId(id);
diff --git a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockDataConnector.java b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockDataConnector.java
index b6a20e4..47c1054 100644
--- a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockDataConnector.java
+++ b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/MockDataConnector.java
@@ -51,7 +51,8 @@ public class MockDataConnector extends AbstractDataConnector {
*
* @param id unique ID for this data connector
* @param connectorValues static collection of values returned by this connector
- * @throws ComponentInitializationException
+ *
+ * @throws ComponentInitializationException ...
*/
public MockDataConnector(String id, Map<String, IdPAttribute> connectorValues) throws ComponentInitializationException {
setId(id);
@@ -70,7 +71,11 @@ public class MockDataConnector extends AbstractDataConnector {
initialize();
}
- /** Fail resolutions */
+ /**
+ * Fail resolutions
+ *
+ * @param fail <code>true</code> to return a {@link ResolutionException}, otherwise <code>null</code>
+ */
public void setFailure(boolean fail) {
if (fail) {
resolutionException = new ResolutionException();
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java
index 9c127d3..a06fa3f 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java
@@ -104,10 +104,10 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
/**
* Test resolution of an simple script (statically generated data).
*
- * @throws ResolutionException
+ * @throws ResolutionException ...
* @throws ComponentInitializationException only if the test will fail
- * @throws ScriptException
- * @throws IOException
+ * @throws ScriptException ...
+ * @throws IOException ...
*/
@Test public void simple() throws ResolutionException, ComponentInitializationException, ScriptException,
IOException {
@@ -134,10 +134,10 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
/**
* Test resolution of an simple script (statically generated data).
*
- * @throws ResolutionException
+ * @throws ResolutionException ...
* @throws ComponentInitializationException only if the test will fail
- * @throws ScriptException
- * @throws IOException
+ * @throws ScriptException ...
+ * @throws IOException ...
*/
@Test public void subject() throws ResolutionException, ComponentInitializationException, ScriptException,
IOException {
@@ -166,7 +166,12 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
/**
- * Test resolution of an script which uses the custom bean
+ * Test resolution of an script which uses the custom bean.
+ *
+ * @throws ResolutionException ...
+ * @throws ComponentInitializationException ...
+ * @throws ScriptException ...
+ * @throws IOException ...
*/
@Test public void custom() throws ResolutionException, ComponentInitializationException, ScriptException,
IOException {
@@ -194,10 +199,10 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
/**
* Test resolution of an simple script (statically generated data).
*
- * @throws ResolutionException
+ * @throws ResolutionException ...
* @throws ComponentInitializationException only if the test will fail
- * @throws ScriptException
- * @throws IOException
+ * @throws ScriptException ...
+ * @throws IOException ...
*/
@Test public void simple2() throws ResolutionException, ComponentInitializationException, ScriptException,
IOException {
@@ -349,8 +354,8 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
*
* @throws ResolutionException if the resolve fails
* @throws ComponentInitializationException only if things go wrong
- * @throws ScriptException
- * @throws IOException
+ * @throws ScriptException ...
+ * @throws IOException ...
*/
@Test public void attributes() throws ResolutionException, ComponentInitializationException, ScriptException,
IOException {
@@ -390,8 +395,8 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
*
* @throws ResolutionException if the resolve fails
* @throws ComponentInitializationException only if things go wrong
- * @throws ScriptException
- * @throws IOException
+ * @throws ScriptException ...
+ * @throws IOException ...
*/
@Test public void attributesWithNull() throws ResolutionException, ComponentInitializationException,
ScriptException, IOException {
@@ -464,8 +469,8 @@ public class ScriptedAttributeTest extends XMLObjectBaseTestCase {
*
* @throws ResolutionException if the resolve fails
* @throws ComponentInitializationException only if the test has gone wrong
- * @throws ScriptException
- * @throws IOException
+ * @throws ScriptException ...
+ * @throws IOException ...
*/
@Test public void context() throws ResolutionException, ComponentInitializationException, ScriptException,
IOException {
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
index e26a17f..ca145be 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
@@ -111,8 +111,10 @@ public class LDAPDataConnectorTest {
*
* @param builder to build search requests
* @param strategy to map search results
+ *
* @return ldap data connector
- * @throws ComponentInitializationException
+ *
+ * @throws ComponentInitializationException ...
*/
protected LDAPDataConnector createLdapDataConnector(final ExecutableSearchBuilder<ExecutableSearchFilter> builder,
final SearchResultMappingStrategy strategy) throws ComponentInitializationException {
@@ -505,7 +507,12 @@ public class LDAPDataConnectorTest {
assertEquals(cache.iterator().next(), optional);
}
- /** See IDP-1077. */
+ /**
+ * See IDP-1077.
+ *
+ * @throws ComponentInitializationException ...
+ * @throws ResolutionException ...
+ */
@Test public void resolveWithCacheCollison() throws ComponentInitializationException, ResolutionException {
final LDAPDataConnector connector = createLdapDataConnector(null, null);
final TestCache cache = new TestCache();
@@ -526,7 +533,12 @@ public class LDAPDataConnectorTest {
assertEquals(cache.size(), 2);
}
- /** See IDP-573. */
+ /**
+ * See IDP-573.
+ *
+ * @throws ComponentInitializationException ...
+ * @throws ResolutionException ...
+ */
@Test public void resolveEmptyAttribute() throws ComponentInitializationException, ResolutionException {
final ParameterizedExecutableSearchFilterBuilder builder =
newParameterizedExecutableSearchFilterBuilder("(uid={principalName})");
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/Regressions.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/Regressions.java
index a2bde2b..890b41a 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/Regressions.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/Regressions.java
@@ -99,8 +99,10 @@ public class Regressions {
*
* @param builder to build search requests
* @param strategy to map search results
+ *
* @return ldap data connector
- * @throws ComponentInitializationException
+ *
+ * @throws ComponentInitializationException ...
*/
protected LDAPDataConnector createLdapDataConnector(final ExecutableSearchBuilder<ExecutableSearchFilter> builder,
final SearchResultMappingStrategy strategy) throws ComponentInitializationException {
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java
index cf29f62..2b1e047 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java
@@ -367,7 +367,12 @@ public class RDBMSDataConnectorTest {
assertTrue(attrs.get("NAME").getValues().contains(new StringAttributeValue("group2")));
}
- /** See IDP-573. */
+ /**
+ * See IDP-573.
+ *
+ * @throws ComponentInitializationException ...
+ * @throws ResolutionException ...
+ */
@Test public void resolveEmptyAttribute() throws ComponentInitializationException, ResolutionException {
final RDBMSDataConnector connector = createUserRdbmsDataConnector(null, null);
connector.initialize();
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
index e75560b..b87c0a7 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
@@ -70,7 +70,11 @@ import net.shibboleth.utilities.java.support.component.DestroyedComponentExcepti
public class AttributeResolverImplTest {
private final Logger log = LoggerFactory.getLogger(AttributeResolverImplTest.class);
- /** Test post-instantiation state. */
+ /**
+ * Test post-instantiation state.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void initDestroy() throws Exception {
final MockAttributeDefinition attrDef = new MockAttributeDefinition("foo", new IdPAttribute("test"));
final MockDataConnector dataCon = new MockDataConnector("bar", (Map<String, IdPAttribute>) null);
@@ -113,7 +117,11 @@ public class AttributeResolverImplTest {
}
- /** Test getting, setting, overwriting, defensive collection copy. */
+ /**
+ * Test getting, setting, overwriting, defensive collection copy.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void setAttributeDefinitions() throws Exception {
final ArrayList<AttributeDefinition> definitions = new ArrayList<>();
definitions.add(new MockAttributeDefinition("foo", new IdPAttribute("test")));
@@ -134,7 +142,11 @@ public class AttributeResolverImplTest {
}
}
- /** Test getting, setting, overwriting, defensive collection copy. */
+ /**
+ * Test getting, setting, overwriting, defensive collection copy.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void setDataConnectors() throws Exception {
final ArrayList<DataConnector> connectors = new ArrayList<>();
connectors.add(new MockDataConnector("foo", (Map<String, IdPAttribute>) null));
@@ -154,7 +166,11 @@ public class AttributeResolverImplTest {
}
}
- /** Test that a simple resolve returns the expected results. */
+ /**
+ * Test that a simple resolve returns the expected results.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void resolve() throws Exception {
final IdPAttribute attribute = new IdPAttribute("ad1");
attribute.setValues(Collections.singletonList(new StringAttributeValue("value1")));
@@ -217,7 +233,11 @@ public class AttributeResolverImplTest {
assertEquals(context.getResolvedIdPAttributes().get(attribute3.getId()), attribute3);
}
- /** Test that a simple resolve returns the expected results. */
+ /**
+ * Test that a simple resolve returns the expected results.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void resolveSpecificAttribute() throws Exception {
final IdPAttribute attribute = new IdPAttribute("ad1");
attribute.setValues(Collections.singletonList(new StringAttributeValue("value1")));
@@ -274,7 +294,11 @@ public class AttributeResolverImplTest {
}
- /** Test that a simple resolve returns the expected results. */
+ /**
+ * Test that a simple resolve returns the expected results.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void resolveFails() throws Exception {
log.debug("Log Resolve fails");
final IdPAttribute attribute = new IdPAttribute("ad1");
@@ -313,7 +337,11 @@ public class AttributeResolverImplTest {
log.debug("Logged Resolve fails");
}
- /** Test that a resolve with no definitions returns nothing the expected results. */
+ /**
+ * Test that a resolve with no definitions returns nothing the expected results.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void resolveEmpty() throws Exception {
final LazySet<AttributeDefinition> definitions = new LazySet<>();
@@ -326,8 +354,11 @@ public class AttributeResolverImplTest {
assertTrue(context.getResolvedIdPAttributes().isEmpty());
}
- /** Test that resolve w/ dependencies returns the expected results. */
-
+ /**
+ * Test that resolve w/ dependencies returns the expected results.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void resolveWithDependencies() throws Exception {
final MockDataConnector dc1 = new MockDataConnector("dc1", (Map<String, IdPAttribute>) null);
dc1.initialize();
@@ -628,6 +659,8 @@ public class AttributeResolverImplTest {
/**
* Test that after resolution attribute definitions which returned null values don't have their results show up in
* the resolved attribute set.
+ *
+ * @throws Exception if something goes wrong
*/
@Test public void resolveCleanNullAttributes() throws Exception {
final LazySet<AttributeDefinition> definitions = new LazySet<>();
@@ -646,6 +679,8 @@ public class AttributeResolverImplTest {
/**
* Test that after resolution attribute definitions which are marked as dependency only don't have their results
* show up in the resolved attribute set.
+ *
+ * @throws Exception if something goes wrong
*/
@Test public void resolveCleanDependencyOnly() throws Exception {
final IdPAttribute attribute = new IdPAttribute("ad1");
@@ -667,7 +702,11 @@ public class AttributeResolverImplTest {
assertTrue(context.getResolvedIdPAttributes().isEmpty());
}
- /** Test that after resolution that the values for a resolved attribute are deduped. */
+ /**
+ * Test that after resolution that the values for a resolved attribute are deduped.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void resolveCleanDuplicateValues() throws Exception {
final IdPAttribute attribute = new IdPAttribute("ad1");
attribute.setValues(Arrays.asList(new StringAttributeValue("value1"), new StringAttributeValue("value1")));
@@ -688,7 +727,11 @@ public class AttributeResolverImplTest {
assertEquals(context.getResolvedIdPAttributes().get("ad1").getValues().size(), 1);
}
- /** Test that after resolution that the values for a resolved attribute are deduped. */
+ /**
+ * Test that after resolution that the values for a resolved attribute are deduped.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void resolveNullValues() throws Exception {
final IdPAttribute attribute = new IdPAttribute("ad1");
attribute.setValues(Arrays.asList(new EmptyAttributeValue(EmptyType.NULL_VALUE), new EmptyAttributeValue(EmptyType.ZERO_LENGTH_VALUE), null));
@@ -722,6 +765,8 @@ public class AttributeResolverImplTest {
/**
* Test that after resolution attribute definitions whose resultant attribute contains no value don't have their
* results show up in the resolved attribute set.
+ *
+ * @throws Exception if something goes wrong
*/
@Test public void resolveCleanEmptyValueAttributes() throws Exception {
final IdPAttribute attribute = new IdPAttribute("ad1");
@@ -742,7 +787,11 @@ public class AttributeResolverImplTest {
assertTrue(context.getResolvedIdPAttributes().isEmpty());
}
- /** Test that validation fails when a plugin depends on a non-existent plugin. */
+ /**
+ * Test that validation fails when a plugin depends on a non-existent plugin.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void badPluginIdInitialize() throws Exception {
final ResolverDataConnectorDependency dep1 = new ResolverDataConnectorDependency("dc1");
final MockAttributeDefinition ad1 = new MockAttributeDefinition("ad1", new IdPAttribute("test"));
@@ -783,7 +832,11 @@ public class AttributeResolverImplTest {
}
}
- /** Test that validation fails when a plugin depends on a non-existent plugin. */
+ /**
+ * Test that validation fails when a plugin depends on a non-existent plugin.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void badPluginIdInitializeOld() throws Exception {
final ResolverDataConnectorDependency dep1 = TestSources.makeDataConnectorDependency("dc1", "test");
final MockAttributeDefinition ad1 = new MockAttributeDefinition("ad1", new IdPAttribute("test"));
@@ -824,7 +877,11 @@ public class AttributeResolverImplTest {
}
}
- /** Test that validation fails when there are circular dependencies between plugins. */
+ /**
+ * Test that validation fails when there are circular dependencies between plugins.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void circularDependencyInitializeOld() throws Exception {
MockAttributeDefinition ad1 = new MockAttributeDefinition("ad1", new IdPAttribute("test"));
ad1.setAttributeDependencies(Collections.singleton(TestSources.makeAttributeDefinitionDependency("ad1")));
@@ -873,7 +930,11 @@ public class AttributeResolverImplTest {
}
- /** Test that validation fails when there are circular dependencies between plugins. */
+ /**
+ * Test that validation fails when there are circular dependencies between plugins.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void circularDependencyInitialize() throws Exception {
MockAttributeDefinition ad1 = new MockAttributeDefinition("ad1", new IdPAttribute("test"));
ad1.setAttributeDependencies(Collections.singleton(new ResolverAttributeDefinitionDependency("ad1")));
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ManagedConnectionTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ManagedConnectionTest.java
index e00c607..79c1559 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ManagedConnectionTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ManagedConnectionTest.java
@@ -86,7 +86,7 @@ public class ManagedConnectionTest extends BaseAttributeDefinitionParserTest {
/**
* Constructor.
*
- * @param environment
+ * @param env ...
*/
public MyInitialContext(Hashtable<?, ?> env) {
environment = env;
@@ -242,7 +242,7 @@ public class ManagedConnectionTest extends BaseAttributeDefinitionParserTest {
/**
* Constructor.
*
- * @param env
+ * @param env ...
*/
public MyDataSource(Hashtable<?, ?> env) {
environment = env;
diff --git a/idp-authn-api/src/test/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptorTest.java b/idp-authn-api/src/test/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptorTest.java
index 4ef2335..f7ad212 100644
--- a/idp-authn-api/src/test/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptorTest.java
+++ b/idp-authn-api/src/test/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptorTest.java
@@ -113,7 +113,11 @@ public class AuthenticationFlowDescriptorTest {
Assert.assertTrue(descriptor.getSupportedPrincipals(UsernamePrincipal.class).contains(baz));
}
- /** Tests handling of active/inactive checks. */
+ /**
+ * Tests handling of active/inactive checks.
+ *
+ * @throws InterruptedException ...
+ */
@Test public void testActiveResults() throws InterruptedException {
AuthenticationResult result = new AuthenticationResult("test", new UsernamePrincipal("foo"));
Assert.assertTrue(descriptor.isResultActive(result));
@@ -134,4 +138,4 @@ public class AuthenticationFlowDescriptorTest {
result.setLastActivityInstantToNow();
Assert.assertTrue(descriptor.isResultActive(result));
}
-}
\ No newline at end of file
+}
diff --git a/idp-authn-api/src/test/java/net/shibboleth/idp/authn/AuthenticationResultTest.java b/idp-authn-api/src/test/java/net/shibboleth/idp/authn/AuthenticationResultTest.java
index 5f09dde..be60873 100644
--- a/idp-authn-api/src/test/java/net/shibboleth/idp/authn/AuthenticationResultTest.java
+++ b/idp-authn-api/src/test/java/net/shibboleth/idp/authn/AuthenticationResultTest.java
@@ -31,7 +31,11 @@ import org.testng.annotations.Test;
/** {@link AuthenticationResult} unit test. */
public class AuthenticationResultTest {
- /** Tests that everything is properly initialized during object construction. */
+ /**
+ * Tests that everything is properly initialized during object construction.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testInstantiation() throws Exception {
Instant start = Instant.now();
// this is here to allow the event's creation time to deviate from the 'start' time
@@ -72,4 +76,4 @@ public class AuthenticationResultTest {
}
}
-}
\ No newline at end of file
+}
diff --git a/idp-authn-api/src/test/java/net/shibboleth/idp/authn/config/MockAuthenticationProfileConfiguration.java b/idp-authn-api/src/test/java/net/shibboleth/idp/authn/config/MockAuthenticationProfileConfiguration.java
index a03d514..6a81648 100644
--- a/idp-authn-api/src/test/java/net/shibboleth/idp/authn/config/MockAuthenticationProfileConfiguration.java
+++ b/idp-authn-api/src/test/java/net/shibboleth/idp/authn/config/MockAuthenticationProfileConfiguration.java
@@ -80,6 +80,7 @@ public class MockAuthenticationProfileConfiguration extends AbstractProfileConfi
*
* @param id ID of this profile
* @param methods default authentication methods to use
+ * @param flows ...
* @param formats name identifier formats to use
*/
public MockAuthenticationProfileConfiguration(@Nonnull @NotEmpty final String id,
diff --git a/idp-authn-api/src/test/java/net/shibboleth/idp/authn/context/AuthenticationContextTest.java b/idp-authn-api/src/test/java/net/shibboleth/idp/authn/context/AuthenticationContextTest.java
index ababe2e..e9a5dca 100644
--- a/idp-authn-api/src/test/java/net/shibboleth/idp/authn/context/AuthenticationContextTest.java
+++ b/idp-authn-api/src/test/java/net/shibboleth/idp/authn/context/AuthenticationContextTest.java
@@ -35,7 +35,11 @@ import org.testng.annotations.Test;
@Test
public class AuthenticationContextTest {
- /** Tests initiation instant instantiation. */
+ /**
+ * Tests initiation instant instantiation.
+ *
+ * @throws Exception if something goes wrong
+ */
public void testInitiationInstant() throws Exception {
Instant start = Instant.now();
// this is here to allow the event's creation time to deviate from the 'start' time
@@ -45,7 +49,11 @@ public class AuthenticationContextTest {
Assert.assertTrue(ctx.getInitiationInstant().isAfter(start));
}
- /** Tests mutating forcing authentication. */
+ /**
+ * Tests mutating forcing authentication.
+ *
+ * @throws Exception if something goes wrong
+ */
public void testForcingAuthentication() throws Exception {
AuthenticationContext ctx = new AuthenticationContext();
Assert.assertFalse(ctx.isForceAuthn());
@@ -54,7 +62,11 @@ public class AuthenticationContextTest {
Assert.assertTrue(ctx.isForceAuthn());
}
- /** Tests active results. */
+ /**
+ * Tests active results.
+ *
+ * @throws Exception if something goes wrong
+ */
public void testActiveResults() throws Exception {
final AuthenticationResult result = new AuthenticationResult("test", new Subject());
@@ -67,7 +79,11 @@ public class AuthenticationContextTest {
Assert.assertEquals(ctx.getActiveResults().get("test"), result);
}
- /** Tests potential flow instantiation. */
+ /**
+ * Tests potential flow instantiation.
+ *
+ * @throws Exception if something goes wrong
+ */
public void testPotentialFlows() throws Exception {
AuthenticationContext ctx = new AuthenticationContext();
Assert.assertTrue(ctx.getPotentialFlows().isEmpty());
@@ -80,7 +96,11 @@ public class AuthenticationContextTest {
Assert.assertEquals(ctx.getPotentialFlows().get("test"), descriptor);
}
- /** Tests mutating attempted flow. */
+ /**
+ * Tests mutating attempted flow.
+ *
+ * @throws Exception if something goes wrong
+ */
public void testAttemptedFlow() throws Exception {
final AuthenticationContext ctx = new AuthenticationContext();
Assert.assertNull(ctx.getAttemptedFlow());
@@ -91,7 +111,11 @@ public class AuthenticationContextTest {
Assert.assertEquals(ctx.getAttemptedFlow(), descriptor);
}
- /** Tests setting completion instant. */
+ /**
+ * Tests setting completion instant.
+ *
+ * @throws Exception if something goes wrong
+ */
public void testCompletionInstant() throws Exception {
final AuthenticationContext ctx = new AuthenticationContext();
Assert.assertNull(ctx.getCompletionInstant());
@@ -104,7 +128,11 @@ public class AuthenticationContextTest {
Assert.assertTrue(ctx.getCompletionInstant().isAfter(now));
}
- /** Tests RequestedPrincipalContext helpers. */
+ /**
+ * Tests RequestedPrincipalContext helpers.
+ *
+ * @throws Exception if something goes wrong
+ */
public void testRequestedPrincipalContextHelpers() throws Exception {
final AuthenticationContext ctx = new AuthenticationContext();
ctx.setPrincipalEvalPredicateFactoryRegistry(new PrincipalEvalPredicateFactoryRegistry());
@@ -138,4 +166,4 @@ public class AuthenticationContextTest {
ctx.addRequestedPrincipalContext("fob", AuthenticationContext.class.getName(), "baz", false);
}
-}
\ No newline at end of file
+}
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOAuthnController.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOAuthnController.java
index 84e10a3..ffc5baa 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOAuthnController.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOAuthnController.java
@@ -80,8 +80,9 @@ public class SPNEGOAuthnController {
* @param httpResponse the HTTP response
*
* @return the response view
- * @throws IOException
- * @throws ExternalAuthenticationException
+ *
+ * @throws IOException ...
+ * @throws ExternalAuthenticationException ...
*/
@RequestMapping(value = "/{conversationKey}", method = RequestMethod.GET)
@Nullable public ModelAndView startSPNEGO(@PathVariable @Nonnull @NotEmpty final String conversationKey,
@@ -116,8 +117,9 @@ public class SPNEGOAuthnController {
* @param httpResponse the HTTP response
*
* @return the response view
- * @throws ExternalAuthenticationException
- * @throws IOException
+ *
+ * @throws ExternalAuthenticationException ...
+ * @throws IOException ...
*/
@RequestMapping(value = "/{conversationKey}", method = RequestMethod.GET, headers = "Authorization")
@Nullable public ModelAndView continueSPNEGO(@PathVariable @Nonnull @NotEmpty final String conversationKey,
@@ -219,8 +221,8 @@ public class SPNEGOAuthnController {
* @param httpRequest the HTTP request
* @param httpResponse the HTTP response
*
- * @throws IOException
- * @throws ExternalAuthenticationException
+ * @throws IOException ...
+ * @throws ExternalAuthenticationException ...
*/
@RequestMapping(value = "/{conversationKey}/error", method = RequestMethod.GET)
public void handleError(@PathVariable final String conversationKey, @Nonnull final HttpServletRequest httpRequest,
@@ -240,8 +242,8 @@ public class SPNEGOAuthnController {
* @param httpResponse the HTTP response
* @param kerberosPrincipal the Kerberos principal to return
*
- * @throws IOException
- * @throws ExternalAuthenticationException
+ * @throws IOException ...
+ * @throws ExternalAuthenticationException ...
*/
private void finishWithSuccess(@Nonnull @NotEmpty final String key, @Nonnull final HttpServletRequest httpRequest,
@Nonnull final HttpServletResponse httpResponse, @Nonnull final KerberosPrincipal kerberosPrincipal)
@@ -267,8 +269,8 @@ public class SPNEGOAuthnController {
* @param httpResponse the HTTP response
* @param error the error string/event to return
*
- * @throws IOException
- * @throws ExternalAuthenticationException
+ * @throws IOException ...
+ * @throws ExternalAuthenticationException ...
*/
private void finishWithError(@Nonnull @NotEmpty final String key, @Nonnull final HttpServletRequest httpRequest,
@Nonnull final HttpServletResponse httpResponse, @Nonnull @NotEmpty final String error)
@@ -289,8 +291,8 @@ public class SPNEGOAuthnController {
* @param httpResponse the HTTP response
* @param ex the exception that has been thrown
*
- * @throws IOException
- * @throws ExternalAuthenticationException
+ * @throws IOException ...
+ * @throws ExternalAuthenticationException ...
*/
private void finishWithException(@Nonnull @NotEmpty final String key, @Nonnull final HttpServletRequest httpRequest,
@Nonnull final HttpServletResponse httpResponse, @Nonnull final Exception ex)
@@ -402,4 +404,4 @@ public class SPNEGOAuthnController {
return Arrays.equals(headerNTLM, Arrays.copyOfRange(token, 0, 7));
}
-}
\ No newline at end of file
+}
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/FinalizeMultiFactorAuthenticationTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/FinalizeMultiFactorAuthenticationTest.java
index 122f428..8e76d4a 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/FinalizeMultiFactorAuthenticationTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/FinalizeMultiFactorAuthenticationTest.java
@@ -52,7 +52,11 @@ public class FinalizeMultiFactorAuthenticationTest extends BaseMultiFactorAuthen
action = new FinalizeMultiFactorAuthentication();
}
- /** Tests no MFA context. */
+ /**
+ * Tests no MFA context.
+ *
+ * @throws ComponentInitializationException ...
+ */
@Test public void testNoContext() throws ComponentInitializationException {
ac.removeSubcontext(mfa);
action.initialize();
@@ -60,7 +64,11 @@ public class FinalizeMultiFactorAuthenticationTest extends BaseMultiFactorAuthen
ActionTestingSupport.assertEvent(event, EventIds.INVALID_PROFILE_CTX);
}
- /** Tests a null result. */
+ /**
+ * Tests a null result.
+ *
+ * @throws ComponentInitializationException ...
+ */
@Test public void testNullResult() throws ComponentInitializationException {
action.setResultMergingStrategy(FunctionSupport.<ProfileRequestContext,AuthenticationResult>constant(null));
action.initialize();
@@ -68,7 +76,11 @@ public class FinalizeMultiFactorAuthenticationTest extends BaseMultiFactorAuthen
ActionTestingSupport.assertEvent(event, AuthnEventIds.INVALID_AUTHN_CTX);
}
- /** Tests "merge" of a single result. */
+ /**
+ * Tests "merge" of a single result.
+ *
+ * @throws ComponentInitializationException ...
+ */
@Test public void testSingleResult() throws ComponentInitializationException {
action.initialize();
final Event event = action.execute(src);
@@ -89,7 +101,11 @@ public class FinalizeMultiFactorAuthenticationTest extends BaseMultiFactorAuthen
Assert.assertSame(merged, prc.getSubcontext(SubjectCanonicalizationContext.class).getSubject());
}
- /** Tests default merging of results. */
+ /**
+ * Tests default merging of results.
+ *
+ * @throws ComponentInitializationException ...
+ */
@Test public void testMergedResults() throws ComponentInitializationException {
final Subject subject = new Subject();
subject.getPrincipals().add(new UsernamePrincipal("foo2"));
@@ -115,4 +131,4 @@ public class FinalizeMultiFactorAuthenticationTest extends BaseMultiFactorAuthen
Assert.assertNotNull(prc.getSubcontext(SubjectCanonicalizationContext.class));
Assert.assertSame(merged, prc.getSubcontext(SubjectCanonicalizationContext.class).getSubject());
}
-}
\ No newline at end of file
+}
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/InitializeRequestedPrincipalContextTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/InitializeRequestedPrincipalContextTest.java
index b8e5fe1..e5fc534 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/InitializeRequestedPrincipalContextTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/InitializeRequestedPrincipalContextTest.java
@@ -59,7 +59,11 @@ public class InitializeRequestedPrincipalContextTest {
action.initialize();
}
- /** Test that the action bails if set not to replace. */
+ /**
+ * Test that the action bails if set not to replace.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testNoReplace() throws Exception {
final AuthenticationContext authCtx = prc.getSubcontext(AuthenticationContext.class, true);
authCtx.getSubcontext(RequestedPrincipalContext.class, true).setOperator("foo");
@@ -69,7 +73,11 @@ public class InitializeRequestedPrincipalContextTest {
Assert.assertEquals(authCtx.getSubcontext(RequestedPrincipalContext.class).getOperator(), "foo");
}
- /** Test that the action errors out properly if there is no relying party context. */
+ /**
+ * Test that the action errors out properly if there is no relying party context.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testNoRelyingPartyContext() throws Exception {
prc.removeSubcontext(RelyingPartyContext.class);
final AuthenticationContext authCtx = prc.getSubcontext(AuthenticationContext.class, true);
@@ -79,7 +87,11 @@ public class InitializeRequestedPrincipalContextTest {
Assert.assertNull(authCtx.getSubcontext(RequestedPrincipalContext.class));
}
- /** Test that the action errors out properly if there is no relying party configuration. */
+ /**
+ * Test that the action errors out properly if there is no relying party configuration.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testNoProfileConfiguration() throws Exception {
final AuthenticationContext authCtx = prc.getSubcontext(AuthenticationContext.class, true);
@@ -88,7 +100,11 @@ public class InitializeRequestedPrincipalContextTest {
Assert.assertNull(authCtx.getSubcontext(RequestedPrincipalContext.class));
}
- /** Test that the action errors out properly if the desired profile configuration is not configured. */
+ /**
+ * Test that the action errors out properly if the desired profile configuration is not configured.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testInvalidProfileConfiguration() throws Exception {
src = new RequestContextBuilder().setRelyingPartyProfileConfigurations(
Collections.<ProfileConfiguration>singleton(new MockProfileConfiguration("mock"))).buildRequestContext();
@@ -100,7 +116,11 @@ public class InitializeRequestedPrincipalContextTest {
Assert.assertNull(authCtx.getSubcontext(RequestedPrincipalContext.class));
}
- /** Test that the action works with no methods supplied. */
+ /**
+ * Test that the action works with no methods supplied.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testNoMethods() throws Exception {
final MockAuthenticationProfileConfiguration mock =
new MockAuthenticationProfileConfiguration("mock", Collections.<Principal>emptyList());
@@ -120,7 +140,11 @@ public class InitializeRequestedPrincipalContextTest {
Assert.assertEquals(authCtx.getSubcontext(RequestedPrincipalContext.class).getOperator(), "foo");
}
- /** Test that the action works with methods supplied. */
+ /**
+ * Test that the action works with methods supplied.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testWithMethods() throws Exception {
final Principal method = new TestPrincipal("test");
final MockAuthenticationProfileConfiguration mock =
@@ -145,4 +169,4 @@ public class InitializeRequestedPrincipalContextTest {
Assert.assertSame(method, rpCtx.getRequestedPrincipals().get(0));
}
-}
\ No newline at end of file
+}
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PopulateAuthenticationContextTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PopulateAuthenticationContextTest.java
index 58cb27b..4259d7e 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PopulateAuthenticationContextTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PopulateAuthenticationContextTest.java
@@ -39,7 +39,11 @@ final public class PopulateAuthenticationContextTest extends BaseAuthenticationC
initializeMembers();
}
- /** Test available flows == potential flows. */
+ /**
+ * Test available flows == potential flows.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testIdentical() throws Exception {
final PopulateAuthenticationContext action = new PopulateAuthenticationContext();
@@ -61,7 +65,11 @@ final public class PopulateAuthenticationContextTest extends BaseAuthenticationC
Assert.assertEquals(authCtx.getPotentialFlows(), authCtx.getAvailableFlows());
}
- /** Test available flows != potential flows. */
+ /**
+ * Test available flows != potential flows.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testNonIdentical() throws Exception {
final PopulateAuthenticationContext action = new PopulateAuthenticationContext();
@@ -90,7 +98,11 @@ final public class PopulateAuthenticationContextTest extends BaseAuthenticationC
Assert.assertNull(authCtx.getPotentialFlows().get("test4"));
}
- /** Test active flow filtering. */
+ /**
+ * Test active flow filtering.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testFiltered() throws Exception {
final PopulateAuthenticationContext action = new PopulateAuthenticationContext();
@@ -117,4 +129,4 @@ final public class PopulateAuthenticationContextTest extends BaseAuthenticationC
Assert.assertNull(authCtx.getPotentialFlows().get("test3"));
}
-}
\ No newline at end of file
+}
diff --git a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PopulateSubjectCanonicalizationContextTest.java b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PopulateSubjectCanonicalizationContextTest.java
index 3662316..70d4ab7 100644
--- a/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PopulateSubjectCanonicalizationContextTest.java
+++ b/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/PopulateSubjectCanonicalizationContextTest.java
@@ -60,7 +60,11 @@ public class PopulateSubjectCanonicalizationContextTest {
action.execute(src);
}
- /** Test that the context is properly added. */
+ /**
+ * Test that the context is properly added.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testAction() throws Exception {
ActionTestingSupport.assertProceedEvent(prc);
@@ -70,4 +74,4 @@ public class PopulateSubjectCanonicalizationContextTest {
Assert.assertEquals(c14nCtx.getPotentialFlows().size(), 3);
Assert.assertNotNull(c14nCtx.getPotentialFlows().get("test1"));
}
-}
\ No newline at end of file
+}
diff --git a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/AbstractFlowActionTest.java b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/AbstractFlowActionTest.java
index 587edbb..8217e9b 100644
--- a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/AbstractFlowActionTest.java
+++ b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/AbstractFlowActionTest.java
@@ -131,7 +131,7 @@ public abstract class AbstractFlowActionTest extends AbstractTestNGSpringContext
/**
* Initialize OpenSAML.
*
- * @throws InitializationException
+ * @throws InitializationException ...
*/
@BeforeSuite
public void initOpenSAML() throws InitializationException {
diff --git a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/service/impl/MetadataServiceRegistryTest.java b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/service/impl/MetadataServiceRegistryTest.java
index 1538442..992ff46 100644
--- a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/service/impl/MetadataServiceRegistryTest.java
+++ b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/service/impl/MetadataServiceRegistryTest.java
@@ -70,7 +70,7 @@ public class MetadataServiceRegistryTest {
/**
* Initialize OpenSAML.
*
- * @throws InitializationException
+ * @throws InitializationException ...
*/
@BeforeSuite
public void initOpenSAML() throws InitializationException {
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
index f37bdc3..0d29516 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
@@ -327,9 +327,10 @@ public abstract class AbstractFlowTest extends AbstractTestNGSpringContextTests
* Get the {@link Flow} with the given flow ID.
*
* @param flowID the flow ID
+ *
* @return the {@link Flow}
*
- * @see {@link FlowDefinitionLocator#getFlowDefinition(String)}
+ * @see FlowDefinitionLocator#getFlowDefinition(String)
*/
@Nonnull public Flow getFlow(@Nonnull final String flowID) {
Constraint.isNotNull(flowID, "Flow ID can not be null");
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java
index 03e4dd0..090d74a 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java
@@ -137,6 +137,8 @@ public class SAML1AttributeQueryFlowTest extends AbstractSAML1FlowTest {
/**
* Build the {@link MockHttpServletRequest}.
*
+ * @param includeDesignators ...
+ *
* @throws Exception if an error occurs
*/
public void buildRequest(final boolean includeDesignators) throws Exception {
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1TestResponseValidator.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1TestResponseValidator.java
index fb3b0d2..ff62453 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1TestResponseValidator.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1TestResponseValidator.java
@@ -412,14 +412,15 @@ public class SAML1TestResponseValidator {
}
/**
- * Assert that :
+ * Assert that:
+ *
* <ul>
* <li>the name identifier is not null</li>
* <li>the name identifier value is not null</li>
* <li>the name identifier value is the expected value if the format is not transient</li>
* <li>the name format is the expected name format</li>
* <li>the name qualifier is the expected name qualifier</li>
- * <ul>
+ * </ul>
*
* @param identifier the name identifier
*/
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2AttributeQueryFlowTest.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2AttributeQueryFlowTest.java
index 78e7c73..9978d8a 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2AttributeQueryFlowTest.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2AttributeQueryFlowTest.java
@@ -142,6 +142,8 @@ public class SAML2AttributeQueryFlowTest extends AbstractSAML2FlowTest {
/**
* Build the {@link MockHttpServletRequest}.
*
+ * @param includeDesignators ...
+ *
* @throws Exception if an error occurs
*/
public void buildRequest(final boolean includeDesignators) throws Exception {
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2POSTSSOFlowTest.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2POSTSSOFlowTest.java
index 9cd198a..989eb28 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2POSTSSOFlowTest.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2POSTSSOFlowTest.java
@@ -45,6 +45,8 @@ public class SAML2POSTSSOFlowTest extends AbstractSAML2SSOFlowTest {
/**
* Test the SAML 2 POST SSO flow.
+ *
+ * @throws Exception if something goes wrong
*/
@Test public void testSAML2POSTSSOFlow() throws Exception {
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2POSTSimpleSignSSOFlowTest.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2POSTSimpleSignSSOFlowTest.java
index 841e914..bf7f2ac 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2POSTSimpleSignSSOFlowTest.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2POSTSimpleSignSSOFlowTest.java
@@ -45,6 +45,8 @@ public class SAML2POSTSimpleSignSSOFlowTest extends AbstractSAML2SSOFlowTest {
/**
* Test the SAML 2 POST SSO flow.
+ *
+ * @throws Exception if something goes wrong
*/
@Test public void testSAML2POSTSSOFlow() throws Exception {
@@ -92,4 +94,4 @@ public class SAML2POSTSimpleSignSSOFlowTest extends AbstractSAML2SSOFlowTest {
return Base64Support.encode(messageXML.getBytes("UTF-8"), Base64Support.UNCHUNKED);
}
-}
\ No newline at end of file
+}
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2RedirectSSOFlowTest.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2RedirectSSOFlowTest.java
index 4d56d17..f5a0d6b 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2RedirectSSOFlowTest.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2RedirectSSOFlowTest.java
@@ -49,7 +49,7 @@ public class SAML2RedirectSSOFlowTest extends AbstractSAML2SSOFlowTest {
/**
* Test the SAML 2 Redirect SSO flow.
*
- * @throws Exception
+ * @throws Exception if something goes wrong
*/
@Test public void testSAML2RedirectFlow() throws Exception {
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestResponseValidator.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestResponseValidator.java
index dcb0254..fdfe948 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestResponseValidator.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestResponseValidator.java
@@ -447,7 +447,8 @@ public class SAML2TestResponseValidator extends SAML2TestStatusResponseTypeValid
}
/**
- * Assert that :
+ * Assert that:
+ *
* <ul>
* <li>the NameID is not null</li>
* <li>the NameID value is not null</li>
@@ -455,7 +456,7 @@ public class SAML2TestResponseValidator extends SAML2TestStatusResponseTypeValid
* <li>the NameID value is the expected value if the format is not transient</li>
* <li>the NameID name qualifier is the expected name qualifier</li>
* <li>the NameID SP name qualifier is the expected SP name qualifier</li>
- * <ul>
+ * </ul>
*
* @param id the NameID
*/
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2UnsolicitedSSOFlowTest.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2UnsolicitedSSOFlowTest.java
index 3418576..7aed757 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2UnsolicitedSSOFlowTest.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2UnsolicitedSSOFlowTest.java
@@ -34,7 +34,9 @@ public class SAML2UnsolicitedSSOFlowTest extends AbstractSAML2FlowTest {
@Nonnull public final static String FLOW_ID = "SAML2/Unsolicited/SSO";
/**
- * Test the SAML 2 unsolicited SSO flow
+ * Test the SAML 2 unsolicited SSO flow.
+ *
+ * @throws Exception if something goes wrong
*/
@Test public void testSAML2UnsolicitedSSOFlow() throws Exception {
@@ -55,4 +57,4 @@ public class SAML2UnsolicitedSSOFlowTest extends AbstractSAML2FlowTest {
request.addParameter(BaseIdPInitiatedSSORequestMessageDecoder.PROVIDER_ID_PARAM, SP_ENTITY_ID);
request.addParameter(BaseIdPInitiatedSSORequestMessageDecoder.TARGET_PARAM, SP_RELAY_STATE);
}
-}
\ No newline at end of file
+}
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/CurrentInstallState.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/CurrentInstallState.java
index 51adcd5..c22ae04 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/CurrentInstallState.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/CurrentInstallState.java
@@ -58,10 +58,11 @@ public interface CurrentInstallState extends InitializableComponent {
*/
@Nullable Properties getCurrentlyInstalledProperties();
- /** Return the list of paths of files which were not there prior to the install
+ /**
+ * Return the list of paths of files which were not there prior to the install
* but which might be created by the installed but to no purpose.
+ *
* @return the list of paths.
- * @return
*/
@Nonnull List<Path> getPathsToBeDeleted();
}
diff --git a/idp-installer/src/test/java/net/shibboleth/idp/installer/Test.java b/idp-installer/src/test/java/net/shibboleth/idp/installer/Test.java
index 6a390fb..dd113b2 100644
--- a/idp-installer/src/test/java/net/shibboleth/idp/installer/Test.java
+++ b/idp-installer/src/test/java/net/shibboleth/idp/installer/Test.java
@@ -37,9 +37,10 @@ public class Test {
@Nonnull private final Logger log = LoggerFactory.getLogger(Test.class);
/**
- * @param args
- * @throws IOException
- * @throws ComponentInitializationException
+ * @param args ...
+ *
+ * @throws IOException ...
+ * @throws ComponentInitializationException ...
*/
public static void main(String[] args) throws IOException, ComponentInitializationException {
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/ScriptedAction.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/ScriptedAction.java
index 000c9da..ce4d9c8 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/ScriptedAction.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/ScriptedAction.java
@@ -65,7 +65,7 @@ public class ScriptedAction extends AbstractProfileAction {
* @param theScript the script we will evaluate
* @param extraInfo debugging information
*
- * @deprecated
+ * @deprecated ...
*/
@Deprecated
public ScriptedAction(@Nonnull final EvaluableScript theScript, @Nullable final String extraInfo) {
diff --git a/idp-profile-api/src/test/java/net/shibboleth/idp/profile/ActionTestingSupport.java b/idp-profile-api/src/test/java/net/shibboleth/idp/profile/ActionTestingSupport.java
index db4dfbf..1430131 100644
--- a/idp-profile-api/src/test/java/net/shibboleth/idp/profile/ActionTestingSupport.java
+++ b/idp-profile-api/src/test/java/net/shibboleth/idp/profile/ActionTestingSupport.java
@@ -42,6 +42,7 @@ public class ActionTestingSupport {
* Checks that the event is not null, that the event source is not null, and that the event ID is the given id.
*
* @param event the event to check
+ * @param id ...
*/
public static void assertEvent(final Event event, final String id) {
Assert.assertNotNull(event);
@@ -58,4 +59,4 @@ public class ActionTestingSupport {
Assert.assertNull(event);
}
-}
\ No newline at end of file
+}
diff --git a/idp-profile-api/src/test/java/net/shibboleth/idp/profile/RequestContextBuilder.java b/idp-profile-api/src/test/java/net/shibboleth/idp/profile/RequestContextBuilder.java
index 93b8a15..525c70f 100644
--- a/idp-profile-api/src/test/java/net/shibboleth/idp/profile/RequestContextBuilder.java
+++ b/idp-profile-api/src/test/java/net/shibboleth/idp/profile/RequestContextBuilder.java
@@ -279,7 +279,8 @@ public class RequestContextBuilder {
* </ul>
*
* @return the constructed {@link MockRequestContext}
- * @throws ComponentInitializationException
+ *
+ * @throws ComponentInitializationException ...
*/
@Nonnull public RequestContext buildRequestContext() throws ComponentInitializationException {
final MockRequestContext context = new MockRequestContext();
@@ -391,8 +392,11 @@ public class RequestContextBuilder {
* {@link #selectProfileConfiguration(Map)}</li>
* </ul>
*
+ * @param profileRequestContext ...
+ *
* @return the constructed {@link RelyingPartyContext}
- * @throws ComponentInitializationException
+ *
+ * @throws ComponentInitializationException ...
*/
@Nonnull protected RelyingPartyContext buildRelyingPartyContext(
@Nonnull final ProfileRequestContext profileRequestContext) throws ComponentInitializationException {
@@ -418,13 +422,14 @@ public class RequestContextBuilder {
* <li>configuration ID is 'mock'</li>
* <li>the responder ID provided by {@link #setOutboundMessageIssuer(String)} or
* {@link ActionTestingSupport#OUTBOUND_MSG_ISSUER} if none is given</li>
- * <li>the activation criteria is {@link Predicates#alwaysTrue()}</li>
+ * <li>the activation criteria is {@link com.google.common.base.Predicates#alwaysTrue()}</li>
* <li>the profile configurations provided {@link #setRelyingPartyProfileConfigurations(Collection)} or one
* {@link MockProfileConfiguration} if none is provided</li>
* </ul>
*
* @return the constructed {@link RelyingPartyConfiguration}
- * @throws ComponentInitializationException
+ *
+ * @throws ComponentInitializationException ...
*/
@Nonnull protected RelyingPartyConfiguration buildRelyingPartyConfiguration() throws ComponentInitializationException {
String responderId;
diff --git a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContextTest.java b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContextTest.java
index c6fb041..62110d5 100644
--- a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContextTest.java
+++ b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContextTest.java
@@ -117,7 +117,11 @@ public class PopulateAuditContextTest {
private Collection<String> result;
- /** Constructor. */
+ /**
+ * Constructor.
+ *
+ * @param arg ...
+ */
public MockFunction(final Collection<String> arg) {
result = arg;
}
@@ -129,4 +133,4 @@ public class PopulateAuditContextTest {
}
}
-}
\ No newline at end of file
+}
diff --git a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/FilterAttributesTest.java b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/FilterAttributesTest.java
index 809215e..8aa60fb 100644
--- a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/FilterAttributesTest.java
+++ b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/FilterAttributesTest.java
@@ -61,7 +61,11 @@ public class FilterAttributesTest {
prc = new WebflowRequestContextProfileRequestContextLookup().apply(src);
}
- /** Test that the action proceeds properly if there is no attribute context. */
+ /**
+ * Test that the action proceeds properly if there is no attribute context.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testNoAttributeContext() throws Exception {
prc.getSubcontext(SubjectContext.class, true);
@@ -76,7 +80,11 @@ public class FilterAttributesTest {
ActionTestingSupport.assertProceedEvent(event);
}
- /** Test that the action proceeds properly if there are no attributes to filter . */
+ /**
+ * Test that the action proceeds properly if there are no attributes to filter.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testNoAttributes() throws Exception {
prc.getSubcontext(SubjectContext.class, true);
@@ -93,7 +101,11 @@ public class FilterAttributesTest {
ActionTestingSupport.assertProceedEvent(event);
}
- /** Test that the action filters attributes and proceeds properly while auto-creating a filter context. */
+ /**
+ * Test that the action filters attributes and proceeds properly while auto-creating a filter context.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testFilterAttributesAutoCreateFilterContext() throws Exception {
final IdPAttribute attribute1 = new IdPAttribute("attribute1");
attribute1.setValues(Arrays.asList(new StringAttributeValue("one"), new StringAttributeValue("two")));
@@ -153,7 +165,11 @@ public class FilterAttributesTest {
Assert.assertTrue(resultAttributeValue.contains(new StringAttributeValue("two")));
}
- /** Test that the action filters attributes and proceeds properly with an existing filter context. */
+ /**
+ * Test that the action filters attributes and proceeds properly with an existing filter context.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testFilterAttributesExistingFilterContext() throws Exception {
final IdPAttribute attribute1 = new IdPAttribute("attribute1");
attribute1.setValues(Arrays.asList(new StringAttributeValue("one"), new StringAttributeValue("two")));
@@ -216,7 +232,11 @@ public class FilterAttributesTest {
Assert.assertTrue(resultAttributeValue.contains(new StringAttributeValue("two")));
}
- /** Test that action returns the proper event if the attributes are not able to be filtered. */
+ /**
+ * Test that action returns the proper event if the attributes are not able to be filtered.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testUnableToFilterAttributes() throws Exception {
final IdPAttribute attribute1 = new MockUncloneableAttribute("attribute1");
attribute1.setValues(Arrays.asList(new StringAttributeValue("one"), new StringAttributeValue("two")));
@@ -261,7 +281,11 @@ public class FilterAttributesTest {
Assert.assertTrue(attributeCtx.getIdPAttributes().isEmpty());
}
- /** Test that action returns the proper event if the attribute configuration is broken */
+ /**
+ * Test that action returns the proper event if the attribute configuration is broken.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testUnableToFindFilter() throws Exception {
final IdPAttribute attribute1 = new MockUncloneableAttribute("attribute1");
attribute1.setValues(Arrays.asList(new StringAttributeValue("one"), new StringAttributeValue("two")));
@@ -291,7 +315,7 @@ public class FilterAttributesTest {
/**
* Constructor.
*
- * @param attributeId
+ * @param attributeId ...
*/
public MockUncloneableAttribute(String attributeId) {
super(attributeId);
diff --git a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/ResolveAttributesTest.java b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/ResolveAttributesTest.java
index d53cdbb..4d28130 100644
--- a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/ResolveAttributesTest.java
+++ b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/ResolveAttributesTest.java
@@ -58,7 +58,11 @@ public class ResolveAttributesTest {
prc = new WebflowRequestContextProfileRequestContextLookup().apply(src);
}
- /** Test that the action resolves attributes and proceeds properly. */
+ /**
+ * Test that the action resolves attributes and proceeds properly.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testResolveAttributes() throws Exception {
prc.getSubcontext(SubjectContext.class, true);
@@ -151,7 +155,11 @@ public class ResolveAttributesTest {
Assert.assertTrue(resolvedAttributeCtx.getIdPAttributes().isEmpty());
}
- /** Test that action returns the proper event if the attributes are not able to be resolved. */
+ /**
+ * Test that action returns the proper event if the attributes are not able to be resolved.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testUnableToResolveAttributes() throws Exception {
prc.getSubcontext(SubjectContext.class, true);
@@ -176,7 +184,11 @@ public class ResolveAttributesTest {
Assert.assertNull(resolvedAttributeCtx);
}
- /** Test that action returns the proper event if the attribute configuration is broken */
+ /**
+ * Test that action returns the proper event if the attribute configuration is broken.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testUnableToFindResolver() throws Exception {
prc.getSubcontext(SubjectContext.class, true);
@@ -194,4 +206,4 @@ public class ResolveAttributesTest {
ActionTestingSupport.assertEvent(event, IdPEventIds.UNABLE_RESOLVE_ATTRIBS);
}
-}
\ No newline at end of file
+}
diff --git a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/SelectProfileConfigurationTest.java b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/SelectProfileConfigurationTest.java
index 0c9ef8a..43bc96e 100644
--- a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/SelectProfileConfigurationTest.java
+++ b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/SelectProfileConfigurationTest.java
@@ -56,7 +56,11 @@ public class SelectProfileConfigurationTest {
action.initialize();
}
- /** Test that the action errors out properly if there is no relying party context. */
+ /**
+ * Test that the action errors out properly if there is no relying party context.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testNoRelyingPartyContext() throws Exception {
prc.removeSubcontext(RelyingPartyContext.class);
@@ -64,7 +68,11 @@ public class SelectProfileConfigurationTest {
ActionTestingSupport.assertEvent(event, IdPEventIds.INVALID_RELYING_PARTY_CTX);
}
- /** Test that the action errors out properly if there is no relying party configuration. */
+ /**
+ * Test that the action errors out properly if there is no relying party configuration.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testNoRelyingPartyConfiguration() throws Exception {
prc.getSubcontext(RelyingPartyContext.class).setConfiguration(null);
@@ -72,7 +80,11 @@ public class SelectProfileConfigurationTest {
ActionTestingSupport.assertEvent(event, IdPEventIds.INVALID_RELYING_PARTY_CONFIG);
}
- /** Test that the action errors out properly if the desired profile configuration is not configured. */
+ /**
+ * Test that the action errors out properly if the desired profile configuration is not configured.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testInvalidProfileConfiguration() throws Exception {
src = new RequestContextBuilder().setRelyingPartyProfileConfigurations(
Collections.<ProfileConfiguration>singleton(new MockProfileConfiguration("mock"))).buildRequestContext();
@@ -82,7 +94,11 @@ public class SelectProfileConfigurationTest {
ActionTestingSupport.assertEvent(event, IdPEventIds.INVALID_PROFILE_CONFIG);
}
- /** Test that the action selects the appropriate profile configuration and proceeds properly. */
+ /**
+ * Test that the action selects the appropriate profile configuration and proceeds properly.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testSelectProfileConfiguration() throws Exception {
src = new RequestContextBuilder().setRelyingPartyProfileConfigurations(
Collections.<ProfileConfiguration>singleton(new MockProfileConfiguration("mock"))).buildRequestContext();
@@ -97,4 +113,4 @@ public class SelectProfileConfigurationTest {
Assert.assertEquals(prc.getSubcontext(RelyingPartyContext.class).getProfileConfig().getId(), "mock");
}
-}
\ No newline at end of file
+}
diff --git a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfigurationTest.java b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfigurationTest.java
index 19c623b..e6e2810 100644
--- a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfigurationTest.java
+++ b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfigurationTest.java
@@ -48,7 +48,11 @@ public class SelectRelyingPartyConfigurationTest {
action.initialize();
}
- /** Test that the action errors out properly if there is no relying party context. */
+ /**
+ * Test that the action errors out properly if there is no relying party context.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testNoRelyingPartyContext() throws Exception {
final RequestContext src = new RequestContextBuilder().buildRequestContext();
final ProfileRequestContext prc = new WebflowRequestContextProfileRequestContextLookup().apply(src);
@@ -65,7 +69,11 @@ public class SelectRelyingPartyConfigurationTest {
ActionTestingSupport.assertEvent(event, IdPEventIds.INVALID_RELYING_PARTY_CTX);
}
- /** Test that the action errors out properly if there is no relying party configuration. */
+ /**
+ * Test that the action errors out properly if there is no relying party configuration.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testNoRelyingPartyConfiguration() throws Exception {
final RequestContext src = new RequestContextBuilder().buildRequestContext();
final ProfileRequestContext prc = new WebflowRequestContextProfileRequestContextLookup().apply(src);
@@ -82,7 +90,11 @@ public class SelectRelyingPartyConfigurationTest {
ActionTestingSupport.assertEvent(event, IdPEventIds.INVALID_RELYING_PARTY_CONFIG);
}
- /** Test that the action errors out properly if the relying party configuration can not be resolved. */
+ /**
+ * Test that the action errors out properly if the relying party configuration can not be resolved.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testUnableToResolveRelyingPartyConfiguration() throws Exception {
final RequestContext src = new RequestContextBuilder().buildRequestContext();
final ProfileRequestContext prc = new WebflowRequestContextProfileRequestContextLookup().apply(src);
@@ -105,7 +117,11 @@ public class SelectRelyingPartyConfigurationTest {
ActionTestingSupport.assertEvent(event, IdPEventIds.INVALID_RELYING_PARTY_CONFIG);
}
- /** Test that the action resolves the relying party and proceeds properly. */
+ /**
+ * Test that the action resolves the relying party and proceeds properly.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testResolveRelyingPartyConfiguration() throws Exception {
final RequestContext src = new RequestContextBuilder().buildRequestContext();
final ProfileRequestContext prc = new WebflowRequestContextProfileRequestContextLookup().apply(src);
@@ -181,4 +197,4 @@ public class SelectRelyingPartyConfigurationTest {
}
}
-}
\ No newline at end of file
+}
diff --git a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/interceptor/impl/PopulateProfileInterceptorContextTest.java b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/interceptor/impl/PopulateProfileInterceptorContextTest.java
index 65255b7..5ad825c 100644
--- a/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/interceptor/impl/PopulateProfileInterceptorContextTest.java
+++ b/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/interceptor/impl/PopulateProfileInterceptorContextTest.java
@@ -66,7 +66,11 @@ public class PopulateProfileInterceptorContextTest {
ActionTestingSupport.assertProceedEvent(event);
}
- /** Test that the context is properly added. */
+ /**
+ * Test that the context is properly added.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testAction() throws Exception {
final ProfileInterceptorContext interceptorContext = prc.getSubcontext(ProfileInterceptorContext.class);
Assert.assertNotNull(interceptorContext);
@@ -78,7 +82,11 @@ public class PopulateProfileInterceptorContextTest {
Assert.assertEquals(availableFlows.get(2).getId(), "intercept/test3");
}
- /** Test that the context is properly added. */
+ /**
+ * Test that the context is properly added.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testError() throws Exception {
final PopulateProfileInterceptorContext action = new PopulateProfileInterceptorContext();
action.setAvailableFlows(interceptorFlows);
@@ -90,4 +98,4 @@ public class PopulateProfileInterceptorContextTest {
ActionTestingSupport.assertEvent(event, IdPEventIds.INVALID_PROFILE_CONFIG);
}
-}
\ No newline at end of file
+}
diff --git a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/FileBackedHTTPMetadataProviderParserTest.java b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/FileBackedHTTPMetadataProviderParserTest.java
index 44c65a0..d211150 100644
--- a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/FileBackedHTTPMetadataProviderParserTest.java
+++ b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/FileBackedHTTPMetadataProviderParserTest.java
@@ -196,10 +196,12 @@ public class FileBackedHTTPMetadataProviderParserTest extends AbstractMetadataPa
Assert.assertNotNull(resolver.resolveSingle(criteriaFor(IDP_ID)));
}
- /**Test the proxy parameters. This will throw an exception because we do not
+ /**
+ * Test the proxy parameters. This will throw an exception because we do not
* have a proxy to test against. It is here to allow hand walking of the code during
* development and as a placeholder against when we get a proxy gost.
- * @throws Exception
+ *
+ * @throws Exception if something goes wrong
*/
@Test(expectedExceptions={BeanCreationException.class,}, enabled=false) public void proxy() throws Exception {
MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
diff --git a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/MockTrustEngine.java b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/MockTrustEngine.java
index ed3d12e..e9c4379 100644
--- a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/MockTrustEngine.java
+++ b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/MockTrustEngine.java
@@ -22,16 +22,14 @@ import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import org.opensaml.security.SecurityException;
import org.opensaml.security.trust.TrustEngine;
-/**
- *
- */
public class MockTrustEngine<T> implements TrustEngine<T> {
private final boolean result;
/**
* Constructor.
- *
+ *
+ * @param retVal ...
*/
public MockTrustEngine(boolean retVal) {
result = retVal;
@@ -42,4 +40,4 @@ public class MockTrustEngine<T> implements TrustEngine<T> {
return result;
}
-}
\ No newline at end of file
+}
diff --git a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/authn/principal/AuthenticationMethodPrincipalTest.java b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/authn/principal/AuthenticationMethodPrincipalTest.java
index db9c6ba..cdf9a20 100644
--- a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/authn/principal/AuthenticationMethodPrincipalTest.java
+++ b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/authn/principal/AuthenticationMethodPrincipalTest.java
@@ -29,9 +29,8 @@ public class AuthenticationMethodPrincipalTest {
/**
* Tests that everything is properly initialized during object construction.
- *
- * @throws MarshallingException
- * @throws CloneNotSupportedException
+ *
+ * @throws CloneNotSupportedException ...
*/
@Test public void testInstantiation() throws CloneNotSupportedException {
AuthenticationMethodPrincipal principal =
@@ -63,4 +62,4 @@ public class AuthenticationMethodPrincipalTest {
}
}
-}
\ No newline at end of file
+}
diff --git a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/authn/principal/AuthnContextClassRefPrincipalTest.java b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/authn/principal/AuthnContextClassRefPrincipalTest.java
index b074247..ce2d375 100644
--- a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/authn/principal/AuthnContextClassRefPrincipalTest.java
+++ b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/authn/principal/AuthnContextClassRefPrincipalTest.java
@@ -34,8 +34,8 @@ public class AuthnContextClassRefPrincipalTest extends XMLObjectBaseTestCase {
/**
* Tests that everything is properly initialized during object construction.
*
- * @throws MarshallingException
- * @throws CloneNotSupportedException
+ * @throws MarshallingException ...
+ * @throws CloneNotSupportedException ...
*/
@Test public void testInstantiation() throws MarshallingException, CloneNotSupportedException {
AuthnContextClassRefPrincipal principal = new AuthnContextClassRefPrincipal(AuthnContext.KERBEROS_AUTHN_CTX);
@@ -71,4 +71,4 @@ public class AuthnContextClassRefPrincipalTest extends XMLObjectBaseTestCase {
}
}
-}
\ No newline at end of file
+}
diff --git a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/authn/principal/AuthnContextDeclRefPrincipalTest.java b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/authn/principal/AuthnContextDeclRefPrincipalTest.java
index c8b422b..9f532dd 100644
--- a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/authn/principal/AuthnContextDeclRefPrincipalTest.java
+++ b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/authn/principal/AuthnContextDeclRefPrincipalTest.java
@@ -33,8 +33,8 @@ public class AuthnContextDeclRefPrincipalTest extends XMLObjectBaseTestCase {
/**
* Tests that everything is properly initialized during object construction.
*
- * @throws MarshallingException
- * @throws CloneNotSupportedException
+ * @throws MarshallingException ...
+ * @throws CloneNotSupportedException ...
*/
@Test public void testInstantiation() throws MarshallingException, CloneNotSupportedException {
AuthnContextDeclRefPrincipal principal = new AuthnContextDeclRefPrincipal("http://opensaml.org/mydecl");
@@ -70,4 +70,4 @@ public class AuthnContextDeclRefPrincipalTest extends XMLObjectBaseTestCase {
}
}
-}
\ No newline at end of file
+}
diff --git a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml1/profile/SAML1ActionTestingSupport.java b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml1/profile/SAML1ActionTestingSupport.java
index 27685a1..af5d928 100644
--- a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml1/profile/SAML1ActionTestingSupport.java
+++ b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml1/profile/SAML1ActionTestingSupport.java
@@ -55,7 +55,8 @@ public final class SAML1ActionTestingSupport extends org.opensaml.saml.saml1.pro
* @param relyingPartyId the ID of the relying party
*
* @return the constructed subcontext
- * @throws ComponentInitializationException
+ *
+ * @throws ComponentInitializationException ...
*/
public static RelyingPartyContext buildRelyingPartySubcontext(@Nonnull final BaseContext parent,
@Nullable final String relyingPartyId) throws ComponentInitializationException {
diff --git a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/SAML2ActionTestingSupport.java b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/SAML2ActionTestingSupport.java
index a6d712b..358f722 100644
--- a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/SAML2ActionTestingSupport.java
+++ b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/saml2/profile/SAML2ActionTestingSupport.java
@@ -55,7 +55,8 @@ public final class SAML2ActionTestingSupport extends org.opensaml.saml.saml2.pro
* @param relyingPartyId the ID of the relying party
*
* @return the constructed subcontext
- * @throws ComponentInitializationException
+ *
+ * @throws ComponentInitializationException ...
*/
public static RelyingPartyContext buildRelyingPartySubcontext(@Nonnull final BaseContext parent,
@Nullable final String relyingPartyId) throws ComponentInitializationException {
diff --git a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/session/SAML2SPSessionTest.java b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/session/SAML2SPSessionTest.java
index 5b2772d..fb1feb8 100644
--- a/idp-saml-api/src/test/java/net/shibboleth/idp/saml/session/SAML2SPSessionTest.java
+++ b/idp-saml-api/src/test/java/net/shibboleth/idp/saml/session/SAML2SPSessionTest.java
@@ -30,7 +30,11 @@ import org.testng.annotations.Test;
/** {@link SAML2SPSession} unit test. */
public class SAML2SPSessionTest extends OpenSAMLInitBaseTestCase {
- /** Tests that everything is properly initialized during object construction. */
+ /**
+ * Tests that everything is properly initialized during object construction.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testInstantiation() throws Exception {
NameID nameID = (NameID) XMLObjectSupport.buildXMLObject(NameID.DEFAULT_ELEMENT_NAME);
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIDDecoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIDDecoderTest.java
index 6240d88..018ed25 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIDDecoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIDDecoderTest.java
@@ -68,9 +68,9 @@ public class CryptoTransientNameIDDecoderTest extends OpenSAMLInitBaseTestCase {
/**
* Set up the data sealer. We take advantage of the fact that Spring a {@link ClassPathResource} wraps a files.
*
- * @throws IOException
- * @throws DataSealerException
- * @throws ComponentInitializationException
+ * @throws IOException ...
+ * @throws DataSealerException ...
+ * @throws ComponentInitializationException ...
*/
@BeforeClass public void setupDataSealer() throws IOException, DataSealerException, ComponentInitializationException {
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIdentifierDecoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIdentifierDecoderTest.java
index 728dcd3..c32660f 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIdentifierDecoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIdentifierDecoderTest.java
@@ -17,7 +17,6 @@
package net.shibboleth.idp.saml.nameid.impl;
-import java.io.IOException;
import java.time.Duration;
import java.util.Collections;
@@ -30,9 +29,7 @@ import net.shibboleth.idp.profile.RequestContextBuilder;
import net.shibboleth.idp.saml.authn.principal.NameIdentifierPrincipal;
import net.shibboleth.idp.saml.impl.TestSources;
import net.shibboleth.idp.saml.nameid.NameIDCanonicalizationFlowDescriptor;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.security.DataSealer;
-import net.shibboleth.utilities.java.support.security.DataSealerException;
import net.shibboleth.utilities.java.support.security.impl.BasicKeystoreKeyStrategy;
import org.opensaml.core.OpenSAMLInitBaseTestCase;
@@ -59,9 +56,7 @@ public class CryptoTransientNameIdentifierDecoderTest extends OpenSAMLInitBaseTe
/**
* Set up the data sealer. We take advantage of the fact that Spring a {@link ClassPathResource} wraps a files.
*
- * @throws IOException
- * @throws DataSealerException
- * @throws ComponentInitializationException
+ * @throws Exception if something goes wrong
*/
@BeforeClass public void setupDataSealer() throws Exception {
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/profile/impl/InitializeAuthenticationContextTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/profile/impl/InitializeAuthenticationContextTest.java
index 1695b72..f6f936f 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/profile/impl/InitializeAuthenticationContextTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/profile/impl/InitializeAuthenticationContextTest.java
@@ -54,8 +54,11 @@ public class InitializeAuthenticationContextTest extends OpenSAMLInitBaseTestCas
action.initialize();
}
- /** Test that the action functions properly if there is no inbound message context.
- * @throws ComponentInitializationException */
+ /**
+ * Test that the action functions properly if there is no inbound message context.
+ *
+ * @throws ComponentInitializationException ...
+ */
@Test public void testNoInboundMessageContext() throws ComponentInitializationException {
final RequestContext requestCtx = new RequestContextBuilder().buildRequestContext();
final ProfileRequestContext prc = new WebflowRequestContextProfileRequestContextLookup().apply(requestCtx);
@@ -71,7 +74,11 @@ public class InitializeAuthenticationContextTest extends OpenSAMLInitBaseTestCas
Assert.assertEquals(authnCtx.getProxyCount(), Integer.valueOf(1));
}
- /** Test that the action functions properly if there is no inbound message. */
+ /**
+ * Test that the action functions properly if there is no inbound message.
+ *
+ * @throws ComponentInitializationException ...
+ */
@Test public void testNoInboundMessage() throws ComponentInitializationException {
final RequestContext requestCtx = new RequestContextBuilder().setInboundMessage(null).buildRequestContext();
final ProfileRequestContext prc = new WebflowRequestContextProfileRequestContextLookup().apply(requestCtx);
@@ -86,7 +93,11 @@ public class InitializeAuthenticationContextTest extends OpenSAMLInitBaseTestCas
Assert.assertEquals(authnCtx.getProxyCount(), Integer.valueOf(1));
}
- /** Test that the action functions properly if the inbound message is not a SAML 2 AuthnRequest. */
+ /**
+ * Test that the action functions properly if the inbound message is not a SAML 2 AuthnRequest.
+ *
+ * @throws ComponentInitializationException ...
+ */
@Test public void testSAML1AuthnRequest() throws ComponentInitializationException {
final RequestContext requestCtx =
new RequestContextBuilder().setInboundMessage(
@@ -104,7 +115,11 @@ public class InitializeAuthenticationContextTest extends OpenSAMLInitBaseTestCas
Assert.assertEquals(authnCtx.getProxyCount(), Integer.valueOf(1));
}
- /** Test that the action proceeds properly if the inbound message is a SAML2 AuthnRequest. */
+ /**
+ * Test that the action proceeds properly if the inbound message is a SAML2 AuthnRequest.
+ *
+ * @throws ComponentInitializationException ...
+ */
@Test public void testCreateAuthenticationContext() throws ComponentInitializationException {
final AuthnRequest authnRequest = SAML2ActionTestingSupport.buildAuthnRequest();
authnRequest.setIsPassive(true);
@@ -211,4 +226,4 @@ public class InitializeAuthenticationContextTest extends OpenSAMLInitBaseTestCas
Assert.assertEquals(authnCtx.getProxiableAuthorities(), Set.of("foo", "bar"));
}
-}
\ No newline at end of file
+}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/profile/impl/PopulateBindingAndEndpointContextsTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/profile/impl/PopulateBindingAndEndpointContextsTest.java
index 7cf3932..662feb4 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/profile/impl/PopulateBindingAndEndpointContextsTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/profile/impl/PopulateBindingAndEndpointContextsTest.java
@@ -166,7 +166,11 @@ public class PopulateBindingAndEndpointContextsTest extends XMLObjectBaseTestCas
Assert.assertEquals(epCtx.getEndpoint().getLocation(), LOCATION_POST);
}
- /** An SP with no endpoints in metadata. */
+ /**
+ * An SP with no endpoints in metadata.
+ *
+ * @throws UnmarshallingException ...
+ */
@Test
public void testNoEndpoints() throws UnmarshallingException {
final EntityDescriptor entity = loadMetadata("/net/shibboleth/idp/saml/impl/profile/SPNoEndpoints.xml");
@@ -179,7 +183,11 @@ public class PopulateBindingAndEndpointContextsTest extends XMLObjectBaseTestCas
ActionTestingSupport.assertEvent(event, SAMLEventIds.ENDPOINT_RESOLUTION_FAILED);
}
- /** An SP with no endpoints in metadata interacting with signed requests. */
+ /**
+ * An SP with no endpoints in metadata interacting with signed requests.
+ *
+ * @throws UnmarshallingException ...
+ */
@Test
public void testSignedNoEndpoints() throws UnmarshallingException {
final EntityDescriptor entity = loadMetadata("/net/shibboleth/idp/saml/impl/profile/SPNoEndpoints.xml");
@@ -214,7 +222,11 @@ public class PopulateBindingAndEndpointContextsTest extends XMLObjectBaseTestCas
Assert.assertEquals(bindingCtx.getBindingUri(), SAMLConstants.SAML2_POST_BINDING_URI);
}
- /** No endpoint with the location requested. */
+ /**
+ * No endpoint with the location requested.
+ *
+ * @throws UnmarshallingException ...
+ */
@Test
public void testBadLocation() throws UnmarshallingException {
final EntityDescriptor entity = loadMetadata("/net/shibboleth/idp/saml/impl/profile/SPWithEndpoints.xml");
@@ -229,7 +241,11 @@ public class PopulateBindingAndEndpointContextsTest extends XMLObjectBaseTestCas
ActionTestingSupport.assertEvent(event, SAMLEventIds.ENDPOINT_RESOLUTION_FAILED);
}
- /** No endpoint at a location with the right binding requested. */
+ /**
+ * No endpoint at a location with the right binding requested.
+ *
+ * @throws UnmarshallingException ...
+ */
@Test
public void testBadBinding() throws UnmarshallingException {
final EntityDescriptor entity = loadMetadata("/net/shibboleth/idp/saml/impl/profile/SPWithEndpoints.xml");
@@ -244,7 +260,11 @@ public class PopulateBindingAndEndpointContextsTest extends XMLObjectBaseTestCas
ActionTestingSupport.assertEvent(event, SAMLEventIds.ENDPOINT_RESOLUTION_FAILED);
}
- /** Endpoint matches but we don't support the binding. */
+ /**
+ * Endpoint matches but we don't support the binding.
+ *
+ * @throws UnmarshallingException ...
+ */
@Test
public void testUnsupportedBinding() throws UnmarshallingException {
final EntityDescriptor entity = loadMetadata("/net/shibboleth/idp/saml/impl/profile/SPWithEndpoints.xml");
@@ -260,7 +280,11 @@ public class PopulateBindingAndEndpointContextsTest extends XMLObjectBaseTestCas
ActionTestingSupport.assertEvent(event, SAMLEventIds.ENDPOINT_RESOLUTION_FAILED);
}
- /** No endpoint with a requested index. */
+ /**
+ * No endpoint with a requested index.
+ *
+ * @throws UnmarshallingException ...
+ */
@Test
public void testBadIndex() throws UnmarshallingException {
final EntityDescriptor entity = loadMetadata("/net/shibboleth/idp/saml/impl/profile/SPWithEndpoints.xml");
@@ -277,7 +301,11 @@ public class PopulateBindingAndEndpointContextsTest extends XMLObjectBaseTestCas
ActionTestingSupport.assertEvent(event, SAMLEventIds.ENDPOINT_RESOLUTION_FAILED);
}
- /** Test SOAP case. */
+ /**
+ * Test SOAP case.
+ *
+ * @throws ComponentInitializationException ...
+ */
@Test
public void testSynchronous() throws ComponentInitializationException {
prc.getInboundMessageContext().getSubcontext(SAMLBindingContext.class).setBindingUri(
@@ -302,7 +330,11 @@ public class PopulateBindingAndEndpointContextsTest extends XMLObjectBaseTestCas
Assert.assertSame(binding, bindingCtx.getBindingDescriptor());
}
- /** Requested location/binding are in metadata. */
+ /**
+ * Requested location/binding are in metadata.
+ *
+ * @throws UnmarshallingException ...
+ */
@Test
public void testInMetadata() throws UnmarshallingException {
final EntityDescriptor entity = loadMetadata("/net/shibboleth/idp/saml/impl/profile/SPWithEndpoints.xml");
@@ -328,7 +360,11 @@ public class PopulateBindingAndEndpointContextsTest extends XMLObjectBaseTestCas
Assert.assertEquals(epCtx.getEndpoint().getLocation(), LOCATION_POST);
}
- /** Requested index is in metadata. */
+ /**
+ * Requested index is in metadata.
+ *
+ * @throws UnmarshallingException ...
+ */
@Test
public void testIndexInMetadata() throws UnmarshallingException {
final EntityDescriptor entity = loadMetadata("/net/shibboleth/idp/saml/impl/profile/SPWithEndpoints.xml");
@@ -358,7 +394,11 @@ public class PopulateBindingAndEndpointContextsTest extends XMLObjectBaseTestCas
Assert.assertEquals(epCtx.getEndpoint().getLocation(), LOCATION_POST);
}
- /** No endpoint with a requested index. */
+ /**
+ * No endpoint with a requested index.
+ *
+ * @throws UnmarshallingException ...
+ */
@Test
public void testIndexUnsupportedBinding() throws UnmarshallingException {
final EntityDescriptor entity = loadMetadata("/net/shibboleth/idp/saml/impl/profile/SPWithEndpoints.xml");
@@ -375,7 +415,11 @@ public class PopulateBindingAndEndpointContextsTest extends XMLObjectBaseTestCas
ActionTestingSupport.assertEvent(event, SAMLEventIds.ENDPOINT_RESOLUTION_FAILED);
}
- /** Get the default endpoint. */
+ /**
+ * Get the default endpoint.
+ *
+ * @throws UnmarshallingException ...
+ */
@Test
public void testDefault() throws UnmarshallingException {
final EntityDescriptor entity = loadMetadata("/net/shibboleth/idp/saml/impl/profile/SPWithEndpoints.xml");
@@ -404,7 +448,11 @@ public class PopulateBindingAndEndpointContextsTest extends XMLObjectBaseTestCas
Assert.assertEquals(epCtx.getEndpoint().getLocation(), LOCATION_POST.replace("POST2", "POST"));
}
- /** Test a SAML 1 request (use of SAML2 bindings here is just for simplicity in testing). */
+ /**
+ * Test a SAML 1 request (use of SAML2 bindings here is just for simplicity in testing).
+ *
+ * @throws UnmarshallingException ...
+ */
@Test
public void testSAML1InMetadata() throws UnmarshallingException {
final EntityDescriptor entity = loadMetadata("/net/shibboleth/idp/saml/impl/profile/SPWithEndpoints.xml");
@@ -445,4 +493,4 @@ public class PopulateBindingAndEndpointContextsTest extends XMLObjectBaseTestCas
}
}
-}
\ No newline at end of file
+}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertionTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertionTest.java
index aaf8d37..9d59e74 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertionTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertionTest.java
@@ -133,7 +133,11 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
action.setTranscoderRegistry(new MockReloadableService<>(registry));
}
- /** Test that the action errors out properly if there is no relying party context. */
+ /**
+ * Test that the action errors out properly if there is no relying party context.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testNoRelyingPartyContext() throws Exception {
prc.removeSubcontext(RelyingPartyContext.class);
@@ -142,7 +146,11 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
ActionTestingSupport.assertEvent(result, EventIds.INVALID_PROFILE_CTX);
}
- /** Test that the action errors out properly if there is no outbound context. */
+ /**
+ * Test that the action errors out properly if there is no outbound context.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testNoOutboundContext() throws Exception {
prc.setOutboundMessageContext(null);
@@ -154,14 +162,22 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
ActionTestingSupport.assertEvent(result, EventIds.INVALID_MSG_CTX);
}
- /** Test that the action continues properly if there is no attribute context. */
+ /**
+ * Test that the action continues properly if there is no attribute context.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testNoAttributeContext() throws Exception {
action.initialize();
Event result = action.execute(rc);
ActionTestingSupport.assertProceedEvent(result);
}
- /** Test that the action continues properly if the attribute context does not contain attributes. */
+ /**
+ * Test that the action continues properly if the attribute context does not contain attributes.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testNoAttributes() throws Exception {
final AttributeContext attribCtx = new AttributeContext();
prc.getSubcontext(RelyingPartyContext.class).addSubcontext(attribCtx);
@@ -171,7 +187,11 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
ActionTestingSupport.assertProceedEvent(result);
}
- /** Test that the action ignores attribute encoding errors. */
+ /**
+ * Test that the action ignores attribute encoding errors.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testIgnoreAttributeEncodingErrors() throws Exception {
final AttributeTranscoderRegistryImpl localregistry = new AttributeTranscoderRegistryImpl();
@@ -208,7 +228,11 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
ActionTestingSupport.assertProceedEvent(result);
}
- /** Test that the action returns the correct transition when an attribute encoding error occurs. */
+ /**
+ * Test that the action returns the correct transition when an attribute encoding error occurs.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void failOnAttributeEncodingErrors() throws Exception {
final AttributeTranscoderRegistryImpl localregistry = new AttributeTranscoderRegistryImpl();
@@ -248,6 +272,8 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
/**
* Test that the attribute statement is correctly added as a new assertion of a response already containing an
* assertion.
+ *
+ * @throws Exception if something goes wrong
*/
@Test public void testAddedAttributeStatement() throws Exception {
@@ -276,7 +302,11 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
}
}
- /** Test that the attribute statement is correctly added to an assertion which already exists in the response. */
+ /**
+ * Test that the attribute statement is correctly added to an assertion which already exists in the response.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testAssertionInResponse() throws Exception {
((Response) prc.getOutboundMessageContext().getMessage()).getAssertions().add(
SAML1ActionTestingSupport.buildAssertion());
@@ -303,6 +333,8 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
/**
* Test that the attribute statement is correctly added to a newly created assertion of the response which
* originally contained no assertions.
+ *
+ * @throws Exception if something goes wrong
*/
@Test public void testNoAssertionInResponse() throws Exception {
final AttributeContext attribCtx = buildAttributeContext();
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAuthenticationStatementToAssertionTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAuthenticationStatementToAssertionTest.java
index abb24c9..2917d2b 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAuthenticationStatementToAssertionTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAuthenticationStatementToAssertionTest.java
@@ -70,13 +70,21 @@ public class AddAuthenticationStatementToAssertionTest extends OpenSAMLInitBaseT
action.initialize();
}
- /** Test that the action errors out properly if there is no authentication context. */
+ /**
+ * Test that the action errors out properly if there is no authentication context.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testNoAuthnContext() throws Exception {
final Event event = action.execute(rc);
ActionTestingSupport.assertEvent(event, AuthnEventIds.INVALID_AUTHN_CTX);
}
- /** Test that the action errors out properly if there is no relying party context. */
+ /**
+ * Test that the action errors out properly if there is no relying party context.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testNoRelyingPartyContext() throws Exception {
prc.getSubcontext(AuthenticationContext.class, true);
prc.removeSubcontext(RelyingPartyContext.class);
@@ -85,7 +93,11 @@ public class AddAuthenticationStatementToAssertionTest extends OpenSAMLInitBaseT
ActionTestingSupport.assertEvent(event, EventIds.INVALID_PROFILE_CTX);
}
- /** Test that the action errors out properly if there is no context. */
+ /**
+ * Test that the action errors out properly if there is no context.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testNoContext() throws Exception {
prc.setOutboundMessageContext(null);
prc.getSubcontext(AuthenticationContext.class, true).setAuthenticationResult(
@@ -95,7 +107,11 @@ public class AddAuthenticationStatementToAssertionTest extends OpenSAMLInitBaseT
ActionTestingSupport.assertEvent(event, EventIds.INVALID_MSG_CTX);
}
- /** Test that the action proceeds properly returning no assertions if there is no authentication result. */
+ /**
+ * Test that the action proceeds properly returning no assertions if there is no authentication result.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testNoAuthenticationStatement() throws Exception {
prc.getSubcontext(AuthenticationContext.class, true);
@@ -103,7 +119,11 @@ public class AddAuthenticationStatementToAssertionTest extends OpenSAMLInitBaseT
ActionTestingSupport.assertEvent(event, AuthnEventIds.INVALID_AUTHN_CTX);
}
- /** Test that the authentication statement is properly added. */
+ /**
+ * Test that the authentication statement is properly added.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testAddAuthenticationStatement() throws Exception {
final Instant now = Instant.now();
// this is here to allow the event's creation time to deviate from the 'start' time
@@ -145,7 +165,11 @@ public class AddAuthenticationStatementToAssertionTest extends OpenSAMLInitBaseT
Assert.assertEquals(authenticationStatement.getSubjectLocality().getIPAddress(), "127.0.0.1");
}
- /** Test that the authentication statement is properly added with the right method. */
+ /**
+ * Test that the authentication statement is properly added with the right method.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testAddAuthenticationStatementAndMethod() throws Exception {
final Subject subject = new Subject();
subject.getPrincipals().add(new AuthenticationMethodPrincipal("Foo"));
@@ -174,4 +198,4 @@ public class AddAuthenticationStatementToAssertionTest extends OpenSAMLInitBaseT
Assert.assertEquals(authenticationStatement.getAuthenticationMethod(), "Bar");
}
-}
\ No newline at end of file
+}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11DecoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11DecoderTest.java
index 0fde321..20f613c 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11DecoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11DecoderTest.java
@@ -52,6 +52,8 @@ public class LibertyHTTPSOAP11DecoderTest extends XMLObjectBaseTestCase {
/**
* Tests decoding a SOAP 1.1 message.
+ *
+ * @throws Exception if something goes wrong
*/
@Test
public void testDecoding() throws Exception {
@@ -73,4 +75,4 @@ public class LibertyHTTPSOAP11DecoderTest extends XMLObjectBaseTestCase {
marshallerFactory.getMarshaller(message).marshall(message);
return SerializeSupport.nodeToString(message.getDOM());
}
-}
\ No newline at end of file
+}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11EncoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11EncoderTest.java
index 78cf3c5..dddb4e2 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11EncoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/LibertyHTTPSOAP11EncoderTest.java
@@ -48,7 +48,7 @@ public class LibertyHTTPSOAP11EncoderTest 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 {
@@ -111,4 +111,4 @@ public class LibertyHTTPSOAP11EncoderTest extends XMLObjectBaseTestCase {
}
Assert.assertEquals(response.getContentAsString().hashCode(), 1113901725);
}
-}
\ No newline at end of file
+}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAttributeStatementToAssertionTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAttributeStatementToAssertionTest.java
index bb25fa5..0e0db14 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAttributeStatementToAssertionTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAttributeStatementToAssertionTest.java
@@ -141,7 +141,11 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
action.setTranscoderRegistry(new MockReloadableService<>(registry));
}
- /** Test that the action errors out properly if there is no relying party context. */
+ /**
+ * Test that the action errors out properly if there is no relying party context.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testNoRelyingPartyContext() throws Exception {
prc.removeSubcontext(RelyingPartyContext.class);
@@ -150,7 +154,11 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
ActionTestingSupport.assertEvent(result, EventIds.INVALID_PROFILE_CTX);
}
- /** Test that the action errors out properly if there is no outbound context. */
+ /**
+ * Test that the action errors out properly if there is no outbound context.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testNoOutboundContext() throws Exception {
prc.setOutboundMessageContext(null);
@@ -162,14 +170,22 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
ActionTestingSupport.assertEvent(result, EventIds.INVALID_MSG_CTX);
}
- /** Test that the action continues properly if there is no attribute context. */
+ /**
+ * Test that the action continues properly if there is no attribute context.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testNoAttributeContext() throws Exception {
action.initialize();
Event result = action.execute(rc);
ActionTestingSupport.assertProceedEvent(result);
}
- /** Test that the action continues properly if the attribute context does not contain attributes. */
+ /**
+ * Test that the action continues properly if the attribute context does not contain attributes.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testNoAttributes() throws Exception {
final AttributeContext attribCtx = new AttributeContext();
prc.getSubcontext(RelyingPartyContext.class).addSubcontext(attribCtx);
@@ -179,7 +195,11 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
ActionTestingSupport.assertProceedEvent(result);
}
- /** Test that the action ignores attribute encoding errors. */
+ /**
+ * Test that the action ignores attribute encoding errors.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testIgnoreAttributeEncodingErrors() throws Exception {
final AttributeTranscoderRegistryImpl localregistry = new AttributeTranscoderRegistryImpl();
@@ -216,7 +236,11 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
ActionTestingSupport.assertProceedEvent(result);
}
- /** Test that the action returns the correct transition when an attribute encoding error occurs. */
+ /**
+ * Test that the action returns the correct transition when an attribute encoding error occurs.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void failOnAttributeEncodingErrors() throws Exception {
final AttributeTranscoderRegistryImpl localregistry = new AttributeTranscoderRegistryImpl();
@@ -256,6 +280,8 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
/**
* Test that the attribute statement is correctly added as a new assertion of a response already containing an
* assertion.
+ *
+ * @throws Exception if something goes wrong
*/
@Test public void testAddedAttributeStatement() throws Exception {
@@ -284,7 +310,11 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
}
}
- /** Test that the attribute statement is correctly added to an assertion which already exists in the response. */
+ /**
+ * Test that the attribute statement is correctly added to an assertion which already exists in the response.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testAssertionInResponse() throws Exception {
((Response) prc.getOutboundMessageContext().getMessage()).getAssertions().add(
SAML2ActionTestingSupport.buildAssertion());
@@ -310,6 +340,8 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
/**
* Test that the attribute statement is correctly added to a newly created assertion of the response which
* originally contained no assertions.
+ *
+ * @throws Exception if something goes wrong
*/
@Test public void testNoAssertionInResponse() throws Exception {
final AttributeContext attribCtx = buildAttributeContext();
@@ -401,4 +433,4 @@ public class AddAttributeStatementToAssertionTest extends OpenSAMLInitBaseTestCa
}
}
-}
\ No newline at end of file
+}
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertionTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertionTest.java
index 03cde8c..aec06fa 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertionTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertionTest.java
@@ -101,7 +101,11 @@ public class AddAuthnStatementToAssertionTest extends OpenSAMLInitBaseTestCase {
ActionTestingSupport.assertEvent(event, EventIds.INVALID_MSG_CTX);
}
- /** Test that the action proceeds properly returning no assertions if there is no authentication result. */
+ /**
+ * Test that the action proceeds properly returning no assertions if there is no authentication result.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testNoAuthenticationStatement() throws Exception {
prc.getSubcontext(AuthenticationContext.class, true);
@@ -109,9 +113,12 @@ public class AddAuthnStatementToAssertionTest extends OpenSAMLInitBaseTestCase {
ActionTestingSupport.assertEvent(event, AuthnEventIds.INVALID_AUTHN_CTX);
}
- /** Test that the authentication statement is properly added.
- * @throws InterruptedException
- * @throws ComponentInitializationException */
+ /**
+ * Test that the authentication statement is properly added.
+ *
+ * @throws InterruptedException ...
+ * @throws ComponentInitializationException ...
+ */
@Test public void testAddAuthenticationStatement() throws InterruptedException, ComponentInitializationException {
final Instant now = Instant.now();
// this is here to allow the event's creation time to deviate from the 'start' time
@@ -230,4 +237,4 @@ public class AddAuthnStatementToAssertionTest extends OpenSAMLInitBaseTestCase {
Assert.assertEquals(authnContext.getAuthenticatingAuthorities().get(2).getURI(), "baz");
}
-}
\ No newline at end of file
+}
diff --git a/idp-session-api/src/test/java/net/shibboleth/idp/session/BasicSPSessionTest.java b/idp-session-api/src/test/java/net/shibboleth/idp/session/BasicSPSessionTest.java
index 6d19b76..fac1d8c 100644
--- a/idp-session-api/src/test/java/net/shibboleth/idp/session/BasicSPSessionTest.java
+++ b/idp-session-api/src/test/java/net/shibboleth/idp/session/BasicSPSessionTest.java
@@ -27,7 +27,11 @@ import org.testng.annotations.Test;
/** {@link BasicSPSession} unit test. */
public class BasicSPSessionTest {
- /** Tests that everything is properly initialized during object construction. */
+ /**
+ * Tests that everything is properly initialized during object construction.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testInstantiation() throws Exception {
final Instant start = Instant.now();
// this is here to allow the event's creation time to deviate from the 'start' time
@@ -61,4 +65,4 @@ public class BasicSPSessionTest {
}
}
-}
\ No newline at end of file
+}
diff --git a/idp-session-api/src/test/java/net/shibboleth/idp/session/IdPSessionTest.java b/idp-session-api/src/test/java/net/shibboleth/idp/session/IdPSessionTest.java
index 7162d2d..8c3a3e9 100644
--- a/idp-session-api/src/test/java/net/shibboleth/idp/session/IdPSessionTest.java
+++ b/idp-session-api/src/test/java/net/shibboleth/idp/session/IdPSessionTest.java
@@ -29,7 +29,11 @@ import org.testng.annotations.Test;
/** {@link IdPSession} unit test. */
public class IdPSessionTest {
- /** Tests that everything is properly initialized during object construction. */
+ /**
+ * Tests that everything is properly initialized during object construction.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testInstantiation() throws Exception {
final Instant start = Instant.now();
Thread.sleep(50);
@@ -73,7 +77,11 @@ public class IdPSessionTest {
}
}
- /** Tests mutating the last activity instant. */
+ /**
+ * Tests mutating the last activity instant.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testLastActivityInstant() throws Exception {
AbstractIdPSession session = new DummyIdPSession("test", "foo");
@@ -88,7 +96,11 @@ public class IdPSessionTest {
Assert.assertEquals(session.getLastActivityInstant(), now);
}
- /** Tests mutating the last activity instant. */
+ /**
+ * Tests mutating the last activity instant.
+ *
+ * @throws Exception if something goes wrong
+ */
@Test public void testAddressValidation() throws Exception {
AbstractIdPSession session = new DummyIdPSession("test", "foo");
@@ -100,8 +112,11 @@ public class IdPSessionTest {
Assert.assertFalse(session.checkAddress("fe80::5a55:caff:fef2:65a3"));
}
- /** Tests adding service sessions.
- * @throws SessionException */
+ /**
+ * Tests adding service sessions.
+ *
+ * @throws SessionException ...
+ */
@Test public void testAddSPSessions() throws SessionException {
final Instant now = Instant.now();
final Instant exp = now.plusSeconds(60);
@@ -151,8 +166,11 @@ public class IdPSessionTest {
Assert.assertEquals(session.getSPSession("svc1"), svcSession1);
}
- /** Tests removing service sessions.
- * @throws SessionException */
+ /**
+ * Tests removing service sessions.
+ *
+ * @throws SessionException ...
+ */
@Test public void testRemoveSPSession() throws SessionException {
final Instant now = Instant.now();
final Instant exp = now.plusSeconds(60);
@@ -187,8 +205,11 @@ public class IdPSessionTest {
}
}
- /** Tests remove authentication results.
- * @throws SessionException */
+ /**
+ * Tests remove authentication results.
+ *
+ * @throws SessionException ...
+ */
@Test public void testRemoveAuthenticationResult() throws SessionException {
AuthenticationResult event1 = new AuthenticationResult("foo", new UsernamePrincipal("john"));
AuthenticationResult event2 = new AuthenticationResult("bar", new UsernamePrincipal("john"));
@@ -229,8 +250,8 @@ public class IdPSessionTest {
/**
* Constructor.
*
- * @param sessionId
- * @param canonicalName
+ * @param sessionId ...
+ * @param canonicalName ...
*/
public DummyIdPSession(String sessionId, String canonicalName) {
super(sessionId, canonicalName, Instant.now());
@@ -241,4 +262,4 @@ public class IdPSessionTest {
}
}
-}
\ No newline at end of file
+}
diff --git a/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/SessionManagerBaseTestCase.java b/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/SessionManagerBaseTestCase.java
index 0de58e0..ceb7631 100644
--- a/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/SessionManagerBaseTestCase.java
+++ b/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/SessionManagerBaseTestCase.java
@@ -80,7 +80,7 @@ public class SessionManagerBaseTestCase extends OpenSAMLInitBaseTestCase {
/**
* Allows override of component properties before initializing them.
*
- * @throws ComponentInitializationException
+ * @throws ComponentInitializationException ...
*/
protected void adjustProperties() throws ComponentInitializationException {
@@ -97,7 +97,8 @@ public class SessionManagerBaseTestCase extends OpenSAMLInitBaseTestCase {
* @param principalName name of principal for session
*
* @return the cookie established by the SessionManager
- * @throws SessionException
+ *
+ * @throws SessionException ...
*/
protected Cookie createSession(@Nonnull @NotEmpty final String principalName) throws SessionException {
HttpServletRequestResponseContext.loadCurrent(new MockHttpServletRequest(), new MockHttpServletResponse());
@@ -106,4 +107,4 @@ public class SessionManagerBaseTestCase extends OpenSAMLInitBaseTestCase {
HttpServletRequestResponseContext.clearCurrent();
return cookie;
}
-}
\ No newline at end of file
+}
diff --git a/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/UpdateSessionWithSPSessionTest.java b/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/UpdateSessionWithSPSessionTest.java
index f2b4c94..e9a8b88 100644
--- a/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/UpdateSessionWithSPSessionTest.java
+++ b/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/UpdateSessionWithSPSessionTest.java
@@ -125,7 +125,12 @@ public class UpdateSessionWithSPSessionTest extends SessionManagerBaseTestCase {
private Instant expirationTime;
- /** Constructor. */
+ /**
+ * Constructor.
+ *
+ * @param creation ...
+ * @param expiration ...
+ */
DummyStrategy(final Instant creation, final Instant expiration) {
creationTime = creation;
expirationTime = expiration;
diff --git a/idp-ui/src/test/java/net/shibboleth/idp/ui/csrf/BaseCSRFTest.java b/idp-ui/src/test/java/net/shibboleth/idp/ui/csrf/BaseCSRFTest.java
index 80c17e0..7159643 100644
--- a/idp-ui/src/test/java/net/shibboleth/idp/ui/csrf/BaseCSRFTest.java
+++ b/idp-ui/src/test/java/net/shibboleth/idp/ui/csrf/BaseCSRFTest.java
@@ -59,7 +59,6 @@ public class BaseCSRFTest {
/**
* MockView, for use when you do not actually need a rendered response.
- * @see {@link org.springframework.webflow.test.MockViewFactoryCreator#MockView}.
*/
protected static class MockView implements View {
diff --git a/idp-ui/src/test/java/net/shibboleth/idp/ui/csrf/impl/CSRFTokenFlowExecutionListenerTest.java b/idp-ui/src/test/java/net/shibboleth/idp/ui/csrf/impl/CSRFTokenFlowExecutionListenerTest.java
index c91c07e..f095b1c 100644
--- a/idp-ui/src/test/java/net/shibboleth/idp/ui/csrf/impl/CSRFTokenFlowExecutionListenerTest.java
+++ b/idp-ui/src/test/java/net/shibboleth/idp/ui/csrf/impl/CSRFTokenFlowExecutionListenerTest.java
@@ -68,8 +68,11 @@ public class CSRFTokenFlowExecutionListenerTest extends BaseCSRFTest{
//listener.initialize();
}
- /** Test the listener adds the CSRF token to the viewScope on view rendering.
- * @throws ComponentInitializationException */
+ /**
+ * Test the listener adds the CSRF token to the viewScope on view rendering.
+ *
+ * @throws ComponentInitializationException ...
+ */
@Test public void testAddingCsrfTokenToViewScopeOnRendering() throws ComponentInitializationException {
listener.initialize();
@@ -90,7 +93,8 @@ public class CSRFTokenFlowExecutionListenerTest extends BaseCSRFTest{
/**
* Test the listener throws an {@link InvalidCSRFTokenException} if the viewScope and request token do not match.
* View is not excluded.
- * @throws ComponentInitializationException
+ *
+ * @throws ComponentInitializationException ...
*/
@Test(expectedExceptions=InvalidCSRFTokenException.class) public void testInvalidToken() throws ComponentInitializationException {
@@ -114,7 +118,11 @@ public class CSRFTokenFlowExecutionListenerTest extends BaseCSRFTest{
}
- /** Test an {@link InvalidCSRFTokenException} is not thrown if the token in the request and viewscope matches.*/
+ /**
+ * Test an {@link InvalidCSRFTokenException} is not thrown if the token in the request and viewscope matches.
+ *
+ * @throws ComponentInitializationException ...
+ */
@Test public void testValidToken() throws ComponentInitializationException {
listener.initialize();
@@ -141,7 +149,8 @@ public class CSRFTokenFlowExecutionListenerTest extends BaseCSRFTest{
/**
* Test the listener does not thrown an {@link InvalidCSRFTokenException}. The tokens do not match,
* but the specific view is excluded.
- * @throws ComponentInitializationException
+ *
+ * @throws ComponentInitializationException ...
*/
@Test public void testViewExcluded() throws ComponentInitializationException {
@@ -170,7 +179,8 @@ public class CSRFTokenFlowExecutionListenerTest extends BaseCSRFTest{
/**
* Test the listener does not throw an {@link InvalidCSRFTokenException} even though the tokens do not match, because
* the listener is disabled.
- * @throws ComponentInitializationException
+ *
+ * @throws ComponentInitializationException ...
*/
@Test public void testDisabled() throws ComponentInitializationException {
@@ -199,7 +209,8 @@ public class CSRFTokenFlowExecutionListenerTest extends BaseCSRFTest{
* Test the listener gracefully (no exception) handles a non view-state. Note this
* should really not happen in production, as SWF should not call the viewRendering method
* unless in a view-state.
- * @throws ComponentInitializationException
+ *
+ * @throws ComponentInitializationException ...
* */
@Test public void testDoesNotAddTokenToNonViewState() throws ComponentInitializationException {
@@ -217,7 +228,8 @@ public class CSRFTokenFlowExecutionListenerTest extends BaseCSRFTest{
* Test the listener does not test the CSRF token if called from in a non view-state.
* No exception should be thrown. Note, if it did test the tokens, as none are present, an exception
* would be thrown - which is undesirable.
- * @throws ComponentInitializationException
+ *
+ * @throws ComponentInitializationException ...
* */
@Test public void testDoesNotTestTokenInNonViewState() throws ComponentInitializationException {
@@ -233,8 +245,11 @@ public class CSRFTokenFlowExecutionListenerTest extends BaseCSRFTest{
- /** Test the listener throws an {@link InvalidCSRFTokenException} if no CSRF token is present in the Http request.
- * @throws ComponentInitializationException */
+ /**
+ * Test the listener throws an {@link InvalidCSRFTokenException} if no CSRF token is present in the Http request.
+ *
+ * @throws ComponentInitializationException ...
+ */
@Test(expectedExceptions=InvalidCSRFTokenException.class) public void testHttpRequestTokenException()
throws ComponentInitializationException {
@@ -255,8 +270,9 @@ public class CSRFTokenFlowExecutionListenerTest extends BaseCSRFTest{
/**
* Test the listener does throw an {@link InvalidCSRFTokenException} as the tokens do not match.
- * A new {@link EventRequiresCSRFTokenValidationPredicate} is created to match by eventId.
- * @throws ComponentInitializationException
+ * A new {@link BiPredicate} is created to match by eventId.
+ *
+ * @throws ComponentInitializationException ...
*/
@Test(expectedExceptions=InvalidCSRFTokenException.class) public void
testInvalidTokenUsingNewEventRequiresCSRFTokenValidationPredicate() throws ComponentInitializationException {
@@ -291,8 +307,11 @@ public class CSRFTokenFlowExecutionListenerTest extends BaseCSRFTest{
}
- /** Test the listener throws an {@link InvalidCSRFTokenException} if no CSRF token is present in the viewscope.
- * @throws ComponentInitializationException */
+ /**
+ * Test the listener throws an {@link InvalidCSRFTokenException} if no CSRF token is present in the viewscope.
+ *
+ * @throws ComponentInitializationException ...
+ */
@Test(expectedExceptions=InvalidCSRFTokenException.class) public void testNoViewScopeTokenException()
throws ComponentInitializationException {
@@ -306,8 +325,11 @@ public class CSRFTokenFlowExecutionListenerTest extends BaseCSRFTest{
}
- /** Test setting a CSRF token manager.
- * @throws ComponentInitializationException */
+ /**
+ * Test setting a CSRF token manager.
+ *
+ * @throws ComponentInitializationException ...
+ */
@Test public void testSetCsrfTokenManager() throws ComponentInitializationException {
listener.setCsrfTokenManager(new CSRFTokenManager());
listener.initialize();
@@ -332,8 +354,11 @@ public class CSRFTokenFlowExecutionListenerTest extends BaseCSRFTest{
Assert.assertTrue(((Boolean) enabledObject));
}
- /** Test the listener does not add CSRF token to the viewScope on view rendering, as listener disabled.
- * @throws ComponentInitializationException */
+ /**
+ * Test the listener does not add CSRF token to the viewScope on view rendering, as listener disabled.
+ *
+ * @throws ComponentInitializationException ...
+ */
@Test public void testTokenNotAddedToViewScopeOnRenderingWhenDisabled() throws ComponentInitializationException {
//set enabled to false.
@@ -372,7 +397,8 @@ public class CSRFTokenFlowExecutionListenerTest extends BaseCSRFTest{
/**
* Tests the {@link InvalidCSRFTokenException} is thrown when the view scoped token is the wrong type -
* String rather than {@link CSRFToken}.
- * @throws ComponentInitializationException
+ *
+ * @throws ComponentInitializationException ...
*/
@Test(expectedExceptions=InvalidCSRFTokenException.class) public void testTokenWrongType()
throws ComponentInitializationException {
@@ -396,7 +422,11 @@ public class CSRFTokenFlowExecutionListenerTest extends BaseCSRFTest{
listener.eventSignaled(src, new Event(this,"proceed"));
}
- /** Test an unset csrf token manager triggers an initialisation exception.*/
+ /**
+ * Test an unset csrf token manager triggers an initialisation exception.
+ *
+ * @throws ComponentInitializationException ...
+ */
@Test(expectedExceptions=ComponentInitializationException.class) void testUnsetCsrfTokenManager()
throws ComponentInitializationException{
@@ -406,7 +436,11 @@ public class CSRFTokenFlowExecutionListenerTest extends BaseCSRFTest{
theListener.initialize();
}
- /** Test an unset ViewRequiresCSRFToken predicate triggers an initialisation exception.*/
+ /**
+ * Test an unset ViewRequiresCSRFToken predicate triggers an initialisation exception.
+ *
+ * @throws ComponentInitializationException ...
+ */
@Test(expectedExceptions=ComponentInitializationException.class) void testUnsetEventRequiresCSRFValidationPredicate()
throws ComponentInitializationException{
@@ -416,7 +450,11 @@ public class CSRFTokenFlowExecutionListenerTest extends BaseCSRFTest{
theListener.initialize();
}
- /** Test an unset EventRequiresCSRFTokenValidation predicate triggers an initialisation exception.*/
+ /**
+ * Test an unset EventRequiresCSRFTokenValidation predicate triggers an initialisation exception.
+ *
+ * @throws ComponentInitializationException ...
+ */
@Test(expectedExceptions=ComponentInitializationException.class) void testUnsetViewRequiresCSRFTokenPredicate()
throws ComponentInitializationException{
@@ -426,7 +464,4 @@ public class CSRFTokenFlowExecutionListenerTest extends BaseCSRFTest{
theListener.initialize();
}
-
-
-
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list