[java-support] branch master updated: IDP-311 -Make test resource path consistent across modules
Scott Cantor
cantor.2 at osu.edu
Fri Mar 4 23:08:26 EST 2016
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository java-support.
The following commit(s) were added to refs/heads/master by this push:
new aa3c6ef IDP-311 -Make test resource path consistent across modules
aa3c6ef is described below
commit aa3c6efae2a518b153f63255a4c816d4e7063a2c
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Mar 4 23:07:09 2016 -0500
IDP-311 -Make test resource path consistent across modules
https://issues.shibboleth.net/jira/browse/IDP-311
---
.../java/support/security/BasicKeystoreKeyStrategyTest.java | 4 ++--
.../utilities/java/support/security/DataSealerTest.java | 6 +++---
.../utilities/java/support/xml/AttributeSupportTest.java | 6 +++---
.../utilities/java/support/xml/BasicParserPoolTest.java | 4 ++--
.../utilities/java/support/xml/DomTypeSupportTest.java | 4 ++--
.../utilities/java/support/xml/ElementSupportTest.java | 2 +-
.../utilities/java/support/xml/NamespaceSupportTest.java | 2 +-
.../utilities/java/support/xml/QNameSupportTest.java | 2 +-
.../utilities/java/support/xml/SchemaBuilderTest.java | 2 +-
.../utilities/java/support/xml/SerializeSupportTest.java | 2 +-
.../utilities/java/support/security/SealerKeyStore.jks | Bin
.../utilities/java/support/security/SealerKeyStore.kver | 0
.../utilities/java/support/security/SealerKeyStore.kver2 | 0
.../utilities/java/support/xml/attributeSupportTest.xml | 0
.../net/shibboleth/utilities/java/support/xml/badNS1.xml | 0
.../net/shibboleth/utilities/java/support/xml/badNS2.xml | 0
.../utilities/java/support/xml/basicParserPoolTest.xml | 0
.../utilities/java/support/xml/basicParserPoolTest.xsd | 0
.../utilities/java/support/xml/elementSupportTest.xml | 0
.../net/shibboleth/utilities/java/support/xml/foo.xml | 0
.../shibboleth/utilities/java/support/xml/getXSIType.xml | 0
.../utilities/java/support/xml/namespaceSupportTest.xml | 0
.../net/shibboleth/utilities/java/support/xml/noXSIType.xml | 0
.../utilities/java/support/xml/qNameSupportTest.xml | 0
.../xml/schemaBuilderTestDir/schemaBuilderTest-fails.xml | 0
.../schemaBuilderTest-schemaFirstLoaded.xsd | 0
.../schemaBuilderTest-schemaSecondLoaded.xsd | 0
.../xml/schemaBuilderTestDir/schemaBuilderTest-works.xml | 0
.../utilities/java/support/xml/serializeSupportTest.xml | 0
29 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/test/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTest.java b/src/test/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTest.java
index 59b8b5d..a615a8e 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTest.java
@@ -32,8 +32,8 @@ import org.testng.annotations.Test;
public class BasicKeystoreKeyStrategyTest {
@Test public void testBasicKeystoreKeyStrategy() throws Exception {
- final File keystoreFile = new File("src/test/resources/data/net/shibboleth/utilities/java/support/security/Temp.jks");
- final File versionFile = new File("src/test/resources/data/net/shibboleth/utilities/java/support/security/Temp.kver");
+ final File keystoreFile = new File("src/test/resources/net/shibboleth/utilities/java/support/security/Temp.jks");
+ final File versionFile = new File("src/test/resources/net/shibboleth/utilities/java/support/security/Temp.kver");
keystoreFile.deleteOnExit();
versionFile.deleteOnExit();
diff --git a/src/test/java/net/shibboleth/utilities/java/support/security/DataSealerTest.java b/src/test/java/net/shibboleth/utilities/java/support/security/DataSealerTest.java
index 1f6ec15..b10587a 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/security/DataSealerTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/security/DataSealerTest.java
@@ -44,17 +44,17 @@ public class DataSealerTest {
@BeforeClass public void initializeKeystoreResource() {
ClassPathResource resource =
- new ClassPathResource("/data/net/shibboleth/utilities/java/support/security/SealerKeyStore.jks");
+ new ClassPathResource("/net/shibboleth/utilities/java/support/security/SealerKeyStore.jks");
Assert.assertTrue(resource.exists());
keystoreResource = TestResourceConverter.of(resource);
resource =
- new ClassPathResource("/data/net/shibboleth/utilities/java/support/security/SealerKeyStore.kver");
+ new ClassPathResource("/net/shibboleth/utilities/java/support/security/SealerKeyStore.kver");
Assert.assertTrue(resource.exists());
versionResource = TestResourceConverter.of(resource);
resource =
- new ClassPathResource("/data/net/shibboleth/utilities/java/support/security/SealerKeyStore.kver2");
+ new ClassPathResource("/net/shibboleth/utilities/java/support/security/SealerKeyStore.kver2");
Assert.assertTrue(resource.exists());
version2Resource = TestResourceConverter.of(resource);
}
diff --git a/src/test/java/net/shibboleth/utilities/java/support/xml/AttributeSupportTest.java b/src/test/java/net/shibboleth/utilities/java/support/xml/AttributeSupportTest.java
index b6a3b2d..33e2f2b 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/xml/AttributeSupportTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/xml/AttributeSupportTest.java
@@ -85,7 +85,7 @@ public class AttributeSupportTest {
idAttrQName = new QName(TEST_NS, TEST_ID_ATTRIBUTE, TEST_PREFIX);
Resource resource =
- new ClassPathResource("data/net/shibboleth/utilities/java/support/xml/attributeSupportTest.xml");
+ new ClassPathResource("/net/shibboleth/utilities/java/support/xml/attributeSupportTest.xml");
Document testFile = builder.parse(resource.getInputStream());
Element root = (Element) testFile.getFirstChild();
@@ -139,7 +139,7 @@ public class AttributeSupportTest {
@Test public void testBadNS() throws XMLParserException, ComponentInitializationException, IOException {
DocumentBuilder builder = parserPool.getBuilder();
- Resource resource = new ClassPathResource("data/net/shibboleth/utilities/java/support/xml/badNS1.xml");
+ Resource resource = new ClassPathResource("/net/shibboleth/utilities/java/support/xml/badNS1.xml");
boolean thrown = false;
Document file = null;
try {
@@ -151,7 +151,7 @@ public class AttributeSupportTest {
thrown,
"xmlns: declaration with name other than xml and namespace of http://www.w3.org/XML/1998/namespace should throw an error ");
- resource = new ClassPathResource("data/net/shibboleth/utilities/java/support/xml/badNS2.xml");
+ resource = new ClassPathResource("/net/shibboleth/utilities/java/support/xml/badNS2.xml");
thrown = false;
try {
file = builder.parse(resource.getInputStream());
diff --git a/src/test/java/net/shibboleth/utilities/java/support/xml/BasicParserPoolTest.java b/src/test/java/net/shibboleth/utilities/java/support/xml/BasicParserPoolTest.java
index 468da4f..5a970c8 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/xml/BasicParserPoolTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/xml/BasicParserPoolTest.java
@@ -58,7 +58,7 @@ import org.xml.sax.SAXParseException;
*/
public class BasicParserPoolTest {
- private static final String TEST_DIR = "data/net/shibboleth/utilities/java/support/xml/";
+ private static final String TEST_DIR = "/net/shibboleth/utilities/java/support/xml/";
private static final String SCHEMA_FILE = TEST_DIR + "basicParserPoolTest.xsd";
@@ -656,7 +656,7 @@ pool.initialize();
@Test
public void testParserUseAfterReturn() throws XMLParserException, URISyntaxException, ComponentInitializationException {
basicParserPool.initialize();
- String testPath = "/data/net/shibboleth/utilities/java/support/xml/foo.xml";
+ String testPath = "/net/shibboleth/utilities/java/support/xml/foo.xml";
InputStream is = BasicParserPoolTest.class.getResourceAsStream(testPath);
File file = new File(this.getClass().getResource(testPath).toURI());
diff --git a/src/test/java/net/shibboleth/utilities/java/support/xml/DomTypeSupportTest.java b/src/test/java/net/shibboleth/utilities/java/support/xml/DomTypeSupportTest.java
index 6e47eb7..c38953e 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/xml/DomTypeSupportTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/xml/DomTypeSupportTest.java
@@ -47,10 +47,10 @@ public class DomTypeSupportTest {
parserPool = pool;
DocumentBuilder builder = parserPool.getBuilder();
- Resource res = new ClassPathResource("data/net/shibboleth/utilities/java/support/xml/getXSIType.xml");
+ Resource res = new ClassPathResource("/net/shibboleth/utilities/java/support/xml/getXSIType.xml");
xsStringXSITypeElement = (Element) builder.parse(res.getInputStream()).getFirstChild();
- res = new ClassPathResource("data/net/shibboleth/utilities/java/support/xml/noXSIType.xml");
+ res = new ClassPathResource("/net/shibboleth/utilities/java/support/xml/noXSIType.xml");
noXSITypeElement = (Element) builder.parse(res.getInputStream()).getFirstChild();
if (null != builder) {
diff --git a/src/test/java/net/shibboleth/utilities/java/support/xml/ElementSupportTest.java b/src/test/java/net/shibboleth/utilities/java/support/xml/ElementSupportTest.java
index 80da88d..5dd5a89 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/xml/ElementSupportTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/xml/ElementSupportTest.java
@@ -73,7 +73,7 @@ public class ElementSupportTest {
try {
Resource resource =
- new ClassPathResource("data/net/shibboleth/utilities/java/support/xml/elementSupportTest.xml");
+ new ClassPathResource("/net/shibboleth/utilities/java/support/xml/elementSupportTest.xml");
testFileDocument = builder.parse(resource.getInputStream());
rootElement = (Element) testFileDocument.getFirstChild();
testerDocument = builder.newDocument();
diff --git a/src/test/java/net/shibboleth/utilities/java/support/xml/NamespaceSupportTest.java b/src/test/java/net/shibboleth/utilities/java/support/xml/NamespaceSupportTest.java
index c627278..9b32be9 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/xml/NamespaceSupportTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/xml/NamespaceSupportTest.java
@@ -73,7 +73,7 @@ public class NamespaceSupportTest {
DocumentBuilder builder = parserPool.getBuilder();
try {
Resource resource =
- new ClassPathResource("data/net/shibboleth/utilities/java/support/xml/namespaceSupportTest.xml");
+ new ClassPathResource("/net/shibboleth/utilities/java/support/xml/namespaceSupportTest.xml");
Document testFile = builder.parse(resource.getInputStream());
parent = (Element) testFile.getFirstChild();
diff --git a/src/test/java/net/shibboleth/utilities/java/support/xml/QNameSupportTest.java b/src/test/java/net/shibboleth/utilities/java/support/xml/QNameSupportTest.java
index abf8283..648ed79 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/xml/QNameSupportTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/xml/QNameSupportTest.java
@@ -69,7 +69,7 @@ public class QNameSupportTest {
DocumentBuilder builder = parserPool.getBuilder();
Resource resource =
- new ClassPathResource("data/net/shibboleth/utilities/java/support/xml/qNameSupportTest.xml");
+ new ClassPathResource("/net/shibboleth/utilities/java/support/xml/qNameSupportTest.xml");
Document testFile = builder.parse(resource.getInputStream());
parent = (Element) testFile.getFirstChild();
diff --git a/src/test/java/net/shibboleth/utilities/java/support/xml/SchemaBuilderTest.java b/src/test/java/net/shibboleth/utilities/java/support/xml/SchemaBuilderTest.java
index d691e75..c7a90b5 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/xml/SchemaBuilderTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/xml/SchemaBuilderTest.java
@@ -39,7 +39,7 @@ import org.xml.sax.SAXException;
*/
public class SchemaBuilderTest {
- private static final String TEST_DIR = "data/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/";
+ private static final String TEST_DIR = "/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/";
private static final String FILE_ROOT = "src/test/resources/";
diff --git a/src/test/java/net/shibboleth/utilities/java/support/xml/SerializeSupportTest.java b/src/test/java/net/shibboleth/utilities/java/support/xml/SerializeSupportTest.java
index 635b133..390cd18 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/xml/SerializeSupportTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/xml/SerializeSupportTest.java
@@ -54,7 +54,7 @@ public class SerializeSupportTest {
DocumentBuilder builder = parserPool.getBuilder();
try {
Resource resource =
- new ClassPathResource("data/net/shibboleth/utilities/java/support/xml/serializeSupportTest.xml");
+ new ClassPathResource("/net/shibboleth/utilities/java/support/xml/serializeSupportTest.xml");
Document testFile = builder.parse(resource.getInputStream());
parent = (Element) testFile.getFirstChild();
diff --git a/src/test/resources/data/net/shibboleth/utilities/java/support/security/SealerKeyStore.jks b/src/test/resources/net/shibboleth/utilities/java/support/security/SealerKeyStore.jks
similarity index 100%
rename from src/test/resources/data/net/shibboleth/utilities/java/support/security/SealerKeyStore.jks
rename to src/test/resources/net/shibboleth/utilities/java/support/security/SealerKeyStore.jks
diff --git a/src/test/resources/data/net/shibboleth/utilities/java/support/security/SealerKeyStore.kver b/src/test/resources/net/shibboleth/utilities/java/support/security/SealerKeyStore.kver
similarity index 100%
rename from src/test/resources/data/net/shibboleth/utilities/java/support/security/SealerKeyStore.kver
rename to src/test/resources/net/shibboleth/utilities/java/support/security/SealerKeyStore.kver
diff --git a/src/test/resources/data/net/shibboleth/utilities/java/support/security/SealerKeyStore.kver2 b/src/test/resources/net/shibboleth/utilities/java/support/security/SealerKeyStore.kver2
similarity index 100%
rename from src/test/resources/data/net/shibboleth/utilities/java/support/security/SealerKeyStore.kver2
rename to src/test/resources/net/shibboleth/utilities/java/support/security/SealerKeyStore.kver2
diff --git a/src/test/resources/data/net/shibboleth/utilities/java/support/xml/attributeSupportTest.xml b/src/test/resources/net/shibboleth/utilities/java/support/xml/attributeSupportTest.xml
similarity index 100%
rename from src/test/resources/data/net/shibboleth/utilities/java/support/xml/attributeSupportTest.xml
rename to src/test/resources/net/shibboleth/utilities/java/support/xml/attributeSupportTest.xml
diff --git a/src/test/resources/data/net/shibboleth/utilities/java/support/xml/badNS1.xml b/src/test/resources/net/shibboleth/utilities/java/support/xml/badNS1.xml
similarity index 100%
rename from src/test/resources/data/net/shibboleth/utilities/java/support/xml/badNS1.xml
rename to src/test/resources/net/shibboleth/utilities/java/support/xml/badNS1.xml
diff --git a/src/test/resources/data/net/shibboleth/utilities/java/support/xml/badNS2.xml b/src/test/resources/net/shibboleth/utilities/java/support/xml/badNS2.xml
similarity index 100%
rename from src/test/resources/data/net/shibboleth/utilities/java/support/xml/badNS2.xml
rename to src/test/resources/net/shibboleth/utilities/java/support/xml/badNS2.xml
diff --git a/src/test/resources/data/net/shibboleth/utilities/java/support/xml/basicParserPoolTest.xml b/src/test/resources/net/shibboleth/utilities/java/support/xml/basicParserPoolTest.xml
similarity index 100%
rename from src/test/resources/data/net/shibboleth/utilities/java/support/xml/basicParserPoolTest.xml
rename to src/test/resources/net/shibboleth/utilities/java/support/xml/basicParserPoolTest.xml
diff --git a/src/test/resources/data/net/shibboleth/utilities/java/support/xml/basicParserPoolTest.xsd b/src/test/resources/net/shibboleth/utilities/java/support/xml/basicParserPoolTest.xsd
similarity index 100%
rename from src/test/resources/data/net/shibboleth/utilities/java/support/xml/basicParserPoolTest.xsd
rename to src/test/resources/net/shibboleth/utilities/java/support/xml/basicParserPoolTest.xsd
diff --git a/src/test/resources/data/net/shibboleth/utilities/java/support/xml/elementSupportTest.xml b/src/test/resources/net/shibboleth/utilities/java/support/xml/elementSupportTest.xml
similarity index 100%
rename from src/test/resources/data/net/shibboleth/utilities/java/support/xml/elementSupportTest.xml
rename to src/test/resources/net/shibboleth/utilities/java/support/xml/elementSupportTest.xml
diff --git a/src/test/resources/data/net/shibboleth/utilities/java/support/xml/foo.xml b/src/test/resources/net/shibboleth/utilities/java/support/xml/foo.xml
similarity index 100%
rename from src/test/resources/data/net/shibboleth/utilities/java/support/xml/foo.xml
rename to src/test/resources/net/shibboleth/utilities/java/support/xml/foo.xml
diff --git a/src/test/resources/data/net/shibboleth/utilities/java/support/xml/getXSIType.xml b/src/test/resources/net/shibboleth/utilities/java/support/xml/getXSIType.xml
similarity index 100%
rename from src/test/resources/data/net/shibboleth/utilities/java/support/xml/getXSIType.xml
rename to src/test/resources/net/shibboleth/utilities/java/support/xml/getXSIType.xml
diff --git a/src/test/resources/data/net/shibboleth/utilities/java/support/xml/namespaceSupportTest.xml b/src/test/resources/net/shibboleth/utilities/java/support/xml/namespaceSupportTest.xml
similarity index 100%
rename from src/test/resources/data/net/shibboleth/utilities/java/support/xml/namespaceSupportTest.xml
rename to src/test/resources/net/shibboleth/utilities/java/support/xml/namespaceSupportTest.xml
diff --git a/src/test/resources/data/net/shibboleth/utilities/java/support/xml/noXSIType.xml b/src/test/resources/net/shibboleth/utilities/java/support/xml/noXSIType.xml
similarity index 100%
rename from src/test/resources/data/net/shibboleth/utilities/java/support/xml/noXSIType.xml
rename to src/test/resources/net/shibboleth/utilities/java/support/xml/noXSIType.xml
diff --git a/src/test/resources/data/net/shibboleth/utilities/java/support/xml/qNameSupportTest.xml b/src/test/resources/net/shibboleth/utilities/java/support/xml/qNameSupportTest.xml
similarity index 100%
rename from src/test/resources/data/net/shibboleth/utilities/java/support/xml/qNameSupportTest.xml
rename to src/test/resources/net/shibboleth/utilities/java/support/xml/qNameSupportTest.xml
diff --git a/src/test/resources/data/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/schemaBuilderTest-fails.xml b/src/test/resources/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/schemaBuilderTest-fails.xml
similarity index 100%
rename from src/test/resources/data/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/schemaBuilderTest-fails.xml
rename to src/test/resources/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/schemaBuilderTest-fails.xml
diff --git a/src/test/resources/data/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/schemaBuilderTest-schemaFirstLoaded.xsd b/src/test/resources/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/schemaBuilderTest-schemaFirstLoaded.xsd
similarity index 100%
rename from src/test/resources/data/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/schemaBuilderTest-schemaFirstLoaded.xsd
rename to src/test/resources/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/schemaBuilderTest-schemaFirstLoaded.xsd
diff --git a/src/test/resources/data/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/schemaBuilderTest-schemaSecondLoaded.xsd b/src/test/resources/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/schemaBuilderTest-schemaSecondLoaded.xsd
similarity index 100%
rename from src/test/resources/data/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/schemaBuilderTest-schemaSecondLoaded.xsd
rename to src/test/resources/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/schemaBuilderTest-schemaSecondLoaded.xsd
diff --git a/src/test/resources/data/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/schemaBuilderTest-works.xml b/src/test/resources/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/schemaBuilderTest-works.xml
similarity index 100%
rename from src/test/resources/data/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/schemaBuilderTest-works.xml
rename to src/test/resources/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/schemaBuilderTest-works.xml
diff --git a/src/test/resources/data/net/shibboleth/utilities/java/support/xml/serializeSupportTest.xml b/src/test/resources/net/shibboleth/utilities/java/support/xml/serializeSupportTest.xml
similarity index 100%
rename from src/test/resources/data/net/shibboleth/utilities/java/support/xml/serializeSupportTest.xml
rename to src/test/resources/net/shibboleth/utilities/java/support/xml/serializeSupportTest.xml
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list