[java-identity-provider] branch main updated: Fix some test warnings, and adjust test resources.
Scott Cantor
cantor.2 at osu.edu
Tue May 9 15:10:15 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=f5f226682842941063de9bc93d5f520517b0d267
The following commit(s) were added to refs/heads/main by this push:
new f5f226682 Fix some test warnings, and adjust test resources.
f5f226682 is described below
commit f5f226682842941063de9bc93d5f520517b0d267
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue May 9 11:10:11 2023 -0400
Fix some test warnings, and adjust test resources.
---
.../src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java | 2 --
.../src/test/java/net/shibboleth/idp/test/flows/c14n/TestC14N.java | 1 +
.../net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML1C14N.java | 1 +
.../net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML2C14N.java | 1 +
.../java/net/shibboleth/idp/test/flows/load/FlowLoadsFlowTest.java | 1 +
.../test/java/net/shibboleth/idp/test/flows/mapper/MappingTest.java | 4 +---
.../java/net/shibboleth/idp/test/flows/mapper/SpoofSAMLMessage.java | 3 ++-
.../test/spring/IdPPropertiesApplicationContextInitializerTest.java | 2 +-
8 files changed, 8 insertions(+), 7 deletions(-)
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 6ad4400c4..7fc432563 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
@@ -21,7 +21,6 @@ import static org.testng.Assert.fail;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
-import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -313,7 +312,6 @@ public abstract class AbstractFlowTest extends AbstractTestNGSpringContextTests
* @throws IOException on badness
* @throws ModuleException on badness
*/
- @SuppressWarnings("null")
@BeforeSuite public static void setupIdPHome() throws IOException, ModuleException {
assert IdPHome==null;
IdPHome = Files.createTempDirectory("IdPHome");
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/TestC14N.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/TestC14N.java
index 6106a7962..bad55395a 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/TestC14N.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/TestC14N.java
@@ -27,6 +27,7 @@ import net.shibboleth.idp.test.flows.AbstractFlowTest;
* Tests for C14N.
*/
@ContextConfiguration({"classpath:/c14n/test-webflow-config.xml", "classpath:/c14n/locate-resolver.xml"})
+ at SuppressWarnings("javadoc")
public class TestC14N extends AbstractFlowTest {
@Test public void testTransientNameID() {
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML1C14N.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML1C14N.java
index f57a0c3a4..242c1aa9b 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML1C14N.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML1C14N.java
@@ -47,6 +47,7 @@ import net.shibboleth.shared.primitive.StringSupport;
/**
* Action to mock up a Subject for C14N.
*/
+ at SuppressWarnings("javadoc")
public class SetupForSAML1C14N extends AbstractProfileAction {
private String attributeName;
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML2C14N.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML2C14N.java
index a50d08b85..cc5396f98 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML2C14N.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML2C14N.java
@@ -47,6 +47,7 @@ import net.shibboleth.shared.primitive.StringSupport;
/**
* Action to mock up a Subject for C14N.
*/
+ at SuppressWarnings("javadoc")
public class SetupForSAML2C14N extends AbstractProfileAction {
private String attributeName;
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/load/FlowLoadsFlowTest.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/load/FlowLoadsFlowTest.java
index d51fa4912..1d2965a08 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/load/FlowLoadsFlowTest.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/load/FlowLoadsFlowTest.java
@@ -34,6 +34,7 @@ import net.shibboleth.idp.test.flows.AbstractFlowTest;
@ContextConfiguration(locations = {"classpath:/flow-load-test/test-webflow-config.xml",})
public class FlowLoadsFlowTest extends AbstractFlowTest {
+ /** Test flow ID. */
@Nonnull public final static String TEST_FLOW_LOADS_ID = "test-flow-loads";
/**
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/mapper/MappingTest.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/mapper/MappingTest.java
index 4c0c74ed1..f15f97ed9 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/mapper/MappingTest.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/mapper/MappingTest.java
@@ -23,9 +23,7 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.webflow.executor.FlowExecutionResult;
import org.testng.annotations.Test;
-/**
- *
- */
+ at SuppressWarnings("javadoc")
@ContextConfiguration({"classpath:/mapping/configs/override.xml", })
public class MappingTest extends AbstractFlowTest {
@Test(enabled=true) public void testResolveAndFilter() {
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/mapper/SpoofSAMLMessage.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/mapper/SpoofSAMLMessage.java
index 24dcdbedd..a18676633 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/mapper/SpoofSAMLMessage.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/mapper/SpoofSAMLMessage.java
@@ -28,6 +28,7 @@ import org.opensaml.saml.common.messaging.context.SAMLProtocolContext;
import org.opensaml.saml.common.xml.SAMLConstants;
import org.opensaml.saml.saml2.metadata.SPSSODescriptor;
+ at SuppressWarnings("javadoc")
public class SpoofSAMLMessage extends AbstractProfileAction {
@Override
@@ -43,4 +44,4 @@ public class SpoofSAMLMessage extends AbstractProfileAction {
}
-}
+}
\ No newline at end of file
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/spring/IdPPropertiesApplicationContextInitializerTest.java b/idp-conf/src/test/java/net/shibboleth/idp/test/spring/IdPPropertiesApplicationContextInitializerTest.java
index 4bc707fad..66b9a0286 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/spring/IdPPropertiesApplicationContextInitializerTest.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/spring/IdPPropertiesApplicationContextInitializerTest.java
@@ -46,7 +46,7 @@ public class IdPPropertiesApplicationContextInitializerTest {
@BeforeMethod public void setUp() {
sc = new MockServletContext("");
sc.addInitParameter(ContextLoader.CONTEXT_CLASS_PARAM, "net.shibboleth.ext.spring.context.DelimiterAwareApplicationContext");
- sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM, "classpath:/system/conf/global-system.xml");
+ sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM, "classpath:/net/shibboleth/idp/conf/global-system.xml,classpath:/net/shibboleth/idp/conf/webflow-config.xml,classpath:/net/shibboleth/idp/conf/mvc-beans.xml");
sc.addInitParameter(ContextLoader.CONTEXT_INITIALIZER_CLASSES_PARAM,
IdPPropertiesApplicationContextInitializer.class.getName());
listener = new ContextLoaderListener();
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list