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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Dec 18 10:55:55 2012
New Revision: 312

URL: http://svn.shibboleth.net/view/utilities?rev=312&view=rev
Log:
Fix test to handle either XML library.

Modified:
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/DomTypeSupportTest.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=312&r1=311&r2=312&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 Tue Dec 18 10:55:55 2012
@@ -81,8 +81,14 @@
     }
 
     @Test public void testLongToDuration() {
-        Assert.assertEquals(DomTypeSupport.longToDuration(1000), "P0Y0M0DT0H0M1.000S", "One second duration");
-        Assert.assertEquals(DomTypeSupport.longToDuration(-1000*24*3600), "-P0Y0M1DT0H0M0.000S", "Back One day duration");
+        // We have to check for two different possible return values because Oracle's and Xerces' implementations
+        // are different.
+        
+        String onesec = DomTypeSupport.longToDuration(1000);
+        Assert.assertTrue("P0Y0M0DT0H0M1.000S".equals(onesec) || "PT1.000S".equals(onesec), "One second duration");
+
+        String backday = DomTypeSupport.longToDuration(-1000*24*3600);
+        Assert.assertTrue("-P0Y0M1DT0H0M0.000S".equals(backday) || "-P1DT0H0M0.000S".equals(backday), "Back one day duration");
     }
     
     @Test public void testGetXSIType() {