Fix CI failures

* don't run StackTraceFrameworkSuite on Scala.js * run Scalafix + Scalafmt
scalameta · May 10, 2020 · a2a694e · a2a694e
1 parent 5605177
commit a2a694e
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 36 deletions.
diff --git a/munit/non-jvm/src/main/scala/munit/internal/junitinterface/Defaults.scala b/munit/non-jvm/src/main/scala/munit/internal/junitinterface/Defaults.scala
diff --git a/munit/shared/src/main/scala/munit/FunFixtures.scala b/munit/shared/src/main/scala/munit/FunFixtures.scala
@@ -46,7 +46,10 @@ trait FunFixtures { self: FunSuite =>
   }
 
   object FunFixture {
-    def apply[T](setup: TestOptions => T, teardown: T => Unit) = {
+    def apply[T](
+        setup: TestOptions => T,
+        teardown: T => Unit
+    ): FunFixture[T] = {
       implicit val ec = munitExecutionContext
       async[T](
         options => Future { setup(options) },

diff --git a/tests/jvm/src/test/scala/munit/AsyncFixtureOrderSuite.scala b/tests/jvm/src/test/scala/munit/AsyncFixtureOrderSuite.scala
@@ -4,11 +4,11 @@ import scala.concurrent.Future
 import scala.concurrent.Promise
 
 class AsyncFixtureOrderSuite extends FunSuite {
-  val latch = Promise[Unit]
-  var completedFromTest = Option.empty[Boolean]
-  var completedFromTeardown = Option.empty[Boolean]
+  val latch: Promise[Unit] = Promise[Unit]
+  var completedFromTest: Option[Boolean] = None
+  var completedFromTeardown: Option[Boolean] = None
 
-  val latchOnTeardown = FunFixture.async[String](
+  val latchOnTeardown: FunFixture[String] = FunFixture.async[String](
     setup = { test => Future.successful(test.name) },
     teardown = { name =>
       implicit val ec = munitExecutionContext

diff --git a/tests/shared/src/main/scala/munit/AssertionsFrameworkSuite.scala b/tests/shared/src/main/scala/munit/AssertionsFrameworkSuite.scala
@@ -39,23 +39,23 @@ class AssertionsFrameworkSuite extends FunSuite {
 object AssertionsFrameworkSuite
     extends FrameworkTest(
       classOf[AssertionsFrameworkSuite],
-    """|==> failure munit.AssertionsFrameworkSuite.equal-tostring - /scala/munit/AssertionsFrameworkSuite.scala:11 values are not equal even if they have the same `toString()`: C
-       |10:    }
-       |11:    assertEquals[Any, Any](new A(), new B())
-       |12:  }
-       |==> failure munit.AssertionsFrameworkSuite.case-class-productPrefix - /scala/munit/AssertionsFrameworkSuite.scala:21 values are not equal even if they have the same `toString()`: A()
-       |20:    }
-       |21:    assertEquals[Any, Any](a.A(), b.A())
-       |22:  }
-       |==> failure munit.AssertionsFrameworkSuite.different-toString - /scala/munit/AssertionsFrameworkSuite.scala:35
-       |34:    }
-       |35:    assertEquals[Any, Any](a.A(), b.A())
-       |36:  }
-       |values are not the same
-       |=> Obtained
-       |a.A()
-       |=> Diff (- obtained, + expected)
-       |-a.A()
-       |+b.B()
-       |""".stripMargin
+      """|==> failure munit.AssertionsFrameworkSuite.equal-tostring - /scala/munit/AssertionsFrameworkSuite.scala:11 values are not equal even if they have the same `toString()`: C
+         |10:    }
+         |11:    assertEquals[Any, Any](new A(), new B())
+         |12:  }
+         |==> failure munit.AssertionsFrameworkSuite.case-class-productPrefix - /scala/munit/AssertionsFrameworkSuite.scala:21 values are not equal even if they have the same `toString()`: A()
+         |20:    }
+         |21:    assertEquals[Any, Any](a.A(), b.A())
+         |22:  }
+         |==> failure munit.AssertionsFrameworkSuite.different-toString - /scala/munit/AssertionsFrameworkSuite.scala:35
+         |34:    }
+         |35:    assertEquals[Any, Any](a.A(), b.A())
+         |36:  }
+         |values are not the same
+         |=> Obtained
+         |a.A()
+         |=> Diff (- obtained, + expected)
+         |-a.A()
+         |+b.B()
+         |""".stripMargin
     )
diff --git a/tests/shared/src/main/scala/munit/AsyncFixtureFrameworkSuite.scala b/tests/shared/src/main/scala/munit/AsyncFixtureFrameworkSuite.scala
@@ -3,17 +3,17 @@ package munit
 import scala.concurrent.Future
 
 class AsyncFixtureFrameworkSuite extends FunSuite {
-  val failingSetup = FunFixture.async[Unit](
+  val failingSetup: FunFixture[Unit] = FunFixture.async[Unit](
     _ => Future.failed(new Error("failure in setup")),
     _ => Future.successful(())
   )
 
-  val failingTeardown = FunFixture.async[Unit](
+  val failingTeardown: FunFixture[Unit] = FunFixture.async[Unit](
     _ => Future.successful(()),
     _ => Future.failed(new Error("failure in teardown"))
   )
 
-  val unitFixture = FunFixture.async[Unit](
+  val unitFixture: FunFixture[Unit] = FunFixture.async[Unit](
     _ => Future.successful(()),
     _ => Future.successful(())
   )

diff --git a/tests/shared/src/main/scala/munit/AsyncFixtureTeardownFrameworkSuite.scala b/tests/shared/src/main/scala/munit/AsyncFixtureTeardownFrameworkSuite.scala
@@ -5,7 +5,7 @@ import scala.concurrent.Future
 class AsyncFixtureTeardownFrameworkSuite extends FunSuite {
   @volatile var cleanedUp: Boolean = _
 
-  val cleanupInTeardown = FunFixture.async[Unit](
+  val cleanupInTeardown: FunFixture[Unit] = FunFixture.async[Unit](
     _ => { cleanedUp = false; Future.successful(()) },
     _ => { cleanedUp = true; Future.successful(()) }
   )

diff --git a/tests/shared/src/main/scala/munit/StackTraceFrameworkSuite.scala b/tests/shared/src/main/scala/munit/StackTraceFrameworkSuite.scala
@@ -11,6 +11,7 @@ class BaseStackTraceFrameworkSuite(arguments: Array[String], expected: String)
       classOf[StackTraceFrameworkSuite],
       expected,
       arguments = arguments,
+      tags = Set(OnlyJVM),
       onEvent = { event =>
         if (event.throwable().isDefined()) {
           val s = event.throwable().get().getStackTrace()

diff --git a/tests/shared/src/test/scala/munit/Tags.scala → tests/shared/src/main/scala/munit/Tags.scala b/tests/shared/src/test/scala/munit/Tags.scala → tests/shared/src/main/scala/munit/Tags.scala
diff --git a/tests/shared/src/test/scala/munit/BaseFrameworkSuite.scala b/tests/shared/src/test/scala/munit/BaseFrameworkSuite.scala
@@ -13,7 +13,7 @@ import munit.internal.console.AnsiColors
 import munit.internal.PlatformCompat
 import scala.concurrent.Future
 
-abstract class BaseFrameworkSuite extends FunSuite {
+abstract class BaseFrameworkSuite extends BaseSuite {
   val systemOut = System.out
   override def munitIgnore: Boolean = !BuildInfo.scalaVersion.startsWith("2.13")
   def exceptionMessage(ex: Throwable): String = {
@@ -29,7 +29,7 @@ abstract class BaseFrameworkSuite extends FunSuite {
   }
 
   def check(t: FrameworkTest): Unit = {
-    test(t.cls.getSimpleName()) {
+    test(t.cls.getSimpleName().withTags(t.tags)) {
       val baos = new ByteArrayOutputStream()
       val out = new PrintStream(baos)
       val logger = new Logger {

diff --git a/tests/shared/src/test/scala/munit/FunFixtureSuite.scala b/tests/shared/src/test/scala/munit/FunFixtureSuite.scala
@@ -2,7 +2,7 @@ package munit
 
 class FunFixtureSuite extends FunSuite {
   var tearDownName = ""
-  val files = FunFixture[String](
+  val files: FunFixture[String] = FunFixture[String](
     setup = { test => test.name + "-setup" },
     teardown = { name => tearDownName = name }
   )