Merge pull request #58 from sullivan-/feat/zone

give ArbitraryJoda.arbJoda a time zone
47degrees · Oct 27, 2017 · 01bd56f · 01bd56f
2 parents 58517ab + 9955938
commit 01bd56f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/datetime/src/main/scala/com/fortysevendeg/scalacheck/datetime/joda/GenJoda.scala b/datetime/src/main/scala/com/fortysevendeg/scalacheck/datetime/joda/GenJoda.scala
@@ -109,5 +109,6 @@ trait GenJoda {
 object GenJoda extends GenJoda
 
 object ArbitraryJoda extends GenJoda {
-  implicit val arbJoda: Arbitrary[DateTime] = Arbitrary(genDateTime)
+  implicit def arbJoda(implicit zone: DateTimeZone = DateTimeZone.getDefault): Arbitrary[DateTime] =
+    Arbitrary(genDateTime.map(_.withZone(zone)))
 }
diff --git a/datetime/src/test/scala/com/fortysevendeg/scalacheck/datetime/joda/GenJodaProperties.scala b/datetime/src/test/scala/com/fortysevendeg/scalacheck/datetime/joda/GenJodaProperties.scala
@@ -76,7 +76,15 @@ object GenJodaProperties extends Properties("Joda Generators") {
   property("arbitrary generation creates valid DateTime instances (with no granularity)") = {
     import ArbitraryJoda._
     forAll { dt: DateTime =>
-      passed
+      dt.getZone == DateTimeZone.getDefault
+    }
+  }
+
+  property("arbitrary generation creates DateTime instances with right time zone") = {
+    implicit val zone = DateTimeZone.UTC
+    import ArbitraryJoda._
+    forAll { dt: DateTime =>
+      dt.getZone == zone
     }
   }