sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1497568 - in /sis/branches/JDK7/core: sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java sis-utility/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java
Date Thu, 27 Jun 2013 21:23:53 GMT
Author: desruisseaux
Date: Thu Jun 27 21:23:52 2013
New Revision: 1497568

URL: http://svn.apache.org/r1497568
Log:
Remove "xsi:schemaLocation" from the 'ignore' list, since this attribute is not used in those
tests.

Modified:
    sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java
    sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java

Modified: sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java?rev=1497568&r1=1497567&r2=1497568&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java
[UTF-8] Thu Jun 27 21:23:52 2013
@@ -111,7 +111,7 @@ public final strictfp class TimePeriodTe
         assertXmlEquals(
                 "<gml:TimeInstant>\n" +
                 "  <gml:timePosition>1992-01-01T01:00:00.000+01:00</gml:timePosition>\n"
+
-                "</gml:TimeInstant>\n", actual, "xmlns:*", "xsi:schemaLocation");
+                "</gml:TimeInstant>\n", actual, "xmlns:*");
 
         final TimeInstant test = (TimeInstant) unmarshal(unmarshaller, actual);
         assertEquals("1992-01-01 00:00:00", format(XmlUtilities.toDate(test.timePosition)));
@@ -163,7 +163,7 @@ public final strictfp class TimePeriodTe
         period.begin = begin;
         period.end   = end;
         final String actual = marshal(marshaller, period);
-        assertXmlEquals(expected, actual, "xmlns:*", "xsi:schemaLocation");
+        assertXmlEquals(expected, actual, "xmlns:*");
         final TimePeriod test = (TimePeriod) unmarshal(unmarshaller, actual);
         if (verifyValues) {
             assertEquals("1992-01-01 00:00:00", format(XmlUtilities.toDate(test.begin.calendar())));

Modified: sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java?rev=1497568&r1=1497567&r2=1497568&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java
[UTF-8] Thu Jun 27 21:23:52 2013
@@ -94,7 +94,7 @@ public final strictfp class NameMarshall
                 "  </gml:alias>\n" +
                 "</gml:IO_IdentifiedObject>\n";
         final String actual = marshal(name);
-        assertXmlEquals(expected, actual, "xmlns:*", "xsi:schemaLocation");
+        assertXmlEquals(expected, actual, "xmlns:*");
         assertEquals(name, unmarshall(actual));
     }
 
@@ -116,7 +116,7 @@ public final strictfp class NameMarshall
                 "  </gml:alias>\n" +
                 "</gml:IO_IdentifiedObject>\n";
         final String actual = marshal(name);
-        assertXmlEquals(expected, actual, "xmlns:*", "xsi:schemaLocation");
+        assertXmlEquals(expected, actual, "xmlns:*");
         assertEquals(name, unmarshall(actual));
     }
 
@@ -141,7 +141,7 @@ public final strictfp class NameMarshall
                 "  </gml:alias>\n" +
                 "</gml:IO_IdentifiedObject>\n";
         final String actual = marshal(name);
-        assertXmlEquals(expected, actual, "xmlns:*", "xsi:schemaLocation");
+        assertXmlEquals(expected, actual, "xmlns:*");
         assertEquals(name, unmarshall(actual));
     }
 
@@ -162,7 +162,7 @@ public final strictfp class NameMarshall
                 "  </gml:alias>\n" +
                 "</gml:IO_IdentifiedObject>\n";
         final String actual = marshal(name);
-        assertXmlEquals(expected, actual, "xmlns:*", "xsi:schemaLocation");
+        assertXmlEquals(expected, actual, "xmlns:*");
         assertEquals(name, unmarshall(actual));
     }
 



Mime
View raw message