From 266fafcd554cd75fb194d43a9623e005f5e1cc13 Mon Sep 17 00:00:00 2001 From: Adam Fraser Date: Sun, 12 Feb 2023 12:59:30 -0800 Subject: [PATCH 1/2] extend zio base spec --- .../src/test/scala-2.13+/ChunkSpecVersionSpecific.scala | 2 +- .../src/test/scala-3/zio/UnsafeSpecVersionSpecific.scala | 2 +- .../src/test/scala-3/zio/ZLayerDerivationSpec.scala | 2 +- core-tests/shared/src/test/scala/zio/DifferSpec.scala | 2 +- core-tests/shared/src/test/scala/zio/ImportlessSpec.scala | 2 +- core-tests/shared/src/test/scala/zio/SupervisorSpec.scala | 2 +- .../shared/src/test/scala/zio/TagCorrectnessSpec.scala | 4 ++-- core-tests/shared/src/test/scala/zio/UnsafeSpec.scala | 2 +- .../src/test/scala/zio/ZEnvironmentIssuesSpec.scala | 2 +- .../shared/src/test/scala/zio/ZEnvironmentSpec.scala | 2 +- core-tests/shared/src/test/scala/zio/ZKeyedPoolSpec.scala | 2 +- core-tests/shared/src/test/scala/zio/ZStateSpec.scala | 2 +- .../zio/autowire/InjectParameterizedServicesSpec.scala | 5 ++--- .../src/test/scala/zio/metrics/PollingMetricSpec.scala | 2 +- .../src/test/scala/zio/stm/TReentrantLockSpec.scala | 8 ++++---- .../src/test/scala/zio/test/magnolia/DeriveDiffSpec.scala | 2 +- .../src/test/scala/zio/test/magnolia/DeriveGenSpec.scala | 2 +- .../scala/zio/test/results/ResultFileOpsJsonSpec.scala | 2 +- .../src/test/scala/zio/test/ExecutionEventSinkSpec.scala | 2 +- .../zio/test/ParallelSuitesInterleavedResultsSpec.scala | 6 +++--- .../shared/src/test/scala/zio/test/SuiteAllSpec.scala | 2 +- .../src/test/scala/zio/test/TestAnnotationMapSpec.scala | 2 +- .../shared/src/test/scala/zio/test/TestOutputSpec.scala | 2 +- .../src/test/scala/zio/test/ZIOSpecAbstractSpec.scala | 2 +- .../shared/src/test/scala/zio/test/poly/PolySpec.scala | 2 +- 25 files changed, 32 insertions(+), 33 deletions(-) diff --git a/core-tests/shared/src/test/scala-2.13+/ChunkSpecVersionSpecific.scala b/core-tests/shared/src/test/scala-2.13+/ChunkSpecVersionSpecific.scala index ede9e4031772..ee5cf7b9f57e 100644 --- a/core-tests/shared/src/test/scala-2.13+/ChunkSpecVersionSpecific.scala +++ b/core-tests/shared/src/test/scala-2.13+/ChunkSpecVersionSpecific.scala @@ -4,7 +4,7 @@ import zio.test._ import scala.collection.Factory -object ChunkSpecVersionSpecific extends ZIOSpecDefault { +object ChunkSpecVersionSpecific extends ZIOBaseSpec { def spec = suite("ChunkSpecVersionSpecific")( test("to") { diff --git a/core-tests/shared/src/test/scala-3/zio/UnsafeSpecVersionSpecific.scala b/core-tests/shared/src/test/scala-3/zio/UnsafeSpecVersionSpecific.scala index 43283c4580d5..cbc53b161bfe 100644 --- a/core-tests/shared/src/test/scala-3/zio/UnsafeSpecVersionSpecific.scala +++ b/core-tests/shared/src/test/scala-3/zio/UnsafeSpecVersionSpecific.scala @@ -2,7 +2,7 @@ package zio import zio.test._ -object UnsafeSpecVersionSpecific extends ZIOSpecDefault { +object UnsafeSpecVersionSpecific extends ZIOBaseSpec { def spec = suite("UnsafeSpecVersionSpecific") { suite("unsafely")( diff --git a/core-tests/shared/src/test/scala-3/zio/ZLayerDerivationSpec.scala b/core-tests/shared/src/test/scala-3/zio/ZLayerDerivationSpec.scala index a4f981f4c743..6707cca65249 100644 --- a/core-tests/shared/src/test/scala-3/zio/ZLayerDerivationSpec.scala +++ b/core-tests/shared/src/test/scala-3/zio/ZLayerDerivationSpec.scala @@ -2,7 +2,7 @@ package zio import zio.test._ -object ZLayerDerivationSpec extends ZIOSpecDefault { +object ZLayerDerivationSpec extends ZIOBaseSpec { case class OneDependency(d1: String) case class TwoDependencies(d1: String, d2: Int) diff --git a/core-tests/shared/src/test/scala/zio/DifferSpec.scala b/core-tests/shared/src/test/scala/zio/DifferSpec.scala index 05074d455b74..ffc795a97456 100644 --- a/core-tests/shared/src/test/scala/zio/DifferSpec.scala +++ b/core-tests/shared/src/test/scala/zio/DifferSpec.scala @@ -2,7 +2,7 @@ package zio import zio.test._ -object DifferSpec extends ZIOSpecDefault { +object DifferSpec extends ZIOBaseSpec { val smallInt = Gen.int(1, 100) diff --git a/core-tests/shared/src/test/scala/zio/ImportlessSpec.scala b/core-tests/shared/src/test/scala/zio/ImportlessSpec.scala index 7fa3189e0a36..2602582f4458 100644 --- a/core-tests/shared/src/test/scala/zio/ImportlessSpec.scala +++ b/core-tests/shared/src/test/scala/zio/ImportlessSpec.scala @@ -2,7 +2,7 @@ package zio import zio.test._ -object ImportlessSpec extends ZIOSpecDefault { +object ImportlessSpec extends ZIOBaseSpec { val spec = suite("Suite")( test("This is a test without imports")(assertCompletes), test("This is an effectful test without imports")(ZIO.succeed(assertCompletes)) diff --git a/core-tests/shared/src/test/scala/zio/SupervisorSpec.scala b/core-tests/shared/src/test/scala/zio/SupervisorSpec.scala index 7913fb718b77..7f8e9eac2c6a 100644 --- a/core-tests/shared/src/test/scala/zio/SupervisorSpec.scala +++ b/core-tests/shared/src/test/scala/zio/SupervisorSpec.scala @@ -2,7 +2,7 @@ package zio import zio.test._ -object SupervisorSpec extends ZIOSpecDefault { +object SupervisorSpec extends ZIOBaseSpec { def spec = suite("SupervisorSpec")( test("++") { diff --git a/core-tests/shared/src/test/scala/zio/TagCorrectnessSpec.scala b/core-tests/shared/src/test/scala/zio/TagCorrectnessSpec.scala index 5964e2534312..6d7d71acf12a 100644 --- a/core-tests/shared/src/test/scala/zio/TagCorrectnessSpec.scala +++ b/core-tests/shared/src/test/scala/zio/TagCorrectnessSpec.scala @@ -2,7 +2,7 @@ package zio import zio.test._ -object TagCorrectnessSpec extends ZIOSpecDefault { +object TagCorrectnessSpec extends ZIOBaseSpec { def spec = suite("TagCorrectnessSpec")( @@ -110,7 +110,7 @@ object TagCorrectnessSpec extends ZIOSpecDefault { /** * Higher-Kinded Tag Correctness Example */ -object HigherKindedTagCorrectness extends ZIOSpecDefault { +object HigherKindedTagCorrectness extends ZIOBaseSpec { trait Cache[F[_], K, V] { def get(key: K): ZIO[Any, Nothing, F[V]] diff --git a/core-tests/shared/src/test/scala/zio/UnsafeSpec.scala b/core-tests/shared/src/test/scala/zio/UnsafeSpec.scala index 5abfa4340b65..891dae0a51b4 100644 --- a/core-tests/shared/src/test/scala/zio/UnsafeSpec.scala +++ b/core-tests/shared/src/test/scala/zio/UnsafeSpec.scala @@ -2,7 +2,7 @@ package zio import zio.test._ -object UnsafeSpec extends ZIOSpecDefault { +object UnsafeSpec extends ZIOBaseSpec { def spec = suite("UnsafeSpec") { suite("unsafe")( diff --git a/core-tests/shared/src/test/scala/zio/ZEnvironmentIssuesSpec.scala b/core-tests/shared/src/test/scala/zio/ZEnvironmentIssuesSpec.scala index 3cba95dc5fd6..c3ba4fd2fce5 100644 --- a/core-tests/shared/src/test/scala/zio/ZEnvironmentIssuesSpec.scala +++ b/core-tests/shared/src/test/scala/zio/ZEnvironmentIssuesSpec.scala @@ -3,7 +3,7 @@ package zio import zio.test._ import zio.test.TestAspect._ -object ZEnvironmentIssuesSpec extends ZIOSpecDefault { +object ZEnvironmentIssuesSpec extends ZIOBaseSpec { def spec = suite("ZEnvironmentIssuesSpec")( test("Providing a subtype") { diff --git a/core-tests/shared/src/test/scala/zio/ZEnvironmentSpec.scala b/core-tests/shared/src/test/scala/zio/ZEnvironmentSpec.scala index 613e657d0d51..7969e9dbc282 100644 --- a/core-tests/shared/src/test/scala/zio/ZEnvironmentSpec.scala +++ b/core-tests/shared/src/test/scala/zio/ZEnvironmentSpec.scala @@ -2,7 +2,7 @@ package zio import zio.test._ -object ZEnvironmentSpec extends ZIOSpecDefault { +object ZEnvironmentSpec extends ZIOBaseSpec { def spec = suite("ZEnvironmentSpec")( test("getting from an empty environment should succeed") { diff --git a/core-tests/shared/src/test/scala/zio/ZKeyedPoolSpec.scala b/core-tests/shared/src/test/scala/zio/ZKeyedPoolSpec.scala index 24d53ee1c9a7..c02a91e338cd 100644 --- a/core-tests/shared/src/test/scala/zio/ZKeyedPoolSpec.scala +++ b/core-tests/shared/src/test/scala/zio/ZKeyedPoolSpec.scala @@ -2,7 +2,7 @@ package zio import zio.test._ -object ZKeyedPoolSpec extends ZIOSpecDefault { +object ZKeyedPoolSpec extends ZIOBaseSpec { override def spec: Spec[TestEnvironment with Scope, Any] = suite("ZKeyedPoolSpec")( test("acquire release many successfully while other key is blocked") { diff --git a/core-tests/shared/src/test/scala/zio/ZStateSpec.scala b/core-tests/shared/src/test/scala/zio/ZStateSpec.scala index 32c80ee7e8c4..d5caacf6158c 100644 --- a/core-tests/shared/src/test/scala/zio/ZStateSpec.scala +++ b/core-tests/shared/src/test/scala/zio/ZStateSpec.scala @@ -2,7 +2,7 @@ package zio import zio.test._ -object ZStateSpec extends ZIOSpecDefault { +object ZStateSpec extends ZIOBaseSpec { def spec = suite("ZStateSpec")( diff --git a/core-tests/shared/src/test/scala/zio/autowire/InjectParameterizedServicesSpec.scala b/core-tests/shared/src/test/scala/zio/autowire/InjectParameterizedServicesSpec.scala index 224281ce0f9f..3cd4478dc59a 100644 --- a/core-tests/shared/src/test/scala/zio/autowire/InjectParameterizedServicesSpec.scala +++ b/core-tests/shared/src/test/scala/zio/autowire/InjectParameterizedServicesSpec.scala @@ -1,11 +1,10 @@ package zio.autowire -import zio.{EnvironmentTag, UIO, ZIO, ZLayer} +import zio._ import zio.test._ -import zio.ULayer // https://github.com/kitlangton/zio-magic/issues/76 -object InjectParameterizedServicesSpec extends ZIOSpecDefault { +object InjectParameterizedServicesSpec extends ZIOBaseSpec { def spec = suite("Samples")( test("compiles with ParameterisedServiceImpl1 direct usage") { diff --git a/core-tests/shared/src/test/scala/zio/metrics/PollingMetricSpec.scala b/core-tests/shared/src/test/scala/zio/metrics/PollingMetricSpec.scala index 79859dddce98..42b6359632b7 100644 --- a/core-tests/shared/src/test/scala/zio/metrics/PollingMetricSpec.scala +++ b/core-tests/shared/src/test/scala/zio/metrics/PollingMetricSpec.scala @@ -5,7 +5,7 @@ import zio.test._ import TestAspect._ import java.util.concurrent.TimeUnit -object PollingMetricSpec extends ZIOSpecDefault { +object PollingMetricSpec extends ZIOBaseSpec { def spec = suite("PollingMetricSpec")( test("`launch` should be interruptible.") { diff --git a/core-tests/shared/src/test/scala/zio/stm/TReentrantLockSpec.scala b/core-tests/shared/src/test/scala/zio/stm/TReentrantLockSpec.scala index d82dbec507c4..8bf4469257e4 100644 --- a/core-tests/shared/src/test/scala/zio/stm/TReentrantLockSpec.scala +++ b/core-tests/shared/src/test/scala/zio/stm/TReentrantLockSpec.scala @@ -1,11 +1,11 @@ package zio.stm -import zio.{Exit, Promise, Ref, Schedule, ZIO, durationInt} -import zio.test.Assertion._ -import zio.test.TestAspect.{flaky, timeout} +import zio._ import zio.test._ +import zio.test.Assertion._ +import zio.test.TestAspect._ -object TReentrantLockSpec extends ZIOSpecDefault { +object TReentrantLockSpec extends ZIOBaseSpec { def pollSchedule[E, A]: Schedule[Any, Option[Exit[E, A]], Option[Exit[E, A]]] = (Schedule.recurs(100) *> Schedule.identity[Option[Exit[E, A]]]).whileOutput(_.isEmpty) diff --git a/test-magnolia-tests/shared/src/test/scala/zio/test/magnolia/DeriveDiffSpec.scala b/test-magnolia-tests/shared/src/test/scala/zio/test/magnolia/DeriveDiffSpec.scala index 0667bfb2719a..843effdde87f 100644 --- a/test-magnolia-tests/shared/src/test/scala/zio/test/magnolia/DeriveDiffSpec.scala +++ b/test-magnolia-tests/shared/src/test/scala/zio/test/magnolia/DeriveDiffSpec.scala @@ -5,7 +5,7 @@ import zio.test._ import DeriveDiff.gen import java.time.Instant -object DeriveDiffSpec extends ZIOSpecDefault { +object DeriveDiffSpec extends ZIOBaseSpec { final case class Pet(name: String, hasBone: Boolean, favoriteFoods: List[String], birthday: Instant) final case class Person(name: String, nickname: Option[String], age: Int, pet: Pet, person: Option[Person] = None) diff --git a/test-magnolia-tests/shared/src/test/scala/zio/test/magnolia/DeriveGenSpec.scala b/test-magnolia-tests/shared/src/test/scala/zio/test/magnolia/DeriveGenSpec.scala index 744012fd4869..ae9693688f46 100644 --- a/test-magnolia-tests/shared/src/test/scala/zio/test/magnolia/DeriveGenSpec.scala +++ b/test-magnolia-tests/shared/src/test/scala/zio/test/magnolia/DeriveGenSpec.scala @@ -9,7 +9,7 @@ import zio.test._ import java.time.{Instant, LocalDate, LocalDateTime, LocalTime} import java.util.UUID -object DeriveGenSpec extends ZIOSpecDefault { +object DeriveGenSpec extends ZIOBaseSpec { final case class Person(name: String, age: Int) diff --git a/test-tests/jvm-native/src/test/scala/zio/test/results/ResultFileOpsJsonSpec.scala b/test-tests/jvm-native/src/test/scala/zio/test/results/ResultFileOpsJsonSpec.scala index 1ce63b63b96d..329560a93829 100644 --- a/test-tests/jvm-native/src/test/scala/zio/test/results/ResultFileOpsJsonSpec.scala +++ b/test-tests/jvm-native/src/test/scala/zio/test/results/ResultFileOpsJsonSpec.scala @@ -5,7 +5,7 @@ import zio.test._ import java.nio.file.Path -object ResultFileOpsJsonSpec extends ZIOSpecDefault { +object ResultFileOpsJsonSpec extends ZIOBaseSpec { def spec = suite("ResultFileOpsJsonSpec")( test("simple write")( for { diff --git a/test-tests/shared/src/test/scala/zio/test/ExecutionEventSinkSpec.scala b/test-tests/shared/src/test/scala/zio/test/ExecutionEventSinkSpec.scala index 5389f4cc0f5d..1ab95ade887c 100644 --- a/test-tests/shared/src/test/scala/zio/test/ExecutionEventSinkSpec.scala +++ b/test-tests/shared/src/test/scala/zio/test/ExecutionEventSinkSpec.scala @@ -3,7 +3,7 @@ package zio.test import zio.{Random, ZIO} import zio.test.ReporterEventRenderer.ConsoleEventRenderer -object ExecutionEventSinkSpec extends ZIOSpecDefault { +object ExecutionEventSinkSpec extends ZIOBaseSpec { val uuid = SuiteId(0) override def spec = suite("ExecutionEventSinkSpec")( diff --git a/test-tests/shared/src/test/scala/zio/test/ParallelSuitesInterleavedResultsSpec.scala b/test-tests/shared/src/test/scala/zio/test/ParallelSuitesInterleavedResultsSpec.scala index e34aee490bc8..db423b9ef93a 100644 --- a/test-tests/shared/src/test/scala/zio/test/ParallelSuitesInterleavedResultsSpec.scala +++ b/test-tests/shared/src/test/scala/zio/test/ParallelSuitesInterleavedResultsSpec.scala @@ -2,7 +2,7 @@ package zio.test import zio._ -object MultiCMinimalSpec extends ZIOSpecDefault { +object MultiCMinimalSpec extends ZIOBaseSpec { override def spec = suite("MultiSpec")( suite("fast inner suite")( test("fast test 1") { @@ -23,7 +23,7 @@ object MultiCMinimalSpec extends ZIOSpecDefault { ) @@ TestAspect.ignore } -object SmallMinimalSpec extends ZIOSpecDefault { +object SmallMinimalSpec extends ZIOBaseSpec { override def spec = suite("SmallMultiSpec")( suite("fast inner suite")( test("fast test 1") { @@ -33,7 +33,7 @@ object SmallMinimalSpec extends ZIOSpecDefault { ) @@ TestAspect.ignore } -object SlowMinimalSpec extends ZIOSpecDefault { +object SlowMinimalSpec extends ZIOBaseSpec { override def spec = suite("SM")( suite("SMFast ")( test("SMF 1") { diff --git a/test-tests/shared/src/test/scala/zio/test/SuiteAllSpec.scala b/test-tests/shared/src/test/scala/zio/test/SuiteAllSpec.scala index 9239ab10ad10..2ec6f6dc0e71 100644 --- a/test-tests/shared/src/test/scala/zio/test/SuiteAllSpec.scala +++ b/test-tests/shared/src/test/scala/zio/test/SuiteAllSpec.scala @@ -2,7 +2,7 @@ package zio.test import zio._ import zio.test.TestAspect.ignore -object SuiteAllSpec extends ZIOSpecDefault { +object SuiteAllSpec extends ZIOBaseSpec { def spec = suiteAll("SweetSpec!") { diff --git a/test-tests/shared/src/test/scala/zio/test/TestAnnotationMapSpec.scala b/test-tests/shared/src/test/scala/zio/test/TestAnnotationMapSpec.scala index 86b2e65e842b..4fc112124b77 100644 --- a/test-tests/shared/src/test/scala/zio/test/TestAnnotationMapSpec.scala +++ b/test-tests/shared/src/test/scala/zio/test/TestAnnotationMapSpec.scala @@ -2,7 +2,7 @@ package zio.test import zio.test.Assertion._ -object TestAnnotationMapSpec extends ZIOSpecDefault { +object TestAnnotationMapSpec extends ZIOBaseSpec { def spec = suite("TestAnnotationMapSpec")( test("get retrieves the annotation of the specified type") { diff --git a/test-tests/shared/src/test/scala/zio/test/TestOutputSpec.scala b/test-tests/shared/src/test/scala/zio/test/TestOutputSpec.scala index a776e1673e60..f01e7c8a43f6 100644 --- a/test-tests/shared/src/test/scala/zio/test/TestOutputSpec.scala +++ b/test-tests/shared/src/test/scala/zio/test/TestOutputSpec.scala @@ -11,7 +11,7 @@ case class TestEntity( TestEntity(SuiteId(newId), id :: ancestors) } -object TestOutputSpec extends ZIOSpecDefault { +object TestOutputSpec extends ZIOBaseSpec { /* 1 -> 2 -> 4 -> 5 diff --git a/test-tests/shared/src/test/scala/zio/test/ZIOSpecAbstractSpec.scala b/test-tests/shared/src/test/scala/zio/test/ZIOSpecAbstractSpec.scala index 058211d6526d..9bcd306735d6 100644 --- a/test-tests/shared/src/test/scala/zio/test/ZIOSpecAbstractSpec.scala +++ b/test-tests/shared/src/test/scala/zio/test/ZIOSpecAbstractSpec.scala @@ -2,7 +2,7 @@ package zio.test import zio.{Scope, ZIO, ZIOAppArgs, ZLayer} import zio.internal.ansi.AnsiStringOps -object ZIOSpecAbstractSpec extends ZIOSpecDefault { +object ZIOSpecAbstractSpec extends ZIOBaseSpec { private val basicSpec: ZIOSpecAbstract = new ZIOSpecDefault { override def spec = test("basic test") { diff --git a/test-tests/shared/src/test/scala/zio/test/poly/PolySpec.scala b/test-tests/shared/src/test/scala/zio/test/poly/PolySpec.scala index 401f2fe656d2..23313cfc8c65 100644 --- a/test-tests/shared/src/test/scala/zio/test/poly/PolySpec.scala +++ b/test-tests/shared/src/test/scala/zio/test/poly/PolySpec.scala @@ -5,7 +5,7 @@ import zio.test._ import scala.annotation.tailrec -object PolySpec extends ZIOSpecDefault { +object PolySpec extends ZIOBaseSpec { sealed trait Expr[+A] From 512a96f1bbd2bbfd5e0c0d4460211563ad95fd2e Mon Sep 17 00:00:00 2001 From: Adam Fraser Date: Mon, 13 Feb 2023 08:18:34 -0800 Subject: [PATCH 2/2] jvm only --- core-tests/shared/src/test/scala/zio/ZKeyedPoolSpec.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core-tests/shared/src/test/scala/zio/ZKeyedPoolSpec.scala b/core-tests/shared/src/test/scala/zio/ZKeyedPoolSpec.scala index c02a91e338cd..5ab8b2928c4c 100644 --- a/core-tests/shared/src/test/scala/zio/ZKeyedPoolSpec.scala +++ b/core-tests/shared/src/test/scala/zio/ZKeyedPoolSpec.scala @@ -1,6 +1,7 @@ package zio import zio.test._ +import zio.test.TestAspect._ object ZKeyedPoolSpec extends ZIOBaseSpec { override def spec: Spec[TestEnvironment with Scope, Any] = @@ -40,5 +41,5 @@ object ZKeyedPoolSpec extends ZIOBaseSpec { _ <- fiber.join } yield assertCompletes } - ) + ) @@ jvmOnly }