some more close operations for tests under windows

Author: Peter

config-example.properties

@@ -24,6 +24,7 @@ prepare.chShortcuts=fastest
 osmreader.wayPointMaxDistance=1
 
 # possible options: CAR,FOOT,BIKE (comma separated)
+# when using two or three option together remeber to set "prepare.chShortcuts=no" above
 osmreader.acceptWay=CAR
 
 # if you want to reduce storage size and you don't need instructions for a path uncomment this

core/src/test/java/com/graphhopper/storage/AbstractDirectoryTester.java

@@ -37,11 +37,9 @@ public abstract class AbstractDirectoryTester
     @After
     public void tearDown()
     {
-        Helper.removeDir(new File(location));
         if (da != null)
-        {
             da.close();
-        }
+        Helper.removeDir(new File(location));        
     }
 
     @Before

core/src/test/java/com/graphhopper/storage/AbstractGraphStorageTester.java

@@ -282,6 +282,7 @@ public void testCopyTo()
             ex.printStackTrace();
             assertTrue(ex.toString(), false);
         }
+        close(gs);
     }
 
     @Test
@@ -514,9 +515,7 @@ public boolean containsLatitude( Graph g, EdgeIterator iter, double latitude )
         while (iter.next())
         {
             if (Math.abs(g.getLatitude(iter.getAdjNode()) - latitude) < 1e-4)
-            {
                 return true;
-            }
         }
         return false;
     }
@@ -936,19 +935,16 @@ public static int getIdOf( Graph g, double latitude )
     static void close( Object o )
     {
         if (o == null)
-        {
             return;
-        }
+
         if (o instanceof Closeable)
-        {
             try
             {
                 ((Closeable) o).close();
             } catch (IOException ex)
             {
                 throw new RuntimeException(ex);
             }
-        }
     }
 
     @Test

core/src/test/java/com/graphhopper/storage/GraphHopperStorageTest.java

@@ -74,6 +74,7 @@ public void testNoCreateCalled() throws IOException
         {
             assertFalse("AssertionError should be raised", true);
         }
+        gs.close();
     }
 
     @Test
@@ -151,27 +152,28 @@ protected void checkGraph( Graph g )
     @Test
     public void internalDisconnect()
     {
-        GraphHopperStorage tmpStorage = (GraphHopperStorage) createGraph();
-        EdgeIteratorState iter0 = tmpStorage.edge(0, 1, 10, true);
-        EdgeIteratorState iter2 = tmpStorage.edge(1, 2, 10, true);
-        EdgeIteratorState iter3 = tmpStorage.edge(0, 3, 10, true);
+        GraphHopperStorage tmpGS = (GraphHopperStorage) createGraph();
+        EdgeIteratorState iter0 = tmpGS.edge(0, 1, 10, true);
+        EdgeIteratorState iter2 = tmpGS.edge(1, 2, 10, true);
+        EdgeIteratorState iter3 = tmpGS.edge(0, 3, 10, true);
 
-        EdgeExplorer explorer = tmpStorage.createEdgeExplorer();
+        EdgeExplorer explorer = tmpGS.createEdgeExplorer();
 
         assertEquals(GHUtility.asSet(3, 1), GHUtility.getNeighbors(explorer.setBaseNode(0)));
         assertEquals(GHUtility.asSet(2, 0), GHUtility.getNeighbors(explorer.setBaseNode(1)));
         // remove edge "1-2" but only from 1 not from 2
-        tmpStorage.internalEdgeDisconnect(iter2.getEdge(), -1, iter2.getBaseNode(), iter2.getAdjNode());
+        tmpGS.internalEdgeDisconnect(iter2.getEdge(), -1, iter2.getBaseNode(), iter2.getAdjNode());
         assertEquals(GHUtility.asSet(0), GHUtility.getNeighbors(explorer.setBaseNode(1)));
         assertEquals(GHUtility.asSet(1), GHUtility.getNeighbors(explorer.setBaseNode(2)));
         // let 0 unchanged -> no side effects
         assertEquals(GHUtility.asSet(3, 1), GHUtility.getNeighbors(explorer.setBaseNode(0)));
 
         // remove edge "0-1" but only from 0
-        tmpStorage.internalEdgeDisconnect(iter0.getEdge(), (long) iter3.getEdge() * tmpStorage.edgeEntryBytes, iter0.getBaseNode(), iter0.getAdjNode());
+        tmpGS.internalEdgeDisconnect(iter0.getEdge(), (long) iter3.getEdge() * tmpGS.edgeEntryBytes, iter0.getBaseNode(), iter0.getAdjNode());
         assertEquals(GHUtility.asSet(3), GHUtility.getNeighbors(explorer.setBaseNode(0)));
         assertEquals(GHUtility.asSet(0), GHUtility.getNeighbors(explorer.setBaseNode(3)));
         assertEquals(GHUtility.asSet(0), GHUtility.getNeighbors(explorer.setBaseNode(1)));
+        tmpGS.close();
     }
 
     @Test
@@ -190,10 +192,11 @@ public void testEnsureSize()
     public void testBigDataEdge()
     {
         Directory dir = new RAMDirectory();
-        GraphHopperStorage gs = new GraphHopperStorage(dir, encodingManager);
-        gs.create(defaultSize);
-        gs.setEdgeCount(Integer.MAX_VALUE / 2);
-        assertTrue(gs.getAllEdges().next());
+        GraphHopperStorage tmpGS = new GraphHopperStorage(dir, encodingManager);
+        tmpGS.create(defaultSize);
+        tmpGS.setEdgeCount(Integer.MAX_VALUE / 2);
+        assertTrue(tmpGS.getAllEdges().next());
+        tmpGS.close();
     }
 
     @Test

core/src/test/java/com/graphhopper/storage/index/AbstractLocation2IDIndexTester.java

@@ -45,6 +45,7 @@
 public abstract class AbstractLocation2IDIndexTester
 {
     String location = "./target/tmp/";
+    LocationIndex idx;
 
     public abstract LocationIndex createIndex( Graph g, int resolution );
 
@@ -56,6 +57,8 @@ public boolean hasEdgeSupport()
     @Before
     public void setUp()
     {
+        if(idx != null)
+            idx.close();
         Helper.removeDir(new File(location));
     }
 
@@ -71,7 +74,7 @@ public void testSimpleGraph()
         Graph g = createGraph(new EncodingManager("CAR"));
         initSimpleGraph(g);
 
-        LocationIndex idx = createIndex(g, 8);
+        idx = createIndex(g, 8);
         assertEquals(4, idx.findID(5, 2));
         assertEquals(3, idx.findID(1.5, 2));
         assertEquals(0, idx.findID(-1, -1));
@@ -123,7 +126,7 @@ public void testSimpleGraph2()
         Graph g = createGraph(new EncodingManager("CAR"));
         initSimpleGraph(g);
 
-        LocationIndex idx = createIndex(g, 28);
+        idx = createIndex(g, 28);
         assertEquals(4, idx.findID(5, 2));
         assertEquals(3, idx.findID(1.5, 2));
         assertEquals(0, idx.findID(-1, -1));
@@ -147,16 +150,15 @@ public void testGrid()
         Graph g = createSampleGraph(new EncodingManager("CAR"));
         int locs = g.getNodes();
 
-        LocationIndex index = createIndex(g, 120);
+        idx = createIndex(g, 120);
         // if we would use less array entries then some points gets the same key so avoid that for this test
         // e.g. for 16 we get "expected 6 but was 9" i.e 6 was overwritten by node j9 which is a bit closer to the grid center        
         // go through every point of the graph if all points are reachable
         for (int i = 0; i < locs; i++)
         {
             double lat = g.getLatitude(i);
             double lon = g.getLongitude(i);
-            assertEquals("nodeId:" + i + " " + (float) lat + "," + (float) lon,
-                    i, index.findID(lat, lon));
+            assertEquals("nodeId:" + i + " " + (float) lat + "," + (float) lon, i, idx.findID(lat, lon));
         }
 
         // hit random lat,lon and compare result to full index
@@ -176,7 +178,7 @@ public void testGrid()
             double fullLat = g.getLatitude(fullId);
             double fullLon = g.getLongitude(fullId);
             float fullDist = (float) dist.calcDist(lat, lon, fullLat, fullLon);
-            int newId = index.findID(lat, lon);
+            int newId = idx.findID(lat, lon);
             double newLat = g.getLatitude(newId);
             double newLon = g.getLongitude(newId);
             float newDist = (float) dist.calcDist(lat, lon, newLat, newLon);
@@ -191,6 +193,7 @@ public void testGrid()
                     + " found:" + newLat + "," + newLon + " foundDist:" + newDist,
                     Math.abs(fullDist - newDist) < 50000);
         }
+        fullIndex.close();
     }
 
     // our simple index has only one node per tile => problems if multiple subnetworks
@@ -203,7 +206,7 @@ boolean testGridIgnore( int i )
     public void testSinglePoints120()
     {
         Graph g = createSampleGraph(new EncodingManager("CAR"));
-        LocationIndex idx = createIndex(g, 120);
+        idx = createIndex(g, 120);
 
         assertEquals(1, idx.findID(1.637, 2.23));
         assertEquals(10, idx.findID(3.649, 1.375));
@@ -218,7 +221,7 @@ public void testSinglePoints120()
     public void testSinglePoints32()
     {
         Graph g = createSampleGraph(new EncodingManager("CAR"));
-        LocationIndex idx = createIndex(g, 32);
+        idx = createIndex(g, 32);
 
         // 10 or 6
         assertEquals(10, idx.findID(3.649, 1.375));
@@ -244,7 +247,8 @@ public void testNoErrorOnEdgeCase_lastIndex()
         {
             g.setNode(i, (float) rand.nextDouble() * 10 + 10, (float) rand.nextDouble() * 10 + 10);
         }
-        createIndex(g, 200);
+        LocationIndex idx = createIndex(g, 200);
+        idx.close();
         Helper.removeDir(new File(location));
     }
 
@@ -343,7 +347,7 @@ public void testDifferentVehicles()
         final EncodingManager encodingManager = new EncodingManager("CAR,FOOT");
         Graph g = createGraph(encodingManager);
         initSimpleGraph(g);
-        LocationIndex idx = createIndex(g, 32);
+        idx = createIndex(g, 32);
         assertEquals(1, idx.findID(1, -1));
 
         // now make all edges from node 1 accessible for CAR only
@@ -353,7 +357,8 @@ public void testDifferentVehicles()
         {
             iter.setFlags(carEncoder.setProperties(50, true, true));
         }
-
+        idx.close();
+        
         idx = createIndex(g, 32);
         FootFlagEncoder footEncoder = (FootFlagEncoder) encodingManager.getEncoder("FOOT");
         assertEquals(2, idx.findClosest(1, -1, new DefaultEdgeFilter(footEncoder)).getClosestNode());