Clean Up Tests (zio#7820)

* extend zio base spec

* jvm only

Author: adamgfraser

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") {

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")(

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)
 

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)
 

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))

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("++") {

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]]

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")(

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") {

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") {

core-tests/shared/src/test/scala/zio/ZKeyedPoolSpec.scala

@@ -1,8 +1,9 @@
 package zio
 
 import zio.test._
+import zio.test.TestAspect._
 
-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") {
@@ -40,5 +41,5 @@ object ZKeyedPoolSpec extends ZIOSpecDefault {
           _ <- fiber.join
         } yield assertCompletes
       }
-    )
+    ) @@ jvmOnly
 }

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")(

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") {

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.") {

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)

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)
 

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)
 

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 {

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")(

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") {

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!") {

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") {

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

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") {

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]