Run modelled STS tests in alphanumeric order in case of equal execution
priority
refs #6889
Change-Id: I4fed12d34de943ea9f950d209754c9465b2ce9b4
import org.simantics.scl.osgi.SCLOsgi;\r
import org.simantics.scl.runtime.reporting.AbstractSCLReportingHandler;\r
import org.simantics.tests.modelled.ontology.TestsResource;\r
import org.simantics.scl.osgi.SCLOsgi;\r
import org.simantics.scl.runtime.reporting.AbstractSCLReportingHandler;\r
import org.simantics.tests.modelled.ontology.TestsResource;\r
+import org.simantics.utils.strings.AlphanumComparator;\r
\r
public class STSTestSuiteModel {\r
\r
\r
public class STSTestSuiteModel {\r
\r
Collections.sort(tests, (o1, o2) -> {\r
if (o1.priority < o2.priority)\r
return -1;\r
Collections.sort(tests, (o1, o2) -> {\r
if (o1.priority < o2.priority)\r
return -1;\r
- if (o1.priority > o2.priority)\r
+ else if (o1.priority > o2.priority)\r
+ else return AlphanumComparator.COMPARATOR.compare(o1.name, o2.name);\r
});\r
suite.children(tests.toArray(new STSTest[tests.size()]));\r
} else {\r
});\r
suite.children(tests.toArray(new STSTest[tests.size()]));\r
} else {\r
+ public String getName() {\r
+ return name;\r
+ }\r
+ \r
public Integer getPriority() {\r
return priority;\r
}\r
public Integer getPriority() {\r
return priority;\r
}\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.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
\r
public class RuntimeTestCollector {\r
\r
}\r
\r
testRunners.sort((test1, test2) -> {\r
}\r
\r
testRunners.sort((test1, test2) -> {\r
- if (test1.getPriority() <= test2.getPriority())\r
+ if (test1.getPriority() < test2.getPriority())\r
+ else if (test1.getPriority() > test2.getPriority())\r
+ else return AlphanumComparator.COMPARATOR.compare(test1.getName(), test2.getName());\r
});\r
suite.addChildren(testRunners);\r
suites.add(suite);\r
});\r
suite.addChildren(testRunners);\r
suites.add(suite);\r