Fixing problems in the database unit testing environment with Acorn

[simantics/platform.git] / bundles / org.simantics.db.testing / src / org / simantics / db / testing / common / AcornTests.java

diff --git a/bundles/org.simantics.db.testing/src/org/simantics/db/testing/common/AcornTests.java b/bundles/org.simantics.db.testing/src/org/simantics/db/testing/common/AcornTests.java
index e72ea3280d35d1bf3ea2a24e5121ebca8e85d2ad..8d8ffb5a88ef7891f5abe2776f3e822ac58dd4ef 100644 (file)
--- a/bundles/org.simantics.db.testing/src/org/simantics/db/testing/common/AcornTests.java
+++ b/bundles/org.simantics.db.testing/src/org/simantics/db/testing/common/AcornTests.java
@@ -17,14 +17,12 @@ import org.simantics.databoard.binding.Binding;
 import org.simantics.databoard.binding.error.BindingConstructionException;
 import org.simantics.db.Session;
 import org.simantics.db.exception.DatabaseException;
-import org.simantics.db.layer0.util.RuntimeEnvironmentRequest;
 import org.simantics.db.management.ISessionContextProvider;
 import org.simantics.db.management.ISessionContextProviderSource;
 import org.simantics.db.management.SessionContext;
 import org.simantics.db.management.SessionContextProvider;
 import org.simantics.db.management.SingleSessionContextProviderSource;
 import org.simantics.db.service.LifecycleSupport;
-import org.simantics.db.service.VirtualGraphSupport;
 import org.simantics.db.testing.impl.Configuration;
 import org.simantics.graph.db.TransferableGraphs;
 import org.simantics.graph.representation.TransferableGraph1;
@@ -41,7 +39,7 @@ public class AcornTests {
 
     public static void freshDatabase() throws Exception {
         DatabaseState state = freshWorkspace(Configuration.get().coreDir, null);
-        AcornTests.shutdown(state);
+        shutdown(state);
     }
 
     public static DatabaseState existingDatabase() throws Exception {
@@ -60,8 +58,7 @@ public class AcornTests {
         AcornTestHandler testHandler = AcornTests.getTestHandler(testSettings, address);
         testHandler.initNew();
         initSimanticsStuff();
-        SessionContext sessionContext = SimanticsPlatform.INSTANCE.startUp("acorn", null, RecoveryPolicy.FixError,
-                OntologyRecoveryPolicy.Merge, true, new DefaultChoiceUserAgent());
+        SessionContext sessionContext = SimanticsPlatform.INSTANCE.startUp("acorn", null, RecoveryPolicy.FixError, OntologyRecoveryPolicy.Merge, true, new DefaultChoiceUserAgent());
         return new DatabaseState(address, sessionContext);
     }
 
@@ -78,12 +75,6 @@ public class AcornTests {
         SCLOsgi.SOURCE_REPOSITORY = null;
         SCLOsgi.MODULE_REPOSITORY = null;
         SCLOsgi.TEST_REPOSITORY = null;
-        
-//        VirtualGraphSupport vsupport;
-//        if (state != null) {
-//            vsupport = state.getSession().getService(VirtualGraphSupport.class);
-//            vsupport.discard();
-//        }
 
         if (Platform.isRunning()) {
             SimanticsPlatform.INSTANCE.shutdown(null);
@@ -147,7 +138,7 @@ public class AcornTests {
             session = null;
         } catch (Exception e) {
             session = null;
-            throw new DatabaseException("Sessuion did not close cleanly.");
+            throw new DatabaseException("Session did not close cleanly.");
         }
     }