From a95f7b8bab5531760496c5dc86b95613c0c5f89d Mon Sep 17 00:00:00 2001 From: Adam Fraser Date: Tue, 3 May 2022 16:10:38 -0700 Subject: [PATCH] Upgrade to ZIO 2.0.0-RC6 (#916) * upgrade zio version * fix compilation error --- build.sbt | 2 +- .../zio/prelude/CommutativeEitherSpec.scala | 2 +- .../scala/zio/prelude/AssertionSpec.scala | 4 +-- .../zio/prelude/AssociativeBothSpec.scala | 2 +- .../zio/prelude/AssociativeEitherSpec.scala | 2 +- .../zio/prelude/AssociativeFlattenSpec.scala | 2 +- .../scala/zio/prelude/AssociativeSpec.scala | 2 +- .../test/scala/zio/prelude/CoherentSpec.scala | 2 +- .../zio/prelude/CommutativeBothSpec.scala | 2 +- .../zio/prelude/CommutativeEitherSpec.scala | 2 +- .../scala/zio/prelude/CommutativeSpec.scala | 2 +- .../scala/zio/prelude/CovariantSpec.scala | 2 +- .../test/scala/zio/prelude/DebugSpec.scala | 2 +- .../test/scala/zio/prelude/EqualSpec.scala | 2 +- .../scala/zio/prelude/EquivalenceSpec.scala | 2 +- .../src/test/scala/zio/prelude/Fixtures.scala | 4 +-- .../test/scala/zio/prelude/ForEachSpec.scala | 2 +- .../src/test/scala/zio/prelude/HashSpec.scala | 2 +- .../scala/zio/prelude/IdempotentSpec.scala | 2 +- .../scala/zio/prelude/IdentityBothSpec.scala | 2 +- .../zio/prelude/IdentityEitherSpec.scala | 2 +- .../zio/prelude/IdentityFlattenSpec.scala | 2 +- .../test/scala/zio/prelude/IdentitySpec.scala | 2 +- .../test/scala/zio/prelude/InverseSpec.scala | 2 +- .../test/scala/zio/prelude/NaturalSpec.scala | 2 +- .../test/scala/zio/prelude/NewtypeSpec.scala | 7 ++--- .../zio/prelude/NonEmptyForEachSpec.scala | 2 +- .../scala/zio/prelude/NonEmptyListSpec.scala | 2 +- .../scala/zio/prelude/NonEmptySetSpec.scala | 2 +- .../src/test/scala/zio/prelude/OrdSpec.scala | 2 +- .../test/scala/zio/prelude/ParSeqSpec.scala | 2 +- .../scala/zio/prelude/PartialOrdSpec.scala | 2 +- .../scala/zio/prelude/SafeFunctionSpec.scala | 2 +- .../scala/zio/prelude/ZNonEmptySetSpec.scala | 8 ++--- .../src/test/scala/zio/prelude/ZSetSpec.scala | 12 +++---- .../scala/zio/prelude/ZValidationSpec.scala | 2 +- .../test/scala/zio/prelude/fx/ZPureSpec.scala | 2 +- .../zio/prelude/AssociativeCompose.scala | 2 +- .../src/main/scala/zio/prelude/Equal.scala | 6 ++-- .../DistributiveAbsorptionSpec.scala | 2 +- .../experimental/ExcludedMiddleSpec.scala | 2 +- .../prelude/experimental/InvolutionSpec.scala | 2 +- .../experimental/NoncontradictionSpec.scala | 2 +- .../main/scala/zio/prelude/laws/GenFs.scala | 30 +++++++++--------- .../zio/prelude/laws/TestAssertions.scala | 31 +++++++++++++------ .../AssociativeFlattenJvmSpec.scala | 6 ++-- .../ForEachJvmSpec.scala | 8 ++--- .../HashJvmSpec.scala | 2 +- .../IdentityFlattenJvmSpec.scala | 6 ++-- .../scalaparallelcollections/OrdJvmSpec.scala | 2 +- .../PartialOrdJvmSpec.scala | 2 +- 51 files changed, 107 insertions(+), 95 deletions(-) diff --git a/build.sbt b/build.sbt index 1f44de803..07d1d206b 100644 --- a/build.sbt +++ b/build.sbt @@ -35,7 +35,7 @@ addCommandAlias( ";lawsNative/test;experimentalLawsNative/test" // `test` currently executes only compilation, see `nativeSettings` in `BuildHelper` ) -val zioVersion = "2.0.0-RC5" +val zioVersion = "2.0.0-RC6" lazy val root = project .in(file(".")) diff --git a/core-tests/jvm/src/test/scala/zio/prelude/CommutativeEitherSpec.scala b/core-tests/jvm/src/test/scala/zio/prelude/CommutativeEitherSpec.scala index 269190215..7aad0b688 100644 --- a/core-tests/jvm/src/test/scala/zio/prelude/CommutativeEitherSpec.scala +++ b/core-tests/jvm/src/test/scala/zio/prelude/CommutativeEitherSpec.scala @@ -8,7 +8,7 @@ import scala.concurrent.{Future, blocking} object FutureCommutativeEitherSpec extends ZIOSpecDefault { - def spec: Spec[Any, TestFailure[Throwable], TestSuccess] = + def spec: Spec[Any, Throwable] = suite("FutureCommutativeEitherSpec")( test("FutureCommutativeEither returns the first future that is completed") { ZIO.blocking { diff --git a/core-tests/shared/src/test/scala/zio/prelude/AssertionSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/AssertionSpec.scala index f91df9379..f5c0697b7 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/AssertionSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/AssertionSpec.scala @@ -1,11 +1,11 @@ package zio.prelude import zio.test.Assertion._ -import zio.test.{ZIOSpecDefault, ZSpec, assert} +import zio.test.{Spec, ZIOSpecDefault, assert} object AssertionSpec extends ZIOSpecDefault { - def spec: ZSpec[Environment, Any] = suite("Assertion")( + def spec: Spec[Environment, Any] = suite("Assertion")( test("matches must fail when the regex only match a part of the string") { assert((Assertion.matches("biking").apply("toto like biking")))(isLeft(anything)) }, diff --git a/core-tests/shared/src/test/scala/zio/prelude/AssociativeBothSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/AssociativeBothSpec.scala index f0cda85f0..b8f1141b3 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/AssociativeBothSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/AssociativeBothSpec.scala @@ -11,7 +11,7 @@ object AssociativeBothSpec extends ZIOSpecDefault { implicit val chunkOptionAssociativeBoth: AssociativeBoth[ChunkOption] = AssociativeBoth.compose[Chunk, Option] - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("AssociativeBothSpec")( suite("laws")( test("chunk . option")(checkAllLaws(AssociativeBothLaws)(chunkOptionGenF, Gen.int)) diff --git a/core-tests/shared/src/test/scala/zio/prelude/AssociativeEitherSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/AssociativeEitherSpec.scala index 8715101b1..63772d01e 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/AssociativeEitherSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/AssociativeEitherSpec.scala @@ -6,7 +6,7 @@ import zio.test.laws._ object AssociativeEitherSpec extends ZIOSpecDefault { - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("AssociativeEitherSpec")( suite("laws")( test("either")(checkAllLaws(AssociativeEitherLaws)(GenF.either(Gen.int), Gen.int)) diff --git a/core-tests/shared/src/test/scala/zio/prelude/AssociativeFlattenSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/AssociativeFlattenSpec.scala index 46375703a..9f6cbc8d4 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/AssociativeFlattenSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/AssociativeFlattenSpec.scala @@ -6,7 +6,7 @@ import zio.test.laws._ object AssociativeFlattenSpec extends ZIOSpecDefault { - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("AssociativeFlattenSpec")( suite("laws")( test("map")(checkAllLaws(AssociativeFlattenLaws)(GenFs.map(Gen.int), Gen.int)) diff --git a/core-tests/shared/src/test/scala/zio/prelude/AssociativeSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/AssociativeSpec.scala index 61f063581..eb22dc41d 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/AssociativeSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/AssociativeSpec.scala @@ -4,7 +4,7 @@ import zio.test._ object AssociativeSpec extends ZIOSpecDefault { - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("AssociativeSpec")( suite("laws")( ) diff --git a/core-tests/shared/src/test/scala/zio/prelude/CoherentSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/CoherentSpec.scala index c4eca69e1..fde528814 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/CoherentSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/CoherentSpec.scala @@ -9,7 +9,7 @@ import zio.test._ object CoherentSpec extends ZIOSpecDefault { - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("CoherentSpec")( test("HashOrd") { val instance = implicitly[HashOrd[Double]].contramap[Int](_.toDouble) diff --git a/core-tests/shared/src/test/scala/zio/prelude/CommutativeBothSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/CommutativeBothSpec.scala index a233887d2..6d178bed6 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/CommutativeBothSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/CommutativeBothSpec.scala @@ -6,7 +6,7 @@ import zio.test.laws._ object CommutativeBothSpec extends ZIOSpecDefault { - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("CommutativeBothSpec")( suite("laws")( test("chunk")(checkAllLaws(CommutativeBothLaws)(GenF.chunk, Gen.chunkOf(Gen.int))), diff --git a/core-tests/shared/src/test/scala/zio/prelude/CommutativeEitherSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/CommutativeEitherSpec.scala index 5ce336482..c88e2b88d 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/CommutativeEitherSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/CommutativeEitherSpec.scala @@ -11,7 +11,7 @@ object CommutativeEitherSpec extends ZIOSpecDefault { coherent.CommutativeEitherDeriveEqualInvariant.derive[Set] - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("CommutativeEitherSpec")( suite("laws")( test("set")(checkAllLaws(CommutativeEitherLaws)(GenF.set, Gen.int)) diff --git a/core-tests/shared/src/test/scala/zio/prelude/CommutativeSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/CommutativeSpec.scala index 59e3b6078..60e1fc1a6 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/CommutativeSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/CommutativeSpec.scala @@ -12,7 +12,7 @@ object CommutativeSpec extends ZIOSpecDefault { private implicit val DoubleEqual: Equal[Double] = Equal.DoubleEqualWithEpsilon() private implicit val FloatEqual: Equal[Float] = Equal.FloatEqualWithEpsilon() - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("CommutativeSpec")( suite("laws")( test("boolean conjuction")(checkAllLaws(CommutativeLaws)(Gen.boolean.map(And(_)))), diff --git a/core-tests/shared/src/test/scala/zio/prelude/CovariantSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/CovariantSpec.scala index bf13062a0..3e1fc225a 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/CovariantSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/CovariantSpec.scala @@ -11,7 +11,7 @@ object CovariantSpec extends ZIOSpecDefault { implicit val chunkOptionCovariant: Covariant[ChunkOption] = Covariant[Chunk].compose(Covariant[Option]) - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("CovariantSpec")( suite("laws")( test("cause")(checkAllLaws(CovariantLaws)(GenFs.cause, Gen.int)), diff --git a/core-tests/shared/src/test/scala/zio/prelude/DebugSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/DebugSpec.scala index 7c5d2b54b..854d1cc51 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/DebugSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/DebugSpec.scala @@ -44,7 +44,7 @@ object DebugSpec extends ZIOSpecDefault { def expectedTupleFull(n: Int)(v: Int): String = s"scala.Tuple$n(${List.fill(n)(v).mkString(", ")})" def expectedTupleSimple(n: Int)(v: Int): String = s"(${List.fill(n)(v).mkString(", ")})" - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("DebugSpec")( suite("ScalaRenderer")( test("unit")(check(Gen.unit)(primScalaTest(_, Some("()")))), diff --git a/core-tests/shared/src/test/scala/zio/prelude/EqualSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/EqualSpec.scala index b92e4e6c8..6b51c2106 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/EqualSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/EqualSpec.scala @@ -7,7 +7,7 @@ import zio.test.laws._ object EqualSpec extends ZIOSpecDefault { - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("EqualSpec")( suite("laws")( { diff --git a/core-tests/shared/src/test/scala/zio/prelude/EquivalenceSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/EquivalenceSpec.scala index 7d7e7e911..12fa167d6 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/EquivalenceSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/EquivalenceSpec.scala @@ -13,7 +13,7 @@ object EquivalenceSpec extends ZIOSpecDefault { val genNothing: Gen[Any, Nothing] = Gen(ZStream.empty) - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("EquivalenceSpec")( suite("laws")( test("either") { diff --git a/core-tests/shared/src/test/scala/zio/prelude/Fixtures.scala b/core-tests/shared/src/test/scala/zio/prelude/Fixtures.scala index a56180711..6458cf7d7 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/Fixtures.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/Fixtures.scala @@ -2,7 +2,7 @@ package zio.prelude import zio.test.laws.GenF import zio.test.{Gen, Sized} -import zio.{Chunk, ZTraceElement} +import zio.{Chunk, Trace} object Fixtures { type ChunkOption[+A] = Chunk[Option[A]] @@ -10,7 +10,7 @@ object Fixtures { val chunkOptionGenF: GenF[Sized, ChunkOption] = new GenF[Sized, ChunkOption] { def apply[R1 <: Sized, A](gen: Gen[R1, A])(implicit - trace: ZTraceElement + trace: Trace ): Gen[R1, Chunk[Option[A]]] = Gen.chunkOf(Gen.option(gen)) } diff --git a/core-tests/shared/src/test/scala/zio/prelude/ForEachSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/ForEachSpec.scala index 71a790955..77116afb5 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/ForEachSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/ForEachSpec.scala @@ -42,7 +42,7 @@ object ForEachSpec extends ZIOSpecDefault { implicit val chunkOptionForEach: ForEach[ChunkOption] = ForEach[Chunk].compose[Option] - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("ForEachSpec")( suite("laws")( test("chunk")(checkAllLaws(ForEachLaws)(GenF.chunk, Gen.int)), diff --git a/core-tests/shared/src/test/scala/zio/prelude/HashSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/HashSpec.scala index cb427a2c1..494f49ff2 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/HashSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/HashSpec.scala @@ -11,7 +11,7 @@ object HashSpec extends ZIOSpecDefault { final def scalaHashCodeConsistency[R, A: Hash](gen: Gen[R, A]): ZIO[R with TestConfig, Nothing, TestResult] = check(gen)(a => assert(a.hash)(equalTo(a.hashCode))) - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("HashSpec")( suite("laws")( test("boolean")(checkAllLaws(HashLaws)(Gen.boolean)), diff --git a/core-tests/shared/src/test/scala/zio/prelude/IdempotentSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/IdempotentSpec.scala index 028b560ba..bc4f7d46e 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/IdempotentSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/IdempotentSpec.scala @@ -31,7 +31,7 @@ object IdempotentSpec extends ZIOSpecDefault { private implicit val DoubleEqual: Equal[Double] = Equal.DoubleEqualWithEpsilon() private implicit val FloatEqual: Equal[Float] = Equal.FloatEqualWithEpsilon() - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("IdempotentSpec")( suite("laws")( test("boolean conjuction")(checkAllLaws(IdempotentLaws)(Gen.boolean.map(And(_)))), diff --git a/core-tests/shared/src/test/scala/zio/prelude/IdentityBothSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/IdentityBothSpec.scala index a20f04a53..ab347d873 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/IdentityBothSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/IdentityBothSpec.scala @@ -6,7 +6,7 @@ import zio.test.laws._ object IdentityBothSpec extends ZIOSpecDefault { - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("IdentityBothSpec")( suite("laws")( test("either")(checkAllLaws(IdentityBothLaws)(GenF.either(Gen.int), Gen.int)), diff --git a/core-tests/shared/src/test/scala/zio/prelude/IdentityEitherSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/IdentityEitherSpec.scala index 4470cefc2..fc7379a63 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/IdentityEitherSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/IdentityEitherSpec.scala @@ -6,7 +6,7 @@ import zio.test.laws._ object IdentityEitherSpec extends ZIOSpecDefault { - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("IdentityEitherSpec")( suite("laws")( test("chunk")(checkAllLaws(IdentityEitherlaws)(GenF.chunk, Gen.int)), diff --git a/core-tests/shared/src/test/scala/zio/prelude/IdentityFlattenSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/IdentityFlattenSpec.scala index 04340ae9e..acecab895 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/IdentityFlattenSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/IdentityFlattenSpec.scala @@ -6,7 +6,7 @@ import zio.test.laws._ object IdentityFlattenSpec extends ZIOSpecDefault { - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("IdentityFlattenSpec")( suite("laws")( test("chunk")(checkAllLaws(IdentityFlattenLaws)(GenF.chunk, Gen.chunkOf(Gen.int))), diff --git a/core-tests/shared/src/test/scala/zio/prelude/IdentitySpec.scala b/core-tests/shared/src/test/scala/zio/prelude/IdentitySpec.scala index 218bfd83f..522bd8906 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/IdentitySpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/IdentitySpec.scala @@ -10,7 +10,7 @@ object IdentitySpec extends ZIOSpecDefault { private implicit val DoubleEqual: Equal[Double] = Equal.DoubleEqualWithEpsilon() private implicit val FloatEqual: Equal[Float] = Equal.FloatEqualWithEpsilon() - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("IdentitySpec")( suite("laws")( test("boolean conjuction")(checkAllLaws(IdentityLaws)(Gen.boolean.map(And(_)))), diff --git a/core-tests/shared/src/test/scala/zio/prelude/InverseSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/InverseSpec.scala index f238cef0c..fe7f0e187 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/InverseSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/InverseSpec.scala @@ -10,7 +10,7 @@ object InverseSpec extends ZIOSpecDefault { private implicit val DoubleEqual: Equal[Double] = Equal.DoubleEqualWithEpsilon() private implicit val FloatEqual: Equal[Float] = Equal.FloatEqualWithEpsilon() - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("InverseSpec")( suite("laws")( test("byte addition")(checkAllLaws(InverseLaws)(Gen.byte.map(Sum(_)))), diff --git a/core-tests/shared/src/test/scala/zio/prelude/NaturalSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/NaturalSpec.scala index 597f398ed..d5d901300 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/NaturalSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/NaturalSpec.scala @@ -7,7 +7,7 @@ import zio.test.laws._ object NaturalSpec extends ZIOSpecDefault { - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("NaturalSpec")( suite("laws")( test("product commutative")(checkAllLaws(CommutativeLaws)(Gens.anyNatural.map(Prod(_)))), diff --git a/core-tests/shared/src/test/scala/zio/prelude/NewtypeSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/NewtypeSpec.scala index 565d5dd4a..c518aeb77 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/NewtypeSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/NewtypeSpec.scala @@ -5,7 +5,6 @@ import zio.prelude.NewtypeSpecTypes._ import zio.prelude.laws._ import zio.prelude.newtypes.{And, Or, Sum} import zio.test.Assertion.{equalTo => _, _} -import zio.test.AssertionM.Render.param import zio.test.{Assertion => TestAssertion, _} object NewtypeSpec extends ZIOSpecDefault { @@ -43,7 +42,7 @@ object NewtypeSpec extends ZIOSpecDefault { ) }, test("invalid values at compile-time") { - assertM(typeCheck("Natural(-1, -8, 4, -3)"))( + assertZIO(typeCheck("Natural(-1, -8, 4, -3)"))( isLeft( containsStringWithoutAnsi("-1 did not satisfy greaterThanOrEqualTo(0)") && containsStringWithoutAnsi("-8 did not satisfy greaterThanOrEqualTo(0)") && @@ -52,7 +51,7 @@ object NewtypeSpec extends ZIOSpecDefault { ) } @@ TestAspect.exceptScala3, test("invalid value at run-time") { - assertM(typeCheck("Natural(-1)"))( + assertZIO(typeCheck("Natural(-1)"))( isLeft(containsStringWithoutAnsi("-1 did not satisfy greaterThanOrEqualTo(0)")) ) } @@ TestAspect.exceptScala3, @@ -149,5 +148,5 @@ object NewtypeSpec extends ZIOSpecDefault { } private def containsStringWithoutAnsi(element: String): TestAssertion[String] = - TestAssertion.assertion("containsStringWithoutAnsi")(param(element))(_.removingAnsiCodes.contains(element)) + TestAssertion.assertion("containsStringWithoutAnsi")(_.removingAnsiCodes.contains(element)) } diff --git a/core-tests/shared/src/test/scala/zio/prelude/NonEmptyForEachSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/NonEmptyForEachSpec.scala index 937c177de..2e1b386ca 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/NonEmptyForEachSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/NonEmptyForEachSpec.scala @@ -18,7 +18,7 @@ object NonEmptyForEachSpec extends ZIOSpecDefault { val genIntFunction2: Gen[Any, (Int, Int) => Int] = Gen.function2(genInt) - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("NonEmptyForEachSpec")( suite("laws")( test("nonEmptyChunk")(checkAllLaws(NonEmptyForEachLaws)(GenFs.nonEmptyChunk, Gen.int)) diff --git a/core-tests/shared/src/test/scala/zio/prelude/NonEmptyListSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/NonEmptyListSpec.scala index 3fe14ae9f..c43889275 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/NonEmptyListSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/NonEmptyListSpec.scala @@ -43,7 +43,7 @@ object NonEmptyListSpec extends ZIOSpecDefault { index <- Gen.int(-2, cons.length + 2) } yield (cons, index) - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("NonEmptyListSpec")( suite("laws")( test("associative")(checkAllLaws(AssociativeLaws)(genNonEmptyList)), diff --git a/core-tests/shared/src/test/scala/zio/prelude/NonEmptySetSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/NonEmptySetSpec.scala index e7ee3643c..cf2a0f9e6 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/NonEmptySetSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/NonEmptySetSpec.scala @@ -18,7 +18,7 @@ object NonEmptySetSpec extends ZIOSpecDefault { private lazy val genNonEmptySet: Gen[Sized, NonEmptySet[Int]] = genSet.map(NonEmptySet.fromSetOption(_).get) - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("NonEmptySetSpec")( suite("laws")( test("commutativeEither")(checkAllLaws(CommutativeEitherLaws)(GenFs.nonEmptySet, Gen.int)), diff --git a/core-tests/shared/src/test/scala/zio/prelude/OrdSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/OrdSpec.scala index 1f11b4cad..7a219534a 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/OrdSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/OrdSpec.scala @@ -40,7 +40,7 @@ object OrdSpec extends ZIOSpecDefault { } } - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("OrdSpec")( suite("laws")( test("boolean")(checkAllLaws(OrdLaws)(Gen.boolean)), diff --git a/core-tests/shared/src/test/scala/zio/prelude/ParSeqSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/ParSeqSpec.scala index 68b9094e5..f0b79981e 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/ParSeqSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/ParSeqSpec.scala @@ -26,7 +26,7 @@ object ParSeqSpec extends ZIOSpecDefault { val hash = ParSeq.parSeqHash - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("parSeqSpec")( suite("laws")( test("covariant") { diff --git a/core-tests/shared/src/test/scala/zio/prelude/PartialOrdSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/PartialOrdSpec.scala index ea7e765a9..0f2b46688 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/PartialOrdSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/PartialOrdSpec.scala @@ -6,7 +6,7 @@ import zio.test.laws._ object PartialOrdSpec extends ZIOSpecDefault { - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("OrdSpec")( suite("laws")( test("map")(checkAllLaws(PartialOrdLaws)(Gen.mapOf(Gen.int, Gen.int))), diff --git a/core-tests/shared/src/test/scala/zio/prelude/SafeFunctionSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/SafeFunctionSpec.scala index d9504a835..ed5a50745 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/SafeFunctionSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/SafeFunctionSpec.scala @@ -16,7 +16,7 @@ object SafeFunctionSpec extends ZIOSpecDefault { def increment(n: Int): Int = n + 1 - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("SafeFunctionSpec")( test("andThen") { val wordCount = SafeFunction(words) andThen SafeFunction(count) diff --git a/core-tests/shared/src/test/scala/zio/prelude/ZNonEmptySetSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/ZNonEmptySetSpec.scala index 54875082f..6fbfd3a4c 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/ZNonEmptySetSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/ZNonEmptySetSpec.scala @@ -8,7 +8,7 @@ import zio.prelude.laws._ import zio.prelude.newtypes._ import zio.test._ import zio.test.laws._ -import zio.{Chunk, ZTraceElement} +import zio.{Chunk, Trace} object ZNonEmptySetSpec extends ZIOSpecDefault { @@ -16,7 +16,7 @@ object ZNonEmptySetSpec extends ZIOSpecDefault { b: Gen[R, B] ): GenF[R, ({ type lambda[+x] = ZNonEmptySet[x, B] })#lambda] = new GenF[R, ({ type lambda[+x] = ZNonEmptySet[x, B] })#lambda] { - def apply[R1 <: R, A](a: Gen[R1, A])(implicit trace: ZTraceElement): Gen[R1, ZNonEmptySet[A, B]] = + def apply[R1 <: R, A](a: Gen[R1, A])(implicit trace: Trace): Gen[R1, ZNonEmptySet[A, B]] = genZNonEmptySet(a, b) } @@ -29,7 +29,7 @@ object ZNonEmptySetSpec extends ZIOSpecDefault { implicit def SumIdentity[A: Identity]: Identity[Sum[A]] = Identity[A].invmap(Equivalence(Sum.wrap, Sum.unwrap)) - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("ZNonEmptySetSpec")( suite("laws")( test("combine commutative")( @@ -50,7 +50,7 @@ object ZNonEmptySetSpec extends ZIOSpecDefault { ZNonEmptySetDeriveEqual(IntHashOrd, Identity[Sum[Int]]) ), IntHashOrd, - implicitly[ZTraceElement] + implicitly[Trace] ) ), test("hash")(checkAllLaws(HashLaws)(genZNonEmptySet(Gen.int, Gen.int))) diff --git a/core-tests/shared/src/test/scala/zio/prelude/ZSetSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/ZSetSpec.scala index d1c6f293b..39283ff98 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/ZSetSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/ZSetSpec.scala @@ -9,13 +9,13 @@ import zio.prelude.newtypes._ import zio.test.Assertion.{equalTo => _, _} import zio.test._ import zio.test.laws._ -import zio.{Chunk, ZTraceElement} +import zio.{Chunk, Trace} object ZSetSpec extends ZIOSpecDefault { def genFZSet[R <: Sized, B](b: Gen[R, B]): GenF[R, ({ type lambda[+x] = ZSet[x, B] })#lambda] = new GenF[R, ({ type lambda[+x] = ZSet[x, B] })#lambda] { - def apply[R1 <: R, A](a: Gen[R1, A])(implicit trace: ZTraceElement): Gen[R1, ZSet[A, B]] = + def apply[R1 <: R, A](a: Gen[R1, A])(implicit trace: Trace): Gen[R1, ZSet[A, B]] = genZSet(a, b) } @@ -25,7 +25,7 @@ object ZSetSpec extends ZIOSpecDefault { lazy val smallInts: Gen[Sized, Chunk[Int]] = Gen.chunkOf(Gen.int(-10, 10)) - def natural(min: Natural, max: Natural)(implicit trace: ZTraceElement): Gen[Any, Natural] = + def natural(min: Natural, max: Natural)(implicit trace: Trace): Gen[Any, Natural] = Gen.int(min, max).map(_.asInstanceOf[Natural]) def naturals: Gen[Sized, Natural] = @@ -34,7 +34,7 @@ object ZSetSpec extends ZIOSpecDefault { implicit def SumIdentity[A: Identity]: Identity[Sum[A]] = Identity[A].invmap(Equivalence(Sum.wrap, Sum.unwrap)) - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("ZSetSpec")( suite("laws")( test("combine commutative")( @@ -55,7 +55,7 @@ object ZSetSpec extends ZIOSpecDefault { ZSetDeriveEqual(IntHashOrd, Identity[Sum[Int]]) ), IntHashOrd, - implicitly[ZTraceElement] + implicitly[Trace] ) ), test("foreach")( @@ -73,7 +73,7 @@ object ZSetSpec extends ZIOSpecDefault { MultiSetForEach ), IntHashOrd, - implicitly[ZTraceElement] + implicitly[Trace] ) ), test("hash")(checkAllLaws(HashLaws)(genZSet(Gen.int, Gen.int))) diff --git a/core-tests/shared/src/test/scala/zio/prelude/ZValidationSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/ZValidationSpec.scala index f85dd1959..a46118f8d 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/ZValidationSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/ZValidationSpec.scala @@ -18,7 +18,7 @@ object ZValidationSpec extends ZIOSpecDefault { val genFValidationFailure: GenF[Sized, ({ type lambda[+x] = newtypes.Failure[ZValidation[Int, x, Int]] })#lambda] = GenFs.validationFailure(Gen.int, Gen.int) - def spec: ZSpec[Environment, Any] = suite("ZValidationSpec")( + def spec: Spec[Environment, Any] = suite("ZValidationSpec")( suite("laws")( test("associativeBoth")(checkAllLaws(AssociativeBothLaws)(genFValidation, Gen.int)), test("commutativeBoth")(checkAllLaws(CommutativeBothLaws)(genFValidation, Gen.int)), diff --git a/core-tests/shared/src/test/scala/zio/prelude/fx/ZPureSpec.scala b/core-tests/shared/src/test/scala/zio/prelude/fx/ZPureSpec.scala index ffca2530c..272aab1a7 100644 --- a/core-tests/shared/src/test/scala/zio/prelude/fx/ZPureSpec.scala +++ b/core-tests/shared/src/test/scala/zio/prelude/fx/ZPureSpec.scala @@ -35,7 +35,7 @@ object ZPureSpec extends ZIOSpecDefault { lazy val genStateState: Gen[Any, State[Int, State[Int, Int]]] = Gens.state(genInt, genState) - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("ZPureSpec")( suite("context")( suite("constructors")( diff --git a/core/shared/src/main/scala/zio/prelude/AssociativeCompose.scala b/core/shared/src/main/scala/zio/prelude/AssociativeCompose.scala index 6c6fe88b8..09fd2b303 100644 --- a/core/shared/src/main/scala/zio/prelude/AssociativeCompose.scala +++ b/core/shared/src/main/scala/zio/prelude/AssociativeCompose.scala @@ -47,7 +47,7 @@ object AssociativeCompose { implicit val URIOIdentityCompose: IdentityCompose[({ type lambda[-r, +a] = URIO[r, ZEnvironment[a]] })#lambda] = new IdentityCompose[({ type lambda[-r, +a] = URIO[r, ZEnvironment[a]] })#lambda] { - def identity[A]: URIO[A, ZEnvironment[A]] = URIO.environment + def identity[A]: URIO[A, ZEnvironment[A]] = ZIO.environment def compose[A, B, C](bc: URIO[B, ZEnvironment[C]], ab: URIO[A, ZEnvironment[B]]): URIO[A, ZEnvironment[C]] = ab.flatMap(b => bc.provideEnvironment(b)) diff --git a/core/shared/src/main/scala/zio/prelude/Equal.scala b/core/shared/src/main/scala/zio/prelude/Equal.scala index 521114e53..19eee13a5 100644 --- a/core/shared/src/main/scala/zio/prelude/Equal.scala +++ b/core/shared/src/main/scala/zio/prelude/Equal.scala @@ -18,7 +18,7 @@ package zio.prelude import zio.Exit.{Failure, Success} import zio.prelude.coherent.{HashOrd, HashPartialOrd} -import zio.{Cause, Chunk, Duration => ZIODuration, Exit, FiberId, NonEmptyChunk, ZTrace} +import zio.{Cause, Chunk, Duration => ZIODuration, Exit, FiberId, NonEmptyChunk, StackTrace} import scala.annotation.implicitNotFound import scala.concurrent.duration.{Duration => ScalaDuration} @@ -890,9 +890,9 @@ object Equal { } /** - * `Hash` (and thus also `Equal`) instance for `ZTrace` values. + * `Hash` (and thus also `Equal`) instance for `StackTrace` values. */ - implicit val ZTraceHash: Hash[ZTrace] = + implicit val StackTraceHash: Hash[StackTrace] = Hash.default /** diff --git a/experimental-tests/shared/src/test/scala/zio/prelude/experimental/DistributiveAbsorptionSpec.scala b/experimental-tests/shared/src/test/scala/zio/prelude/experimental/DistributiveAbsorptionSpec.scala index b4e683ed5..935dc3e05 100644 --- a/experimental-tests/shared/src/test/scala/zio/prelude/experimental/DistributiveAbsorptionSpec.scala +++ b/experimental-tests/shared/src/test/scala/zio/prelude/experimental/DistributiveAbsorptionSpec.scala @@ -7,7 +7,7 @@ import zio.test.laws._ object DistributiveAbsorptionSpec extends ZIOSpecDefault { - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("DistributiveAbsorptionSpec")( suite("laws")( test("set")(checkAllLaws(DistributiveAbsorptionLaws)(Gen.setOf(Gen.int))), diff --git a/experimental-tests/shared/src/test/scala/zio/prelude/experimental/ExcludedMiddleSpec.scala b/experimental-tests/shared/src/test/scala/zio/prelude/experimental/ExcludedMiddleSpec.scala index 073b8512b..863dd6b41 100644 --- a/experimental-tests/shared/src/test/scala/zio/prelude/experimental/ExcludedMiddleSpec.scala +++ b/experimental-tests/shared/src/test/scala/zio/prelude/experimental/ExcludedMiddleSpec.scala @@ -7,7 +7,7 @@ import zio.test.laws._ object ExcludedMiddleSpec extends ZIOSpecDefault { - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("ExcludedMiddleSpec")( suite("laws")( test("boolean")(checkAllLaws(ExcludedMiddleLaws)(Gen.boolean)) diff --git a/experimental-tests/shared/src/test/scala/zio/prelude/experimental/InvolutionSpec.scala b/experimental-tests/shared/src/test/scala/zio/prelude/experimental/InvolutionSpec.scala index 2bb6a1416..d312c6698 100644 --- a/experimental-tests/shared/src/test/scala/zio/prelude/experimental/InvolutionSpec.scala +++ b/experimental-tests/shared/src/test/scala/zio/prelude/experimental/InvolutionSpec.scala @@ -7,7 +7,7 @@ import zio.test.laws._ object InvolutionSpec extends ZIOSpecDefault { - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("InvolutionSpec")( suite("laws")( test("boolean")(checkAllLaws(InvolutionLaws)(Gen.boolean)) diff --git a/experimental-tests/shared/src/test/scala/zio/prelude/experimental/NoncontradictionSpec.scala b/experimental-tests/shared/src/test/scala/zio/prelude/experimental/NoncontradictionSpec.scala index 2f56ec16a..350e996a1 100644 --- a/experimental-tests/shared/src/test/scala/zio/prelude/experimental/NoncontradictionSpec.scala +++ b/experimental-tests/shared/src/test/scala/zio/prelude/experimental/NoncontradictionSpec.scala @@ -7,7 +7,7 @@ import zio.test.laws._ object NoncontradictionSpec extends ZIOSpecDefault { - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("NoncontradictionSpec")( suite("laws")( test("boolean")(checkAllLaws(NoncontradictionLaws)(Gen.boolean)) diff --git a/laws/shared/src/main/scala/zio/prelude/laws/GenFs.scala b/laws/shared/src/main/scala/zio/prelude/laws/GenFs.scala index 402becc56..def867d33 100644 --- a/laws/shared/src/main/scala/zio/prelude/laws/GenFs.scala +++ b/laws/shared/src/main/scala/zio/prelude/laws/GenFs.scala @@ -21,7 +21,7 @@ import zio.prelude.newtypes.Failure import zio.test.Gen.oneOf import zio.test._ import zio.test.laws._ -import zio.{Cause, Exit, NonEmptyChunk, ZTraceElement} +import zio.{Cause, Exit, NonEmptyChunk, Trace} import scala.concurrent.Future import scala.util.Try @@ -37,14 +37,14 @@ object GenFs { val cause: GenF[Sized, Cause] = new GenF[Sized, Cause] { def apply[R1 <: Sized, A](gen: Gen[R1, A])(implicit - trace: ZTraceElement + trace: Trace ): Gen[R1, Cause[A]] = Gen.causes(gen, Gen.throwable) } def either[R <: Sized, E](e: Gen[R, E]): GenF[R, ({ type lambda[+a] = Either[E, a] })#lambda] = new GenF[R, ({ type lambda[+a] = Either[E, a] })#lambda] { - def apply[R1 <: R, A](a: Gen[R1, A])(implicit trace: ZTraceElement): Gen[R1, Either[E, A]] = + def apply[R1 <: R, A](a: Gen[R1, A])(implicit trace: Trace): Gen[R1, Either[E, A]] = Gen.either(e, a) } @@ -55,7 +55,7 @@ object GenFs { e: Gen[R, Cause[E]] ): GenF[R, ({ type lambda[+a] = Exit[E, a] })#lambda] = new GenF[R, ({ type lambda[+a] = Exit[E, a] })#lambda] { - def apply[R1 <: R, A](a: Gen[R1, A])(implicit trace: ZTraceElement): Gen[R1, Exit[E, A]] = + def apply[R1 <: R, A](a: Gen[R1, A])(implicit trace: Trace): Gen[R1, Exit[E, A]] = Gen.either(e, a).map { case Left(cause) => Exit.failCause(cause) case Right(success) => Exit.succeed(success) @@ -68,14 +68,14 @@ object GenFs { val future: GenF[Sized, Future] = new GenF[Sized, Future] { def apply[R1 <: Sized, A](gen: Gen[R1, A])(implicit - trace: ZTraceElement + trace: Trace ): Gen[R1, Future[A]] = oneOf(Gen.throwable.map(Future.failed), gen.map(Future.successful)) } def map[R <: Sized, K](k: Gen[R, K]): GenF[R, ({ type lambda[+v] = Map[K, v] })#lambda] = new GenF[R, ({ type lambda[+v] = Map[K, v] })#lambda] { - def apply[R1 <: R, V](v: Gen[R1, V])(implicit trace: ZTraceElement): Gen[R1, Map[K, V]] = + def apply[R1 <: R, V](v: Gen[R1, V])(implicit trace: Trace): Gen[R1, Map[K, V]] = Gen.mapOf(k, v) } @@ -85,7 +85,7 @@ object GenFs { def nonEmptyChunk: GenF[Sized, NonEmptyChunk] = new GenF[Sized, NonEmptyChunk] { def apply[R1 <: Sized, A](gen: Gen[R1, A])(implicit - trace: ZTraceElement + trace: Trace ): Gen[R1, NonEmptyChunk[A]] = Gen.chunkOf1(gen) } @@ -93,7 +93,7 @@ object GenFs { def nonEmptyList: GenF[Sized, NonEmptyList] = new GenF[Sized, NonEmptyList] { def apply[R1 <: Sized, A](gen: Gen[R1, A])(implicit - trace: ZTraceElement + trace: Trace ): Gen[R1, NonEmptyList[A]] = Gens.nonEmptyListOf(gen) } @@ -101,7 +101,7 @@ object GenFs { def nonEmptySet: GenF[Sized, NonEmptySet] = new GenF[Sized, NonEmptySet] { def apply[R1 <: Sized, A](gen: Gen[R1, A])(implicit - trace: ZTraceElement + trace: Trace ): Gen[R1, NonEmptySet[A]] = Gens.nonEmptySetOf(gen) } @@ -113,7 +113,7 @@ object GenFs { z: Gen[R, Z] ): GenF[R, ({ type lambda[+x] = ParSeq[Z, x] })#lambda] = new GenF[R, ({ type lambda[+x] = ParSeq[Z, x] })#lambda] { - def apply[R1 <: R, A](a: Gen[R1, A])(implicit trace: ZTraceElement): Gen[R1, ParSeq[Z, A]] = + def apply[R1 <: R, A](a: Gen[R1, A])(implicit trace: Trace): Gen[R1, ParSeq[Z, A]] = Gens.parSeq(z, a) } @@ -122,13 +122,13 @@ object GenFs { */ val tryScala: GenF[Sized, Try] = new GenF[Sized, Try] { - def apply[R1 <: Sized, A](gen: Gen[R1, A])(implicit trace: ZTraceElement): Gen[R1, Try[A]] = + def apply[R1 <: Sized, A](gen: Gen[R1, A])(implicit trace: Trace): Gen[R1, Try[A]] = oneOf(Gen.throwable.map(scala.util.Failure(_)), gen.map(scala.util.Success(_))) } def tuple2[R <: Sized, A](a: Gen[R, A]): GenF[R, ({ type lambda[+x] = (A, x) })#lambda] = new GenF[R, ({ type lambda[+x] = (A, x) })#lambda] { - def apply[R1 <: R, B](b: Gen[R1, B])(implicit trace: ZTraceElement): Gen[R1, (A, B)] = + def apply[R1 <: R, B](b: Gen[R1, B])(implicit trace: Trace): Gen[R1, (A, B)] = a.zip(b) } @@ -137,7 +137,7 @@ object GenFs { b: Gen[R, B] ): GenF[R, ({ type lambda[+c] = (A, B, c) })#lambda] = new GenF[R, ({ type lambda[+c] = (A, B, c) })#lambda] { - def apply[R1 <: R, C](c: Gen[R1, C])(implicit trace: ZTraceElement): Gen[R1, (A, B, C)] = + def apply[R1 <: R, C](c: Gen[R1, C])(implicit trace: Trace): Gen[R1, (A, B, C)] = a.zip(b).zip(c) } @@ -146,7 +146,7 @@ object GenFs { e: Gen[R, E] ): GenF[R, ({ type lambda[+x] = ZValidation[W, E, x] })#lambda] = new GenF[R, ({ type lambda[+x] = ZValidation[W, E, x] })#lambda] { - def apply[R1 <: R, A](a: Gen[R1, A])(implicit trace: ZTraceElement): Gen[R1, ZValidation[W, E, A]] = + def apply[R1 <: R, A](a: Gen[R1, A])(implicit trace: Trace): Gen[R1, ZValidation[W, E, A]] = Gens.validation(w, e, a) } @@ -155,7 +155,7 @@ object GenFs { a: Gen[R, A] ): GenF[R, ({ type lambda[+x] = Failure[ZValidation[W, x, A]] })#lambda] = new GenF[R, ({ type lambda[+x] = Failure[ZValidation[W, x, A]] })#lambda] { - def apply[R1 <: R, E](e: Gen[R1, E])(implicit trace: ZTraceElement): Gen[R1, Failure[ZValidation[W, E, A]]] = + def apply[R1 <: R, E](e: Gen[R1, E])(implicit trace: Trace): Gen[R1, Failure[ZValidation[W, E, A]]] = Gens.validation(w, e, a).map(Failure.wrap) } } diff --git a/laws/shared/src/main/scala/zio/prelude/laws/TestAssertions.scala b/laws/shared/src/main/scala/zio/prelude/laws/TestAssertions.scala index 86505b815..6531389e8 100644 --- a/laws/shared/src/main/scala/zio/prelude/laws/TestAssertions.scala +++ b/laws/shared/src/main/scala/zio/prelude/laws/TestAssertions.scala @@ -17,8 +17,8 @@ package zio.prelude import zio.NonEmptyChunk -import zio.test.Assertion.Render._ -import zio.test.{Assertion => TestAssertion} +import zio.test._ +import zio.test.{Assertion => TestAssertion, ErrorMessage => M} /** * Provides versions of assertions from _ZIO Test_ that use `Equal`, `Ord`, and @@ -30,14 +30,14 @@ trait TestAssertions { * Makes a new assertion that requires a value equal the specified value. */ def equalTo[A: Equal](expected: A): TestAssertion[A] = - TestAssertion.assertion("equalTo")(param(expected))(_ === expected) + TestAssertion.assertion("equalTo")(_ === expected) /** * Makes a new assertion that requires a validation failure satisfying a * specified assertion. */ def isFailureV[E](assertion: TestAssertion[NonEmptyChunk[E]]): TestAssertion[ZValidation[Any, E, Any]] = - TestAssertion.assertionRec("isFailureV")(param(assertion))(assertion) { + assertionRec("isFailureV")(assertion) { case ZValidation.Failure(_, es) => Some(es) case _ => None } @@ -47,36 +47,49 @@ trait TestAssertions { * specified reference value. */ def isGreaterThan[A](reference: A)(implicit ord: PartialOrd[A]): TestAssertion[A] = - TestAssertion.assertion("isGreaterThan")(param(reference))(_ > reference) + TestAssertion.assertion("isGreaterThan")(_ > reference) /** * Makes a new assertion that requires the value be greater than or equal to * the specified reference value. */ def isGreaterThanEqualTo[A](reference: A)(implicit ord: PartialOrd[A]): TestAssertion[A] = - TestAssertion.assertion("isGreaterThanEqualTo")(param(reference))(_ >= reference) + TestAssertion.assertion("isGreaterThanEqualTo")(_ >= reference) /** * Makes a new assertion that requires the value be less than the specified * reference value. */ def isLessThan[A](reference: A)(implicit ord: PartialOrd[A]): TestAssertion[A] = - TestAssertion.assertion("isLessThan")(param(reference))(_ < reference) + TestAssertion.assertion("isLessThan")(_ < reference) /** * Makes a new assertion that requires the value be less than or equal to the * specified reference value. */ def isLessThanEqualTo[A](reference: A)(implicit ord: PartialOrd[A]): TestAssertion[A] = - TestAssertion.assertion("isLessThanEqualTo")(param(reference))(_ <= reference) + TestAssertion.assertion("isLessThanEqualTo")(_ <= reference) /** * Makes a new assertion that requires a validation failure satisfying a * specified assertion. */ def isSuccessV[A](assertion: TestAssertion[A]): TestAssertion[ZValidation[Any, Any, A]] = - TestAssertion.assertionRec("isSuccessV")(param(assertion))(assertion) { + assertionRec("isSuccessV")(assertion) { case ZValidation.Success(_, a) => Some(a) case _ => None } + + def assertionRec[A, B](name: String)(assertion: TestAssertion[B])(get: (=> A) => Option[B]): TestAssertion[A] = + TestAssertion( + TestArrow + .make[A, B] { a => + get(a).fold[TestTrace[B]]( + TestTrace.fail(M.text("Custom Assertion") + M.value(name) + M.choice("succeeded", "failed")) + ) { b => + TestTrace.succeed(b) + } + } + .withCode(name) >>> assertion.arrow + ) } diff --git a/scala-parallel-collections/src/test/scala/zio/prelude/scalaparallelcollections/AssociativeFlattenJvmSpec.scala b/scala-parallel-collections/src/test/scala/zio/prelude/scalaparallelcollections/AssociativeFlattenJvmSpec.scala index 16e53bfcd..a8617ee24 100644 --- a/scala-parallel-collections/src/test/scala/zio/prelude/scalaparallelcollections/AssociativeFlattenJvmSpec.scala +++ b/scala-parallel-collections/src/test/scala/zio/prelude/scalaparallelcollections/AssociativeFlattenJvmSpec.scala @@ -2,7 +2,7 @@ package zio.prelude package scalaparallelcollections import com.github.ghik.silencer.silent -import zio.ZTraceElement +import zio.Trace import zio.prelude.laws._ import zio.test._ import zio.test.laws._ @@ -27,11 +27,11 @@ object AssociativeFlattenJvmSpec extends ZIOSpecDefault { k: Gen[R, K] ): GenF[R, ({ type lambda[+v] = par.ParMap[K, v] })#lambda] = new GenF[R, ({ type lambda[+v] = par.ParMap[K, v] })#lambda] { - def apply[R1 <: R, V](v: Gen[R1, V])(implicit trace: ZTraceElement): Gen[R1, par.ParMap[K, V]] = + def apply[R1 <: R, V](v: Gen[R1, V])(implicit trace: Trace): Gen[R1, par.ParMap[K, V]] = Gen.mapOf(k, v).map(_.par) } - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("AssociativeFlattenJvmSpec")( suite("laws")( test("parMap")(checkAllLaws(AssociativeFlattenLaws)(genParMap(Gen.int), Gen.int)) diff --git a/scala-parallel-collections/src/test/scala/zio/prelude/scalaparallelcollections/ForEachJvmSpec.scala b/scala-parallel-collections/src/test/scala/zio/prelude/scalaparallelcollections/ForEachJvmSpec.scala index 781559a14..7640897ea 100644 --- a/scala-parallel-collections/src/test/scala/zio/prelude/scalaparallelcollections/ForEachJvmSpec.scala +++ b/scala-parallel-collections/src/test/scala/zio/prelude/scalaparallelcollections/ForEachJvmSpec.scala @@ -2,7 +2,7 @@ package zio.prelude package scalaparallelcollections import com.github.ghik.silencer.silent -import zio.ZTraceElement +import zio.Trace import zio.prelude.laws._ import zio.test._ import zio.test.laws._ @@ -27,19 +27,19 @@ object ForEachJvmSpec extends ZIOSpecDefault { k: Gen[R, K] ): GenF[R, ({ type lambda[+v] = par.ParMap[K, v] })#lambda] = new GenF[R, ({ type lambda[+v] = par.ParMap[K, v] })#lambda] { - def apply[R1 <: R, V](v: Gen[R1, V])(implicit trace: ZTraceElement): Gen[R1, par.ParMap[K, V]] = + def apply[R1 <: R, V](v: Gen[R1, V])(implicit trace: Trace): Gen[R1, par.ParMap[K, V]] = Gen.mapOf(k, v).map(_.par) } val genParSeq: GenF[Sized, par.ParSeq] = new GenF[Sized, par.ParSeq] { def apply[R1 <: Sized, A](gen: Gen[R1, A])(implicit - trace: ZTraceElement + trace: Trace ): Gen[R1, par.ParSeq[A]] = Gen.listOf(gen).map(_.par) } - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("ForEachJvmSpec")( suite("laws")( test("parMap")(checkAllLaws(ForEachLaws)(genParMap(Gen.int), Gen.int)), diff --git a/scala-parallel-collections/src/test/scala/zio/prelude/scalaparallelcollections/HashJvmSpec.scala b/scala-parallel-collections/src/test/scala/zio/prelude/scalaparallelcollections/HashJvmSpec.scala index 3049b4f36..e4b29e8e0 100644 --- a/scala-parallel-collections/src/test/scala/zio/prelude/scalaparallelcollections/HashJvmSpec.scala +++ b/scala-parallel-collections/src/test/scala/zio/prelude/scalaparallelcollections/HashJvmSpec.scala @@ -21,7 +21,7 @@ object HashJvmSpec extends ZIOSpecDefault { } import ParallelCollectionCompatibility._ - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("HashJvmSpec")( suite("laws")( test("parMap")(checkAllLaws(HashLaws)(Gen.mapOf(Gen.int, Gen.int).map(_.par))), diff --git a/scala-parallel-collections/src/test/scala/zio/prelude/scalaparallelcollections/IdentityFlattenJvmSpec.scala b/scala-parallel-collections/src/test/scala/zio/prelude/scalaparallelcollections/IdentityFlattenJvmSpec.scala index feeacf49b..6b59d55c5 100644 --- a/scala-parallel-collections/src/test/scala/zio/prelude/scalaparallelcollections/IdentityFlattenJvmSpec.scala +++ b/scala-parallel-collections/src/test/scala/zio/prelude/scalaparallelcollections/IdentityFlattenJvmSpec.scala @@ -2,7 +2,7 @@ package zio.prelude package scalaparallelcollections import com.github.ghik.silencer.silent -import zio.ZTraceElement +import zio.Trace import zio.prelude.laws._ import zio.test._ import zio.test.laws._ @@ -26,12 +26,12 @@ object IdentityFlattenJvmSpec extends ZIOSpecDefault { val genParSeq: GenF[Sized, par.ParSeq] = new GenF[Sized, par.ParSeq] { def apply[R1 <: Sized, A](gen: Gen[R1, A])(implicit - trace: ZTraceElement + trace: Trace ): Gen[R1, par.ParSeq[A]] = Gen.listOf(gen).map(_.par) } - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("IdentityFlattenJvmSpec")( suite("laws")( test("parSeq")(checkAllLaws(IdentityFlattenLaws)(genParSeq, Gen.int)) diff --git a/scala-parallel-collections/src/test/scala/zio/prelude/scalaparallelcollections/OrdJvmSpec.scala b/scala-parallel-collections/src/test/scala/zio/prelude/scalaparallelcollections/OrdJvmSpec.scala index b3869cb78..a7ec625d8 100644 --- a/scala-parallel-collections/src/test/scala/zio/prelude/scalaparallelcollections/OrdJvmSpec.scala +++ b/scala-parallel-collections/src/test/scala/zio/prelude/scalaparallelcollections/OrdJvmSpec.scala @@ -20,7 +20,7 @@ object OrdJvmSpec extends ZIOSpecDefault { } import ParallelCollectionCompatibility._ - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("OrdJvmSpec")( suite("laws")( test("parSeq")(checkAllLaws(OrdLaws)(Gen.listOf(Gen.int).map(_.par))) diff --git a/scala-parallel-collections/src/test/scala/zio/prelude/scalaparallelcollections/PartialOrdJvmSpec.scala b/scala-parallel-collections/src/test/scala/zio/prelude/scalaparallelcollections/PartialOrdJvmSpec.scala index 122ae783c..624f94e62 100644 --- a/scala-parallel-collections/src/test/scala/zio/prelude/scalaparallelcollections/PartialOrdJvmSpec.scala +++ b/scala-parallel-collections/src/test/scala/zio/prelude/scalaparallelcollections/PartialOrdJvmSpec.scala @@ -20,7 +20,7 @@ object PartialOrdJvmSpec extends ZIOSpecDefault { } import ParallelCollectionCompatibility._ - def spec: ZSpec[Environment, Any] = + def spec: Spec[Environment, Any] = suite("EqualJvmSpec")( suite("laws")( test("parMap")(checkAllLaws(PartialOrdLaws)(Gen.mapOf(Gen.int, Gen.int).map(_.par))),