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

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Oct 17 14:04:05 2012
New Revision: 299

URL: http://svn.shibboleth.net/view/utilities?rev=299&view=rev
Log:
Fix failing java-support tests. Adding the schemaLocation attribute to <import /> in the xsd will help tests pass when the order of files returned by listFiles() varies by platform.

Modified:
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/DomTypeSupportTest.java
    java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/schemaBuilderTest-schemaSecondLoaded.xsd

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=299&r1=298&r2=299&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 Oct 17 14:04:05 2012
@@ -81,8 +81,8 @@
     }
 
     @Test public void testLongToDuration() {
-        Assert.assertEquals(DomTypeSupport.longToDuration(1000), "PT1.000S", "One second duration");
-        Assert.assertEquals(DomTypeSupport.longToDuration(-1000*24*3600), "-P1DT0H0M0.000S", "Back One day duration");
+        Assert.assertEquals(DomTypeSupport.longToDuration(1000), "P0Y0M0DT0H0M1.000S", "One second duration");
+        Assert.assertEquals(DomTypeSupport.longToDuration(-1000*24*3600), "-P0Y0M1DT0H0M0.000S", "Back One day duration");
     }
     
     @Test public void testGetXSIType() {

Modified: java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/schemaBuilderTest-schemaSecondLoaded.xsd
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/schemaBuilderTest-schemaSecondLoaded.xsd?rev=299&r1=298&r2=299&view=diff
==============================================================================
--- java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/schemaBuilderTest-schemaSecondLoaded.xsd (original)
+++ java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/xml/schemaBuilderTestDir/schemaBuilderTest-schemaSecondLoaded.xsd Wed Oct 17 14:04:05 2012
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://www.example.org/Example" xmlns:me="https://www.example.org/Example" xmlns:child="https://www.example.org/Example2">
 
-<import namespace="https://www.example.org/Example2" />
+<import namespace="https://www.example.org/Example2" schemaLocation="schemaBuilderTest-schemaFirstLoaded.xsd"/>
 
 <complexType name="parentType">
     <sequence>