Author: desruisseaux
Date: Tue Mar 24 12:14:01 2015
New Revision: 1668857

URL: http://svn.apache.org/r1668857
Log:
Referencing: added some verifications of parameter names.

Modified:
    
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java

Modified: 
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java?rev=1668857&r1=1668856&r2=1668857&view=diff
==============================================================================
--- 
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java
 [UTF-8] (original)
+++ 
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java
 [UTF-8] Tue Mar 24 12:14:01 2015
@@ -16,11 +16,16 @@
  */
 package org.apache.sis.internal.referencing.provider;
 
+import org.opengis.util.GenericName;
+import org.opengis.metadata.Identifier;
+import org.opengis.parameter.GeneralParameterDescriptor;
+import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.internal.util.Constants;
+import org.apache.sis.test.ReferencingAssert;
 import org.apache.sis.test.TestCase;
 import org.junit.Test;
 
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
 
 
 /**
@@ -37,8 +42,8 @@ public final strictfp class MapProjectio
      */
     @Test
     public void testSemiAxes() {
-        assertOgcIdentifierEquals(Constants.SEMI_MAJOR, 
MapProjection.SEMI_MAJOR.getName());
-        assertOgcIdentifierEquals(Constants.SEMI_MINOR, 
MapProjection.SEMI_MINOR.getName());
+        assertOgcNameEquals(Constants.SEMI_MAJOR, MapProjection.SEMI_MAJOR);
+        assertOgcNameEquals(Constants.SEMI_MINOR, MapProjection.SEMI_MINOR);
     }
 
     /**
@@ -46,11 +51,68 @@ public final strictfp class MapProjectio
      */
     @Test
     public void testMercator1SP() {
-        assertEpsgIdentifierEquals("Mercator (variant A)",           new 
Mercator1SP().getName());
-        assertEpsgIdentifierEquals("Latitude of natural origin",     
Mercator1SP.LATITUDE_OF_ORIGIN.getName());
-        assertEpsgIdentifierEquals("Longitude of natural origin",    
Mercator1SP.CENTRAL_MERIDIAN  .getName());
-        assertEpsgIdentifierEquals("Scale factor at natural origin", 
Mercator1SP.SCALE_FACTOR      .getName());
-        assertEpsgIdentifierEquals("False easting",                  
Mercator1SP.FALSE_EASTING     .getName());
-        assertEpsgIdentifierEquals("False northing",                 
Mercator1SP.FALSE_NORTHING    .getName());
+        assertEpsgNameEquals("Mercator (variant A)",           
Mercator1SP.PARAMETERS);
+        assertEpsgNameEquals("Latitude of natural origin",     
Mercator1SP.LATITUDE_OF_ORIGIN);
+        assertEpsgNameEquals("Longitude of natural origin",    
Mercator1SP.CENTRAL_MERIDIAN);
+        assertEpsgNameEquals("Scale factor at natural origin", 
Mercator1SP.SCALE_FACTOR);
+        assertEpsgNameEquals("False easting",                  
Mercator1SP.FALSE_EASTING);
+        assertEpsgNameEquals("False northing",                 
Mercator1SP.FALSE_NORTHING);
+
+        assertOgcAliasEquals("Mercator_1SP",       Mercator1SP.PARAMETERS);
+        assertOgcAliasEquals("latitude_of_origin", 
Mercator1SP.LATITUDE_OF_ORIGIN);
+        assertOgcAliasEquals("central_meridian",   
Mercator1SP.CENTRAL_MERIDIAN);
+        assertOgcAliasEquals("scale_factor",       Mercator1SP.SCALE_FACTOR);
+        assertOgcAliasEquals("false_easting",      Mercator1SP.FALSE_EASTING);
+        assertOgcAliasEquals("false_northing",     Mercator1SP.FALSE_NORTHING);
+    }
+
+    /**
+     * Verifies some {@link Mercator2SP} parameter descriptors.
+     */
+    @Test
+    public void testMercator2SP() {
+        assertEpsgNameEquals("Mercator (variant B)",              
Mercator2SP.PARAMETERS);
+        assertEpsgNameEquals("Latitude of 1st standard parallel", 
Mercator2SP.STANDARD_PARALLEL);
+        assertEpsgNameEquals("Latitude of natural origin",        
Mercator2SP.LATITUDE_OF_ORIGIN);
+        assertEpsgNameEquals("Longitude of natural origin",       
Mercator2SP.CENTRAL_MERIDIAN);
+        assertEpsgNameEquals("Scale factor at natural origin",    
Mercator2SP.SCALE_FACTOR);
+        assertEpsgNameEquals("False easting",                     
Mercator2SP.FALSE_EASTING);
+        assertEpsgNameEquals("False northing",                    
Mercator2SP.FALSE_NORTHING);
+
+        assertOgcAliasEquals("Mercator_2SP",        Mercator2SP.PARAMETERS);
+        assertOgcAliasEquals("standard_parallel_1", 
Mercator2SP.STANDARD_PARALLEL);
+        assertOgcAliasEquals("latitude_of_origin",  
Mercator2SP.LATITUDE_OF_ORIGIN);
+        assertOgcAliasEquals("central_meridian",    
Mercator2SP.CENTRAL_MERIDIAN);
+        assertOgcAliasEquals("scale_factor",        Mercator2SP.SCALE_FACTOR);
+        assertOgcAliasEquals("false_easting",       Mercator2SP.FALSE_EASTING);
+        assertOgcAliasEquals("false_northing",      
Mercator2SP.FALSE_NORTHING);
+    }
+
+    /**
+     * Asserts that the primary name of the given parameter is the given name 
in the EPSG namespace.
+     */
+    private static void assertEpsgNameEquals(final String expected, final 
GeneralParameterDescriptor actual) {
+        ReferencingAssert.assertEpsgIdentifierEquals(expected, 
actual.getName());
+    }
+
+    /**
+     * Asserts that the primary name of the given parameter is the given name 
in the OGC namespace.
+     */
+    private static void assertOgcNameEquals(final String expected, final 
GeneralParameterDescriptor actual) {
+        ReferencingAssert.assertOgcIdentifierEquals(expected, 
actual.getName());
+    }
+
+    /**
+     * Asserts that the first alias (ignoring other EPSG alias)
+     * of the given parameter is the given name in the OGC namespace.
+     */
+    private static void assertOgcAliasEquals(final String expected, final 
GeneralParameterDescriptor actual) {
+        for (final GenericName alias : actual.getAlias()) {
+            if (alias instanceof Identifier && ((Identifier) 
alias).getAuthority() != Citations.OGP) {
+                ReferencingAssert.assertOgcIdentifierEquals(expected, 
(Identifier) alias);
+                return;
+            }
+        }
+        fail("OGC alias not found.");
     }
 }


Reply via email to