sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1555453 - in /sis/branches/JDK7/core/sis-referencing/src/test: java/org/apache/sis/test/integration/ReferencingInMetadataTest.java resources/org/apache/sis/test/integration/Metadata with vertical CRS.xml
Date Sun, 05 Jan 2014 04:19:53 GMT
Author: desruisseaux
Date: Sun Jan  5 04:19:52 2014
New Revision: 1555453

URL: http://svn.apache.org/r1555453
Log:
Enable test of 'gml:id' value.

Modified:
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/integration/ReferencingInMetadataTest.java
    sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/test/integration/Metadata
with vertical CRS.xml

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/integration/ReferencingInMetadataTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/integration/ReferencingInMetadataTest.java?rev=1555453&r1=1555452&r2=1555453&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/integration/ReferencingInMetadataTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/integration/ReferencingInMetadataTest.java
[UTF-8] Sun Jan  5 04:19:52 2014
@@ -43,6 +43,7 @@ import org.opengis.referencing.datum.Ver
 import org.apache.sis.xml.NilObject;
 import org.apache.sis.xml.NilReason;
 import org.apache.sis.test.XMLTestCase;
+import org.apache.sis.test.DependsOn;
 import org.junit.Test;
 
 import static org.apache.sis.test.Assert.*;
@@ -57,6 +58,9 @@ import static org.apache.sis.test.TestUt
  * @version 0.4
  * @module
  */
+@DependsOn({
+    org.apache.sis.referencing.datum.DefaultVerticalDatumTest.class
+})
 public final strictfp class ReferencingInMetadataTest extends XMLTestCase {
     /**
      * Tolerance threshold for strict floating point comparisons.
@@ -168,9 +172,9 @@ public final strictfp class ReferencingI
          *   </gmd:MD_DataIdentification>
          * </gmd:identificationInfo>
          *
-         * Now marshal the object and compare with the original file, ignoring gml:id for
now.
+         * Now marshal the object and compare with the original file.
          */
-        assertMarshalEqualsFile(VERTICAL_CRS_XML, metadata, "xmlns:*", "xsi:schemaLocation",
"gml:id");
+        assertMarshalEqualsFile(VERTICAL_CRS_XML, metadata, "xmlns:*", "xsi:schemaLocation");
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/test/integration/Metadata
with vertical CRS.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/test/integration/Metadata%20with%20vertical%20CRS.xml?rev=1555453&r1=1555452&r2=1555453&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/test/integration/Metadata
with vertical CRS.xml (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/resources/org/apache/sis/test/integration/Metadata
with vertical CRS.xml Sun Jan  5 04:19:52 2014
@@ -111,16 +111,16 @@
               <gmd:minimumValue> <gco:Real>  0.1</gco:Real> </gmd:minimumValue>
               <gmd:maximumValue> <gco:Real>10000</gco:Real> </gmd:maximumValue>
               <gmd:verticalCRS>
-                <gml:VerticalCRS gml:id="crs-depth">
+                <gml:VerticalCRS gml:id="sis-crs-test1">
                   <gml:identifier codeSpace="SIS">urn:ogc:def:crs:SIS::test1</gml:identifier>
                   <gml:name>Depth</gml:name>
                   <gml:scope>World</gml:scope>
                   <gml:verticalCS>
-                    <gml:VerticalCS gml:id="cs-depth">
+                    <gml:VerticalCS gml:id="sis-cs-test3">
                       <gml:identifier codeSpace="SIS">urn:ogc:def:cs:SIS::test3</gml:identifier>
                       <gml:name>Depth</gml:name>
                       <gml:axis>
-                        <gml:CoordinateSystemAxis uom="urn:ogc:def:uom:EPSG::9001" gml:id="axis-depth">
+                        <gml:CoordinateSystemAxis uom="urn:ogc:def:uom:EPSG::9001" gml:id="sis-axis-test4">
                           <gml:identifier codeSpace="SIS">urn:ogc:def:axis:SIS::test4</gml:identifier>
                           <gml:name>Depth</gml:name>
                           <gml:axisAbbrev>d</gml:axisAbbrev>
@@ -130,7 +130,7 @@
                     </gml:VerticalCS>
                   </gml:verticalCS>
                   <gml:verticalDatum>
-                    <gml:VerticalDatum gml:id="datum-depth">
+                    <gml:VerticalDatum gml:id="sis-datum-test2">
                       <gml:identifier codeSpace="SIS">urn:ogc:def:datum:SIS::test2</gml:identifier>
                       <gml:name>Depth</gml:name>
                       <gml:scope>World</gml:scope>



Mime
View raw message