[utilities COMMIT] in /java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml: DomTypeSupportTest...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jan 15 14:17:15 2014
New Revision: 510

URL: http://svn.shibboleth.net/view/utilities?rev=510&view=rev
Log:
Remove unnecessary resource wrapper from tests.

Modified:
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/DomTypeSupportTest.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/ElementSupportTest.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/NamespaceSupportTest.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/QNameSupportTest.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/SchemaBuilderTest.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/SerializeSupportTest.java

Modified: java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/DomTypeSupportTest.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/DomTypeSupportTest.java?rev=510&r1=509&r2=510&view=diff
==============================================================================
--- java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/DomTypeSupportTest.java (original)
+++ java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/DomTypeSupportTest.java Wed Jan 15 14:17:15 2014
@@ -23,10 +23,9 @@
 import javax.xml.parsers.DocumentBuilder;
 
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.resource.ShibbolethResource;
-import net.shibboleth.utilities.java.support.resource.TestResourceConverter;
 
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
 import org.testng.Assert;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
@@ -48,10 +47,10 @@
         parserPool = pool;
         
         DocumentBuilder builder = parserPool.getBuilder();
-        ShibbolethResource res = TestResourceConverter.of(new ClassPathResource("data/net/shibboleth/utilities/java/support/xml/getXSIType.xml"));
+        Resource res = new ClassPathResource("data/net/shibboleth/utilities/java/support/xml/getXSIType.xml");
         xsStringXSITypeElement = (Element) builder.parse(res.getInputStream()).getFirstChild();
 
-        res = TestResourceConverter.of(new ClassPathResource("data/net/shibboleth/utilities/java/support/xml/noXSIType.xml"));
+        res = new ClassPathResource("data/net/shibboleth/utilities/java/support/xml/noXSIType.xml");
         noXSITypeElement = (Element) builder.parse(res.getInputStream()).getFirstChild();
         
         if (null != builder) {

Modified: java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/ElementSupportTest.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/ElementSupportTest.java?rev=510&r1=509&r2=510&view=diff
==============================================================================
--- java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/ElementSupportTest.java (original)
+++ java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/ElementSupportTest.java Wed Jan 15 14:17:15 2014
@@ -28,10 +28,9 @@
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.resource.ShibbolethResource;
-import net.shibboleth.utilities.java.support.resource.TestResourceConverter;
 
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
 import org.testng.Assert;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
@@ -73,8 +72,8 @@
         DocumentBuilder builder = parserPool.getBuilder();
         try {
 
-            ShibbolethResource resource =
-                    TestResourceConverter.of(new ClassPathResource("data/net/shibboleth/utilities/java/support/xml/elementSupportTest.xml"));
+            Resource resource =
+                    new ClassPathResource("data/net/shibboleth/utilities/java/support/xml/elementSupportTest.xml");
             testFileDocument = builder.parse(resource.getInputStream());
             rootElement = (Element) testFileDocument.getFirstChild();
             testerDocument = builder.newDocument();

Modified: java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/NamespaceSupportTest.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/NamespaceSupportTest.java?rev=510&r1=509&r2=510&view=diff
==============================================================================

[... 124 lines stripped ...]