luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Scalariform changes

This commit is contained in:
Eugene Yokota 2017-05-21 13:18:53 -04:00
parent fa82807eee
commit 303ee137bd
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/src/main/scala/sbt/Defaults.scala
View File

@ -2151,7 +2151,8 @@ trait BuildExtra extends BuildCommon with DefExtra {
def fullRunInputTask(scoped: InputKey[Unit], config: Configuration, mainClass: String, baseArguments: String*): Setting[InputTask[Unit]] = def fullRunInputTask(scoped: InputKey[Unit], config: Configuration, mainClass: String, baseArguments: String*): Setting[InputTask[Unit]] =
scoped := (inputTask { result => scoped := (inputTask { result =>
(initScoped(scoped.scopedKey, runnerInit) zipWith (fullClasspath in config, streams, result).identityMap) { (rTask, t) => (initScoped(scoped.scopedKey, runnerInit) zipWith (fullClasspath in config, streams, result).identityMap) { (rTask, t) =>
(t, rTask) map { case ((cp, s, args), r) => (t, rTask) map {
case ((cp, s, args), r) =>
r.run(mainClass, data(cp), baseArguments ++ args, s.log) foreach sys.error r.run(mainClass, data(cp), baseArguments ++ args, s.log) foreach sys.error
} }
} }
@ -2159,7 +2160,8 @@ trait BuildExtra extends BuildCommon with DefExtra {
def fullRunTask(scoped: TaskKey[Unit], config: Configuration, mainClass: String, arguments: String*): Setting[Task[Unit]] = def fullRunTask(scoped: TaskKey[Unit], config: Configuration, mainClass: String, arguments: String*): Setting[Task[Unit]] =
scoped := ((initScoped(scoped.scopedKey, runnerInit) zipWith (fullClasspath in config, streams).identityMap) { scoped := ((initScoped(scoped.scopedKey, runnerInit) zipWith (fullClasspath in config, streams).identityMap) {
case (rTask, t) => case (rTask, t) =>
(t, rTask) map { case ((cp, s), r) => (t, rTask) map {
case ((cp, s), r) =>
r.run(mainClass, data(cp), arguments, s.log) foreach sys.error r.run(mainClass, data(cp), arguments, s.log) foreach sys.error
} }
}).value }).value

9
testing/src/main/scala/sbt/JUnitXmlTestsListener.scala
View File

@ -70,9 +70,12 @@ class JUnitXmlTestsListener(val outputDir: String) extends TestsListener {
{ {
for (e <- events) yield <testcase classname={ name } name={ for (e <- events) yield <testcase classname={ name } name={
e.selector match { e.selector match {
case selector: TestSelector => selector.testName.split('.').last case selector: TestSelector =>
case nested: NestedTestSelector => nested.suiteId().split('.').last + "." + nested.testName() selector.testName.split('.').last
case other => s"(It is not a test it is a ${other.getClass.getCanonicalName})" case nested: NestedTestSelector =>
nested.suiteId().split('.').last + "." + nested.testName()
case other =>
s"(It is not a test it is a ${other.getClass.getCanonicalName})"
} }
} time={ (e.duration() / 1000.0).toString }> } time={ (e.duration() / 1000.0).toString }>
{ {