You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2015/10/12 15:38:36 UTC
svn commit: r1708115 - in /sis/branches/JDK8/core/sis-referencing/src/test:
java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
resources/org/apache/sis/referencing/crs/DerivedCRS.xml
Author: desruisseaux
Date: Mon Oct 12 13:38:36 2015
New Revision: 1708115
URL: http://svn.apache.org/viewvc?rev=1708115&view=rev
Log:
Test also gml:id values.
Modified:
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/crs/DerivedCRS.xml
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java?rev=1708115&r1=1708114&r2=1708115&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java [UTF-8] Mon Oct 12 13:38:36 2015
@@ -239,6 +239,6 @@ public final strictfp class DefaultDeriv
/*
* Test marshalling and compare with the original file.
*/
- assertMarshalEqualsFile(XML_FILE, crs, "xmlns:*", "xsi:schemaLocation", "gml:id");
+ assertMarshalEqualsFile(XML_FILE, crs, "xmlns:*", "xsi:schemaLocation");
}
}
Modified: sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/crs/DerivedCRS.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/crs/DerivedCRS.xml?rev=1708115&r1=1708114&r2=1708115&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/crs/DerivedCRS.xml (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/crs/DerivedCRS.xml Mon Oct 12 13:38:36 2015
@@ -22,15 +22,15 @@
xmlns:gml = "http://www.opengis.net/gml/3.2"
xmlns:xlink = "http://www.w3.org/1999/xlink"
xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
- gml:id = "test-derived-crs">
+ gml:id = "test-crs-derived">
- <gml:identifier codeSpace="SIS">urn:ogc:def:crs:SIS::test-derived-crs</gml:identifier>
- <gml:name codeSpace="SIS">Topocentric example</gml:name>
+ <gml:identifier codeSpace="test">urn:ogc:def:crs:test::derived</gml:identifier>
+ <gml:name codeSpace="test">Topocentric example</gml:name>
<gml:scope>Nowhere.</gml:scope>
<gml:conversion>
- <gml:Conversion gml:id="test-conversion">
- <gml:identifier codeSpace="SIS">urn:ogc:def:coordinateOperation:SIS::test-conversion</gml:identifier>
- <gml:name codeSpace="SIS">Topocentric example</gml:name>
+ <gml:Conversion gml:id="test-coordinateOperation-frombase">
+ <gml:identifier codeSpace="test">urn:ogc:def:coordinateOperation:test::fromBase</gml:identifier>
+ <gml:name codeSpace="test">Topocentric example</gml:name>
<gml:scope>Nowhere.</gml:scope>
<gml:method>
<gml:OperationMethod gml:id="epsg-method-9837">
@@ -150,28 +150,28 @@
<gml:derivedCRSType codeSpace="EPSG">engineering</gml:derivedCRSType>
<gml:coordinateSystem>
- <gml:CartesianCS gml:id="test-cs">
- <gml:identifier codeSpace="SIS">urn:ogc:def:cs:SIS::test-cs</gml:identifier>
+ <gml:CartesianCS gml:id="test-cs-derivedcs">
+ <gml:identifier codeSpace="test">urn:ogc:def:cs:test::derivedCS</gml:identifier>
<gml:name>Topocentric easting and northing</gml:name>
<gml:axis>
- <gml:CoordinateSystemAxis uom="urn:ogc:def:uom:EPSG::9001" gml:id="test-east">
- <gml:identifier codeSpace="SIS">urn:ogc:def:axis:SIS::test-east</gml:identifier>
+ <gml:CoordinateSystemAxis uom="urn:ogc:def:uom:EPSG::9001" gml:id="test-axis-east">
+ <gml:identifier codeSpace="test">urn:ogc:def:axis:test::east</gml:identifier>
<gml:name>Topocentric East</gml:name>
<gml:axisAbbrev>U</gml:axisAbbrev>
<gml:axisDirection codeSpace="EPSG">east</gml:axisDirection>
</gml:CoordinateSystemAxis>
</gml:axis>
<gml:axis>
- <gml:CoordinateSystemAxis uom="urn:ogc:def:uom:EPSG::9001" gml:id="test-north">
- <gml:identifier codeSpace="SIS">urn:ogc:def:axis:SIS::test-north</gml:identifier>
+ <gml:CoordinateSystemAxis uom="urn:ogc:def:uom:EPSG::9001" gml:id="test-axis-north">
+ <gml:identifier codeSpace="test">urn:ogc:def:axis:test::north</gml:identifier>
<gml:name>Topocentric North</gml:name>
<gml:axisAbbrev>V</gml:axisAbbrev>
<gml:axisDirection codeSpace="EPSG">north</gml:axisDirection>
</gml:CoordinateSystemAxis>
</gml:axis>
<gml:axis>
- <gml:CoordinateSystemAxis uom="urn:ogc:def:uom:EPSG::9001" gml:id="test-up">
- <gml:identifier codeSpace="SIS">urn:ogc:def:axis:SIS::test-up</gml:identifier>
+ <gml:CoordinateSystemAxis uom="urn:ogc:def:uom:EPSG::9001" gml:id="test-axis-up">
+ <gml:identifier codeSpace="test">urn:ogc:def:axis:test::up</gml:identifier>
<gml:name>Topocentric Up</gml:name>
<gml:axisAbbrev>z</gml:axisAbbrev>
<gml:axisDirection codeSpace="EPSG">up</gml:axisDirection>