From: jsimomaa <jani.simomaa@vtt.fi>
Date: Mon, 19 Dec 2016 15:03:40 +0000 (+0200)
Subject: Fixing modelled STS tests to not include nested JUnit suites
X-Git-Tag: v1.26.0~22
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=1ee238f6b3803cc07932496beb51a38afa2ae01c;p=simantics%2Fplatform.git

Fixing modelled STS tests to not include nested JUnit suites

refs #6884

Change-Id: Ia86e62bae10e6ef12922e168231917bda40fc002
---

diff --git a/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeSTSRunner.java b/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeSTSRunner.java
index 6f9bda06a..e85d2f7d7 100644
--- a/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeSTSRunner.java
+++ b/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeSTSRunner.java
@@ -10,7 +10,7 @@ import org.junit.runner.notification.RunListener;
 import org.junit.runner.notification.RunNotifier;
 import org.junit.runners.ParentRunner;
 
-public abstract class RuntimeSTSRunner extends ParentRunner<Runner> {
+public abstract class RuntimeSTSRunner<T extends Runner> extends ParentRunner<T> {
 
     public RuntimeSTSRunner(Class<?> testClass) throws Exception {
         super(testClass);
@@ -20,12 +20,6 @@ public abstract class RuntimeSTSRunner extends ParentRunner<Runner> {
 
     public abstract void deinitialize() throws Exception;
 
-    @Override
-    protected List<Runner> getChildren() {
-        System.out.println("getting children");
-        return RuntimeTestCollector.collectTests();
-    }
-
     @Override
     protected Description describeChild(Runner child) {
         return child.getDescription();