Merge pull request #54 from olafurpg/indent

Indent successful test case reports by two spaces.
scalameta · Feb 16, 2020 · 977de88 · 977de88
2 parents ba5d46b + 0254523
commit 977de88
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/build.sbt b/build.sbt
@@ -109,7 +109,8 @@ lazy val junit = project
     autoScalaLibrary := false,
     crossPaths := false,
     sbtPlugin := false,
-    libraryDependencies ++= Seq(
+    crossScalaVersions := List(scala213),
+    libraryDependencies ++= List(
       "junit" % "junit" % junitVersion,
       "org.scala-sbt" % "test-interface" % "1.0"
     ),
@@ -188,6 +189,7 @@ lazy val plugin = project
     sbtPlugin := true,
     skip in publish := customScalaJSVersion.isDefined,
     scalaVersion := scala212,
+    crossScalaVersions := List(scala212),
     buildInfoPackage := "munit.sbtmunit",
     buildInfoKeys := Seq[BuildInfoKey](
       "munitVersion" -> version.value
@@ -238,6 +240,7 @@ lazy val docs = project
       "org.scala-lang.modules" %% "scala-xml" % "2.0.0-M1",
       gcp
     ),
+    test := {},
     munitRepository := Some("scalameta/munit"),
     mdocOut :=
       baseDirectory.in(ThisBuild).value / "website" / "target" / "docs",

diff --git a/junit-interface/src/main/java/munit/internal/junitinterface/RunSettings.java b/junit-interface/src/main/java/munit/internal/junitinterface/RunSettings.java
@@ -133,7 +133,7 @@ String buildPlainName(Description desc) {
   String buildTestResult(Status status) {
     switch (status) {
         case Success:
-          return c("+ ", SUCCESS1);
+          return c("  + ", SUCCESS1);
         case Ignored:
           return c("==> i ", SKIPPED);
         case Skipped:

diff --git a/munit/non-jvm/src/main/scala/munit/internal/junitinterface/JUnitReporter.scala b/munit/non-jvm/src/main/scala/munit/internal/junitinterface/JUnitReporter.scala
@@ -47,7 +47,7 @@ final class JUnitReporter(
   def reportTestPassed(method: String, elapsedMillis: Double): Unit = {
     log(
       Info,
-      AnsiColors.c(s"+ $method", AnsiColors.GREEN) + " " +
+      AnsiColors.c(s"  + $method", AnsiColors.GREEN) + " " +
         formatTime(elapsedMillis)
     )
     emitEvent(method, Status.Success)

diff --git a/tests/shared/src/main/scala/munit/FixtureFrameworkSuite.scala b/tests/shared/src/main/scala/munit/FixtureFrameworkSuite.scala
@@ -56,23 +56,23 @@ object FixtureFrameworkSuite
          |afterEach(a, 1)
          |afterEach(b, 1)
          |afterEach(ad-hoc, 1)
-         |+ 1 <elapsed time>
+         |  + 1 <elapsed time>
          |beforeEach(ad-hoc, 2)
          |beforeEach(a, 2)
          |beforeEach(b, 2)
          |test(2)
          |afterEach(a, 2)
          |afterEach(b, 2)
          |afterEach(ad-hoc, 2)
-         |+ 2 <elapsed time>
+         |  + 2 <elapsed time>
          |beforeEach(ad-hoc, 3)
          |beforeEach(a, 3)
          |beforeEach(b, 3)
          |test(3)
          |afterEach(a, 3)
          |afterEach(b, 3)
          |afterEach(ad-hoc, 3)
-         |+ 3 <elapsed time>
+         |  + 3 <elapsed time>
          |afterAll(a)
          |afterAll(b)
          |afterAll(ad-hoc)