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
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
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
}\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
}\r
}\r
\r
- public static List<Runner> collectTests() {\r
+ public static List<RuntimeSTSSuiteRunner> collectTests() {\r
return new ArrayList<>(collectTestsFromGraph());\r
}\r
}\r