Author: desruisseaux
Date: Tue Aug 25 02:33:36 2015
New Revision: 1697533
URL: http://svn.apache.org/r1697533
Log:
Renamed XML test files for making clearer which kind of object we are testing.
Added:
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/crs/GeographicCRS.xml
- copied unchanged from r1697532,
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/crs/WGS
84.xml
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/crs/ProjectedCRS.xml
- copied unchanged from r1697532,
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/crs/NTF.xml
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Ellipsoid.xml
- copied unchanged from r1697532,
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Clarke
1880.xml
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/GeodeticDatum.xml
- copied unchanged from r1697532,
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/WGS
84.xml
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/PrimeMeridian.xml
- copied unchanged from r1697532,
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Paris.xml
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/TemporalDatum.xml
- copied unchanged from r1697532,
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Modified
Julian.xml
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/VerticalDatum
(GML 3.1).xml
- copied, changed from r1697532,
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Mean
Sea Level (GML 3.1).xml
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/VerticalDatum.xml
- copied unchanged from r1697532,
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Mean
Sea Level.xml
Removed:
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/crs/NTF.xml
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/crs/WGS
84.xml
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Clarke
1880.xml
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Mean
Sea Level (GML 3.1).xml
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Mean
Sea Level.xml
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Modified
Julian.xml
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Paris.xml
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/WGS
84.xml
Modified:
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
Modified:
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java?rev=1697533&r1=1697532&r2=1697533&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java
[UTF-8] Tue Aug 25 02:33:36 2015
@@ -45,7 +45,7 @@ public final strictfp class DefaultGeode
/**
* An XML file in this package containing a geodetic CRS definition.
*/
- private static final String XML_FILE = "WGS 84.xml";
+ private static final String XML_FILE = "GeographicCRS.xml";
/**
* Tests (un)marshalling of a geodetic coordinate reference system.
Modified:
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java?rev=1697533&r1=1697532&r2=1697533&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
[UTF-8] Tue Aug 25 02:33:36 2015
@@ -73,7 +73,7 @@ public final strictfp class DefaultProje
/**
* An XML file in this package containing a projected CRS definition.
*/
- private static final String XML_FILE = "NTF.xml";
+ private static final String XML_FILE = "ProjectedCRS.xml";
/**
* Creates the "NTF (Paris) / Lambert zone II" CRS. The prime meridian is
always in grades,
Modified:
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java?rev=1697533&r1=1697532&r2=1697533&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
[UTF-8] Tue Aug 25 02:33:36 2015
@@ -49,7 +49,7 @@ public final strictfp class DefaultEllip
/**
* An XML file in this package containing an ellipsoid definition.
*/
- private static final String XML_FILE = "Clarke 1880.xml";
+ private static final String XML_FILE = "Ellipsoid.xml";
/**
* Half of a minute of angle, in degrees.
Modified:
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java?rev=1697533&r1=1697532&r2=1697533&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
[UTF-8] Tue Aug 25 02:33:36 2015
@@ -58,7 +58,7 @@ public final strictfp class DefaultGeode
/**
* An XML file in this package containing a geodetic datum definition.
*/
- private static final String XML_FILE = "WGS 84.xml";
+ private static final String XML_FILE = "GeodeticDatum.xml";
/**
* Tests the creation and serialization of a {@link DefaultGeodeticDatum}.
Modified:
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java?rev=1697533&r1=1697532&r2=1697533&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
[UTF-8] Tue Aug 25 02:33:36 2015
@@ -180,7 +180,7 @@ public final strictfp class DefaultPrime
@Test
@DependsOnMethod({"testUnmarshall", "testMarshall", "testWKT_inGrads"})
public void testParisMeridian() throws JAXBException {
- final DefaultPrimeMeridian pm =
unmarshalFile(DefaultPrimeMeridian.class, "Paris.xml");
+ final DefaultPrimeMeridian pm =
unmarshalFile(DefaultPrimeMeridian.class, "PrimeMeridian.xml");
assertIsParis(pm);
assertEquals("greenwichLongitude", 2.33722917,
pm.getGreenwichLongitude(NonSI.DEGREE_ANGLE), 1E-12);
assertEquals("Equivalent to 2°20′14.025″.",
pm.getRemarks().toString());
Modified:
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java?rev=1697533&r1=1697532&r2=1697533&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
[UTF-8] Tue Aug 25 02:33:36 2015
@@ -42,7 +42,7 @@ public final strictfp class DefaultTempo
/**
* An XML file in this package containing a vertical datum definition.
*/
- private static final String XML_FILE = "Modified Julian.xml";
+ private static final String XML_FILE = "TemporalDatum.xml";
/**
* November 17, 1858 at 00:00 UTC as a Java timestamp.
Modified:
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java?rev=1697533&r1=1697532&r2=1697533&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
[UTF-8] Tue Aug 25 02:33:36 2015
@@ -47,12 +47,12 @@ public final strictfp class DefaultVerti
/**
* An XML file in this package containing a vertical datum definition.
*/
- private static final String XML_FILE = "Mean Sea Level.xml";
+ private static final String XML_FILE = "VerticalDatum.xml";
/**
* An XML file with the same content than {@link #XML_FILE}, but written
in an older GML format.
*/
- private static final String GML31_FILE = "Mean Sea Level (GML 3.1).xml";
+ private static final String GML31_FILE = "VerticalDatum (GML 3.1).xml";
/**
* Tests the {@link DefaultVerticalDatum#getVerticalDatumType()} method in
a state
Copied:
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/VerticalDatum
(GML 3.1).xml (from r1697532,
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Mean
Sea Level (GML 3.1).xml)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/VerticalDatum%20%28GML%203.1%29.xml?p2=sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/VerticalDatum%20%28GML%203.1%29.xml&p1=sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Mean%20Sea%20Level%20%28GML%203.1%29.xml&r1=1697532&r2=1697533&rev=1697533&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/Mean
Sea Level (GML 3.1).xml (original)
+++
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/referencing/datum/VerticalDatum
(GML 3.1).xml Tue Aug 25 02:33:36 2015
@@ -17,13 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-
<gml:VerticalDatum xsi:schemaLocation = "http://www.opengis.net/gml
http://schemas.opengis.net/gml/3.1.1/base/datums.xsd";
xmlns:gml = "http://www.opengis.net/gml";
xmlns:xsi =
"http://www.w3.org/2001/XMLSchema-instance";
gml:id = "epsg-datum-5100">
<!--
- Below is the same content than in the "Mean Sea Level.xml" file, but using
+ Below is the same content than in the "VerticalDatum.xml" file, but using
the GML 3.1.1 schema instead of 3.2.1. Some elements have different names:
âââââââââââââââââââââ¬ââââââââââââââââââââ
â GML 3.1 â GML 3.2 â
