Merge changes Ib64cf026,I238948da

[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..90abe0e1661d2ef29fe441a09088c2eb8b02baf4 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
@@ -1,54 +1,59 @@
-package org.simantics.tests.modelled.junit;\r
-\r
-import java.util.ArrayList;\r
-import java.util.Collection;\r
-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
-\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
-        this.suiteName = suiteName;\r
-    }\r
-    \r
-    @Override\r
-    protected String getName() {\r
-        return suiteName;\r
-    }\r
-\r
-    @Override\r
-    public Description getDescription() {\r
-        Description description = Description.createSuiteDescription(getName(), getRunnerAnnotations());\r
-        getChildren().forEach(child -> description.addChild(describeChild(child)));\r
-        return description;\r
-    }\r
-\r
-    public void addChildren(Collection<RuntimeSTSTestRunner> testChildren) {\r
-        CommandSession session = new CommandSession(SCLOsgi.MODULE_REPOSITORY, null);\r
-        testChildren.forEach(c -> c.setCommandSession(session));\r
-        children.addAll(testChildren);\r
-    }\r
-    \r
-    @SuppressWarnings({ "unchecked", "rawtypes" })\r
-    @Override\r
-    protected List<Runner> getChildren() {\r
-        return (List) children;\r
-    }\r
-\r
-    @Override\r
-    public void initialize() {\r
-    }\r
-\r
-    @Override\r
-    public void deinitialize() {\r
-    }\r
-\r
-}\r
+package org.simantics.tests.modelled.junit;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.junit.runner.Description;
+import org.simantics.scl.compiler.commands.CommandSession;
+import org.simantics.scl.osgi.SCLOsgi;
+
+@Deprecated
+public class RuntimeSTSSuiteRunner extends RuntimeSTSRunner<RuntimeSTSTestRunner> {
+
+    private final List<RuntimeSTSTestRunner> children = new ArrayList<>();
+    private final String suiteName;
+
+    protected RuntimeSTSSuiteRunner(Class<?> clazz, String suiteName) throws Exception {
+        super(clazz);
+        this.suiteName = suiteName;
+    }
+
+    @Override
+    protected String getName() {
+        return suiteName;
+    }
+
+    @Override
+    public Description getDescription() {
+        Description description = Description.createSuiteDescription(getName(), getRunnerAnnotations());
+        getChildren().forEach(child -> description.addChild(describeChild(child)));
+        return description;
+    }
+
+    public void addChildren(Collection<RuntimeSTSTestRunner> testChildren) {
+        CommandSession session = new CommandSession(SCLOsgi.MODULE_REPOSITORY, null);
+        testChildren.forEach(c -> c.setCommandSession(session));
+        children.addAll(testChildren);
+    }
+    
+    @Override
+    protected boolean isIgnored(RuntimeSTSTestRunner child) {
+        // TODO Auto-generated method stub
+        return super.isIgnored(child);
+    }
+
+    @Override
+    public List<RuntimeSTSTestRunner> getChildren() {
+        return children;
+    }
+
+    @Override
+    public void initialize() throws Exception {
+    }
+    
+    @Override
+    public void deinitialize() throws Exception {
+    }
+
+}