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%2FRuntimeTestCollector.java;h=0ab31b3f01a8961ad652f36ca980d4a9a475e8b7;hp=81d1ef7e7f52d7a961df8c53a2918f6b332e7382;hb=3448b94a8e90047c88eb62a0542c1596acb701b8;hpb=53059ca1a958697cc6235d27628614fbaa944d59

diff --git a/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeTestCollector.java b/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeTestCollector.java
index 81d1ef7e7..0ab31b3f0 100644
--- a/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeTestCollector.java
+++ b/bundles/org.simantics.tests.modelled/src/org/simantics/tests/modelled/junit/RuntimeTestCollector.java
@@ -7,7 +7,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.junit.runner.Runner;
 import org.simantics.Simantics;
 import org.simantics.databoard.Bindings;
 import org.simantics.db.ReadGraph;
@@ -19,6 +18,7 @@ import org.simantics.layer0.Layer0;
 import org.simantics.modeling.ModelingUtils;
 import org.simantics.scl.runtime.tuple.Tuple0;
 import org.simantics.tests.modelled.ontology.TestsResource;
+import org.simantics.utils.strings.AlphanumComparator;
 
 public class RuntimeTestCollector {
 
@@ -50,7 +50,7 @@ public class RuntimeTestCollector {
                                 if (tests.isEmpty())
                                     continue;
     
-                                RuntimeSTSSuiteRunner suite = new RuntimeSTSSuiteRunner(suiteName);
+                                RuntimeSTSSuiteRunner suite = new RuntimeSTSSuiteRunner(RuntimeSTSSuiteRunner.class, suiteName);
                                 List<RuntimeSTSTestRunner> testRunners = new ArrayList<>();
                                 for (Resource test : tests) {
                                     String testName = graph.getRelatedValue(test, L0.HasName, Bindings.STRING);
@@ -61,10 +61,11 @@ public class RuntimeTestCollector {
                                 }
                                 
                                 testRunners.sort((test1, test2) -> {
-                                    if (test1.getPriority() <= test2.getPriority())
+                                    if (test1.getPriority() < test2.getPriority())
                                         return -1;
-                                    else
+                                    else if (test1.getPriority() > test2.getPriority())
                                         return 1;
+                                    else return AlphanumComparator.COMPARATOR.compare(test1.getName(), test2.getName());
                                 });
                                 suite.addChildren(testRunners);
                                 suites.add(suite);
@@ -83,7 +84,7 @@ public class RuntimeTestCollector {
         }
     }
 
-    public static List<Runner> collectTests() {
+    public static List<RuntimeSTSSuiteRunner> collectTests() {
         return new ArrayList<>(collectTestsFromGraph());
     }
 }