Skip to content

Commit 37beb52

Browse files
travisbrowntravisbrown
committed
Use discipline-scalatest
1 parent 869b931 commit 37beb52

File tree

5 files changed

+36
-36
lines changed

5 files changed

+36
-36
lines changed

‎build.sbt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ lazy val optics = crossProject(JSPlatform, JVMPlatform)
6868
"io.circe" %%% "circe-core" % circeVersion,
6969
"io.circe" %%% "circe-generic" % circeVersion % Test,
7070
"io.circe" %%% "circe-testing" % circeVersion % Test,
71-
"org.scalatestplus" %%% "scalatestplus-scalacheck" % "3.1.0.0-RC2" % Test
71+
"org.scalatestplus" %%% "scalacheck-1-14" % "3.1.0.1" % Test,
72+
"org.typelevel" %%% "discipline-scalatest" % "1.0.0" % Test
7273
),
7374
ghpagesNoJekyll := true,
7475
docMappingsApiDir := "api",
@@ -89,9 +90,7 @@ lazy val publishSettings = Seq(
8990
licenses := Seq("Apache 2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")),
9091
publishMavenStyle := true,
9192
publishArtifact in Test := false,
92-
pomIncludeRepository := { _ =>
93-
false
94-
},
93+
pomIncludeRepository := { _ => false },
9594
publishTo := {
9695
val nexus = "https://oss.sonatype.org/"
9796
if (isSnapshot.value)

‎optics/src/test/scala/io/circe/optics/CirceSuite.scala‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@ import io.circe.testing.{ ArbitraryInstances, EqInstances }
77
import org.scalatest.flatspec.AnyFlatSpec
88
import org.scalatestplus.scalacheck.{ Checkers, ScalaCheckDrivenPropertyChecks }
99
import org.typelevel.discipline.Laws
10+
import org.typelevel.discipline.scalatest.FlatSpecDiscipline
1011
import scala.language.implicitConversions
1112

1213
/**
1314
* An opinionated stack of traits to improve consistency and reduce boilerplate in circe tests.
1415
*/
1516
trait CirceSuite
1617
extends AnyFlatSpec
18+
with FlatSpecDiscipline
1719
with ScalaCheckDrivenPropertyChecks
1820
with AllInstances
1921
with AllSyntax

‎optics/src/test/scala/io/circe/optics/DeriveWithIsoSuite.scala‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@ class DeriveWithIsoSuite extends CirceSuite {
1010
case class UserSnake(id: Long, first_name: String, last_name: String)
1111
case class UserCamel(id: Long, firstName: String, lastName: String)
1212

13-
val snake2camel = Iso[UserSnake, UserCamel] { (s: UserSnake) =>
14-
UserCamel(s.id, s.first_name, s.last_name)
15-
} { (s: UserCamel) =>
16-
UserSnake(s.id, s.firstName, s.lastName)
13+
val snake2camel = Iso[UserSnake, UserCamel]((s: UserSnake) => UserCamel(s.id, s.first_name, s.last_name)) {
14+
(s: UserCamel) => UserSnake(s.id, s.firstName, s.lastName)
1715
}
1816

1917
val john: Json = Json.obj(

‎optics/src/test/scala/io/circe/optics/LawsTests.scala‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ object LawsTests extends Laws {
7474
"modify id = id" -> Prop.forAll((s: S, i: I) => laws(i).modifyIdentity(s)),
7575
"compose modify" -> Prop.forAll((s: S, g: A => A, h: A => A, i: I) => laws(i).composeModify(s, g, h)),
7676
"consistent set with modify" -> Prop.forAll((s: S, a: A, i: I) => laws(i).consistentSetModify(s, a)),
77-
"consistent modify with modifyId" -> Prop.forAll((s: S, g: A => A, i: I) => laws(i).consistentModifyModifyId(s, g)
77+
"consistent modify with modifyId" -> Prop.forAll((s: S, g: A => A, i: I) =>
78+
laws(i).consistentModifyModifyId(s, g)
7879
),
7980
"consistent getOption with modifyId" -> Prop.forAll((s: S, i: I) => laws(i).consistentGetOptionModifyId(s))
8081
)

‎optics/src/test/scala/io/circe/optics/OpticsSuite.scala‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,33 +18,33 @@ class OpticsSuite extends CirceSuite {
1818
(x.isNaN && y.isNaN) || x == y
1919
}
2020

21-
checkLaws("Json to Unit", LawsTests.prismTests(jsonNull))
22-
checkLaws("Json to Boolean", LawsTests.prismTests(jsonBoolean))
23-
checkLaws("Json to BigDecimal", LawsTests.prismTests(jsonBigDecimal))
24-
checkLaws("Json to Double", LawsTests.prismTests(jsonDouble))
25-
checkLaws("Json to BigInt", LawsTests.prismTests(jsonBigInt))
26-
checkLaws("Json to Long", LawsTests.prismTests(jsonLong))
27-
checkLaws("Json to Int", LawsTests.prismTests(jsonInt))
28-
checkLaws("Json to Short", LawsTests.prismTests(jsonShort))
29-
checkLaws("Json to Byte", LawsTests.prismTests(jsonByte))
30-
checkLaws("Json to String", LawsTests.prismTests(jsonString))
31-
checkLaws("Json to JsonNumber", LawsTests.prismTests(jsonNumber))
32-
checkLaws("Json to JsonObject", LawsTests.prismTests(jsonObject))
33-
checkLaws("Json to Vector[Json]", LawsTests.prismTests(jsonArray))
34-
35-
checkLaws("JsonNumber to BigDecimal", LawsTests.prismTests(jsonNumberBigDecimal))
36-
checkLaws("JsonNumber to BigInt", LawsTests.prismTests(jsonNumberBigInt))
37-
checkLaws("JsonNumber to Long", LawsTests.prismTests(jsonNumberLong))
38-
checkLaws("JsonNumber to Int", LawsTests.prismTests(jsonNumberInt))
39-
checkLaws("JsonNumber to Short", LawsTests.prismTests(jsonNumberShort))
40-
checkLaws("JsonNumber to Byte", LawsTests.prismTests(jsonNumberByte))
41-
42-
checkLaws("plated Json", LawsTests.traversalTests(plate[Json]))
43-
44-
checkLaws("jsonObjectEach", LawsTests.eachTests[JsonObject, Json])
45-
checkLaws("jsonObjectAt", LawsTests.atTests[JsonObject, String, Option[Json]])
46-
checkLaws("jsonObjectIndex", LawsTests.indexTests[JsonObject, String, Json])
47-
checkLaws("jsonObjectFilterIndex", LawsTests.filterIndexTests[JsonObject, String, Json])
21+
checkAll("Json to Unit", LawsTests.prismTests(jsonNull))
22+
checkAll("Json to Boolean", LawsTests.prismTests(jsonBoolean))
23+
checkAll("Json to BigDecimal", LawsTests.prismTests(jsonBigDecimal))
24+
checkAll("Json to Double", LawsTests.prismTests(jsonDouble))
25+
checkAll("Json to BigInt", LawsTests.prismTests(jsonBigInt))
26+
checkAll("Json to Long", LawsTests.prismTests(jsonLong))
27+
checkAll("Json to Int", LawsTests.prismTests(jsonInt))
28+
checkAll("Json to Short", LawsTests.prismTests(jsonShort))
29+
checkAll("Json to Byte", LawsTests.prismTests(jsonByte))
30+
checkAll("Json to String", LawsTests.prismTests(jsonString))
31+
checkAll("Json to JsonNumber", LawsTests.prismTests(jsonNumber))
32+
checkAll("Json to JsonObject", LawsTests.prismTests(jsonObject))
33+
checkAll("Json to Vector[Json]", LawsTests.prismTests(jsonArray))
34+
35+
checkAll("JsonNumber to BigDecimal", LawsTests.prismTests(jsonNumberBigDecimal))
36+
checkAll("JsonNumber to BigInt", LawsTests.prismTests(jsonNumberBigInt))
37+
checkAll("JsonNumber to Long", LawsTests.prismTests(jsonNumberLong))
38+
checkAll("JsonNumber to Int", LawsTests.prismTests(jsonNumberInt))
39+
checkAll("JsonNumber to Short", LawsTests.prismTests(jsonNumberShort))
40+
checkAll("JsonNumber to Byte", LawsTests.prismTests(jsonNumberByte))
41+
42+
checkAll("plated Json", LawsTests.traversalTests(plate[Json]))
43+
44+
checkAll("jsonObjectEach", LawsTests.eachTests[JsonObject, Json])
45+
checkAll("jsonObjectAt", LawsTests.atTests[JsonObject, String, Option[Json]])
46+
checkAll("jsonObjectIndex", LawsTests.indexTests[JsonObject, String, Json])
47+
checkAll("jsonObjectFilterIndex", LawsTests.filterIndexTests[JsonObject, String, Json])
4848

4949
"jsonDouble" should "round-trip in reverse with Double.NaN" in {
5050
assert(jsonDouble.getOption(jsonDouble.reverseGet(Double.NaN)) === Some(Double.NaN))

0 commit comments

Comments
 (0)