Skip to content

Commit

Permalink
remove newly added methods, change signature of asScala to return fin…
Browse files Browse the repository at this point in the history
…ite duration instead
  • Loading branch information
NavidJalali committed May 13, 2024
1 parent 5a84e39 commit 867c862
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 24 deletions.
12 changes: 3 additions & 9 deletions core-tests/shared/src/test/scala/zio/DurationSpec.scala
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package zio

import zio.test.Assertion.{equalTo, not, throwsA}
import zio.test.Assertion.{equalTo, not}
import zio.test.assert

import java.time.temporal.ChronoUnit
import java.time.{Duration => JavaDuration}
import java.util.concurrent.TimeUnit
import scala.concurrent.duration.{Duration => ScalaDuration}
import scala.concurrent.duration.{Duration => ScalaDuration, FiniteDuration => ScalaFiniteDuration}

object DurationSpec extends ZIOBaseSpec {

Expand Down Expand Up @@ -155,13 +155,7 @@ object DurationSpec extends ZIOBaseSpec {
assert(Duration.Infinity.isZero)(equalTo(false))
},
test("It converts into the infinite s.c.d.Duration") {
assert(Duration.Infinity.asScala)(equalTo(ScalaDuration.Inf: ScalaDuration))
},
test("It converts into None for asFiniteDuration") {
assert(Duration.Infinity.asFiniteDuration)(equalTo(None))
},
test("It throws an exception for asFiniteDurationUnsafe") {
assert(Duration.Infinity.asFiniteDurationUnsafe)(throwsA[IllegalArgumentException])
assert(Duration.Infinity.asScala)(equalTo(ScalaFiniteDuration.apply(Long.MaxValue, TimeUnit.NANOSECONDS)))
},
test("It converts into a Long.MaxValue second-long JDK Duration") {
assert(Duration.Infinity)(equalTo(JavaDuration.ofNanos(Long.MaxValue)))
Expand Down
16 changes: 1 addition & 15 deletions core/shared/src/main/scala/zio/Duration.scala
Original file line number Diff line number Diff line change
Expand Up @@ -173,21 +173,7 @@ final class DurationOps(private val duration: Duration) extends AnyVal {
}
}

def asScala: ScalaDuration = duration match {
case Duration.Infinity => ScalaDuration.Inf
case Duration.Zero => ScalaDuration.Zero
case _ => ScalaFiniteDuration(duration.toNanos, TimeUnit.NANOSECONDS)
}

def asFiniteDuration: Option[ScalaFiniteDuration] = duration match {
case Duration.Infinity => None
case Duration.Zero => Some(ScalaDuration.Zero)
case _ => Some(ScalaFiniteDuration(duration.toNanos, TimeUnit.NANOSECONDS))
}

def asFiniteDurationUnsafe: ScalaFiniteDuration = duration match {
case Duration.Infinity =>
throw new IllegalArgumentException("Duration is infinite but finite duration was expected")
def asScala: ScalaFiniteDuration = duration match {
case Duration.Zero => ScalaDuration.Zero
case _ => ScalaFiniteDuration(duration.toNanos, TimeUnit.NANOSECONDS)
}
Expand Down

0 comments on commit 867c862

Please sign in to comment.