Skip to content

Commit edef036

Browse files
committed
Use Global EC for CatsResource
1 parent be95599 commit edef036

File tree

3 files changed

+68
-6
lines changed

3 files changed

+68
-6
lines changed

scalatest/shared/src/main/scala/cats/effect/testing/scalatest/CatsResource.scala

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,18 @@ trait CatsResource[F[_], A] extends BeforeAndAfterAll { this: FixtureAsyncTestSu
7373
}
7474

7575
override def afterAll(): Unit = {
76-
UnsafeRun[F].unsafeToFuture(shutdown, finiteResourceTimeout)
77-
78-
gate = None
79-
value = None
80-
shutdown = ().pure[F]
76+
UnsafeRun[F].unsafeToFuture(
77+
for {
78+
_ <- shutdown
79+
_ <- Sync[F] delay {
80+
gate = None
81+
value = None
82+
shutdown = ().pure[F]
83+
}
84+
} yield (),
85+
finiteResourceTimeout
86+
)
87+
()
8188
}
8289

8390
override type FixtureParam = A

scalatest/shared/src/main/scala/cats/effect/testing/scalatest/CatsResourceIO.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@ import cats.effect.unsafe.IORuntime
2222

2323
import org.scalatest.FixtureAsyncTestSuite
2424

25-
import scala.concurrent.Future
25+
import scala.concurrent.{ExecutionContext, Future}
2626
import scala.concurrent.duration._
2727

2828
trait CatsResourceIO[A] extends CatsResource[IO, A] with RuntimePlatform { this: FixtureAsyncTestSuite =>
2929

30+
override implicit def executionContext: ExecutionContext = ExecutionContext.global
31+
3032
final def ResourceAsync = Async[IO]
3133

3234
final def ResourceUnsafeRun = _ResourceUnsafeRun
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
package cats.effect.testing.scalatest
2+
3+
import cats.effect.{IO, Resource}
4+
import org.scalatest.concurrent.Eventually
5+
import org.scalatest.events.Event
6+
import org.scalatest.{Args, Reporter}
7+
import org.scalatest.matchers.must.Matchers._
8+
import org.scalatest.wordspec.{AsyncWordSpec, FixtureAsyncWordSpec}
9+
10+
import scala.concurrent.duration._
11+
12+
class CatsResourceAllocationSpecs extends AsyncWordSpec with Eventually {
13+
14+
override implicit def patienceConfig: PatienceConfig =
15+
super.patienceConfig.copy(timeout = 1.second)
16+
17+
@volatile
18+
var beforeCalled: Int = 0
19+
20+
@volatile
21+
var afterCalled: Int = 0
22+
23+
class ResourceSpec
24+
extends FixtureAsyncWordSpec
25+
with AsyncIOSpec
26+
with CatsResourceIO[Unit] {
27+
28+
override val resource: Resource[IO, Unit] =
29+
Resource.make { IO.delay { beforeCalled += 1 } } { _ =>
30+
IO.delay { afterCalled += 1 }
31+
}
32+
33+
"test" should {
34+
"doFoo" in { _ => true mustBe true }
35+
}
36+
}
37+
38+
val reporter: Reporter = (_: Event) => ()
39+
40+
"cats resource allocation" should {
41+
"release the resource" in {
42+
43+
val outerResourceSpec = new ResourceSpec
44+
45+
outerResourceSpec.run(None, Args(reporter))
46+
47+
eventually {
48+
beforeCalled mustBe 1
49+
afterCalled mustBe 1
50+
}
51+
}
52+
}
53+
}

0 commit comments

Comments
 (0)