Try to force orient graph shutdown so broken tests don't cascade.

tinkerpop · Dec 13, 2010 · 6ea692b · 6ea692b
1 parent ab900b2
commit 6ea692b
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/test/java/com/tinkerpop/blueprints/pgm/impls/orientdb/OrientGraphTest.java b/src/test/java/com/tinkerpop/blueprints/pgm/impls/orientdb/OrientGraphTest.java
@@ -14,6 +14,7 @@
  * @author Luca Garulli (http://www.orientechnologies.com)
  */
 public class OrientGraphTest extends GraphTest {
+    private OrientGraph currentGraph;
 
     public OrientGraphTest() {
         this.allowsDuplicateEdges = true;
@@ -78,7 +79,8 @@ public void testGraphMLReaderTestSuite() throws Exception {
 
     public Graph getGraphInstance() {
         String directory = getWorkingDirectory();
-        return new OrientGraph("local:" + directory + "/graph");
+        this.currentGraph = new OrientGraph("local:" + directory + "/graph");
+        return this.currentGraph;
     }
 
     public void doTestSuite(final TestSuite testSuite) throws Exception {
@@ -90,6 +92,10 @@ public void doTestSuite(final TestSuite testSuite) throws Exception {
                 if (method.getName().startsWith("test")) {
                     System.out.println("Testing " + method.getName() + "...");
                     method.invoke(testSuite);
+                    try {
+                        if (this.currentGraph != null)
+                            this.currentGraph.shutdown();
+                    } catch (Exception e) {  }
                     new ODatabaseGraphTx("local:" + directory + "/graph").delete();
                 }
             }