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

Skip to content

Fixed #8051 #8054

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 3 commits into from
Apr 18, 2023
Merged

Fixed #8051 #8054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cceb150
Fixed #8051
DaniRey Apr 17, 2023
baf0501
Fixed #8051
DaniRey Apr 17, 2023
dfa5cf8
Fixed #8051
DaniRey Apr 18, 2023
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
7 changes: 7 additions & 0 deletions test-tests/shared/src/test/scala/zio/test/GenSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,13 @@ object GenSpec extends ZIOBaseSpec {
test("offsetDateTime generates OffsetDateTime values") {
checkSample(Gen.offsetDateTime)(isNonEmpty)
},
test(
"offsetDateTime generates OffsetDateTime values, when limited to one day range when changing from summer to winter time"
) {
val from = OffsetDateTime.parse("2025-10-29T00:00:00+02:00")
val to = OffsetDateTime.parse("2025-10-29T23:59:59.99999999+01:00")
checkSample(Gen.offsetDateTime(from, to))(isNonEmpty)
},
test("offsetTime generates java.time.OffsetTime values") {
checkSample(Gen.offsetTime)(isNonEmpty)
},
Expand Down
19 changes: 14 additions & 5 deletions test/shared/src/main/scala/zio/test/TimeVariants.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
package zio.test

import com.github.ghik.silencer.silent
import zio.{Duration, Random, Trace}
import zio.stacktracer.TracingImplicits.disableAutoTrace
import zio.{Duration, Trace}

import java.time._
import scala.collection.JavaConverters._
Expand Down Expand Up @@ -179,9 +178,19 @@ trait TimeVariants {
val minLocalDate = min.atZoneSimilarLocal(utc).toLocalDate
val maxLocalDate = max.atZoneSimilarLocal(utc).toLocalDate
val actualLocalDate = actual.toLocalDate
val minOffsetSeconds = if (minLocalDate == actualLocalDate) min.getOffset.getTotalSeconds else -18 * 3600
val maxOffsetSeconds = if (maxLocalDate == actualLocalDate) max.getOffset.getTotalSeconds else 18 * 3600
Gen.int(minOffsetSeconds, maxOffsetSeconds).map(ZoneOffset.ofTotalSeconds)
val zoneOffsetMin = -18 * 3600
val zoneOffsetMax = 18 * 3600
val minOffsetSeconds = if (minLocalDate == actualLocalDate) min.getOffset.getTotalSeconds else zoneOffsetMin
val maxOffsetSeconds = if (maxLocalDate == actualLocalDate) max.getOffset.getTotalSeconds else zoneOffsetMax
if (minOffsetSeconds > maxOffsetSeconds) {
val secondsAfterMin = (min.toInstant.toEpochMilli - actual.toInstant(utc).toEpochMilli) / 1000
val secondsBeforeMax = (max.toInstant.toEpochMilli - actual.toInstant(utc).toEpochMilli) / 1000
Gen
.int(Math.max(secondsAfterMin.toInt, zoneOffsetMin), Math.min(secondsBeforeMax.toInt, zoneOffsetMax))
.map(ZoneOffset.ofTotalSeconds)
} else {
Gen.int(minOffsetSeconds, maxOffsetSeconds).map(ZoneOffset.ofTotalSeconds)
}
}

for {
Expand Down