Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Delete ZIO Test Services From Environment #7243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 26, 2022
Merged

Delete ZIO Test Services From Environment #7243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ce1acc
initial work
adamgfraser Aug 24, 2022
ad3b342
try to resolve version specific issues
adamgfraser Aug 24, 2022
402b4d9
implement zany
adamgfraser Aug 24, 2022
95b1f46
cleanup
adamgfraser Aug 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core-tests/jvm/src/test/scala/zio/SystemSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import java.io.File

object SystemSpec extends ZIOBaseSpec {

def spec: Spec[Live with Annotations, Any] = suite("SystemSpec")(
def spec: Spec[Any, Any] = suite("SystemSpec")(
suite("Fetch an environment variable and check that")(
test("If it exists, return a reasonable value") {
assertZIO(live(System.env("PATH")))(isSome(containsString(File.separator + "bin")))
Expand Down
2 changes: 1 addition & 1 deletion core-tests/jvm/src/test/scala/zio/interop/JavaSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ object JavaSpec extends ZIOBaseSpec {

import ZIOTag._

def spec: Spec[Annotations, Any] = suite("JavaSpec")(
def spec: Spec[Any, Any] = suite("JavaSpec")(
suite("`ZIO.fromFutureJava` must")(
test("be lazy on the `Future` parameter") {
var evaluated = false
Expand Down
8 changes: 4 additions & 4 deletions core-tests/shared/src/test/scala/zio/BitChunkByteSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@ import zio.test._

object BitChunkByteSpec extends ZIOBaseSpec {

val genByteChunk: Gen[Sized, Chunk[Byte]] =
val genByteChunk: Gen[Any, Chunk[Byte]] =
for {
bytes <- Gen.listOf(Gen.byte)
} yield Chunk.fromIterable(bytes)

val genInt: Gen[Sized, Int] =
val genInt: Gen[Any, Int] =
Gen.small(Gen.const(_))

val genBitChunk: Gen[Sized, Chunk.BitChunkByte] =
val genBitChunk: Gen[Any, Chunk.BitChunkByte] =
for {
chunk <- genByteChunk
i <- Gen.int(0, chunk.length * 8)
j <- Gen.int(0, chunk.length * 8)
} yield Chunk.BitChunkByte(chunk, i min j, i max j)

val genBoolChunk: Gen[Sized, Chunk[Boolean]] =
val genBoolChunk: Gen[Any, Chunk[Boolean]] =
Gen.listOf(Gen.boolean).map(Chunk.fromIterable(_))

def toBinaryString(byte: Byte): String =
Expand Down
6 changes: 3 additions & 3 deletions core-tests/shared/src/test/scala/zio/BitChunkIntSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ import zio.test._

object BitChunkIntSpec extends ZIOBaseSpec {

val genIntChunk: Gen[Sized, Chunk[Int]] =
val genIntChunk: Gen[Any, Chunk[Int]] =
for {
ints <- Gen.listOf(Gen.int)
} yield Chunk.fromIterable(ints)

val genInt: Gen[Sized, Int] =
val genInt: Gen[Any, Int] =
Gen.small(Gen.const(_))

val genEndianness: Gen[Sized, Chunk.BitChunk.Endianness] =
val genEndianness: Gen[Any, Chunk.BitChunk.Endianness] =
Gen.elements(Chunk.BitChunk.Endianness.BigEndian, Chunk.BitChunk.Endianness.LittleEndian)

def toBinaryString(endianness: Chunk.BitChunk.Endianness)(int: Int): String = {
Expand Down
6 changes: 3 additions & 3 deletions core-tests/shared/src/test/scala/zio/BitChunkLongSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ import zio.test._

object BitChunkLongSpec extends ZIOBaseSpec {

val genLongChunk: Gen[Sized, Chunk[Long]] =
val genLongChunk: Gen[Any, Chunk[Long]] =
for {
longs <- Gen.listOf(Gen.long)
} yield Chunk.fromIterable(longs)

val genInt: Gen[Sized, Int] =
val genInt: Gen[Any, Int] =
Gen.small(Gen.const(_))

val genEndianness: Gen[Sized, Chunk.BitChunk.Endianness] =
val genEndianness: Gen[Any, Chunk.BitChunk.Endianness] =
Gen.elements(Chunk.BitChunk.Endianness.BigEndian, Chunk.BitChunk.Endianness.LittleEndian)

def toBinaryString(endianness: Chunk.BitChunk.Endianness)(long: Long): String = {
Expand Down
8 changes: 4 additions & 4 deletions core-tests/shared/src/test/scala/zio/CauseSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,10 @@ object CauseSpec extends ZIOBaseSpec {
)
) @@ samples(10)

val causes: Gen[Sized, Cause[String]] =
val causes: Gen[Any, Cause[String]] =
Gen.causes(Gen.string, Gen.string.map(s => new RuntimeException(s)))

val equalCauses: Gen[Sized, (Cause[String], Cause[String])] =
val equalCauses: Gen[Any, (Cause[String], Cause[String])] =
(causes <*> causes <*> causes).flatMap { case (a, b, c) =>
Gen.elements(
(a, a),
Expand All @@ -183,10 +183,10 @@ object CauseSpec extends ZIOBaseSpec {
)
}

val errorCauseFunctions: Gen[Sized, String => Cause[String]] =
val errorCauseFunctions: Gen[Any, String => Cause[String]] =
Gen.function(causes)

val errors: Gen[Sized, String] =
val errors: Gen[Any, String] =
Gen.string

val fiberIds: Gen[Any, FiberId] =
Expand Down
6 changes: 3 additions & 3 deletions core-tests/shared/src/test/scala/zio/ChunkPackedBooleanSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import zio.test._

object ChunkPackedBooleanSpec extends ZIOBaseSpec {

val genEndianness: Gen[Sized, Chunk.BitChunk.Endianness] =
val genEndianness: Gen[Any, Chunk.BitChunk.Endianness] =
Gen.elements(Chunk.BitChunk.Endianness.BigEndian, Chunk.BitChunk.Endianness.LittleEndian)

val genBoolChunk: Gen[Sized, Chunk[Boolean]] =
val genBoolChunk: Gen[Any, Chunk[Boolean]] =
for {
endianness <- genEndianness
booleanChunk <- Gen.listOf(Gen.boolean).map(Chunk.fromIterable)
Expand All @@ -18,7 +18,7 @@ object ChunkPackedBooleanSpec extends ZIOBaseSpec {
oneOf <- Gen.elements(booleanChunk, byteChunk, intChunk, longChunk)
} yield oneOf

val genInt: Gen[Sized, Int] =
val genInt: Gen[Any, Int] =
Gen.small(Gen.const(_))

def toBinaryString(bool: Boolean): String =
Expand Down
36 changes: 18 additions & 18 deletions core-tests/shared/src/test/scala/zio/ChunkSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ object ChunkSpec extends ZIOBaseSpec {
def tinyChunks[R, A](a: Gen[R, A]): Gen[R, Chunk[A]] =
Gen.chunkOfBounded(0, 3)(a)

def smallChunks[R, A](a: Gen[R, A]): Gen[R with Sized, Chunk[A]] =
def smallChunks[R, A](a: Gen[R, A]): Gen[R, Chunk[A]] =
Gen.small(Gen.chunkOfN(_)(a))

def mediumChunks[R, A](a: Gen[R, A]): Gen[R with Sized, Chunk[A]] =
def mediumChunks[R, A](a: Gen[R, A]): Gen[R, Chunk[A]] =
Gen.medium(Gen.chunkOfN(_)(a))

def largeChunks[R, A](a: Gen[R, A]): Gen[R with Sized, Chunk[A]] =
def largeChunks[R, A](a: Gen[R, A]): Gen[R, Chunk[A]] =
Gen.large(Gen.chunkOfN(_)(a))

def chunkWithIndex[R, A](a: Gen[R, A]): Gen[R with Sized, (Chunk[A], Int)] =
def chunkWithIndex[R, A](a: Gen[R, A]): Gen[R, (Chunk[A], Int)] =
for {
chunk <- Gen.chunkOfBounded(1, 100)(a)
idx <- Gen.int(0, chunk.length - 1)
Expand Down Expand Up @@ -58,7 +58,7 @@ object ChunkSpec extends ZIOBaseSpec {
),
suite("append")(
test("apply") {
val chunksWithIndex: Gen[Sized, (Chunk[Int], Chunk[Int], Int)] =
val chunksWithIndex: Gen[Any, (Chunk[Int], Chunk[Int], Int)] =
for {
p <- Gen.boolean
as <- Gen.chunkOf(Gen.int)
Expand Down Expand Up @@ -114,7 +114,7 @@ object ChunkSpec extends ZIOBaseSpec {
),
suite("prepend")(
test("apply") {
val chunksWithIndex: Gen[Sized, (Chunk[Int], Chunk[Int], Int)] =
val chunksWithIndex: Gen[Any, (Chunk[Int], Chunk[Int], Int)] =
for {
p <- Gen.boolean
as <- Gen.chunkOf(Gen.int)
Expand Down Expand Up @@ -218,7 +218,7 @@ object ChunkSpec extends ZIOBaseSpec {
test("corresponds") {
val genChunk = smallChunks(intGen)
val genFunction =
Gen.function[Sized, (Int, Int), Boolean](Gen.boolean).map(Function.untupled(_))
Gen.function[Any, (Int, Int), Boolean](Gen.boolean).map(Function.untupled(_))
check(genChunk, genChunk, genFunction) { (as, bs, f) =>
val actual = as.corresponds(bs)(f)
val expected = as.toList.corresponds(bs.toList)(f)
Expand Down Expand Up @@ -281,7 +281,7 @@ object ChunkSpec extends ZIOBaseSpec {
} @@ zioTag(errors)
),
test("map") {
val fn = Gen.function[Sized, Int, Int](intGen)
val fn = Gen.function[Any, Int, Int](intGen)
check(smallChunks(intGen), fn)((c, f) => assert(c.map(f).toList)(equalTo(c.toList.map(f))))
},
suite("mapZIO")(
Expand All @@ -293,7 +293,7 @@ object ChunkSpec extends ZIOBaseSpec {
} @@ zioTag(errors)
),
test("flatMap") {
val fn = Gen.function[Sized, Int, Chunk[Int]](smallChunks(intGen))
val fn = Gen.function[Any, Int, Chunk[Int]](smallChunks(intGen))
check(smallChunks(intGen), fn) { (c, f) =>
assert(c.flatMap(f).toList)(equalTo(c.toList.flatMap(f.andThen(_.toList))))
}
Expand All @@ -309,23 +309,23 @@ object ChunkSpec extends ZIOBaseSpec {
check(mediumChunks(intGen))(c => assert(c.lastOption)(equalTo(c.toList.lastOption)))
},
test("indexWhere") {
val fn = Gen.function[Sized, Int, Boolean](Gen.boolean)
val fn = Gen.function[Any, Int, Boolean](Gen.boolean)
check(smallChunks(intGen), smallChunks(intGen), fn, intGen) { (left, right, p, from) =>
val actual = (left ++ right).indexWhere(p, from)
val expected = (left.toVector ++ right.toVector).indexWhere(p, from)
assert(actual)(equalTo(expected))
}
} @@ exceptScala211,
test("exists") {
val fn = Gen.function[Sized, Int, Boolean](Gen.boolean)
val fn = Gen.function[Any, Int, Boolean](Gen.boolean)
check(mediumChunks(intGen), fn)((chunk, p) => assert(chunk.exists(p))(equalTo(chunk.toList.exists(p))))
},
test("forall") {
val fn = Gen.function[Sized, Int, Boolean](Gen.boolean)
val fn = Gen.function[Any, Int, Boolean](Gen.boolean)
check(mediumChunks(intGen), fn)((chunk, p) => assert(chunk.forall(p))(equalTo(chunk.toList.forall(p))))
},
test("find") {
val fn = Gen.function[Sized, Int, Boolean](Gen.boolean)
val fn = Gen.function[Any, Int, Boolean](Gen.boolean)
check(mediumChunks(intGen), fn)((chunk, p) => assert(chunk.find(p))(equalTo(chunk.toList.find(p))))
},
suite("findZIO")(
Expand All @@ -337,7 +337,7 @@ object ChunkSpec extends ZIOBaseSpec {
} @@ zioTag(errors)
),
test("filter") {
val fn = Gen.function[Sized, Int, Boolean](Gen.boolean)
val fn = Gen.function[Any, Int, Boolean](Gen.boolean)
check(mediumChunks(intGen), fn)((chunk, p) => assert(chunk.filter(p).toList)(equalTo(chunk.toList.filter(p))))
},
suite("filterZIO")(
Expand Down Expand Up @@ -424,7 +424,7 @@ object ChunkSpec extends ZIOBaseSpec {
assert(Chunk.empty[Nothing].collect { case _ => 1 })(isEmpty)
},
test("collect chunk") {
val pfGen = Gen.partialFunction[Sized, Int, Int](intGen)
val pfGen = Gen.partialFunction[Any, Int, Int](intGen)
check(mediumChunks(intGen), pfGen)((c, pf) => assert(c.collect(pf).toList)(equalTo(c.toList.collect(pf))))
}
),
Expand All @@ -433,7 +433,7 @@ object ChunkSpec extends ZIOBaseSpec {
assertZIO(Chunk.empty[Nothing].collectZIO { case _ => ZIO.succeed(1) })(equalTo(Chunk.empty))
},
test("collectZIO chunk") {
val pfGen = Gen.partialFunction[Sized, Int, UIO[Int]](Gen.successes(intGen))
val pfGen = Gen.partialFunction[Any, Int, UIO[Int]](Gen.successes(intGen))
check(mediumChunks(intGen), pfGen) { (c, pf) =>
for {
result <- c.collectZIO(pf).map(_.toList)
Expand All @@ -450,7 +450,7 @@ object ChunkSpec extends ZIOBaseSpec {
assert(Chunk.empty[Nothing].collectWhile { case _ => 1 })(isEmpty)
},
test("collectWhile chunk") {
val pfGen = Gen.partialFunction[Sized, Int, Int](intGen)
val pfGen = Gen.partialFunction[Any, Int, Int](intGen)
check(mediumChunks(intGen), pfGen) { (c, pf) =>
assert(c.collectWhile(pf).toList)(equalTo(c.toList.takeWhile(pf.isDefinedAt).map(pf.apply)))
}
Expand All @@ -461,7 +461,7 @@ object ChunkSpec extends ZIOBaseSpec {
assertZIO(Chunk.empty[Nothing].collectWhileZIO { case _ => ZIO.succeed(1) })(equalTo(Chunk.empty))
},
test("collectWhileZIO chunk") {
val pfGen = Gen.partialFunction[Sized, Int, UIO[Int]](Gen.successes(intGen))
val pfGen = Gen.partialFunction[Any, Int, UIO[Int]](Gen.successes(intGen))
check(mediumChunks(intGen), pfGen) { (c, pf) =>
for {
result <- c.collectWhileZIO(pf).map(_.toList)
Expand Down
2 changes: 1 addition & 1 deletion core-tests/shared/src/test/scala/zio/DifferSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ object DifferSpec extends ZIOSpecDefault {

def diffLaws[Environment, Value, Patch](differ: Differ[Value, Patch])(
gen: Gen[Environment, Value]
)(equal: (Value, Value) => Boolean): Spec[Environment with TestConfig, Nothing] =
)(equal: (Value, Value) => Boolean): Spec[Environment, Nothing] =
suite("differ laws")(
test("combining patches is associative") {
check(gen, gen, gen, gen) { (value1, value2, value3, value4) =>
Expand Down
2 changes: 1 addition & 1 deletion core-tests/shared/src/test/scala/zio/HubSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import zio.test.Assertion._
import zio.test._
object HubSpec extends ZIOBaseSpec {

val smallInt: Gen[Sized, Int] =
val smallInt: Gen[Any, Int] =
Gen.small(Gen.const(_), 1)

def spec = suite("HubSpec")(
Expand Down
6 changes: 3 additions & 3 deletions core-tests/shared/src/test/scala/zio/NonEmptyChunkSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ import zio.test._

object NonEmptyChunkSpec extends ZIOBaseSpec {

lazy val genChunk: Gen[Sized, Chunk[Int]] = Gen.chunkOf(genInt)
lazy val genChunk: Gen[Any, Chunk[Int]] = Gen.chunkOf(genInt)

lazy val genInt: Gen[Any, Int] = Gen.int(-10, 10)

lazy val genIntFunction: Gen[Any, Any => Int] = Gen.function(genInt)

lazy val genIntFunction2: Gen[Any, (Any, Any) => Int] = Gen.function2(genInt)

lazy val genNonEmptyChunk: Gen[Sized, NonEmptyChunk[Int]] = Gen.chunkOf1(genInt)
lazy val genNonEmptyChunk: Gen[Any, NonEmptyChunk[Int]] = Gen.chunkOf1(genInt)

lazy val genNonEmptyChunkFunction: Gen[Sized, Any => NonEmptyChunk[Int]] =
lazy val genNonEmptyChunkFunction: Gen[Any, Any => NonEmptyChunk[Int]] =
Gen.function(genNonEmptyChunk)

def spec = suite("NonEmptyChunkSpec")(
Expand Down
6 changes: 3 additions & 3 deletions core-tests/shared/src/test/scala/zio/QueueSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,12 +772,12 @@ object QueueSpec extends ZIOBaseSpec {
}

object QueueSpecUtil {
def waitForValue[T](ref: UIO[T], value: T): URIO[Live, T] =
def waitForValue[T](ref: UIO[T], value: T): UIO[T] =
Live.live((ref <* Clock.sleep(10.millis)).repeatUntil(_ == value))

def waitForSize[A](queue: Queue[A], size: Int): URIO[Live, Int] =
def waitForSize[A](queue: Queue[A], size: Int): UIO[Int] =
waitForValue(queue.size, size)

val smallInt: Gen[Sized, Int] =
val smallInt: Gen[Any, Int] =
Gen.small(Gen.const(_), 1)
}
2 changes: 1 addition & 1 deletion core-tests/shared/src/test/scala/zio/TaggedSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import zio.test._

object TaggedSpec extends ZIOBaseSpec {

def spec: Spec[Annotations, TestFailure[Any]] = suite("TaggedSpec")(
def spec: Spec[Any, TestFailure[Any]] = suite("TaggedSpec")(
test("tags can be derived for polymorphic services") {
val result = typeCheck {
"""
Expand Down
2 changes: 1 addition & 1 deletion core-tests/shared/src/test/scala/zio/ZIOBaseSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import zio.test._
import scala.annotation.tailrec

trait ZIOBaseSpec extends ZIOSpecDefault {
override def aspects: Chunk[TestAspectAtLeastR[Live]] =
override def aspects: Chunk[TestAspectPoly] =
if (TestPlatform.isJVM) Chunk(TestAspect.timeout(120.seconds))
else Chunk(TestAspect.timeout(120.seconds), TestAspect.sequential)

Expand Down
6 changes: 3 additions & 3 deletions core-tests/shared/src/test/scala/zio/ZIOSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4214,10 +4214,10 @@ object ZIOSpec extends ZIOBaseSpec {
)
)

def functionIOGen: Gen[Sized, String => ZIO[Any, Throwable, Int]] =
Gen.function[Sized, String, Task[Int]](Gen.successes(Gen.int))
def functionIOGen: Gen[Any, String => ZIO[Any, Throwable, Int]] =
Gen.function[Any, String, Task[Int]](Gen.successes(Gen.int))

def listGen: Gen[Sized, List[String]] =
def listGen: Gen[Any, List[String]] =
Gen.listOfN(100)(Gen.alphaNumericString)

val exampleError = new Error("something went wrong")
Expand Down
2 changes: 1 addition & 1 deletion core-tests/shared/src/test/scala/zio/internal/StackSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,6 @@ object StackSpec extends ZIOBaseSpec {
case object True extends Boolean
case object False extends Boolean

val gen: Gen[Sized, List[Boolean]] =
val gen: Gen[Any, List[Boolean]] =
Gen.large(n => Gen.listOfN(n)(Gen.elements(True, False)))
}
4 changes: 2 additions & 2 deletions core-tests/shared/src/test/scala/zio/stm/THubSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package zio.stm

import zio._
import zio.test.Assertion._
import zio.test.{assert, Gen, Sized, check}
import zio.test.{assert, Gen, check}

object THubSpec extends ZIOBaseSpec {

val smallInt: Gen[Sized, Int] =
val smallInt: Gen[Any, Int] =
Gen.small(Gen.const(_), 1)

def spec =
Expand Down
4 changes: 2 additions & 2 deletions core-tests/shared/src/test/scala/zio/stm/TPriorityQueueSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ object TPriorityQueueSpec extends ZIOBaseSpec {
implicit val eventOrdering: Ordering[Event] =
Ordering.by(_.time)

val genEvent: Gen[Sized, Event] =
val genEvent: Gen[Any, Event] =
for {
time <- Gen.int(-10, 10)
description <- Gen.alphaNumericString
} yield Event(time, description)

val genEvents: Gen[Sized, Chunk[Event]] =
val genEvents: Gen[Any, Chunk[Event]] =
Gen.chunkOf(genEvent)

val genPredicate: Gen[Any, Event => Boolean] =
Expand Down
Loading