sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1726864 - in /sis/branches/JDK8/core/sis-referencing/src: main/java/org/apache/sis/referencing/ test/java/org/apache/sis/io/wkt/ test/java/org/apache/sis/referencing/ test/java/org/apache/sis/referencing/factory/sql/ test/java/org/apache/s...
Date Tue, 26 Jan 2016 20:00:57 GMT
Author: desruisseaux
Date: Tue Jan 26 20:00:57 2016
New Revision: 1726864

URL: http://svn.apache.org/viewvc?rev=1726864&view=rev
Log:
Minor tuning and add more tests.

Added:
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/AuthorityFactoriesTest.java
  (with props)
Modified:
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/EPSGFactoryFallbackTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java?rev=1726864&r1=1726863&r2=1726864&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
[UTF-8] Tue Jan 26 20:00:57 2016
@@ -123,7 +123,9 @@ public final class CRS extends Static {
      * This method accepts also the URN and URL syntax.
      * For example the following codes are considered equivalent to {@code "EPSG:4326"}:
      * <ul>
+     *   <li>{@code "EPSG::4326"}</li>
      *   <li>{@code "urn:ogc:def:crs:EPSG::4326"}</li>
+     *   <li>{@code "http://www.opengis.net/def/crs/epsg/0/4326"}</li>
      *   <li>{@code "http://www.opengis.net/gml/srs/epsg.xml#4326"}</li>
      * </ul>
      *
@@ -545,17 +547,17 @@ check:  while (lower != 0 || upper != di
 
     /**
      * Returns the system-wide authority factory used by {@link #forCode(String)} and other
SIS methods.
-     * By default, this factory is an instance of {@link org.apache.sis.referencing.factory.MultiAuthoritiesFactory}
+     * By default, this method returns an instance of {@link org.apache.sis.referencing.factory.MultiAuthoritiesFactory}
      * capable to process at least some EPSG and WMS codes. The set of EPSG codes that are
guaranteed to be supported
-     * is listed in {@link #forCode(String)}. Other authorities may also be supported if
their factories are declared
-     * in the following file:
+     * is listed in the {@link #forCode(String)} method javadoc.
+     * Other authorities may also be supported if their factories are declared in the following
file:
      *
      * {@preformat text
      *     META-INF/services/org.opengis.referencing.crs.CRSAuthorityFactory
      * }
      *
      * <div class="section">Factories of other kinds</div>
-     * By default the returned factory can also be used as a
+     * By default the returned factory can also be used as
      * {@link org.opengis.referencing.cs.CSAuthorityFactory},
      * {@link org.opengis.referencing.datum.DatumAuthorityFactory} or
      * {@link org.opengis.referencing.operation.CoordinateOperationAuthorityFactory}.

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java?rev=1726864&r1=1726863&r2=1726864&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
[UTF-8] Tue Jan 26 20:00:57 2016
@@ -404,13 +404,12 @@ public final class IdentifiedObjects ext
         String urn = null;
         if (object != null) {
             for (final IdentifiedObject candidate : newFinder().find(object)) {
-                final Identifier id = getIdentifier(candidate, authority);
-                if (id != null) {
-                    final String previous = urn;
-                    urn = NameMeaning.toURN(candidate.getClass(), id.getCodeSpace(), id.getVersion(),
id.getCode());
-                    if (previous != null && !previous.equals(urn)) {
+                final String c = toURN(candidate.getClass(), getIdentifier(candidate, authority));
+                if (c != null) {
+                    if (urn != null && !urn.equals(c)) {
                         return null;
                     }
+                    urn = c;
                 }
             }
         }

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java?rev=1726864&r1=1726863&r2=1726864&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
[UTF-8] Tue Jan 26 20:00:57 2016
@@ -70,7 +70,8 @@ import static org.apache.sis.test.TestUt
     org.apache.sis.referencing.crs.DefaultCompoundCRSTest.class,
     org.apache.sis.referencing.crs.DefaultEngineeringCRSTest.class,
     org.apache.sis.referencing.crs.DefaultImageCRSTest.class,
-    org.apache.sis.referencing.cs.DirectionAlongMeridianTest.class
+    org.apache.sis.referencing.cs.DirectionAlongMeridianTest.class,
+    org.apache.sis.referencing.factory.GeodeticObjectFactoryTest.class
 })
 public final strictfp class GeodeticObjectParserTest extends TestCase {
     /**

Added: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/AuthorityFactoriesTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/AuthorityFactoriesTest.java?rev=1726864&view=auto
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/AuthorityFactoriesTest.java
(added)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/AuthorityFactoriesTest.java
[UTF-8] Tue Jan 26 20:00:57 2016
@@ -0,0 +1,61 @@
+/*
+ * 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;
+
+import org.opengis.referencing.crs.CRSAuthorityFactory;
+import org.opengis.referencing.crs.GeographicCRS;
+import org.opengis.util.FactoryException;
+import org.apache.sis.test.TestCase;
+import org.junit.Test;
+
+import static org.apache.sis.test.Assert.*;
+
+
+/**
+ * Tests {@link AuthorityFactories}.
+ *
+ * @author  Martin Desruisseaux (Geomatys)
+ * @since   0.7
+ * @version 0.7
+ * @module
+ */
+public final strictfp class AuthorityFactoriesTest extends TestCase {
+    /**
+     * Tests creation of {@code CRS:84} from various codes.
+     *
+     * @throws FactoryException if a CRS:84 creation failed.
+     */
+    @Test
+    public void testCRS84() throws FactoryException {
+        final CRSAuthorityFactory factory = AuthorityFactories.ALL;
+        final GeographicCRS crs = factory.createGeographicCRS("CRS:84");
+        assertSame(crs, factory.createGeographicCRS("urn:ogc:def:crs:CRS::84"));
+        assertSame(crs, factory.createGeographicCRS("urn:ogc:def:crs:CRS:1.3:84"));
+        assertSame(crs, factory.createGeographicCRS("URN:OGC:DEF:CRS:CRS:1.3:84"));
+        assertSame(crs, factory.createGeographicCRS("URN:OGC:DEF:CRS:CRS::84"));
+        assertSame(crs, factory.createGeographicCRS("urn:x-ogc:def:crs:CRS:1.3:84"));
+        assertSame(crs, factory.createGeographicCRS("urn:ogc:def:crs:OGC:1.3:CRS84"));
+
+        // Following are just wrappers for above factory.
+        assertSame(crs, CRS.forCode("urn:ogc:def:crs:CRS:1.3:84"));
+        assertSame(crs, CRS.forCode("urn:ogc:def:crs:OGC:1.3:CRS84"));
+        assertSame(crs, CRS.forCode("CRS:84"));
+        assertSame(crs, CRS.forCode("OGC:CRS84"));
+
+        assertNotDeepEquals(crs, CRS.forCode("CRS:83"));
+    }
+}

Propchange: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/AuthorityFactoriesTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

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

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java?rev=1726864&r1=1726863&r2=1726864&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java
[UTF-8] Tue Jan 26 20:00:57 2016
@@ -43,7 +43,8 @@ import static org.apache.sis.test.Assert
  * @module
  */
 @DependsOn({
-    CommonCRSTest.class
+    CommonCRSTest.class,
+    AuthorityFactoriesTest.class
 })
 public final strictfp class CRSTest extends TestCase {
     /**
@@ -251,4 +252,16 @@ public final strictfp class CRSTest exte
         assertEquals(0,          CRS.getGreenwichLongitude(HardCodedCRS.WGS84), STRICT);
         assertEquals(2.33722917, CRS.getGreenwichLongitude(HardCodedCRS.NTF),   1E-12);
     }
+
+    /**
+     * Tests {@link IdentifiedObjects#lookupEPSG(IdentifiedObject)} and
+     * {@link IdentifiedObjects#lookupURN(IdentifiedObject, Citation)}.
+     *
+     * @throws FactoryException if an error occurred during the lookup.
+     */
+    @Test
+    public void testIdentifiedObjectLookup() throws FactoryException {
+        IdentifiedObjectsTest.testLookupEPSG();
+        IdentifiedObjectsTest.testLookupWMS();
+    }
 }

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/EPSGFactoryFallbackTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/EPSGFactoryFallbackTest.java?rev=1726864&r1=1726863&r2=1726864&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/EPSGFactoryFallbackTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/EPSGFactoryFallbackTest.java
[UTF-8] Tue Jan 26 20:00:57 2016
@@ -17,6 +17,8 @@
 package org.apache.sis.referencing;
 
 import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Collections;
 import org.opengis.util.FactoryException;
 import org.opengis.referencing.crs.SingleCRS;
 import org.opengis.referencing.crs.VerticalCRS;
@@ -31,6 +33,7 @@ import org.apache.sis.util.Utilities;
 import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.DependsOn;
 import org.apache.sis.test.TestCase;
+import org.apache.sis.test.TestUtilities;
 import org.junit.Test;
 
 import static org.apache.sis.test.Assert.*;
@@ -119,7 +122,9 @@ public final strictfp class EPSGFactoryF
         final CRSAuthorityFactory EPSG = (CRSAuthorityFactory) AuthorityFactories.EPSG();
         try {
             setEPSGFactory(EPSGFactoryFallback.INSTANCE);
-            for (final String code : EPSGFactoryFallback.INSTANCE.getAuthorityCodes(CoordinateReferenceSystem.class))
{
+            final ArrayList<String> codes = new ArrayList<>(EPSGFactoryFallback.INSTANCE.getAuthorityCodes(CoordinateReferenceSystem.class));
+            Collections.shuffle(codes, TestUtilities.createRandomNumberGenerator());
+            for (final String code : codes) {
                 if (!EPSGFactoryFallback.PENDING_NEXT_EPSG && code.equals("5715"))
{
                     continue;
                 }

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java?rev=1726864&r1=1726863&r2=1726864&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java
[UTF-8] Tue Jan 26 20:00:57 2016
@@ -18,8 +18,11 @@ package org.apache.sis.referencing;
 
 import org.opengis.util.GenericName;
 import org.opengis.util.NameFactory;
+import org.opengis.util.FactoryException;
+import org.opengis.metadata.citation.Citation;
 import org.opengis.referencing.IdentifiedObject;
 import org.apache.sis.internal.system.DefaultFactories;
+import org.apache.sis.referencing.crs.HardCodedCRS;
 import org.apache.sis.test.mock.IdentifiedObjectMock;
 import org.apache.sis.test.TestCase;
 import org.junit.Test;
@@ -30,10 +33,13 @@ import static org.apache.sis.referencing
 
 /**
  * Tests the {@link IdentifiedObjects} static methods.
+ * This test class intentionally declares {@code testLookup()} method without {@link Test}
annotation
+ * because those tests should not be executed only after the EPSG tests. Those tests will
be executed
+ * by {@link CRSTest} instead.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.4
- * @version 0.4
+ * @version 0.7
  * @module
  */
 public final strictfp class IdentifiedObjectsTest extends TestCase {
@@ -73,4 +79,40 @@ public final strictfp class IdentifiedOb
         assertTrue (isHeuristicMatchForName(object, "Réunion"));
         assertTrue (isHeuristicMatchForName(object, "Reunion"));
     }
+
+    /**
+     * Tests {@link IdentifiedObjects#lookupEPSG(IdentifiedObject)} and
+     * {@link IdentifiedObjects#lookupURN(IdentifiedObject, Citation)}
+     * with a CRS which is expected to be found in the EPSG dataset.
+     *
+     * <p>This method is intentionally not annotated with {@link Test}.
+     * See class javadoc for explanation.</p>
+     *
+     * @throws FactoryException if an error occurred during the lookup.
+     *
+     * @see CRSTest#testIdentifiedObjectLookup()
+     */
+    public static void testLookupEPSG() throws FactoryException {
+        assertEquals("EPSG:4326", Integer.valueOf(4326), IdentifiedObjects.lookupEPSG(HardCodedCRS.WGS84_φλ));
+        String urn = IdentifiedObjects.lookupURN(HardCodedCRS.WGS84_φλ, null);
+        assertTrue(urn, urn.matches("urn\\:ogc\\:def\\:crs\\:EPSG\\:.*\\:4326"));
+    }
+
+    /**
+     * Tests {@link IdentifiedObjects#lookupEPSG(IdentifiedObject)} and
+     * {@link IdentifiedObjects#lookupURN(IdentifiedObject, Citation)}.
+     * with a CRS which is expected to be found in the WMS definitions.
+     *
+     * <p>This method is intentionally not annotated with {@link Test}.
+     * See class javadoc for explanation.</p>
+     *
+     * @throws FactoryException if an error occurred during the lookup.
+     *
+     * @see CRSTest#testIdentifiedObjectLookup()
+     */
+    public static void testLookupWMS() throws FactoryException {
+        assertNull("CRS:84", IdentifiedObjects.lookupEPSG(HardCodedCRS.WGS84));
+        String urn = IdentifiedObjects.lookupURN(HardCodedCRS.WGS84, null);
+        assertTrue(urn, urn.matches("urn\\:ogc\\:def\\:crs\\:OGC\\:.*\\:CRS84"));
+    }
 }

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java?rev=1726864&r1=1726863&r2=1726864&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java
[UTF-8] Tue Jan 26 20:00:57 2016
@@ -53,6 +53,7 @@ import org.apache.sis.referencing.crs.De
 import org.apache.sis.referencing.datum.BursaWolfParameters;
 import org.apache.sis.referencing.datum.DefaultGeodeticDatum;
 import org.apache.sis.referencing.operation.AbstractCoordinateOperation;
+import org.apache.sis.referencing.factory.GeodeticObjectFactory;
 import org.apache.sis.referencing.factory.IdentifiedObjectFinder;
 import org.apache.sis.referencing.factory.UnavailableFactoryException;
 
@@ -100,8 +101,9 @@ public final strictfp class EPSGFactoryT
      */
     @BeforeClass
     public static void createFactory() throws FactoryException {
+        final GeodeticObjectFactory f = new GeodeticObjectFactory();
         try {
-            factory = new EPSGFactory();
+            factory = new EPSGFactory(null, null, f, f, f, null, null, null);
         } catch (UnavailableFactoryException e) {
             Logging.getLogger(Loggers.CRS_FACTORY).warning(e.toString());
             // Leave INSTANCE to null. This will have the effect of skipping tests.
@@ -298,7 +300,7 @@ public final strictfp class EPSGFactoryT
     /**
      * Tests the "WGS 72 / UTM zone 10N" projection and ensures
      * that it is not confused with "WGS 72BE / UTM zone 10N".
-     * In the EPSG database, those two projected CRS uses the same conversion.
+     * In the EPSG database, those two projected CRS use the same conversion.
      * However in Apache SIS the conversions must differ because the datum are not the same.
      *
      * @throws FactoryException if an error occurred while querying the factory.
@@ -323,6 +325,10 @@ public final strictfp class EPSGFactoryT
         assertEpsgNameAndIdentifierEqual("Transverse Mercator", 9807, variant.getConversionFromBase().getMethod());
         assertEpsgNameAndIdentifierEqual("UTM zone 10N", 16010, variant.getConversionFromBase());
         verifyTransverseMercatorParmeters(crs.getConversionFromBase().getParameterValues(),
-123);
+        assertEquals("Operation method", crs.getConversionFromBase().getMethod(),
+                                     variant.getConversionFromBase().getMethod());
+        assertEquals("Coordinate system", crs.getCoordinateSystem(),
+                                      variant.getCoordinateSystem());
         assertSame("Operation method", crs.getConversionFromBase().getMethod(),
                                    variant.getConversionFromBase().getMethod());
         assertSame("Coordinate system", crs.getCoordinateSystem(),

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java?rev=1726864&r1=1726863&r2=1726864&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
[UTF-8] Tue Jan 26 20:00:57 2016
@@ -168,19 +168,21 @@ import org.junit.BeforeClass;
     org.apache.sis.referencing.crs.DefaultCompoundCRSTest.class,
     org.apache.sis.referencing.crs.HardCodedCRSTest.class,
 
+    // Direct (not from authority codes) geodetic object creations.
     org.apache.sis.referencing.StandardDefinitionsTest.class,
-    org.apache.sis.referencing.CommonCRSTest.class,
-    org.apache.sis.referencing.EPSGFactoryFallbackTest.class,
-    org.apache.sis.referencing.CRSTest.class,
+    org.apache.sis.referencing.factory.GeodeticObjectFactoryTest.class,
     org.apache.sis.referencing.factory.GIGS3002.class,
     org.apache.sis.referencing.factory.GIGS3003.class,
     org.apache.sis.referencing.factory.GIGS3004.class,
     org.apache.sis.referencing.factory.GIGS3005.class,
-    org.apache.sis.referencing.factory.GeodeticObjectFactoryTest.class,
-    org.apache.sis.referencing.factory.CommonAuthorityFactoryTest.class,
-    org.apache.sis.referencing.factory.AuthorityFactoryProxyTest.class,
-    org.apache.sis.referencing.factory.IdentifiedObjectFinderTest.class,
-    org.apache.sis.referencing.factory.MultiAuthoritiesFactoryTest.class,
+
+    // Well Known Text parsing require above factory.
+    org.apache.sis.io.wkt.MathTransformParserTest.class,
+    org.apache.sis.io.wkt.GeodeticObjectParserTest.class,
+    org.apache.sis.io.wkt.WKTFormatTest.class,
+    org.apache.sis.io.wkt.WKTParserTest.class,
+
+    // Geodetic object creations from authority codes.
     org.apache.sis.referencing.factory.GIGS2001.class,
     org.apache.sis.referencing.factory.GIGS2002.class,
     org.apache.sis.referencing.factory.GIGS2003.class,
@@ -190,12 +192,17 @@ import org.junit.BeforeClass;
     org.apache.sis.referencing.factory.GIGS2007.class,
     org.apache.sis.referencing.factory.GIGS2008.class,
     org.apache.sis.referencing.factory.GIGS2009.class,
-    org.apache.sis.referencing.factory.sql.EPSGFactoryTest.class,
 
-    org.apache.sis.io.wkt.MathTransformParserTest.class,
-    org.apache.sis.io.wkt.GeodeticObjectParserTest.class,
-    org.apache.sis.io.wkt.WKTFormatTest.class,
-    org.apache.sis.io.wkt.WKTParserTest.class,
+    // Following tests use indirectly EPSG factory.
+    org.apache.sis.referencing.CommonCRSTest.class,
+    org.apache.sis.referencing.factory.CommonAuthorityFactoryTest.class,
+    org.apache.sis.referencing.factory.AuthorityFactoryProxyTest.class,
+    org.apache.sis.referencing.factory.IdentifiedObjectFinderTest.class,
+    org.apache.sis.referencing.factory.MultiAuthoritiesFactoryTest.class,
+    org.apache.sis.referencing.factory.sql.EPSGFactoryTest.class,
+    org.apache.sis.referencing.EPSGFactoryFallbackTest.class,
+    org.apache.sis.referencing.AuthorityFactoriesTest.class,
+    org.apache.sis.referencing.CRSTest.class,
 
     org.apache.sis.geometry.AbstractDirectPositionTest.class,
     org.apache.sis.geometry.GeneralDirectPositionTest.class,



Mime
View raw message