o Changed the test temp db directory naming scheme from System.currentTimeMillis() to a counter

o Removed an extraneous delete of the db dir that happened too soon and broke with the new kernel locking scheme

Author: digitalstain

src/test/java/org/neo4j/gis/spatial/Neo4jTestCase.java

@@ -82,14 +82,14 @@ protected void setUp() throws Exception {
 
     protected void updateStorePrefix()
     {
-        storePrefix = System.currentTimeMillis();
+        storePrefix++;
     }
 
     /**
      * Configurable options for text cases, with or without deleting the previous database, and with
      * or without using the BatchInserter for higher creation speeds. Note that tests that need to
      * delete nodes or use transactions should not use the BatchInserter.
-     * 
+     *
      * @param deleteDb
      * @param useBatchInserter
      * @throws Exception
@@ -102,7 +102,7 @@ protected void setUp(boolean deleteDb, boolean useBatchInserter, boolean autoTx)
     /**
      * For test cases that want to control their own database access, we should
      * shutdown the current one.
-     * 
+     *
      * @param deleteDb
      */
     protected void shutdownDatabase(boolean deleteDb) {
@@ -126,13 +126,13 @@ protected void shutdownDatabase(boolean deleteDb) {
      * Some tests require switching between normal EmbeddedGraphDatabase and BatchInserter, so we
      * allow that with this method. We also allow deleting the previous database, if that is desired
      * (probably only the first time this is called).
-     * 
+     *
      * @param deleteDb
      * @param useBatchInserter
      * @throws Exception
      */
     protected void reActivateDatabase(boolean deleteDb, boolean useBatchInserter, boolean autoTx) throws Exception {
-        shutdownDatabase(deleteDb);
+        shutdownDatabase( deleteDb );
         Map<String, String> config = NORMAL_CONFIG;
         String largeMode = System.getProperty("spatial.test.large");
         if (largeMode != null && largeMode.equalsIgnoreCase("true")) {
@@ -153,7 +153,7 @@ protected void reActivateDatabase(boolean deleteDb, boolean useBatchInserter, bo
     @Override
     @After
     protected void tearDown() throws Exception {
-        shutdownDatabase(true);
+        shutdownDatabase( true );
         super.tearDown();
     }
 

src/test/java/org/neo4j/gis/spatial/TestSpatial.java

@@ -70,7 +70,7 @@
  * out neo4j-spatial</dd>
  * </dl>
  * </p>
- * 
+ *
  * @author Davide Savazzi
  * @author Craig Taverner
  */
@@ -96,7 +96,7 @@ public String toString() {
      * testing against real geometries. We have a few hard-coded test geometries we expect to find
      * stored in predictable ways in the test database. Currently we only test for bounding box so
      * this class only contains that information.
-     * 
+     *
      * @author craig
      * @since 1.0.0
      */
@@ -280,7 +280,6 @@ protected void testImport(String layerName) throws Exception {
             }
         }
         System.out.println("Total time for load: " + 1.0 * (System.currentTimeMillis() - start) / 1000.0 + "s");
-        deleteDatabase( false );
     }
 
     private void loadTestShpData(String layerName, int commitInterval) throws ShapefileException, FileNotFoundException,