Skip to content
This repository was archived by the owner on Sep 8, 2022. It is now read-only.

Commit 5abf9df

Browse files
committed
Move SBTRunner to its own file.
1 parent 69c2131 commit 5abf9df

File tree

2 files changed

+51
-39
lines changed

2 files changed

+51
-39
lines changed

src/main/scala/scala/tools/partest/nest/AntRunner.scala

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,6 @@
99
package scala.tools.partest
1010
package nest
1111

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
2112
import java.net.URLClassLoader
2213

2314
// not using any Scala types to ease calling across different scala versions
@@ -69,33 +60,3 @@ abstract class AntRunner(srcDir: String, testClassLoader: URLClassLoader, javaCm
6960
else "Test suite finished with no failures."
7061
}
7162
}
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-
}
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
/* __ *\
2+
** ________ ___ / / ___ Scala Parallel Testing **
3+
** / __/ __// _ | / / / _ | (c) 2007-2013, LAMP/EPFL **
4+
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
5+
** /____/\___/_/ |_/____/_/ | | **
6+
** |/ **
7+
\* */
8+
9+
package scala.tools.partest
10+
package nest
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+
import java.net.URLClassLoader
22+
23+
// called reflectively from scala-partest-test-interface
24+
class SBTRunner(partestFingerprint: Fingerprint, eventHandler: EventHandler, loggers: Array[Logger],
25+
srcDir: String, testClassLoader: URLClassLoader, javaCmd: File, javacCmd: File, scalacArgs: Array[String])
26+
extends AntRunner(srcDir, testClassLoader, javaCmd, javacCmd, scalacArgs) {
27+
override def error(msg: String): Nothing = sys.error(msg)
28+
def echo(msg: String): Unit = loggers foreach { l => l.info(msg) }
29+
def log(msg: String): Unit = loggers foreach { l => l.debug(msg) }
30+
def onFinishKind(kind: String, passed: Array[TestState], failed: Array[TestState]): Unit =
31+
eventHandler.handle(new Event {
32+
def fullyQualifiedName: String = kind
33+
def fingerprint: Fingerprint = partestFingerprint
34+
def selector: Selector = new SuiteSelector
35+
def status: Status = if (failed.isEmpty) Status.Success else Status.Failure
36+
def throwable: OptionalThrowable = new OptionalThrowable
37+
def duration: Long = -1
38+
})
39+
40+
override def onFinishTest(testFile: File, result: TestState): TestState = {
41+
eventHandler.handle(new Event {
42+
def fullyQualifiedName: String = testFile.testIdent
43+
def fingerprint: Fingerprint = partestFingerprint
44+
def selector: Selector = new TestSelector(testFile.testIdent)
45+
def status: Status = if (result.isOk) Status.Success else Status.Failure
46+
def throwable: OptionalThrowable = new OptionalThrowable
47+
def duration: Long = -1
48+
})
49+
result
50+
}
51+
}

0 commit comments

Comments
 (0)