Fixing modelled STS tests to not include nested JUnit suites

[simantics/platform.git] / bundles / org.simantics.tests.modelled / src / org / simantics / tests / modelled / junit / RuntimeSTSSuiteRunner.java

diff --git a/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeSTSSuiteRunner.java b/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeSTSSuiteRunner.java
index 70325319dcb25a0cb851f3c16c544a3958a6baa5..a02c69e85466f8c9fb31229794bb18dcecac7bf6 100644 (file)
--- a/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeSTSSuiteRunner.java
+++ b/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeSTSSuiteRunner.java
@@ -5,20 +5,19 @@ import java.util.Collection;
 import java.util.List;\r
 \r
 import org.junit.runner.Description;\r
-import org.junit.runner.Runner;\r
 import org.simantics.scl.compiler.commands.CommandSession;\r
 import org.simantics.scl.osgi.SCLOsgi;\r
 \r
-public class RuntimeSTSSuiteRunner extends RuntimeSTSRunner {\r
+public class RuntimeSTSSuiteRunner extends RuntimeSTSRunner<RuntimeSTSTestRunner> {\r
 \r
     private final List<RuntimeSTSTestRunner> children = new ArrayList<>();\r
     private final String suiteName;\r
 \r
-    RuntimeSTSSuiteRunner(String suiteName) throws Exception {\r
-        super(RuntimeSTSSuiteRunner.class);\r
+    protected RuntimeSTSSuiteRunner(Class<?> clazz, String suiteName) throws Exception {\r
+        super(clazz);\r
         this.suiteName = suiteName;\r
     }\r
-    \r
+\r
     @Override\r
     protected String getName() {\r
         return suiteName;\r
@@ -36,19 +35,18 @@ public class RuntimeSTSSuiteRunner extends RuntimeSTSRunner {
         testChildren.forEach(c -> c.setCommandSession(session));\r
         children.addAll(testChildren);\r
     }\r
-    \r
-    @SuppressWarnings({ "unchecked", "rawtypes" })\r
+\r
     @Override\r
-    protected List<Runner> getChildren() {\r
-        return (List) children;\r
+    public List<RuntimeSTSTestRunner> getChildren() {\r
+        return children;\r
     }\r
 \r
     @Override\r
-    public void initialize() {\r
+    public void initialize() throws Exception {\r
     }\r
 \r
     @Override\r
-    public void deinitialize() {\r
+    public void deinitialize() throws Exception {\r
     }\r
 \r
 }\r