[java-idp-plugin-duo] branch main updated: Fix test javadoc
Phil Smart
philip.smart at jisc.ac.uk
Thu Sep 3 15:07:34 UTC 2020
This is an automated email from the git hooks/post-receive script.
philsmart pushed a commit to branch main
in repository java-idp-plugin-duo.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-duo.git;a=commit;h=f7b61ac8db19396320d8ecbfc9e1b8bc510aaf33
The following commit(s) were added to refs/heads/main by this push:
new f7b61ac Fix test javadoc
f7b61ac is described below
commit f7b61ac8db19396320d8ecbfc9e1b8bc510aaf33
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Thu Sep 3 16:07:29 2020 +0100
Fix test javadoc
---
idp-duo-api/pom.xml | 6 +-----
idp-duo-distribution/src/main/assembly/duo-bare-assembly.xml | 1 +
.../src/main/assembly/duo-native-sdk-assembly.xml | 1 +
.../java/net/shibboleth/idp/plugin/authn/duo/PluginTest.java | 11 ++++++++++-
.../authn/duo/impl/AbstractAuthnXmlFlowExecutionTests.java | 6 +++---
.../plugin/authn/duo/impl/ExchangeCodeForDuoTokenTest.java | 4 ++--
.../plugin/authn/duo/impl/ValidateDuoResponseStateTest.java | 8 ++++----
.../plugin/authn/duo/impl/ValidateDuoTokenAudienceTest.java | 4 ++--
.../authn/spring/CustomAbstractXmlFlowExecutionTests.java | 4 ++--
.../idp/plugin/authn/spring/CustomFlowModelFlowBuilder.java | 2 +-
10 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/idp-duo-api/pom.xml b/idp-duo-api/pom.xml
index 856085a..5dd3f45 100644
--- a/idp-duo-api/pom.xml
+++ b/idp-duo-api/pom.xml
@@ -45,11 +45,7 @@
<artifactId>opensaml-messaging-api</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
- <scope>provided</scope>
- </dependency>
+
<!-- Test dependencies -->
diff --git a/idp-duo-distribution/src/main/assembly/duo-bare-assembly.xml b/idp-duo-distribution/src/main/assembly/duo-bare-assembly.xml
index 6b7dba2..a17a4cd 100644
--- a/idp-duo-distribution/src/main/assembly/duo-bare-assembly.xml
+++ b/idp-duo-distribution/src/main/assembly/duo-bare-assembly.xml
@@ -8,6 +8,7 @@
<format>zip</format>
</formats>
<fileSets>
+ <!-- Is this first one needed? -->
<fileSet>
<directory>../idp-duo-impl/src/main/resources/flows</directory>
<outputDirectory>flows</outputDirectory>
diff --git a/idp-duo-distribution/src/main/assembly/duo-native-sdk-assembly.xml b/idp-duo-distribution/src/main/assembly/duo-native-sdk-assembly.xml
index 1d14c4d..f980dff 100644
--- a/idp-duo-distribution/src/main/assembly/duo-native-sdk-assembly.xml
+++ b/idp-duo-distribution/src/main/assembly/duo-native-sdk-assembly.xml
@@ -9,6 +9,7 @@
</formats>
<fileSets>
<fileSet>
+ <!-- What is this one for? -->
<directory>../idp-duo-impl/src/main/resources/flows</directory>
<outputDirectory>flows</outputDirectory>
<includes>
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/PluginTest.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/PluginTest.java
index 40d6478..0e5dcac 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/PluginTest.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/PluginTest.java
@@ -65,6 +65,11 @@ public class PluginTest {
}
+ /**
+ * Test files.
+ *
+ * @throws IOException on error
+ */
@Test
public void testFiles() throws IOException {
final Path distDir = Path.of("../idp-duo-distribution/src/main/resources");
@@ -81,7 +86,11 @@ public class PluginTest {
}
}
- /** Test the plugin state. */
+ /**
+ * Test the plugin state.
+ *
+ * @throws ComponentInitializationException on error
+ */
@Test
public void testState() throws ComponentInitializationException {
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/AbstractAuthnXmlFlowExecutionTests.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/AbstractAuthnXmlFlowExecutionTests.java
index 8e2c0d3..43ab6ef 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/AbstractAuthnXmlFlowExecutionTests.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/AbstractAuthnXmlFlowExecutionTests.java
@@ -42,6 +42,7 @@ import org.springframework.core.env.StandardEnvironment;
import org.springframework.mock.env.MockPropertySource;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.test.context.ContextConfiguration;
import org.springframework.webflow.config.FlowDefinitionResource;
import org.springframework.webflow.config.FlowDefinitionResourceFactory;
import org.springframework.webflow.engine.Flow;
@@ -79,7 +80,7 @@ import net.shibboleth.utilities.java.support.security.impl.SecureRandomIdentifie
* <p>
* Extends the {@link CustomAbstractXmlFlowExecutionTests} over the standard
* {@link AbstractExternalizedFlowExecutionTests} for the sole reason of being able to set a
- * {@link CustomFlowModelFlowBuilder} with a placeholder prefix of {@literal %{} to be compatible with those used by the
+ * {@link CustomFlowModelFlowBuilder} with a placeholder prefix of <code>%{</code> to be compatible with those used by the
* IdP. We also set this prefix in various other locations, but those are either ignored by the inbuilt SWF flow builder
* when it substitutes the placeholder inside the bean import, or do not share the same Mock properties source as is set
* in the {@link #registerMockPropertySource(MockFlowBuilderContext)} method. If a better way is found to support that,
@@ -172,7 +173,7 @@ public abstract class AbstractAuthnXmlFlowExecutionTests extends CustomAbstractX
/**
* Set the mock properties to use within a property source.
*
- * @param properties
+ * @param properties the mock properties.
*/
public void setMockProperties(@Nonnull final Map<String,String> properties) {
assertNotNull(properties);
@@ -262,7 +263,6 @@ public abstract class AbstractAuthnXmlFlowExecutionTests extends CustomAbstractX
* but are required for authentication flows to proceed.
*
* @param builderContext the context used to register the beans.
- * @throws ComponentInitializationException
*/
private void registerMockBeanDefinitions(@Nonnull final MockFlowBuilderContext builderContext) {
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ExchangeCodeForDuoTokenTest.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ExchangeCodeForDuoTokenTest.java
index ffded9f..792edb3 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ExchangeCodeForDuoTokenTest.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ExchangeCodeForDuoTokenTest.java
@@ -46,7 +46,7 @@ public class ExchangeCodeForDuoTokenTest extends AbstractDuoActionTest {
}
- /** Test ExchangeCodeForDuoToken executes successfully.*/
+ /* Test ExchangeCodeForDuoToken executes successfully.*/
@Test
public void testExecuteSuccess() throws ComponentInitializationException, DuoRegistryException, DuoClientException {
addDuoContext();
@@ -60,7 +60,7 @@ public class ExchangeCodeForDuoTokenTest extends AbstractDuoActionTest {
AssertJUnit.assertNull(event);
}
- /** Test ExchangeCodeForDuoToken with no authorization code.*/
+ /* Test ExchangeCodeForDuoToken with no authorization code.*/
@Test
public void testExecuteNoAuthCode()
throws ComponentInitializationException, DuoRegistryException, DuoClientException {
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoResponseStateTest.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoResponseStateTest.java
index 66b17ca..ad58f37 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoResponseStateTest.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoResponseStateTest.java
@@ -41,7 +41,7 @@ public class ValidateDuoResponseStateTest extends AbstractDuoActionTest{
}
- /** Test Duo 2FA response validation, success.*/
+ /* Test Duo 2FA response validation, success.*/
@Test
public void testExecuteSuccess() throws ComponentInitializationException {
addDuoContext();
@@ -56,7 +56,7 @@ public class ValidateDuoResponseStateTest extends AbstractDuoActionTest{
assertNull(event);
}
- /** Test Duo 2FA response validation, no state in either request or response.*/
+ /* Test Duo 2FA response validation, no state in either request or response.*/
@Test
public void testExecuteNoStateInRequestOrResponse() throws ComponentInitializationException {
addDuoContext();
@@ -67,7 +67,7 @@ public class ValidateDuoResponseStateTest extends AbstractDuoActionTest{
assertEventId(event,AuthnEventIds.AUTHN_EXCEPTION);
}
- /** Test Duo 2FA response validation, no state in response. */
+ /* Test Duo 2FA response validation, no state in response. */
@Test
public void testExecuteNoStateInResponse() throws ComponentInitializationException {
addDuoContext();
@@ -79,7 +79,7 @@ public class ValidateDuoResponseStateTest extends AbstractDuoActionTest{
assertEventId(event,AuthnEventIds.AUTHN_EXCEPTION);
}
- /** Test Duo 2FA response validation, no state in request.*/
+ /* Test Duo 2FA response validation, no state in request.*/
@Test
public void testExecuteNoStateInRequest() throws ComponentInitializationException {
addDuoContext();
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAudienceTest.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAudienceTest.java
index 7e199a6..644873f 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAudienceTest.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/duo/impl/ValidateDuoTokenAudienceTest.java
@@ -62,7 +62,7 @@ public class ValidateDuoTokenAudienceTest extends AbstractDuoActionTest {
}
- /** Test Duo 2FA token response audience validation, success.*/
+ /* Test Duo 2FA token response audience validation, success.*/
@Test
public final void testDoExecuteSuccess() throws ComponentInitializationException {
addDuoContext();
@@ -77,7 +77,7 @@ public class ValidateDuoTokenAudienceTest extends AbstractDuoActionTest {
}
- /** Test Duo 2FA token response audience validation, wrong audience.*/
+ /* Test Duo 2FA token response audience validation, wrong audience.*/
@Test
public final void testDoExecuteWrongAudience() throws ComponentInitializationException {
addDuoContext();
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/spring/CustomAbstractXmlFlowExecutionTests.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/spring/CustomAbstractXmlFlowExecutionTests.java
index 41a39e9..adcf054 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/spring/CustomAbstractXmlFlowExecutionTests.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/spring/CustomAbstractXmlFlowExecutionTests.java
@@ -30,8 +30,8 @@ import org.springframework.webflow.test.execution.AbstractExternalizedFlowExecut
import org.springframework.webflow.test.execution.AbstractXmlFlowExecutionTests;
/**
- * Copy of the {@link AbstractXmlFlowExecutionTests} class, but using a custom {@link CustomFlowModelBuilder}
- * to set the property placeholder prefix of {@literal %{}.
+ * Copy of the {@link AbstractXmlFlowExecutionTests} class, but using a custom {@link CustomFlowModelFlowBuilder}
+ * to set the property placeholder prefix of <code>%{</code>.
*/
public abstract class CustomAbstractXmlFlowExecutionTests extends AbstractExternalizedFlowExecutionTests {
diff --git a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/spring/CustomFlowModelFlowBuilder.java b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/spring/CustomFlowModelFlowBuilder.java
index 8371ba7..4b28d89 100644
--- a/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/spring/CustomFlowModelFlowBuilder.java
+++ b/idp-duo-impl/src/test/java/net/shibboleth/idp/plugin/authn/spring/CustomFlowModelFlowBuilder.java
@@ -115,7 +115,7 @@ import org.springframework.webflow.scope.ViewScope;
import org.springframework.webflow.security.SecurityRule;
/**
- * Copy of {@link FlowModelFlowBuilder} for setting the property placeholder prefix of {@literal %{ }.
+ * Copy of {@link FlowModelFlowBuilder} for setting the property placeholder prefix of <code>%{</code>.
*/
public class CustomFlowModelFlowBuilder extends AbstractFlowBuilder {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list