Added: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedCSTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedCSTest.java?rev=1559289&view=auto
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedCSTest.java
 (added)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedCSTest.java
 [UTF-8] Fri Jan 17 23:54:34 2014
@@ -0,0 +1,104 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sis.referencing.cs;
+
+import org.opengis.test.Validators;
+import org.apache.sis.test.TestCase;
+import org.apache.sis.test.DependsOn;
+import org.junit.Test;
+
+import static org.apache.sis.test.Assert.*;
+import static org.apache.sis.referencing.cs.HardCodedCS.*;
+
+
+/**
+ * Validates the {@link HardCodedCS} definitions.
+ *
+ * @author  Martin Desruisseaux (IRD, Geomatys)
+ * @since   0.4 (derived from geotk-2.4)
+ * @version 0.4
+ * @module
+ */
+@DependsOn({
+    DefaultCartesianCSTest.class,
+    DefaultEllipsoidalCSTest.class
+})
+public final strictfp class HardCodedCSTest extends TestCase {
+    /**
+     * Validates constants.
+     */
+    @Test
+    public void validate() {
+        Validators.validate(PROJECTED);
+        Validators.validate(GEOCENTRIC);
+        Validators.validate(CARTESIAN_2D);
+        Validators.validate(CARTESIAN_3D);
+        Validators.validate(GRID);
+        Validators.validate(DISPLAY);
+        Validators.validate(GEODETIC_2D);
+        Validators.validate(GEODETIC_3D);
+        Validators.validate(ELLIPSOIDAL_HEIGHT);
+        Validators.validate(GRAVITY_RELATED_HEIGHT);
+        Validators.validate(DEPTH);
+        Validators.validate(DAYS);
+        Validators.validate(SECONDS);
+        Validators.validate(MILLISECONDS);
+        Validators.validate(SPHERICAL);
+    }
+
+    /**
+     * Tests the dimensions of some hard-coded coordinate systems.
+     */
+    @Test
+    public void testDimensions() {
+        assertEquals("Cartesian 2D",   2, PROJECTED  .getDimension());
+        assertEquals("Cartesian 3D",   3, GEOCENTRIC .getDimension());
+        assertEquals("Ellipsoidal 2D", 2, GEODETIC_2D.getDimension());
+        assertEquals("Ellipsoidal 3D", 3, GEODETIC_3D.getDimension());
+        assertEquals("Vertical",       1, DEPTH      .getDimension());
+        assertEquals("Temporal",       1, DAYS       .getDimension());
+    }
+
+    /**
+     * Tests serialization of various objects.
+     */
+    @Test
+    public void testSerialization() {
+        assertSerializedEquals(PROJECTED);
+        assertSerializedEquals(GEOCENTRIC);
+        assertSerializedEquals(GEODETIC_2D);
+        assertSerializedEquals(GEODETIC_3D);
+    }
+
+    /**
+     * Verifies that some definitions are already normalized.
+     */
+    @Test
+    public void testNormalized() {
+        AbstractCS cs;
+        cs = GRID;               assertSame(cs, 
cs.forConvention(AxesConvention.NORMALIZED));
+        cs = SPHERICAL;          assertSame(cs, 
cs.forConvention(AxesConvention.NORMALIZED));
+        cs = GEOCENTRIC;         assertSame(cs, 
cs.forConvention(AxesConvention.NORMALIZED));
+        cs = CARTESIAN_2D;       assertSame(cs, 
cs.forConvention(AxesConvention.NORMALIZED));
+        cs = CARTESIAN_3D;       assertSame(cs, 
cs.forConvention(AxesConvention.NORMALIZED));
+        cs = PROJECTED;          assertSame(cs, 
cs.forConvention(AxesConvention.NORMALIZED));
+        cs = GEODETIC_2D;        assertSame(cs, 
cs.forConvention(AxesConvention.NORMALIZED));
+        cs = GEODETIC_3D;        assertSame(cs, 
cs.forConvention(AxesConvention.NORMALIZED));
+        cs = DAYS;               assertSame(cs, 
cs.forConvention(AxesConvention.NORMALIZED));
+        cs = ELLIPSOIDAL_HEIGHT; assertSame(cs, 
cs.forConvention(AxesConvention.NORMALIZED));
+    }
+}

Propchange: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedCSTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedCSTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Modified: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java?rev=1559289&r1=1559288&r2=1559289&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java
 [UTF-8] Fri Jan 17 23:54:34 2014
@@ -50,22 +50,22 @@ public final strictfp class NormalizerTe
     @Test
     public void testSort() {
         assertOrdered(new CoordinateSystemAxis[] {
-            HardCodedAxes.LONGITUDE,
-            HardCodedAxes.LATITUDE,
+            HardCodedAxes.GEODETIC_LONGITUDE,
+            HardCodedAxes.GEODETIC_LATITUDE,
             HardCodedAxes.ELLIPSOIDAL_HEIGHT
         }, new CoordinateSystemAxis[] {
-            HardCodedAxes.LONGITUDE,
-            HardCodedAxes.LATITUDE,
+            HardCodedAxes.GEODETIC_LONGITUDE,
+            HardCodedAxes.GEODETIC_LATITUDE,
             HardCodedAxes.ELLIPSOIDAL_HEIGHT
         });
         assertOrdered(new CoordinateSystemAxis[] {
-            HardCodedAxes.LONGITUDE,
-            HardCodedAxes.LATITUDE,
+            HardCodedAxes.GEODETIC_LONGITUDE,
+            HardCodedAxes.GEODETIC_LATITUDE,
             HardCodedAxes.ELLIPSOIDAL_HEIGHT
         }, new CoordinateSystemAxis[] {
-            HardCodedAxes.LATITUDE,
+            HardCodedAxes.GEODETIC_LATITUDE,
             HardCodedAxes.ELLIPSOIDAL_HEIGHT,
-            HardCodedAxes.LONGITUDE
+            HardCodedAxes.GEODETIC_LONGITUDE
         });
 
         // A plausible CS.
@@ -166,12 +166,12 @@ public final strictfp class NormalizerTe
      */
     @Test
     public void testNormalizeAxis() {
-        assertSame(HardCodedAxes.LATITUDE,  
Normalizer.normalize(HardCodedAxes.LATITUDE));
-        assertSame(HardCodedAxes.LONGITUDE, 
Normalizer.normalize(HardCodedAxes.LONGITUDE));
-        assertSame(HardCodedAxes.EASTING,   
Normalizer.normalize(HardCodedAxes.EASTING));
-        assertSame(HardCodedAxes.NORTHING,  
Normalizer.normalize(HardCodedAxes.NORTHING));
-        assertSame(HardCodedAxes.ALTITUDE,  
Normalizer.normalize(HardCodedAxes.ALTITUDE));
-        assertSame(HardCodedAxes.TIME,      
Normalizer.normalize(HardCodedAxes.TIME));
+        assertSame(HardCodedAxes.GEODETIC_LATITUDE,  
Normalizer.normalize(HardCodedAxes.GEODETIC_LATITUDE));
+        assertSame(HardCodedAxes.GEODETIC_LONGITUDE, 
Normalizer.normalize(HardCodedAxes.GEODETIC_LONGITUDE));
+        assertSame(HardCodedAxes.EASTING,            
Normalizer.normalize(HardCodedAxes.EASTING));
+        assertSame(HardCodedAxes.NORTHING,           
Normalizer.normalize(HardCodedAxes.NORTHING));
+        assertSame(HardCodedAxes.ALTITUDE,           
Normalizer.normalize(HardCodedAxes.ALTITUDE));
+        assertSame(HardCodedAxes.TIME,               
Normalizer.normalize(HardCodedAxes.TIME));
         /*
          * Test a change of unit from centimetre to metre.
          */

Modified: 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java?rev=1559289&r1=1559288&r2=1559289&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
 [UTF-8] Fri Jan 17 23:54:34 2014
@@ -69,10 +69,13 @@ import org.junit.BeforeClass;
     org.apache.sis.referencing.cs.DefaultEllipsoidalCSTest.class,
     org.apache.sis.referencing.cs.DefaultCompoundCSTest.class,
     org.apache.sis.referencing.cs.CoordinateSystemsTest.class,
+    org.apache.sis.referencing.cs.HardCodedCSTest.class,
     org.apache.sis.referencing.crs.AbstractCRSTest.class,
     org.apache.sis.referencing.crs.DefaultGeodeticCRSTest.class,
+    org.apache.sis.referencing.crs.DefaultGeographicCRSTest.class,
     org.apache.sis.referencing.crs.SubTypesTest.class,
     org.apache.sis.referencing.crs.DefaultCompoundCRSTest.class,
+    org.apache.sis.referencing.crs.HardCodedCRSTest.class,
     org.apache.sis.referencing.StandardDefinitionsTest.class,
     org.apache.sis.referencing.GeodeticObjectsTest.class,
     org.apache.sis.referencing.CRSTest.class,


Reply via email to