Merge "Ensure GetElementClassRequest is not constructed without elementFactory"

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

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