|
9 | 9 | package scala.tools.partest
|
10 | 10 | package nest
|
11 | 11 |
|
12 |
| -import sbt.testing.EventHandler |
13 |
| -import sbt.testing.Logger |
14 |
| -import sbt.testing.Event |
15 |
| -import sbt.testing.Fingerprint |
16 |
| -import sbt.testing.Selector |
17 |
| -import sbt.testing.Status |
18 |
| -import sbt.testing.OptionalThrowable |
19 |
| -import sbt.testing.SuiteSelector |
20 |
| -import sbt.testing.TestSelector |
21 | 12 | import java.net.URLClassLoader
|
22 | 13 |
|
23 | 14 | // not using any Scala types to ease calling across different scala versions
|
@@ -69,33 +60,3 @@ abstract class AntRunner(srcDir: String, testClassLoader: URLClassLoader, javaCm
|
69 | 60 | else "Test suite finished with no failures."
|
70 | 61 | }
|
71 | 62 | }
|
72 |
| - |
73 |
| -// called reflectively from scala-partest-test-interface |
74 |
| -class SBTRunner(partestFingerprint: Fingerprint, eventHandler: EventHandler, loggers: Array[Logger], |
75 |
| - srcDir: String, testClassLoader: URLClassLoader, javaCmd: File, javacCmd: File, scalacArgs: Array[String]) |
76 |
| - extends AntRunner(srcDir, testClassLoader, javaCmd, javacCmd, scalacArgs) { |
77 |
| - override def error(msg: String): Nothing = sys.error(msg) |
78 |
| - def echo(msg: String): Unit = loggers foreach { l => l.info(msg) } |
79 |
| - def log(msg: String): Unit = loggers foreach { l => l.debug(msg) } |
80 |
| - def onFinishKind(kind: String, passed: Array[TestState], failed: Array[TestState]): Unit = |
81 |
| - eventHandler.handle(new Event { |
82 |
| - def fullyQualifiedName: String = kind |
83 |
| - def fingerprint: Fingerprint = partestFingerprint |
84 |
| - def selector: Selector = new SuiteSelector |
85 |
| - def status: Status = if (failed.isEmpty) Status.Success else Status.Failure |
86 |
| - def throwable: OptionalThrowable = new OptionalThrowable |
87 |
| - def duration: Long = -1 |
88 |
| - }) |
89 |
| - |
90 |
| - override def onFinishTest(testFile: File, result: TestState): TestState = { |
91 |
| - eventHandler.handle(new Event { |
92 |
| - def fullyQualifiedName: String = testFile.testIdent |
93 |
| - def fingerprint: Fingerprint = partestFingerprint |
94 |
| - def selector: Selector = new TestSelector(testFile.testIdent) |
95 |
| - def status: Status = if (result.isOk) Status.Success else Status.Failure |
96 |
| - def throwable: OptionalThrowable = new OptionalThrowable |
97 |
| - def duration: Long = -1 |
98 |
| - }) |
99 |
| - result |
100 |
| - } |
101 |
| -} |
0 commit comments