Merge pull request #1229 from simboss/upm

Trying to fix the build for ImageMosaic on OpenJDK
geotools · Jun 30, 2016 · 5a6e0a8 · 5a6e0a8
2 parents d2a1455 + 63bbae5
commit 5a6e0a8
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 50 deletions.
diff --git a/...lugin/imagemosaic/src/test/java/org/geotools/gce/imagemosaic/GranuleCollectorSPITest.java b/...lugin/imagemosaic/src/test/java/org/geotools/gce/imagemosaic/GranuleCollectorSPITest.java
@@ -17,74 +17,27 @@
 
 package org.geotools.gce.imagemosaic;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.io.FileUtils;
-import org.geotools.data.Query;
-import org.geotools.factory.Hints;
-import org.geotools.filter.text.cql2.CQL;
-import org.geotools.filter.text.cql2.CQLException;
 import org.geotools.gce.imagemosaic.acceptors.ColorCheckAcceptor;
 import org.geotools.gce.imagemosaic.acceptors.DefaultGranuleAcceptorFactory;
 import org.geotools.gce.imagemosaic.acceptors.GranuleAcceptor;
 import org.geotools.gce.imagemosaic.acceptors.GranuleAcceptorFactorySPI;
 import org.geotools.gce.imagemosaic.acceptors.GranuleAcceptorFactorySPIFinder;
 import org.geotools.gce.imagemosaic.acceptors.HeterogeneousCRSAcceptorFactory;
 import org.geotools.gce.imagemosaic.acceptors.HomogeneousCRSAcceptor;
-import org.geotools.gce.imagemosaic.catalog.GranuleCatalog;
-import org.geotools.referencing.CRS;
-import org.geotools.test.TestData;
 import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+
 
 /**
  * Testing that granule collectors correctly get configured and initialized
  */
 public class GranuleCollectorSPITest {
 
-    @Rule
-    public TemporaryFolder testFolder = new TemporaryFolder();
-
-    @Rule
-    public TemporaryFolder crsMosaicFolder = new TemporaryFolder();
-
-    @BeforeClass
-    public static void setupReferencing() {
-        System.setProperty("org.geotools.referencing.forceXY", "true");
-        CRS.reset("all");
-    }
-
-    @Test
-    public void testCustomizedGranuleAcceptor() throws IOException, URISyntaxException,
-            CQLException {
-        URL testDataURL = TestData.url(this, "diffprojections");
-        File testDataFolder = new File(testDataURL.toURI());
-        File testDirectory = testFolder.newFolder("diffprojectionstest");
-        FileUtils.copyDirectory(testDataFolder, testDirectory);
-        Hints creationHints = new Hints();
-        ImageMosaicReader imReader = new ImageMosaicReader(testDirectory, creationHints);
-        assertNotNull(imReader);
-        assertEquals(imReader.getGranules(
-                imReader.getGridCoverageNames()[0], true).getCount(null),
-                2);
-
-        GranuleCatalog gc = imReader.getRasterManager("diffprojectionstest").getGranuleCatalog();
-        assertNotNull(gc);
-        Query q = new Query(gc.getTypeNames()[0], CQL.toFilter("BBOX(the_geom, -180, -90, 180, 90)"));
-        assertEquals(2, gc.getGranules(q).size());
-    }
-
     @Test
     public void basicTest(){
         // get the SPIs

diff --git a/.../plugin/imagemosaic/src/test/java/org/geotools/gce/imagemosaic/ImageMosaicReaderTest.java b/.../plugin/imagemosaic/src/test/java/org/geotools/gce/imagemosaic/ImageMosaicReaderTest.java
@@ -45,6 +45,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.sql.Connection;
 import java.sql.Statement;
@@ -101,6 +102,8 @@
 import org.geotools.data.simple.SimpleFeatureIterator;
 import org.geotools.factory.Hints;
 import org.geotools.feature.simple.SimpleFeatureBuilder;
+import org.geotools.filter.text.cql2.CQL;
+import org.geotools.filter.text.cql2.CQLException;
 import org.geotools.filter.text.ecql.ECQL;
 import org.geotools.gce.imagemosaic.Utils.Prop;
 import org.geotools.gce.imagemosaic.catalog.GranuleCatalog;
@@ -3922,10 +3925,10 @@ private void cleanConfigurationFiles(File testMosaic, String mosaicName) {
         }
     }
 
-        @AfterClass
+    @AfterClass
 	public static void close(){
 		System.clearProperty("org.geotools.referencing.forceXY");
-	        CRS.reset("all");
+		CRS.reset("all");
 	}
 
     /**
@@ -4211,4 +4214,27 @@ public void testOverviewSupportFiles() throws Exception {
             assertTrue(supportFiles.contains(myFile));
         }
     }
+
+	@Test
+	public void testCustomizedGranuleAcceptor() throws IOException, URISyntaxException,
+	        CQLException {
+	    URL testDataURL = TestData.url(this, "diffprojections");
+	    File testDataFolder = new File(testDataURL.toURI());
+
+	    Hints creationHints = new Hints();
+	    ImageMosaicReader imReader = new ImageMosaicReader(testDataFolder, creationHints);
+	    assertNotNull(imReader);
+	    String[] gridCoverageNames = imReader.getGridCoverageNames();
+	    assertNotNull(gridCoverageNames);
+	    Assert.assertTrue(gridCoverageNames.length==1);
+		String coverageName = gridCoverageNames[0];
+		assertEquals(imReader.getGranules(
+	            coverageName, true).getCount(null),
+	            2);
+
+	    GranuleCatalog gc = imReader.getRasterManager(coverageName).getGranuleCatalog();
+	    assertNotNull(gc);
+	    Query q = new Query(gc.getTypeNames()[0], CQL.toFilter("BBOX(the_geom, -180, -90, 180, 90)"));
+	    assertEquals(2, gc.getGranules(q).size());
+	}
 }