Update the tests

typelevel · Jun 19, 2022 · b58baef · b58baef
1 parent ba30103
commit b58baef
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 97 deletions.
diff --git a/build.sbt b/build.sbt
@@ -13,7 +13,7 @@ lazy val docs = project
 lazy val root = tlCrossRootProject.aggregate(core)
 
 lazy val core = crossProject(JSPlatform, JVMPlatform)
-  .crossType(CrossType.Full)
+  .crossType(CrossType.Pure)
   .in(file("core"))
   .settings(
     name := "munit-cats-effect",

diff --git a/core/shared/src/test/scala/munit/CatsEffectFixturesSpec.scala b/core/shared/src/test/scala/munit/CatsEffectFixturesSpec.scala
diff --git a/...in/scala/munit/CatsEffectAssertions.scala → ...in/scala/munit/CatsEffectAssertions.scala b/...in/scala/munit/CatsEffectAssertions.scala → ...in/scala/munit/CatsEffectAssertions.scala
diff --git a/...main/scala/munit/CatsEffectFixtures.scala → ...main/scala/munit/CatsEffectFixtures.scala b/...main/scala/munit/CatsEffectFixtures.scala → ...main/scala/munit/CatsEffectFixtures.scala
diff --git a/...n/scala/munit/CatsEffectFunFixtures.scala → ...n/scala/munit/CatsEffectFunFixtures.scala b/...n/scala/munit/CatsEffectFunFixtures.scala → ...n/scala/munit/CatsEffectFunFixtures.scala
diff --git a/...rc/main/scala/munit/CatsEffectSuite.scala → ...rc/main/scala/munit/CatsEffectSuite.scala b/...rc/main/scala/munit/CatsEffectSuite.scala → ...rc/main/scala/munit/CatsEffectSuite.scala
diff --git a/...la/munit/catseffect/ResourceFixture.scala → ...la/munit/catseffect/ResourceFixture.scala b/...la/munit/catseffect/ResourceFixture.scala → ...la/munit/catseffect/ResourceFixture.scala
diff --git a/...hared/src/main/scala/munit/internal.scala → core/src/main/scala/munit/internal.scala b/...hared/src/main/scala/munit/internal.scala → core/src/main/scala/munit/internal.scala
diff --git a/...cala/munit/CatsEffectAssertionsSpec.scala → ...cala/munit/CatsEffectAssertionsSpec.scala b/...cala/munit/CatsEffectAssertionsSpec.scala → ...cala/munit/CatsEffectAssertionsSpec.scala
diff --git a/...unit/CatsEffectAssertionsSyntaxSpec.scala → ...unit/CatsEffectAssertionsSyntaxSpec.scala b/...unit/CatsEffectAssertionsSyntaxSpec.scala → ...unit/CatsEffectAssertionsSyntaxSpec.scala
diff --git a/...unit/CatsEffectFixturesPlatformSpec.scala → .../scala/munit/CatsEffectFixturesSpec.scala b/...unit/CatsEffectFixturesPlatformSpec.scala → .../scala/munit/CatsEffectFixturesSpec.scala
@@ -21,10 +21,10 @@ import munit.catseffect.ResourceFixture.FixtureNotInstantiatedException
 
 import scala.concurrent.duration._
 
-class CatsEffectFixturesPlatformSpec extends CatsEffectSuite with CatsEffectAssertions {
+class CatsEffectFixturesSpec extends CatsEffectSuite with CatsEffectAssertions {
 
-  var acquired: Int = 0
-  var released: Int = 0
+  @volatile var acquired: Int = 0
+  @volatile var released: Int = 0
 
   val fixture = ResourceSuiteLocalFixture(
     "fixture",

diff --git a/...ala/munit/CatsEffectFunFixturesSpec.scala → ...ala/munit/CatsEffectFunFixturesSpec.scala b/...ala/munit/CatsEffectFunFixturesSpec.scala → ...ala/munit/CatsEffectFunFixturesSpec.scala
@@ -16,43 +16,34 @@
 
 package munit
 
-import cats.effect.{IO, SyncIO, Resource}
-import cats.syntax.flatMap._
+import cats.effect.IO
+import cats.effect.Resource
+import cats.effect.SyncIO
 
 import scala.concurrent.Promise
 import scala.concurrent.duration._
 
 class CatsEffectFunFixturesSpec extends CatsEffectSuite with CatsEffectFunFixtures {
   val latch: Promise[Unit] = Promise[Unit]()
-  var completedFromTest: Option[Boolean] = None
-  var completedFromTeardown: Option[Boolean] = None
 
-  var completedFromResourceAcquire: Option[Boolean] = None
-  var completedFromResourceRelease: Option[Boolean] = None
+  @volatile var completedFromTest: Option[Boolean] = None
+
+  @volatile var completedFromResourceAcquire: Option[Boolean] = None
+  @volatile var completedFromResourceRelease: Option[Boolean] = None
 
   val latchOnTeardown: SyncIO[FunFixture[String]] =
-    ResourceFixture[String](
-      resource = Resource.make[IO, String](
-        IO {
-          completedFromResourceAcquire = Some(true)
-          "test"
-        }
-      )(_ =>
-        IO {
-          completedFromResourceRelease = Some(true)
-        }
-      ),
-      setup = { (_: TestOptions, _: String) =>
-        IO {
-          completedFromResourceAcquire = Some(false)
-        }
-      },
-      teardown = { (_: String) =>
-        IO {
-          completedFromResourceRelease = Some(false)
-          completedFromTeardown = Some(latch.trySuccess(()));
-        }
-      }
+    ResourceFunFixture[String](
+      Resource
+        .make[IO, String](
+          IO {
+            completedFromResourceAcquire = Some(true)
+            "test"
+          }
+        )(_ =>
+          IO {
+            completedFromResourceRelease = Some(true)
+          }
+        )
     )
 
   override def afterAll(): Unit = {
@@ -62,8 +53,6 @@ class CatsEffectFunFixturesSpec extends CatsEffectSuite with CatsEffectFunFixtur
     assertEquals(completedFromResourceRelease, Some(true))
     // promise was completed first by the test
     assertEquals(completedFromTest, Some(true))
-    // and then there was a completion attempt by the teardown
-    assertEquals(completedFromTeardown, Some(false))
   }
 
   latchOnTeardown.test("teardown runs only after test completes") { _ =>

diff --git a/...est/scala/munit/CatsEffectSuiteSpec.scala → ...est/scala/munit/CatsEffectSuiteSpec.scala b/...est/scala/munit/CatsEffectSuiteSpec.scala → ...est/scala/munit/CatsEffectSuiteSpec.scala
diff --git a/...d/src/test/scala/munit/ExampleSuite.scala → core/src/test/scala/munit/ExampleSuite.scala b/...d/src/test/scala/munit/ExampleSuite.scala → core/src/test/scala/munit/ExampleSuite.scala
@@ -41,7 +41,7 @@ class ExampleSuite extends CatsEffectSuite {
 
   import cats.effect.std.Dispatcher
 
-  val dispatcher = ResourceFixture(Dispatcher[IO])
+  val dispatcher = ResourceFunFixture(Dispatcher[IO])
 
   dispatcher.test("resources can be lifted to munit fixtures") { dsp =>
     dsp.unsafeRunAndForget(IO(42))