preparation for accepting String instead of Zoned/LocalDate(Time) object

preparation for #480, #481 and #482
robstoll · May 15, 2020 · 1bddd19 · 1bddd19
1 parent 8a0c1fd
commit 1bddd19
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 21 deletions.
diff --git a/.../src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/ChronoLocalDateAssertionsSpec.kt b/.../src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/ChronoLocalDateAssertionsSpec.kt
@@ -3,17 +3,28 @@ package ch.tutteli.atrium.api.fluent.en_GB.jdk8
 import ch.tutteli.atrium.creating.Expect
 import ch.tutteli.atrium.specs.fun1
 import ch.tutteli.atrium.specs.notImplemented
+import org.spekframework.spek2.Spek
 import java.time.LocalDate
 import java.time.chrono.ChronoLocalDate
 import java.time.chrono.JapaneseDate
 
-class ChronoLocalDateAssertionsSpec : ch.tutteli.atrium.specs.integration.ChronoLocalDateAssertionSpec(
-    fun1(Expect<ChronoLocalDate>::isBefore),
-    fun1(Expect<ChronoLocalDate>::isBeforeOrEqual),
-    fun1(Expect<ChronoLocalDate>::isAfter),
-    fun1(Expect<ChronoLocalDate>::isAfterOrEqual),
-    fun1(Expect<ChronoLocalDate>::isEqual)
-) {
+class ChronoLocalDateAssertionsSpec : Spek({
+    include(ChronoLocalDateSpec)
+}) {
+    object ChronoLocalDateSpec : ch.tutteli.atrium.specs.integration.ChronoLocalDateAssertionSpec(
+        fun1(Expect<ChronoLocalDate>::isBefore),
+        fun1(Expect<ChronoLocalDate>::isBeforeOrEqual),
+        fun1(Expect<ChronoLocalDate>::isAfter),
+        fun1(Expect<ChronoLocalDate>::isAfterOrEqual),
+        fun1(Expect<ChronoLocalDate>::isEqual)
+    )
+
+    companion object {
+        fun isBefore(expect: Expect<ChronoLocalDate>, expected: ChronoLocalDate): Expect<ChronoLocalDate> =
+            //TODO #480 turn into string in ISO format
+            expect.isBefore(expected)
+    }
+
     @Suppress("unused", "UNUSED_VALUE")
     private fun ambiguityTest() {
         val chronoLocalDate: ChronoLocalDate = notImplemented()

diff --git a/...c/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/ChronoLocalDateTimeAssertionSpec.kt b/...c/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/ChronoLocalDateTimeAssertionSpec.kt
@@ -3,18 +3,33 @@ package ch.tutteli.atrium.api.fluent.en_GB.jdk8
 import ch.tutteli.atrium.creating.Expect
 import ch.tutteli.atrium.specs.fun1
 import ch.tutteli.atrium.specs.notImplemented
+import org.spekframework.spek2.Spek
 import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.chrono.ChronoLocalDate
 import java.time.chrono.ChronoLocalDateTime
 
-class ChronoLocalDateTimeAssertionSpec : ch.tutteli.atrium.specs.integration.ChronoLocalDateTimeAssertionSpec(
-    fun1(Expect<ChronoLocalDateTime<*>>::isBefore),
-    fun1(Expect<ChronoLocalDateTime<*>>::isBeforeOrEqual),
-    fun1(Expect<ChronoLocalDateTime<*>>::isAfter),
-    fun1(Expect<ChronoLocalDateTime<*>>::isAfterOrEqual),
-    fun1(Expect<ChronoLocalDateTime<*>>::isEqual)
-) {
+class ChronoLocalDateTimeAssertionSpec : Spek({
+    include(ChronoLocalDateTimeSpec)
+}) {
+    object ChronoLocalDateTimeSpec : ch.tutteli.atrium.specs.integration.ChronoLocalDateTimeAssertionSpec(
+        fun1(Expect<ChronoLocalDateTime<*>>::isBefore),
+        fun1(Expect<ChronoLocalDateTime<*>>::isBeforeOrEqual),
+        fun1(Expect<ChronoLocalDateTime<*>>::isAfter),
+        fun1(Expect<ChronoLocalDateTime<*>>::isAfterOrEqual),
+        fun1(Expect<ChronoLocalDateTime<*>>::isEqual)
+    )
+
+    companion object {
+        fun isBefore(
+            expect: Expect<ChronoLocalDateTime<*>>,
+            expected: ChronoLocalDateTime<*>
+        ): Expect<ChronoLocalDateTime<*>> =
+            //TODO #481 turn into string in ISO format
+            expect.isBefore(expected)
+    }
+
+
     @Suppress("unused", "UNUSED_VALUE")
     private fun ambiguityTest() {
         val chronoLocalDateTime: ChronoLocalDateTime<*> = notImplemented()

diff --git a/...c/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/ChronoZonedDateTimeAssertionSpec.kt b/...c/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/ChronoZonedDateTimeAssertionSpec.kt
@@ -3,18 +3,32 @@ package ch.tutteli.atrium.api.fluent.en_GB.jdk8
 import ch.tutteli.atrium.creating.Expect
 import ch.tutteli.atrium.specs.fun1
 import ch.tutteli.atrium.specs.notImplemented
+import org.spekframework.spek2.Spek
 import java.time.LocalDate
 import java.time.ZonedDateTime
 import java.time.chrono.ChronoLocalDate
 import java.time.chrono.ChronoZonedDateTime
 
-class ChronoZonedDateTimeAssertionSpec : ch.tutteli.atrium.specs.integration.ChronoZonedDateTimeAssertionSpec(
-    fun1(Expect<ChronoZonedDateTime<*>>::isBefore),
-    fun1(Expect<ChronoZonedDateTime<*>>::isBeforeOrEqual),
-    fun1(Expect<ChronoZonedDateTime<*>>::isAfter),
-    fun1(Expect<ChronoZonedDateTime<*>>::isAfterOrEqual),
-    fun1(Expect<ChronoZonedDateTime<*>>::isEqual)
-) {
+class ChronoZonedDateTimeAssertionSpec : Spek({
+    include(ChronoLocalDateTimeAssertionSpec.ChronoLocalDateTimeSpec)
+}) {
+    object ChronoZonedDateTimeSpec : ch.tutteli.atrium.specs.integration.ChronoZonedDateTimeAssertionSpec(
+        fun1(Expect<ChronoZonedDateTime<*>>::isBefore),
+        fun1(Expect<ChronoZonedDateTime<*>>::isBeforeOrEqual),
+        fun1(Expect<ChronoZonedDateTime<*>>::isAfter),
+        fun1(Expect<ChronoZonedDateTime<*>>::isAfterOrEqual),
+        fun1(Expect<ChronoZonedDateTime<*>>::isEqual)
+    )
+
+    companion object {
+        fun isBefore(
+            expect: Expect<ChronoZonedDateTime<*>>,
+            expected: ChronoZonedDateTime<*>
+        ): Expect<ChronoZonedDateTime<*>> =
+            //TODO #482 turn into string in ISO format
+            expect.isBefore(expected)
+    }
+
     @Suppress("unused", "UNUSED_VALUE")
     private fun ambiguityTest() {
         val chronoZonedDateTime: ChronoZonedDateTime<*> = notImplemented()