[GEOT-6045] Unnecessary assert prevents EPSG HSQL database in path wi…

…th spaces
geotools · Jun 20, 2018 · dd12933 · dd12933
1 parent fdb6995
commit dd12933
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/modules/plugin/epsg-hsql/pom.xml b/modules/plugin/epsg-hsql/pom.xml
@@ -132,6 +132,11 @@
       <artifactId>commons-dbcp</artifactId>
       <scope>test</scope>
     </dependency>    
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.geotools</groupId>
       <artifactId>gt-referencing</artifactId>

diff --git a/...psg-hsql/src/main/java/org/geotools/referencing/factory/epsg/ThreadedHsqlEpsgFactory.java b/...psg-hsql/src/main/java/org/geotools/referencing/factory/epsg/ThreadedHsqlEpsgFactory.java
@@ -211,7 +211,6 @@ protected DataSource createDataSource() throws SQLException {
             url.append(DATABASE_NAME);
             url.append(";shutdown=true;readonly=true");
             source.setDatabase(url.toString());
-            assert directory.equals(getDirectory(source)) : url;
         }
         /*
          * If the temporary directory do not exists or can't be created, lets the 'database'

diff --git a/...hsql/src/test/java/org/geotools/referencing/factory/epsg/ThreadedHsqlEpsgFactoryTest.java b/...hsql/src/test/java/org/geotools/referencing/factory/epsg/ThreadedHsqlEpsgFactoryTest.java
@@ -16,10 +16,16 @@
  */
 package org.geotools.referencing.factory.epsg;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 
+import java.io.File;
 import java.lang.reflect.Method;
 import java.util.Set;
+import org.apache.commons.io.FileUtils;
 import org.geotools.geometry.DirectPosition2D;
 import org.geotools.referencing.AbstractIdentifiedObject;
 import org.geotools.referencing.CRS;
@@ -331,4 +337,29 @@ public void testDelay() throws Exception {
         factory.getAuthorityCodes(CoordinateReferenceSystem.class);
         assertTrue(factory.isConnected());
     }
+
+    /** Test data source creation when <code>java.io.tmpdir</code> contains spaces. */
+    @Test
+    public void testTmpWithSpaces() throws Exception {
+        final String JAVA_IO_TMPDIR_PROPERTY = "java.io.tmpdir";
+        String oldTmpDir = System.getProperty(JAVA_IO_TMPDIR_PROPERTY);
+        File tmpDir = new File("target/tmp with spaces");
+        FileUtils.deleteQuietly(tmpDir);
+        tmpDir.mkdirs();
+        try {
+            System.setProperty(JAVA_IO_TMPDIR_PROPERTY, tmpDir.getPath());
+            // force data source re-creation
+            factory.dispose();
+            assertNotNull(factory.createCoordinateReferenceSystem("EPSG:4326"));
+            String creationMarker =
+                    String.format(
+                            "Geotools/Databases/HSQL/v%s/EPSG_creation_marker.txt",
+                            ThreadedHsqlEpsgFactory.VERSION);
+            assertTrue((new File(tmpDir, creationMarker)).exists());
+        } finally {
+            System.setProperty(JAVA_IO_TMPDIR_PROPERTY, oldTmpDir);
+            factory.dispose();
+            FileUtils.deleteQuietly(tmpDir);
+        }
+    }
 }