X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.tests.modelled%2Fsrc%2Forg%2Fsimantics%2Ftests%2Fmodelled%2Fjunit%2Fv2%2FModelledSTSSuiteRunner.java;h=11931d824c3990c432aece73020949d1bb058491;hp=5b7a8ef0ac3d5b352052476055bd160b7c58531b;hb=9c866c82a391db00ae11913c61d39d7dc46b14d0;hpb=1ec0193a5a5b8f368b03adb24acd762838ddf8ea

diff --git a/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/v2/ModelledSTSSuiteRunner.java b/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/v2/ModelledSTSSuiteRunner.java
index 5b7a8ef0a..11931d824 100644
--- a/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/v2/ModelledSTSSuiteRunner.java
+++ b/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/v2/ModelledSTSSuiteRunner.java
@@ -1,6 +1,7 @@
 package org.simantics.tests.modelled.junit.v2;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -18,7 +19,7 @@ public class ModelledSTSSuiteRunner extends ParentRunner<ModelledSTSTestRunner>
 
     private final ModelledSTSSuite suite;
     private final List<ModelledSTSTestRunner> children;
-    private Map<String, List<CommandSessionVariable>> storedVariables;
+    private Map<String, List<CommandSessionVariable>> storedVariables = new HashMap<>();
 
     public ModelledSTSSuiteRunner(ModelledSTSSuite suite) throws InitializationError {
         super(ModelledSTSSuiteRunner.class);
@@ -58,10 +59,11 @@ public class ModelledSTSSuiteRunner extends ParentRunner<ModelledSTSTestRunner>
                         variables.addAll(storedVars);
                     }
                 }
+                notifier.fireTestStarted(description);
                 List<CommandSessionVariable> newVars = child.runWithVars(variables);
                 storedVariables.put(child.getTest().getName(), newVars);
                 notifier.fireTestFinished(description);
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 notifier.fireTestFailure(new Failure(description, e));
             }
         }