sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1730021 - in /sis/branches/JDK8/core/sis-referencing/src: main/java/org/apache/sis/referencing/ test/java/org/apache/sis/referencing/
Date Fri, 12 Feb 2016 13:23:56 GMT
Author: desruisseaux
Date: Fri Feb 12 13:23:56 2016
New Revision: 1730021

URL: http://svn.apache.org/viewvc?rev=1730021&view=rev
Log:
Remove a condition on test execution which is not needed anymore after upgrade from EPSG 7.9
to 8.8.

Modified:
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/EPSGFactoryFallback.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/CommonCRSTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/EPSGFactoryFallbackTest.java

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/EPSGFactoryFallback.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/EPSGFactoryFallback.java?rev=1730021&r1=1730020&r2=1730021&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/EPSGFactoryFallback.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/EPSGFactoryFallback.java
[UTF-8] Fri Feb 12 13:23:56 2016
@@ -59,12 +59,6 @@ final class EPSGFactoryFallback extends
     static final boolean FORCE_HARDCODED = false;
 
     /**
-     * A temporary flag for tests that need to be revisited after the upgrade to the next
EPSG database version.
-     */
-    @Debug
-    static final boolean PENDING_NEXT_EPSG = false;
-
-    /**
      * The singleton instance.
      */
     static final CRSAuthorityFactory INSTANCE = new EPSGFactoryFallback();

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=1730021&r1=1730020&r2=1730021&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] Fri Feb 12 13:23:56 2016
@@ -84,13 +84,7 @@ public final strictfp class CRSTest exte
         verifyForCode(CommonCRS.WGS72 .geographic3D(), "EPSG:4985");
         verifyForCode(CommonCRS.ETRS89.geographic3D(), "EPSG:4937");
         verifyForCode(CommonCRS.Vertical.MEAN_SEA_LEVEL.crs(), "EPSG:5714");
-        /*
-         * Following test is skipped when using the EPSG factory because EPSG uses
-         * the "Gravity-related depth" axis name while ISO 19111 mandates "Depth".
-         */
-        if (EPSGFactoryFallback.PENDING_NEXT_EPSG) {
-            verifyForCode(CommonCRS.Vertical.DEPTH.crs(), "EPSG:5715");
-        }
+        verifyForCode(CommonCRS.Vertical.DEPTH.crs(), "EPSG:5715");
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java?rev=1730021&r1=1730020&r2=1730021&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java
[UTF-8] Fri Feb 12 13:23:56 2016
@@ -167,9 +167,6 @@ public final strictfp class CommonCRSTes
             assertSame  (name, crs.getDatum(), e.datum());                      // Datum
after CRS creation.
             assertEquals(name, datumName, datum.getName().getCode());
             assertEquals(name, datumType, datum.getVerticalDatumType());
-            if (!EPSGFactoryFallback.PENDING_NEXT_EPSG && e == CommonCRS.Vertical.DEPTH)
{
-                continue;   // Pending the renaming of "Gravity-related depth" as "Depth"
in EPSG database.
-            }
             assertEquals(name, axisName,  crs.getCoordinateSystem().getAxis(0).getName().getCode());
         }
     }

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=1730021&r1=1730020&r2=1730021&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] Fri Feb 12 13:23:56 2016
@@ -125,9 +125,6 @@ public final strictfp class EPSGFactoryF
             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;
-                }
                 final CoordinateReferenceSystem crs = EPSGFactoryFallback.INSTANCE.createCoordinateReferenceSystem(code);
                 final CoordinateReferenceSystem expected = EPSG.createCoordinateReferenceSystem(code);
                 assertTrue(code, Utilities.deepEquals(expected, crs, ComparisonMode.DEBUG));



Mime
View raw message