sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1730818 - in /sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory: GIGS2004.java sql/EPSGFactoryTest.java
Date Wed, 17 Feb 2016 11:42:29 GMT
Author: desruisseaux
Date: Wed Feb 17 11:42:29 2016
New Revision: 1730818

URL: http://svn.apache.org/viewvc?rev=1730818&view=rev
Log:
Fix test failures.

Modified:
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2004.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2004.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2004.java?rev=1730818&r1=1730817&r2=1730818&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2004.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GIGS2004.java
[UTF-8] Wed Feb 17 11:42:29 2016
@@ -17,7 +17,9 @@
 package org.apache.sis.referencing.factory;
 
 import org.opengis.util.FactoryException;
+import org.opengis.referencing.IdentifiedObject;
 import org.apache.sis.internal.system.Loggers;
+import org.apache.sis.util.CharSequences;
 
 // Test imports
 import org.junit.Rule;
@@ -90,6 +92,17 @@ public final strictfp class GIGS2004 ext
     }
 
     /**
+     * Removes the accented characters from the object name, so it can be compared against
the expected name.
+     *
+     * @param object The object from which to get a name than can be verified against the
expected name.
+     * @return The name of the given object, eventually modified in order to match the expected
name.
+     */
+    @Override
+    protected String getVerifiableName(final IdentifiedObject object) {
+        return CharSequences.toASCII(super.getVerifiableName(object)).toString();
+    }
+
+    /**
      * Overrides the GeoAPI test for verifying the log messages emitted during the construction
of deprecated objects.
      *
      * @throws FactoryException if an error occurred while creating the object.

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=1730818&r1=1730817&r2=1730818&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] Wed Feb 17 11:42:29 2016
@@ -469,6 +469,7 @@ public final strictfp class EPSGFactoryT
      */
     @Test
     public void testDeprecatedCoordinateSystems() throws FactoryException {
+        assumeNotNull(factory);
         for (final Map.Entry<Integer,Integer> entry : EPSGDataAccess.deprecatedCS().entrySet())
{
             final CoordinateSystem expected = factory.createEllipsoidalCS(entry.getValue().toString());
             loggings.assertNoUnexpectedLog();



Mime
View raw message