sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1701632 [2/2] - in /sis/branches/JDK8/core: sis-metadata/src/main/java/org/apache/sis/io/wkt/ sis-metadata/src/test/java/org/apache/sis/io/wkt/ sis-metadata/src/test/java/org/apache/sis/metadata/iso/ sis-referencing/src/main/java/org/apach...
Date Mon, 07 Sep 2015 14:51:26 GMT
Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java?rev=1701632&r1=1701631&r2=1701632&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java
[UTF-8] Mon Sep  7 14:51:25 2015
@@ -89,17 +89,17 @@ public final strictfp class DefaultCoord
      */
     @Test
     public void testWKT() {
-        assertWktEquals("Axis[“x”, east, LengthUnit[“metre”, 1]]",  X);
-        assertWktEquals("Axis[“y”, north, LengthUnit[“metre”, 1]]", Y);
-        assertWktEquals("Axis[“z”, up, LengthUnit[“metre”, 1]]",    Z);
-        assertWktEquals("Axis[“Longitude (λ)”, east, AngleUnit[“grade”, 0.015707963267948967]]",
            LONGITUDE_gon);
-        assertWktEquals("Axis[“Latitude (φ)”, north, AngleUnit[“grade”, 0.015707963267948967]]",
            LATITUDE_gon);
-        assertWktEquals("Axis[“Altitude (h)”, up, LengthUnit[“metre”, 1]]",     
                            ALTITUDE);
-        assertWktEquals("Axis[“Time (t)”, future, TimeUnit[“day”, 86400]]",     
                            TIME);
-        assertWktEquals("Axis[“Longitude (λ)”, east, AngleUnit[“degree”, 0.017453292519943295]]",
           GEODETIC_LONGITUDE);
-        assertWktEquals("Axis[“Spherical longitude (θ)”, east, AngleUnit[“degree”,
0.017453292519943295]]",  SPHERICAL_LONGITUDE);
-        assertWktEquals("Axis[“Latitude (φ)”, north, AngleUnit[“degree”, 0.017453292519943295]]",
           GEODETIC_LATITUDE);
-        assertWktEquals("Axis[“Spherical latitude (φ')”, north, AngleUnit[“degree”,
0.017453292519943295]]", SPHERICAL_LATITUDE);
+        assertWktEquals("AXIS[“x”, east, LENGTHUNIT[“metre”, 1]]",  X);
+        assertWktEquals("AXIS[“y”, north, LENGTHUNIT[“metre”, 1]]", Y);
+        assertWktEquals("AXIS[“z”, up, LENGTHUNIT[“metre”, 1]]",    Z);
+        assertWktEquals("AXIS[“Longitude (λ)”, east, ANGLEUNIT[“grade”, 0.015707963267948967]]",
            LONGITUDE_gon);
+        assertWktEquals("AXIS[“Latitude (φ)”, north, ANGLEUNIT[“grade”, 0.015707963267948967]]",
            LATITUDE_gon);
+        assertWktEquals("AXIS[“Altitude (h)”, up, LENGTHUNIT[“metre”, 1]]",     
                            ALTITUDE);
+        assertWktEquals("AXIS[“Time (t)”, future, TIMEUNIT[“day”, 86400]]",     
                            TIME);
+        assertWktEquals("AXIS[“Longitude (λ)”, east, ANGLEUNIT[“degree”, 0.017453292519943295]]",
           GEODETIC_LONGITUDE);
+        assertWktEquals("AXIS[“Spherical longitude (θ)”, east, ANGLEUNIT[“degree”,
0.017453292519943295]]",  SPHERICAL_LONGITUDE);
+        assertWktEquals("AXIS[“Latitude (φ)”, north, ANGLEUNIT[“degree”, 0.017453292519943295]]",
           GEODETIC_LATITUDE);
+        assertWktEquals("AXIS[“Spherical latitude (φ')”, north, ANGLEUNIT[“degree”,
0.017453292519943295]]", SPHERICAL_LATITUDE);
 
         assertWktEquals(Convention.WKT1,     "AXIS[“x”, EAST]",  X);
         assertWktEquals(Convention.WKT1,     "AXIS[“y”, NORTH]", Y);
@@ -116,7 +116,7 @@ public final strictfp class DefaultCoord
     @Test
     @DependsOnMethod("testWKT")
     public void testMeridianWKT() {
-        assertWktEquals("Axis[“South along 90°W (x)”, south, Meridian[-90.0, AngleUnit[“degree”,
0.017453292519943295]], LengthUnit[“metre”, 1]]",
+        assertWktEquals("AXIS[“South along 90°W (x)”, south, MERIDIAN[-90.0, ANGLEUNIT[“degree”,
0.017453292519943295]], LENGTHUNIT[“metre”, 1]]",
                 new DefaultCoordinateSystemAxis(singletonMap(DefaultCoordinateSystemAxis.NAME_KEY,
"South along 90°W"),
                         "x", new DirectionAlongMeridian(AxisDirection.SOUTH, -90).getDirection(),
SI.METRE));
     }

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DirectionAlongMeridianTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DirectionAlongMeridianTest.java?rev=1701632&r1=1701631&r2=1701632&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DirectionAlongMeridianTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DirectionAlongMeridianTest.java
[UTF-8] Mon Sep  7 14:51:25 2015
@@ -17,6 +17,7 @@
 package org.apache.sis.referencing.cs;
 
 import org.opengis.referencing.cs.AxisDirection;
+import org.apache.sis.io.wkt.Convention;
 import org.apache.sis.test.DependsOn;
 import org.apache.sis.test.TestCase;
 import org.junit.Test;
@@ -106,7 +107,10 @@ public final strictfp class DirectionAlo
      */
     @Test
     public void testWKT() {
-        assertWktEquals("Meridian[-90.0, AngleUnit[“degree”, 0.017453292519943295]]",
-                DirectionAlongMeridian.parse("South along 90°W"));
+        final DirectionAlongMeridian dm = DirectionAlongMeridian.parse("South along 90°W");
+        assertWktEquals(Convention.WKT2,
+                "MERIDIAN[-90.0, ANGLEUNIT[“degree”, 0.017453292519943295]]", dm);
+        assertWktEquals(Convention.WKT2_SIMPLIFIED,
+                "Meridian[-90.0, Unit[“degree”, 0.017453292519943295]]", dm);
     }
 }

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=1701632&r1=1701631&r2=1701632&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] Mon Sep  7 14:51:25 2015
@@ -166,7 +166,7 @@ public final strictfp class DefaultEllip
     @Test
     public void testToWKT() {
         final DefaultEllipsoid e = new DefaultEllipsoid(GeodeticDatumMock.WGS84.getEllipsoid());
-        assertWktEquals("Ellipsoid[“WGS84”, 6378137.0, 298.257223563, LengthUnit[“metre”,
1]]", e);
+        assertWktEquals("ELLIPSOID[“WGS84”, 6378137.0, 298.257223563, LENGTHUNIT[“metre”,
1]]", e);
     }
 
     /**

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=1701632&r1=1701631&r2=1701632&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] Mon Sep  7 14:51:25 2015
@@ -183,9 +183,14 @@ public final strictfp class DefaultGeode
     @Test
     public void testToWKT() {
         final DefaultGeodeticDatum datum = new DefaultGeodeticDatum(WGS84);
-        assertWktEquals(
+        assertWktEquals(Convention.WKT2,
+                "DATUM[“WGS84”,\n" +
+                "  ELLIPSOID[“WGS84”, 6378137.0, 298.257223563, LENGTHUNIT[“metre”,
1]]]",
+                datum);
+
+        assertWktEquals(Convention.WKT2_SIMPLIFIED,
                 "GeodeticDatum[“WGS84”,\n" +
-                "  Ellipsoid[“WGS84”, 6378137.0, 298.257223563, LengthUnit[“metre”,
1]]]",
+                "  Ellipsoid[“WGS84”, 6378137.0, 298.257223563]]",
                 datum);
     }
 
@@ -266,8 +271,14 @@ public final strictfp class DefaultGeode
                 datum);
 
         assertWktEquals(Convention.WKT2,
+                "DATUM[“World Geodetic System 1984”,\n" +
+                "  ELLIPSOID[“WGS 84”, 6378137.0, 298.257223563, LENGTHUNIT[“metre”,
1]],\n" +
+                "  ID[“EPSG”, 6326, URI[“urn:ogc:def:datum:EPSG::6326”]]]",
+                datum);
+
+        assertWktEquals(Convention.WKT2_SIMPLIFIED,
                 "GeodeticDatum[“World Geodetic System 1984”,\n" +
-                "  Ellipsoid[“WGS 84”, 6378137.0, 298.257223563, LengthUnit[“metre”,
1]],\n" +
+                "  Ellipsoid[“WGS 84”, 6378137.0, 298.257223563],\n" +
                 "  Id[“EPSG”, 6326, URI[“urn:ogc:def:datum:EPSG::6326”]]]",
                 datum);
 

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=1701632&r1=1701631&r2=1701632&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] Mon Sep  7 14:51:25 2015
@@ -61,7 +61,8 @@ public final strictfp class DefaultPrime
     public void testToWKT() {
         final DefaultPrimeMeridian pm = new DefaultPrimeMeridian(GREENWICH);
         assertIsGreenwich(pm);
-        assertWktEquals("PrimeMeridian[“Greenwich”, 0.0, AngleUnit[“degree”, 0.017453292519943295]]",
pm);
+        assertWktEquals(Convention.WKT2, "PRIMEM[“Greenwich”, 0.0, ANGLEUNIT[“degree”,
0.017453292519943295]]", pm);
+        assertWktEquals(Convention.WKT2_SIMPLIFIED, "PrimeMeridian[“Greenwich”, 0.0]",
pm);
     }
 
     /**
@@ -94,8 +95,9 @@ public final strictfp class DefaultPrime
          * In WKT 1 format, if there is no contextual unit (which is the case of this test),
          * the formatter default to decimal degrees. In WKT 2 format it depends on the PM
unit.
          */
-        assertWktEquals(Convention.WKT1,            "PRIMEM[“Test”, 10.5]", pm);  //
10.3 DM  ==  10.5°
-        assertWktEquals(Convention.WKT2,     "PrimeMeridian[“Test”, 10.5, AngleUnit[“degree”,
0.017453292519943295]]", pm);
+        assertWktEquals(Convention.WKT1, "PRIMEM[“Test”, 10.5]", pm);  // 10.3 DM  ==
 10.5°
+        assertWktEquals(Convention.WKT2, "PRIMEM[“Test”, 10.5, ANGLEUNIT[“degree”,
0.017453292519943295]]", pm);
+        assertWktEquals(Convention.WKT2_SIMPLIFIED, "PrimeMeridian[“Test”, 10.5]", pm);
         assertWktEquals(Convention.INTERNAL, "PrimeMeridian[“Test”, 10.3, Unit[“D.M”,
0.017453292519943295, Id[“EPSG”, 9111]]]", pm);
     }
 
@@ -188,7 +190,9 @@ public final strictfp class DefaultPrime
         assertWktEquals(Convention.WKT1,
                 "PRIMEM[“Paris”, 2.33722917, AUTHORITY[“EPSG”, “8903”]]", pm);
         assertWktEquals(Convention.WKT2,
-                "PrimeMeridian[“Paris”, 2.5969213, AngleUnit[“grade”, 0.015707963267948967],
Id[“EPSG”, 8903, URI[“urn:ogc:def:meridian:EPSG::8903”]]]", pm);
+                "PRIMEM[“Paris”, 2.5969213, ANGLEUNIT[“grade”, 0.015707963267948967],
ID[“EPSG”, 8903, URI[“urn:ogc:def:meridian:EPSG::8903”]]]", pm);
+        assertWktEquals(Convention.WKT2_SIMPLIFIED,
+                "PrimeMeridian[“Paris”, 2.5969213, Unit[“grade”, 0.015707963267948967],
Id[“EPSG”, 8903, URI[“urn:ogc:def:meridian:EPSG::8903”]]]", pm);
         assertWktEquals(Convention.INTERNAL,
                 "PrimeMeridian[“Paris”, 2.5969213, Unit[“grade”, 0.015707963267948967,
Id[“EPSG”, 9105]], Id[“EPSG”, 8903],\n" +
                 "  Remark[“Equivalent to 2°20′14.025″.”]]", pm);

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=1701632&r1=1701631&r2=1701632&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] Mon Sep  7 14:51:25 2015
@@ -81,8 +81,9 @@ public final strictfp class DefaultTempo
     @Test
     public void testToWKT() {
         final DefaultTemporalDatum datum = create();
-        assertWktEquals(Convention.WKT1, "TIMEDATUM[“Modified Julian”, TIMEORIGIN[1858-11-17T00:00:00.0Z],
AUTHORITY[“SIS”, “MJ”]]", datum);
-        assertWktEquals(Convention.WKT2, "TimeDatum[“Modified Julian”, TimeOrigin[1858-11-17T00:00:00.0Z],
Id[“SIS”, “MJ”]]", datum);
+        assertWktEquals(Convention.WKT1, "TDATUM[“Modified Julian”, TIMEORIGIN[1858-11-17T00:00:00.0Z],
AUTHORITY[“SIS”, “MJ”]]", datum);
+        assertWktEquals(Convention.WKT2, "TDATUM[“Modified Julian”, TIMEORIGIN[1858-11-17T00:00:00.0Z],
ID[“SIS”, “MJ”]]", datum);
+        assertWktEquals(Convention.WKT2_SIMPLIFIED, "TimeDatum[“Modified Julian”, TimeOrigin[1858-11-17T00:00:00.0Z],
Id[“SIS”, “MJ”]]", datum);
     }
 
     /**

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=1701632&r1=1701631&r2=1701632&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] Mon Sep  7 14:51:25 2015
@@ -89,11 +89,13 @@ public final strictfp class DefaultVerti
         DefaultVerticalDatum datum;
         datum = new DefaultVerticalDatum(singletonMap(DefaultVerticalDatum.NAME_KEY, "Geoidal"),
VerticalDatumType.GEOIDAL);
         assertWktEquals(Convention.WKT1, "VERT_DATUM[“Geoidal”, 2005]", datum);
-        assertWktEquals(Convention.WKT2, "VerticalDatum[“Geoidal”]", datum);
+        assertWktEquals(Convention.WKT2, "VDATUM[“Geoidal”]", datum);
+        assertWktEquals(Convention.WKT2_SIMPLIFIED, "VerticalDatum[“Geoidal”]", datum);
 
         datum = new DefaultVerticalDatum(singletonMap(DefaultVerticalDatum.NAME_KEY, "Ellipsoidal"),
VerticalDatumTypes.ELLIPSOIDAL);
         assertWktEquals(Convention.WKT1, "VERT_DATUM[“Ellipsoidal”, 2002]", datum);
-        assertWktEquals(Convention.WKT2, "VerticalDatum[“Ellipsoidal”]", datum);
+        assertWktEquals(Convention.WKT2, "VDATUM[“Ellipsoidal”]", datum);
+        assertWktEquals(Convention.WKT2_SIMPLIFIED, "VerticalDatum[“Ellipsoidal”]", datum);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultFormulaTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultFormulaTest.java?rev=1701632&r1=1701631&r2=1701632&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultFormulaTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultFormulaTest.java
[UTF-8] Mon Sep  7 14:51:25 2015
@@ -16,6 +16,7 @@
  */
 package org.apache.sis.referencing.operation;
 
+import org.apache.sis.io.wkt.Convention;
 import org.apache.sis.test.TestCase;
 import org.junit.Test;
 
@@ -37,6 +38,7 @@ public final strictfp class DefaultFormu
     @Test
     public void testWKT() {
         final DefaultFormula formula = new DefaultFormula("Mercator");
-        assertWktEquals("Formula[“Mercator”]", formula);
+        assertWktEquals(Convention.WKT2_SIMPLIFIED, "Formula[“Mercator”]", formula);
+        assertWktEquals(Convention.WKT2, "FORMULA[“Mercator”]", formula);
     }
 }

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java?rev=1701632&r1=1701631&r2=1701632&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java
[UTF-8] Mon Sep  7 14:51:25 2015
@@ -160,7 +160,7 @@ public final strictfp class DefaultOpera
     @DependsOnMethod("testConstruction")
     public void testWKT() {
         final OperationMethod method = create("Mercator (variant A)", "9804", "EPSG guidance
note #7-2", 2);
-        assertWktEquals("Method[“Mercator (variant A)”, Id[“EPSG”, 9804, URI[“urn:ogc:def:method:EPSG::9804”]]]",
method);
+        assertWktEquals("METHOD[“Mercator (variant A)”, ID[“EPSG”, 9804, URI[“urn:ogc:def:method:EPSG::9804”]]]",
method);
         assertWktEquals(Convention.WKT1, "PROJECTION[“Mercator (variant A)”, AUTHORITY[“EPSG”,
“9804”]]", method);
     }
 }

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java?rev=1701632&r1=1701631&r2=1701632&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java
[UTF-8] Mon Sep  7 14:51:25 2015
@@ -156,30 +156,30 @@ public final strictfp class DefaultTrans
     @DependsOnMethod("testConstruction")
     public void testWKT() {
         final DefaultTransformation op = createGeocentricTranslation();
-        assertWktEquals(
-                "CoordinateOperation[“Tokyo to JGD2000 (GSI)”,\n" +
-                "  SourceCRS[GeodeticCRS[“Tokyo 1918”,\n" +
-                "    Datum[“Tokyo 1918”,\n" +
-                "      Ellipsoid[“Bessel 1841”, 6377397.155, 299.1528128, LengthUnit[“metre”,
1]]],\n" +
-                "      PrimeMeridian[“Greenwich”, 0.0, AngleUnit[“degree”, 0.017453292519943295]],\n"
+
+        assertWktEquals(Convention.WKT2,
+                "COORDINATEOPERATION[“Tokyo to JGD2000 (GSI)”,\n" +
+                "  SOURCECRS[GEODCRS[“Tokyo 1918”,\n" +
+                "    DATUM[“Tokyo 1918”,\n" +
+                "      ELLIPSOID[“Bessel 1841”, 6377397.155, 299.1528128, LENGTHUNIT[“metre”,
1]]],\n" +
+                "      PRIMEM[“Greenwich”, 0.0, ANGLEUNIT[“degree”, 0.017453292519943295]],\n"
+
                 "    CS[Cartesian, 3],\n" +
-                "      Axis[“(X)”, geocentricX, Order[1]],\n" +
-                "      Axis[“(Y)”, geocentricY, Order[2]],\n" +
-                "      Axis[“(Z)”, geocentricZ, Order[3]],\n" +
-                "      LengthUnit[“metre”, 1]]],\n" +
-                "  TargetCRS[GeodeticCRS[“JGD2000”,\n" +
-                "    Datum[“Japanese Geodetic Datum 2000”,\n" +
-                "      Ellipsoid[“GRS 1980”, 6378137.0, 298.257222101, LengthUnit[“metre”,
1]]],\n" +
-                "      PrimeMeridian[“Greenwich”, 0.0, AngleUnit[“degree”, 0.017453292519943295]],\n"
+
+                "      AXIS[“(X)”, geocentricX, ORDER[1]],\n" +
+                "      AXIS[“(Y)”, geocentricY, ORDER[2]],\n" +
+                "      AXIS[“(Z)”, geocentricZ, ORDER[3]],\n" +
+                "      LENGTHUNIT[“metre”, 1]]],\n" +
+                "  TARGETCRS[GEODCRS[“JGD2000”,\n" +
+                "    DATUM[“Japanese Geodetic Datum 2000”,\n" +
+                "      ELLIPSOID[“GRS 1980”, 6378137.0, 298.257222101, LENGTHUNIT[“metre”,
1]]],\n" +
+                "      PRIMEM[“Greenwich”, 0.0, ANGLEUNIT[“degree”, 0.017453292519943295]],\n"
+
                 "    CS[Cartesian, 3],\n" +
-                "      Axis[“(X)”, geocentricX, Order[1]],\n" +
-                "      Axis[“(Y)”, geocentricY, Order[2]],\n" +
-                "      Axis[“(Z)”, geocentricZ, Order[3]],\n" +
-                "      LengthUnit[“metre”, 1]]],\n" +
-                "  Method[“Geocentric translations”, Id[“EPSG”, 1031]],\n" +
-                "  Parameter[“X-axis translation”, -146.414, Id[“EPSG”, 8605]],\n"
+
-                "  Parameter[“Y-axis translation”, 507.337, Id[“EPSG”, 8606]],\n"
+
-                "  Parameter[“Z-axis translation”, 680.507, Id[“EPSG”, 8607]]]",
op);
+                "      AXIS[“(X)”, geocentricX, ORDER[1]],\n" +
+                "      AXIS[“(Y)”, geocentricY, ORDER[2]],\n" +
+                "      AXIS[“(Z)”, geocentricZ, ORDER[3]],\n" +
+                "      LENGTHUNIT[“metre”, 1]]],\n" +
+                "  METHOD[“Geocentric translations”, ID[“EPSG”, 1031]],\n" +
+                "  PARAMETER[“X-axis translation”, -146.414, ID[“EPSG”, 8605]],\n"
+
+                "  PARAMETER[“Y-axis translation”, 507.337, ID[“EPSG”, 8606]],\n"
+
+                "  PARAMETER[“Z-axis translation”, 680.507, ID[“EPSG”, 8607]]]",
op);
 
         assertWktEquals(Convention.WKT2_SIMPLIFIED,
                 "CoordinateOperation[“Tokyo to JGD2000 (GSI)”,\n" +

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java?rev=1701632&r1=1701631&r2=1701632&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java
[UTF-8] Mon Sep  7 14:51:25 2015
@@ -72,9 +72,9 @@ public final strictfp class Equirectangu
                 "  PARAMETER[“semi_minor”, 6371007.0]]");
 
         ReferencingAssert.assertWktEquals(Convention.WKT2,
-                "Param_MT[“Equidistant Cylindrical (Spherical)”,\n" +
-                "  Parameter[“semi_major”, 6371007.0, LengthUnit[“metre”, 1]],\n"
+
-                "  Parameter[“semi_minor”, 6371007.0, LengthUnit[“metre”, 1]]]",
transform);
+                "PARAM_MT[“Equidistant Cylindrical (Spherical)”,\n" +
+                "  PARAMETER[“semi_major”, 6371007.0, LENGTHUNIT[“metre”, 1]],\n"
+
+                "  PARAMETER[“semi_minor”, 6371007.0, LENGTHUNIT[“metre”, 1]]]",
transform);
 
         ReferencingAssert.assertWktEquals(Convention.WKT2_SIMPLIFIED,
                 "Param_MT[“Equidistant Cylindrical (Spherical)”,\n" +

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java?rev=1701632&r1=1701631&r2=1701632&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java
[UTF-8] Mon Sep  7 14:51:25 2015
@@ -33,7 +33,7 @@ import org.junit.Test;
 
 import static java.lang.StrictMath.PI;
 import static java.lang.StrictMath.toRadians;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.opengis.test.Assert.*;
 
 
 /**
@@ -84,20 +84,6 @@ public final strictfp class ContextualPa
     }
 
     /**
-     * Tests Well Known Text (WKT) formatting.
-     */
-    @DependsOnMethod("testParameters")
-    public void testWKT() {
-        final ContextualParameters p = create(1, 1);
-        p.parameter("Mandatory 1").setValue(4);
-        p.parameter("Mandatory 2").setValue(5);
-        assertWktEquals(
-                "Param_MT[“Test group”,\n" +
-                "  Parameter[“Mandatory 1”, 4],\n" +
-                "  Parameter[“Mandatory 2”, 5]]", p);
-    }
-
-    /**
      * Tests {@link ContextualParameters#completeTransform(MathTransformFactory, MathTransform)}
      * with identity normalization / denormalization transform. The complete transform should
be
      * equals to the kernel (often the same instance, but not necessarily because of caching).



Mime
View raw message