@@ -9,9 +9,7 @@ import doobie.*
99import doobie .implicits .*
1010import io .circe .{Decoder , Encoder , Json }
1111
12- class PGJsonSuite extends munit.FunSuite {
13-
14- import cats .effect .unsafe .implicits .global
12+ class PGJsonSuite extends munit.CatsEffectSuite {
1513
1614 val xa = Transactor .fromDriverManager[IO ](
1715 driver = " org.postgresql.Driver" ,
@@ -29,13 +27,14 @@ class PGJsonSuite extends munit.FunSuite {
2927
3028 def testInOut [A ](col : String , a : A , t : Transactor [IO ])(implicit m : Get [A ], p : Put [A ]) = {
3129 test(s " Mapping for $col as ${m.typeStack} - write+read $col as ${m.typeStack}" ) {
32- assertEquals( inOut(col, a).transact(t).attempt.unsafeRunSync(), Right (a))
30+ inOut(col, a).transact(t).attempt.assertEquals( Right (a))
3331 }
3432 test(s " Mapping for $col as ${m.typeStack} - write+read $col as Option[ ${m.typeStack}] (Some) " ) {
35- assertEquals( inOut[Option [A ]](col, Some (a)).transact(t).attempt.unsafeRunSync(), Right (Some (a)))
33+ inOut[Option [A ]](col, Some (a)).transact(t).attempt.assertEquals( Right (Some (a)))
3634 }
3735 test(s " Mapping for $col as ${m.typeStack} - write+read $col as Option[ ${m.typeStack}] (None) " ) {
38- assertEquals(inOut[Option [A ]](col, None ).transact(t).attempt.unsafeRunSync(), Right (None ))
36+ inOut[Option [A ]](col, None ).transact(t).attempt.assertEquals(
37+ Right (None ))
3938 }
4039 }
4140
@@ -54,25 +53,26 @@ class PGJsonSuite extends munit.FunSuite {
5453 test(" json should check ok for read" ) {
5554 import doobie .postgres .circe .json .implicits .*
5655
57- val a = sql " select '{}' :: json " .query[Json ].analysis.transact(xa).unsafeRunSync()
58- assertEquals(a. columnTypeErrors, Nil )
56+ val a = sql " select '{}' :: json " .query[Json ].analysis.transact(xa)
57+ a.map(_. columnTypeErrors).assertEquals( Nil )
5958 }
6059 test(" json should check ok for write" ) {
6160 import doobie .postgres .circe .json .implicits .*
62- val a = sql " select ${Json .obj()} :: json " .query[Json ].analysis.transact(xa).unsafeRunSync()
63- assertEquals(a.parameterTypeErrors, Nil )
61+ val a = sql " select ${Json .obj()} :: json " .query[Json ].analysis.transact(xa)
62+ a.map(_.parameterTypeErrors).assertEquals(Nil )
63+
6464 }
6565
6666 test(" jsonb should check ok for read" ) {
6767 import doobie .postgres .circe .jsonb .implicits .*
68- val a = sql " select '{}' :: jsonb " .query[Json ].analysis.transact(xa).unsafeRunSync()
69- assertEquals(a. columnTypeErrors, Nil )
68+ val a = sql " select '{}' :: jsonb " .query[Json ].analysis.transact(xa)
69+ a.map(_. columnTypeErrors).assertEquals( Nil )
7070 }
7171
7272 test(" jsonb should check ok for write" ) {
7373 import doobie .postgres .circe .jsonb .implicits .*
74- val a = sql " select ${Json .obj()} :: jsonb " .query[Json ].analysis.transact(xa).unsafeRunSync()
75- assertEquals(a. parameterTypeErrors, Nil )
74+ val a = sql " select ${Json .obj()} :: jsonb " .query[Json ].analysis.transact(xa)
75+ a.map(_. parameterTypeErrors).assertEquals( Nil )
7676 }
7777
7878 // Encoder / Decoders
@@ -86,12 +86,12 @@ class PGJsonSuite extends munit.FunSuite {
8686 }
8787
8888 test(" fooGet should check ok for read" ) {
89- val a = sql " select '{}' :: json " .query[Foo ].analysis.transact(xa).unsafeRunSync()
90- assertEquals(a. columnTypeErrors, Nil )
89+ val a = sql " select '{}' :: json " .query[Foo ].analysis.transact(xa)
90+ a.map(_. columnTypeErrors).assertEquals( Nil )
9191 }
9292 test(" fooPut check ok for write" ) {
93- val a = sql " select ${Foo (Json .obj())} :: json " .query[Foo ].analysis.transact(xa).unsafeRunSync()
94- assertEquals(a. parameterTypeErrors, Nil )
93+ val a = sql " select ${Foo (Json .obj())} :: json " .query[Foo ].analysis.transact(xa)
94+ a.map(_. parameterTypeErrors).assertEquals( Nil )
9595 }
9696
9797}
0 commit comments