From 3100d3f727720c3a2fcf5782b88d43ab7972038f Mon Sep 17 00:00:00 2001 From: Peter Kotula Date: Sat, 4 Jan 2025 15:20:34 +0100 Subject: [PATCH] zio 2.1.14, test fixes --- build.sbt | 2 +- .../src/test/scala/zio/logging/JsonLogFormatSpec.scala | 4 ++-- .../src/test/scala/zio/logging/LogFilterSpec.scala | 2 +- .../src/test/scala/zio/logging/LogFormatSpec.scala | 2 +- .../src/test/scala/zio/logging/LogGroupSpec.scala | 10 +++++----- .../scala/zio/logging/LoggerNameExtractorSpec.scala | 6 +++--- project/Versions.scala | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build.sbt b/build.sbt index 905109104..d6c1c8614 100644 --- a/build.sbt +++ b/build.sbt @@ -33,7 +33,7 @@ inThisBuild( ), Developer("justcoon", "Peter Kotula", "peto.kotula@yahoo.com", url("https://github.com/justcoon")) ), - zioVersion := "2.1.13", + zioVersion := "2.1.14", scala213 := "2.13.15" ) ) diff --git a/core/shared/src/test/scala/zio/logging/JsonLogFormatSpec.scala b/core/shared/src/test/scala/zio/logging/JsonLogFormatSpec.scala index 1e68081bf..34227b08a 100644 --- a/core/shared/src/test/scala/zio/logging/JsonLogFormatSpec.scala +++ b/core/shared/src/test/scala/zio/logging/JsonLogFormatSpec.scala @@ -144,7 +144,7 @@ object JsonLogFormatSpec extends ZIOSpecDefault { }, test("numeric value") { val format = label("line", traceLine) - check(Gen.int) { i => + check(Gen.int(1, 1000)) { i => val result = format.toJsonLogger( Trace.apply("", "", i), FiberId.None, @@ -161,7 +161,7 @@ object JsonLogFormatSpec extends ZIOSpecDefault { }, test("numeric value concatenated with string") { val format = label("line", traceLine |-| line) - check(Gen.alphaNumericString, Gen.int) { (line, i) => + check(Gen.alphaNumericString, Gen.int(1, 1000)) { (line, i) => val result = format.toJsonLogger( Trace.apply("", "", i), FiberId.None, diff --git a/core/shared/src/test/scala/zio/logging/LogFilterSpec.scala b/core/shared/src/test/scala/zio/logging/LogFilterSpec.scala index 59ae8a579..6a2c7db28 100644 --- a/core/shared/src/test/scala/zio/logging/LogFilterSpec.scala +++ b/core/shared/src/test/scala/zio/logging/LogFilterSpec.scala @@ -28,7 +28,7 @@ object LogFilterSpec extends ZIOSpecDefault { expectation: Assertion[Boolean] ): TestResult = assert( - filter(Trace(location, "", 0), FiberId.None, level, () => "", Cause.empty, FiberRefs.empty, List.empty, Map.empty) + filter(Trace(location, "", 1), FiberId.None, level, () => "", Cause.empty, FiberRefs.empty, List.empty, Map.empty) )(expectation ?? s"$location with $level") private def testFilterAnnotation( diff --git a/core/shared/src/test/scala/zio/logging/LogFormatSpec.scala b/core/shared/src/test/scala/zio/logging/LogFormatSpec.scala index ba7c83254..dbc83efae 100644 --- a/core/shared/src/test/scala/zio/logging/LogFormatSpec.scala +++ b/core/shared/src/test/scala/zio/logging/LogFormatSpec.scala @@ -370,7 +370,7 @@ object LogFormatSpec extends ZIOSpecDefault { }, test("traceLine") { val format = LogFormat.traceLine - check(Gen.int) { tLine => + check(Gen.int(1, 2000)) { tLine => val result = format.toLogger( Trace("location", "file", tLine), FiberId.None, diff --git a/core/shared/src/test/scala/zio/logging/LogGroupSpec.scala b/core/shared/src/test/scala/zio/logging/LogGroupSpec.scala index bcc582fd7..ad88a6060 100644 --- a/core/shared/src/test/scala/zio/logging/LogGroupSpec.scala +++ b/core/shared/src/test/scala/zio/logging/LogGroupSpec.scala @@ -25,7 +25,7 @@ object LogGroupSpec extends ZIOSpecDefault { val group = LogGroup.loggerName check(Gen.alphaNumericString) { value => val result = group( - Trace.apply(value, "", 0), + Trace.apply(value, "", 1), FiberId.None, LogLevel.Info, () => "", @@ -58,7 +58,7 @@ object LogGroupSpec extends ZIOSpecDefault { check(Gen.alphaNumericString, Gen.elements(LogLevel.Info, LogLevel.Warning, LogLevel.Error, LogLevel.Debug)) { (value, level) => val result = group( - Trace.apply(value, "", 0), + Trace.apply(value, "", 1), FiberId.None, level, () => "", @@ -75,7 +75,7 @@ object LogGroupSpec extends ZIOSpecDefault { check(Gen.alphaNumericString, Gen.elements(LogLevel.Info, LogLevel.Warning, LogLevel.Error, LogLevel.Debug)) { (value, level) => val result = group( - Trace.apply(value, "", 0), + Trace.apply(value, "", 1), FiberId.None, level, () => "", @@ -107,7 +107,7 @@ object LogGroupSpec extends ZIOSpecDefault { val group = LogGroup.loggerName.map("PREFIX_" + _) check(Gen.alphaNumericString) { value => val result = group( - Trace.apply(value, "", 0), + Trace.apply(value, "", 1), FiberId.None, LogLevel.Info, () => "", @@ -124,7 +124,7 @@ object LogGroupSpec extends ZIOSpecDefault { check(Gen.alphaNumericString, Gen.elements(LogLevel.Info, LogLevel.Warning, LogLevel.Error, LogLevel.Debug)) { (value, level) => val result = group( - Trace.apply(value, "", 0), + Trace.apply(value, "", 1), FiberId.None, level, () => "", diff --git a/core/shared/src/test/scala/zio/logging/LoggerNameExtractorSpec.scala b/core/shared/src/test/scala/zio/logging/LoggerNameExtractorSpec.scala index cc0132c3e..d50506f60 100644 --- a/core/shared/src/test/scala/zio/logging/LoggerNameExtractorSpec.scala +++ b/core/shared/src/test/scala/zio/logging/LoggerNameExtractorSpec.scala @@ -29,7 +29,7 @@ object LoggerNameExtractorSpec extends ZIOSpecDefault { } else trace } val result = extractor( - Trace.apply(trace, "", 0), + Trace.apply(trace, "", 1), FiberRefs.empty, annotations ) @@ -49,7 +49,7 @@ object LoggerNameExtractorSpec extends ZIOSpecDefault { } else trace } val result = extractor( - Trace.apply(trace, "", 0), + Trace.apply(trace, "", 1), FiberRefs.empty, annotations ) @@ -76,7 +76,7 @@ object LoggerNameExtractorSpec extends ZIOSpecDefault { trace.substring(0, last) } else trace val result = extractor( - Trace.apply(trace, "", 0), + Trace.apply(trace, "", 1), FiberRefs.empty, Map.empty ) diff --git a/project/Versions.scala b/project/Versions.scala index 973374777..782b862a6 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -9,7 +9,7 @@ object Versions { val zioMetricsConnectorsVersion = "2.3.1" val zioConfig = "4.0.3" val zioParser = "0.1.11" - val zioPrelude = "1.0.0-RC35" + val zioPrelude = "1.0.0-RC36" val zioHttp = "3.0.1" val log4jVersion = "2.24.3" }