From 303ee137bd0441982fba95a44fe4ab5805f301b6 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 21 May 2017 13:18:53 -0400 Subject: [PATCH] Scalariform changes --- main/src/main/scala/sbt/Defaults.scala | 10 ++++++---- testing/src/main/scala/sbt/JUnitXmlTestsListener.scala | 9 ++++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 1d1534338..e4a1b6f63 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -2151,16 +2151,18 @@ trait BuildExtra extends BuildCommon with DefExtra { def fullRunInputTask(scoped: InputKey[Unit], config: Configuration, mainClass: String, baseArguments: String*): Setting[InputTask[Unit]] = scoped := (inputTask { result => (initScoped(scoped.scopedKey, runnerInit) zipWith (fullClasspath in config, streams, result).identityMap) { (rTask, t) => - (t, rTask) map { case ((cp, s, args), r) => - r.run(mainClass, data(cp), baseArguments ++ args, s.log) foreach sys.error + (t, rTask) map { + case ((cp, s, args), r) => + r.run(mainClass, data(cp), baseArguments ++ args, s.log) foreach sys.error } } }).evaluated 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) { case (rTask, t) => - (t, rTask) map { case ((cp, s), r) => - r.run(mainClass, data(cp), arguments, s.log) foreach sys.error + (t, rTask) map { + case ((cp, s), r) => + r.run(mainClass, data(cp), arguments, s.log) foreach sys.error } }).value def initScoped[T](sk: ScopedKey[_], i: Initialize[T]): Initialize[T] = initScope(fillTaskAxis(sk.scope, sk.key), i) diff --git a/testing/src/main/scala/sbt/JUnitXmlTestsListener.scala b/testing/src/main/scala/sbt/JUnitXmlTestsListener.scala index 050966223..00fe94a43 100644 --- a/testing/src/main/scala/sbt/JUnitXmlTestsListener.scala +++ b/testing/src/main/scala/sbt/JUnitXmlTestsListener.scala @@ -70,9 +70,12 @@ class JUnitXmlTestsListener(val outputDir: String) extends TestsListener { { for (e <- events) yield selector.testName.split('.').last - case nested: NestedTestSelector => nested.suiteId().split('.').last + "." + nested.testName() - case other => s"(It is not a test it is a ${other.getClass.getCanonicalName})" + case selector: TestSelector => + selector.testName.split('.').last + 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 }> {