From ea6230b3d0c425a94e35eac59dceeb33e2a82252 Mon Sep 17 00:00:00 2001 From: Rhushikesh Apte Date: Sat, 9 Oct 2021 23:59:52 +0530 Subject: [PATCH 1/6] Add samples for localDateTimeAssertions of api-fluent (#997) --- .../fluent/en_GB/localDateTimeAssertions.kt | 8 ++ .../LocalDateTimeExpectationSamples.kt | 81 +++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/LocalDateTimeExpectationSamples.kt diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/localDateTimeAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/localDateTimeAssertions.kt index 8b502c1d31..0adbe3f2b9 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/localDateTimeAssertions.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/localDateTimeAssertions.kt @@ -29,6 +29,8 @@ val Expect.year: Expect * * @return an [Expect] for the subject of `this` expectation. * + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.LocalDateTimeExpectationSamples.year + * * @since 0.9.0 */ fun Expect.year(assertionCreator: Expect.() -> Unit): Expect = @@ -52,6 +54,8 @@ val Expect.month: Expect * * @return an [Expect] for the subject of `this` expectation. * + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.LocalDateTimeExpectationSamples.month + * * @since 0.9.0 */ fun Expect.month(assertionCreator: Expect.() -> Unit): Expect = @@ -75,6 +79,8 @@ val Expect.dayOfWeek: Expect * * @return an [Expect] for the subject of `this` expectation. * + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.LocalDateTimeExpectationSamples.dayOfWeek + * * @since 0.9.0 */ fun Expect.dayOfWeek(assertionCreator: Expect.() -> Unit): Expect = @@ -98,6 +104,8 @@ val Expect.day: Expect * * @return an [Expect] for the subject of `this` expectation. * + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.LocalDateTimeExpectationSamples.day + * * @since 0.9.0 */ fun Expect.day(assertionCreator: Expect.() -> Unit): Expect = diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/LocalDateTimeExpectationSamples.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/LocalDateTimeExpectationSamples.kt new file mode 100644 index 0000000000..a74553212a --- /dev/null +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/LocalDateTimeExpectationSamples.kt @@ -0,0 +1,81 @@ +package ch.tutteli.atrium.api.fluent.en_GB.samples + +import ch.tutteli.atrium.api.fluent.en_GB.* +import ch.tutteli.atrium.api.verbs.internal.expect +import java.time.DayOfWeek +import java.time.LocalDateTime +import java.time.Month +import kotlin.test.Test + +class LocalDateTimeExpectationSamples { + + @Test + fun year() { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) + .year { + toEqual(2021) + toBeGreaterThan(2020) + } + + fails { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) + .year { + notToEqual(2022) + toBeGreaterThan(2022) + toBeLessThan(2020) + } + } + } + + @Test + fun month() { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) + .month { + toEqual(Month.OCTOBER.value) + notToEqual(Month.SEPTEMBER.value) + } + + fails { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) + .month { + toEqual(Month.SEPTEMBER.value) + notToEqual(Month.OCTOBER.value) + } + } + } + + @Test + fun dayOfWeek() { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) + .dayOfWeek { + toEqual(DayOfWeek.SATURDAY) + notToEqual(DayOfWeek.SUNDAY) + } + + fails { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) + .dayOfWeek { + toEqual(DayOfWeek.MONDAY) + notToEqual(DayOfWeek.SATURDAY) + } + } + } + + @Test + fun day() { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) + .day { + toEqual(9) + toBeGreaterThan(5) + } + + fails { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) + .day { + toEqual(5) + toBeLessThan(7) + } + } + } + +} From 04a0e50136b580b9838eb2450d36092ba88dc270 Mon Sep 17 00:00:00 2001 From: Rhushikesh Apte Date: Sun, 10 Oct 2021 00:05:19 +0530 Subject: [PATCH 2/6] Add samples for localDateTimeAssertions of api-infix (#997) --- .../infix/en_GB/localDateTimeAssertions.kt | 8 ++ .../LocalDateTimeExpectationSamples.kt | 73 +++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/LocalDateTimeExpectationSamples.kt diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/localDateTimeAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/localDateTimeAssertions.kt index a060baa33b..caa003ffc0 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/localDateTimeAssertions.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/localDateTimeAssertions.kt @@ -29,6 +29,8 @@ val Expect.year: Expect * * @return an [Expect] for the subject of `this` expectation. * + * @sample ch.tutteli.atrium.api.infix.en_GB.samples.LocalDateTimeExpectationSamples.year + * * @since 0.12.0 */ infix fun Expect.year(assertionCreator: Expect.() -> Unit): Expect = @@ -52,6 +54,8 @@ val Expect.month: Expect * * @return an [Expect] for the subject of `this` expectation. * + * @sample ch.tutteli.atrium.api.infix.en_GB.samples.LocalDateTimeExpectationSamples.month + * * @since 0.12.0 */ infix fun Expect.month(assertionCreator: Expect.() -> Unit): Expect = @@ -75,6 +79,8 @@ val Expect.dayOfWeek: Expect * * @return an [Expect] for the subject of `this` expectation. * + * @sample ch.tutteli.atrium.api.infix.en_GB.samples.LocalDateTimeExpectationSamples.dayOfWeek + * * @since 0.12.0 */ infix fun Expect.dayOfWeek(assertionCreator: Expect.() -> Unit): Expect = @@ -98,6 +104,8 @@ val Expect.day: Expect * * @return an [Expect] for the subject of `this` expectation. * + * @sample ch.tutteli.atrium.api.infix.en_GB.samples.LocalDateTimeExpectationSamples.day + * * @since 0.12.0 */ infix fun Expect.day(assertionCreator: Expect.() -> Unit): Expect = diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/LocalDateTimeExpectationSamples.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/LocalDateTimeExpectationSamples.kt new file mode 100644 index 0000000000..d263dd8bf5 --- /dev/null +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/LocalDateTimeExpectationSamples.kt @@ -0,0 +1,73 @@ +package ch.tutteli.atrium.api.infix.en_GB.samples + +import ch.tutteli.atrium.api.infix.en_GB.* +import ch.tutteli.atrium.api.verbs.internal.expect +import java.time.DayOfWeek +import java.time.LocalDateTime +import java.time.Month +import kotlin.test.Test + +class LocalDateTimeExpectationSamples { + + @Test + fun year() { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) year { + it toEqual 2021 + it toBeGreaterThan 2020 + } + + fails { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) year { + it notToEqual 2022 + it toBeGreaterThan 2022 + it toBeLessThan 2020 + } + } + } + + @Test + fun month() { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) month { + it toEqual Month.OCTOBER.value + it notToEqual Month.SEPTEMBER.value + } + + fails { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) month { + it toEqual Month.SEPTEMBER.value + it notToEqual Month.OCTOBER.value + } + } + } + + @Test + fun dayOfWeek() { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) dayOfWeek { + it toEqual DayOfWeek.SATURDAY + it notToEqual DayOfWeek.SUNDAY + } + + fails { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) dayOfWeek { + it toEqual DayOfWeek.MONDAY + it notToEqual DayOfWeek.SATURDAY + } + } + } + + @Test + fun day() { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) day { + it toEqual 9 + it toBeGreaterThan 5 + } + + fails { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) day { + it toEqual 5 + it toBeLessThan 7 + } + } + } + +} From 68e79ff03bf8f4b20408bdbf1c97b86a484f82c2 Mon Sep 17 00:00:00 2001 From: Rhushikesh Apte Date: Sun, 10 Oct 2021 09:46:25 +0530 Subject: [PATCH 3/6] Add comment to exmplain type and value of subject inside block (#997) --- .../en_GB/samples/LocalDateTimeExpectationSamples.kt | 8 ++++++++ .../en_GB/samples/LocalDateTimeExpectationSamples.kt | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/LocalDateTimeExpectationSamples.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/LocalDateTimeExpectationSamples.kt index a74553212a..2e17021319 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/LocalDateTimeExpectationSamples.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/LocalDateTimeExpectationSamples.kt @@ -13,6 +13,7 @@ class LocalDateTimeExpectationSamples { fun year() { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) .year { + // subject inside this block is of type Int (actually 2021) toEqual(2021) toBeGreaterThan(2020) } @@ -20,6 +21,7 @@ class LocalDateTimeExpectationSamples { fails { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) .year { + // subject inside this block is of type Int (actually 2021) notToEqual(2022) toBeGreaterThan(2022) toBeLessThan(2020) @@ -31,6 +33,7 @@ class LocalDateTimeExpectationSamples { fun month() { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) .month { + // subject inside this block is of type Int (actually Month.OCTOBER.value i.e. 10) toEqual(Month.OCTOBER.value) notToEqual(Month.SEPTEMBER.value) } @@ -38,6 +41,7 @@ class LocalDateTimeExpectationSamples { fails { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) .month { + // subject inside this block is of type Int (actually Month.OCTOBER.value i.e. 10) toEqual(Month.SEPTEMBER.value) notToEqual(Month.OCTOBER.value) } @@ -48,6 +52,7 @@ class LocalDateTimeExpectationSamples { fun dayOfWeek() { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) .dayOfWeek { + // subject inside this block is of type DayOfWeek (actually SATURDAY) toEqual(DayOfWeek.SATURDAY) notToEqual(DayOfWeek.SUNDAY) } @@ -55,6 +60,7 @@ class LocalDateTimeExpectationSamples { fails { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) .dayOfWeek { + // subject inside this block is of type DayOfWeek (actually SATURDAY) toEqual(DayOfWeek.MONDAY) notToEqual(DayOfWeek.SATURDAY) } @@ -65,6 +71,7 @@ class LocalDateTimeExpectationSamples { fun day() { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) .day { + // subject inside this block is of type Int (actually 9) toEqual(9) toBeGreaterThan(5) } @@ -72,6 +79,7 @@ class LocalDateTimeExpectationSamples { fails { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) .day { + // subject inside this block is of type Int (actually 9) toEqual(5) toBeLessThan(7) } diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/LocalDateTimeExpectationSamples.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/LocalDateTimeExpectationSamples.kt index d263dd8bf5..38a14f85e2 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/LocalDateTimeExpectationSamples.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/LocalDateTimeExpectationSamples.kt @@ -12,12 +12,14 @@ class LocalDateTimeExpectationSamples { @Test fun year() { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) year { + // subject inside this block is of type Int (actually 2021) it toEqual 2021 it toBeGreaterThan 2020 } fails { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) year { + // subject inside this block is of type Int (actually 2021) it notToEqual 2022 it toBeGreaterThan 2022 it toBeLessThan 2020 @@ -28,12 +30,14 @@ class LocalDateTimeExpectationSamples { @Test fun month() { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) month { + // subject inside this block is of type Int (actually Month.OCTOBER.value i.e. 10) it toEqual Month.OCTOBER.value it notToEqual Month.SEPTEMBER.value } fails { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) month { + // subject inside this block is of type Int (actually Month.OCTOBER.value i.e. 10) it toEqual Month.SEPTEMBER.value it notToEqual Month.OCTOBER.value } @@ -43,12 +47,14 @@ class LocalDateTimeExpectationSamples { @Test fun dayOfWeek() { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) dayOfWeek { + // subject inside this block is of type DayOfWeek (actually SATURDAY) it toEqual DayOfWeek.SATURDAY it notToEqual DayOfWeek.SUNDAY } fails { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) dayOfWeek { + // subject inside this block is of type DayOfWeek (actually SATURDAY) it toEqual DayOfWeek.MONDAY it notToEqual DayOfWeek.SATURDAY } @@ -58,12 +64,14 @@ class LocalDateTimeExpectationSamples { @Test fun day() { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) day { + // subject inside this block is of type Int (actually 9) it toEqual 9 it toBeGreaterThan 5 } fails { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) day { + // subject inside this block is of type Int (actually 9) it toEqual 5 it toBeLessThan 7 } From de10e1a47c0cb2bbc2e81c03657f3e57b0ff9347 Mon Sep 17 00:00:00 2001 From: Rhushikesh Apte Date: Sun, 10 Oct 2021 10:00:53 +0530 Subject: [PATCH 4/6] Add samples for localDateTimeAssertions expect values (#997) --- .../fluent/en_GB/localDateTimeAssertions.kt | 8 ++++ .../LocalDateTimeExpectationSamples.kt | 47 ++++++++++++++++++- .../infix/en_GB/localDateTimeAssertions.kt | 8 ++++ .../LocalDateTimeExpectationSamples.kt | 44 ++++++++++++++++- 4 files changed, 103 insertions(+), 4 deletions(-) diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/localDateTimeAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/localDateTimeAssertions.kt index 0adbe3f2b9..b94b6277d7 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/localDateTimeAssertions.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/localDateTimeAssertions.kt @@ -17,6 +17,8 @@ import java.time.LocalDateTime * * @return The newly created [Expect] for the extracted feature. * + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.LocalDateTimeExpectationSamples.yearFeature + * * @since 0.9.0 */ val Expect.year: Expect @@ -42,6 +44,8 @@ fun Expect.year(assertionCreator: Expect.() -> Unit): Expect * * @return The newly created [Expect] for the extracted feature. * + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.LocalDateTimeExpectationSamples.monthFeature + * * @since 0.9.0 */ val Expect.month: Expect @@ -67,6 +71,8 @@ fun Expect.month(assertionCreator: Expect.() -> Unit): Expec * * @return The newly created [Expect] for the extracted feature. * + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.LocalDateTimeExpectationSamples.dayOfWeekFeature + * * @since 0.9.0 */ val Expect.dayOfWeek: Expect @@ -92,6 +98,8 @@ fun Expect.dayOfWeek(assertionCreator: Expect.() -> Un * * @return The newly created [Expect] for the extracted feature. * + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.LocalDateTimeExpectationSamples.dayFeature + * * @since 0.9.0 */ val Expect.day: Expect diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/LocalDateTimeExpectationSamples.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/LocalDateTimeExpectationSamples.kt index 2e17021319..bf14f34322 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/LocalDateTimeExpectationSamples.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/LocalDateTimeExpectationSamples.kt @@ -9,6 +9,17 @@ import kotlin.test.Test class LocalDateTimeExpectationSamples { + @Test + fun yearFeature() { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) + .year.toEqual(2021) + + fails { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) + .year.notToEqual(2021) + } + } + @Test fun year() { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) @@ -22,13 +33,24 @@ class LocalDateTimeExpectationSamples { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) .year { // subject inside this block is of type Int (actually 2021) - notToEqual(2022) + notToEqual(2021) toBeGreaterThan(2022) toBeLessThan(2020) } } } + @Test + fun monthFeature() { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) + .month.toEqual(Month.OCTOBER.value) + + fails { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) + .month.toEqual(Month.SEPTEMBER.value) + } + } + @Test fun month() { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) @@ -48,6 +70,17 @@ class LocalDateTimeExpectationSamples { } } + @Test + fun dayOfWeekFeature() { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) + .dayOfWeek.toEqual(DayOfWeek.SATURDAY) + + fails { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) + .dayOfWeek.toEqual(DayOfWeek.MONDAY) + } + } + @Test fun dayOfWeek() { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) @@ -67,6 +100,17 @@ class LocalDateTimeExpectationSamples { } } + @Test + fun dayFeature() { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) + .day.toEqual(9) + + fails { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) + .day.toEqual(5) + } + } + @Test fun day() { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) @@ -85,5 +129,4 @@ class LocalDateTimeExpectationSamples { } } } - } diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/localDateTimeAssertions.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/localDateTimeAssertions.kt index caa003ffc0..29f9c714af 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/localDateTimeAssertions.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/infix/en_GB/localDateTimeAssertions.kt @@ -17,6 +17,8 @@ import java.time.LocalDateTime * * @return The newly created [Expect] for the extracted feature. * + * @sample ch.tutteli.atrium.api.infix.en_GB.samples.LocalDateTimeExpectationSamples.yearFeature + * * @since 0.12.0 */ val Expect.year: Expect @@ -42,6 +44,8 @@ infix fun Expect.year(assertionCreator: Expect.() -> Unit): * * @return The newly created [Expect] for the extracted feature. * + * @sample ch.tutteli.atrium.api.infix.en_GB.samples.LocalDateTimeExpectationSamples.monthFeature + * * @since 0.12.0 */ val Expect.month: Expect @@ -67,6 +71,8 @@ infix fun Expect.month(assertionCreator: Expect.() -> Unit): * * @return The newly created [Expect] for the extracted feature. * + * @sample ch.tutteli.atrium.api.infix.en_GB.samples.LocalDateTimeExpectationSamples.dayOfWeekFeature + * * @since 0.12.0 */ val Expect.dayOfWeek: Expect @@ -92,6 +98,8 @@ infix fun Expect.dayOfWeek(assertionCreator: Expect.() * * @return The newly created [Expect] for the extracted feature. * + * @sample ch.tutteli.atrium.api.infix.en_GB.samples.LocalDateTimeExpectationSamples.dayFeature + * * @since 0.12.0 */ val Expect.day: Expect diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/LocalDateTimeExpectationSamples.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/LocalDateTimeExpectationSamples.kt index 38a14f85e2..dbc177e3ef 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/LocalDateTimeExpectationSamples.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/LocalDateTimeExpectationSamples.kt @@ -1,6 +1,7 @@ package ch.tutteli.atrium.api.infix.en_GB.samples import ch.tutteli.atrium.api.infix.en_GB.* +import ch.tutteli.atrium.api.infix.en_GB.workaround.it import ch.tutteli.atrium.api.verbs.internal.expect import java.time.DayOfWeek import java.time.LocalDateTime @@ -9,6 +10,15 @@ import kotlin.test.Test class LocalDateTimeExpectationSamples { + @Test + fun yearFeature() { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)).year toEqual 2021 + + fails { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)).year toEqual 2022 + } + } + @Test fun year() { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) year { @@ -20,13 +30,24 @@ class LocalDateTimeExpectationSamples { fails { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) year { // subject inside this block is of type Int (actually 2021) - it notToEqual 2022 + it notToEqual 2021 it toBeGreaterThan 2022 it toBeLessThan 2020 } } } + @Test + fun monthFeature() { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) + .month toEqual Month.OCTOBER.value + + fails { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) + .month toEqual Month.SEPTEMBER.value + } + } + @Test fun month() { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) month { @@ -44,6 +65,17 @@ class LocalDateTimeExpectationSamples { } } + @Test + fun dayOfWeekFeature() { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) + .dayOfWeek toEqual DayOfWeek.SATURDAY + + fails { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) + .dayOfWeek toEqual DayOfWeek.MONDAY + } + } + @Test fun dayOfWeek() { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) dayOfWeek { @@ -61,6 +93,15 @@ class LocalDateTimeExpectationSamples { } } + @Test + fun dayFeature() { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)).day toEqual 9 + + fails { + expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)).day toEqual 5 + } + } + @Test fun day() { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) day { @@ -77,5 +118,4 @@ class LocalDateTimeExpectationSamples { } } } - } From 0cf1784448ff9027d0dc80e8abf1c5a3294659a7 Mon Sep 17 00:00:00 2001 From: Rhushikesh Apte Date: Tue, 12 Oct 2021 22:04:59 +0530 Subject: [PATCH 5/6] Add comment to exmplain type subject offside block (#997) --- .../samples/LocalDateTimeExpectationSamples.kt | 16 ++++++++-------- .../samples/LocalDateTimeExpectationSamples.kt | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/LocalDateTimeExpectationSamples.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/LocalDateTimeExpectationSamples.kt index bf14f34322..9c598f24d1 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/LocalDateTimeExpectationSamples.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/LocalDateTimeExpectationSamples.kt @@ -27,7 +27,7 @@ class LocalDateTimeExpectationSamples { // subject inside this block is of type Int (actually 2021) toEqual(2021) toBeGreaterThan(2020) - } + } // subject here is back to type LocalDateTime fails { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) @@ -36,7 +36,7 @@ class LocalDateTimeExpectationSamples { notToEqual(2021) toBeGreaterThan(2022) toBeLessThan(2020) - } + } // subject here is back to type LocalDateTime } } @@ -58,7 +58,7 @@ class LocalDateTimeExpectationSamples { // subject inside this block is of type Int (actually Month.OCTOBER.value i.e. 10) toEqual(Month.OCTOBER.value) notToEqual(Month.SEPTEMBER.value) - } + } // subject here is back to type LocalDateTime fails { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) @@ -66,7 +66,7 @@ class LocalDateTimeExpectationSamples { // subject inside this block is of type Int (actually Month.OCTOBER.value i.e. 10) toEqual(Month.SEPTEMBER.value) notToEqual(Month.OCTOBER.value) - } + } // subject here is back to type LocalDateTime } } @@ -88,7 +88,7 @@ class LocalDateTimeExpectationSamples { // subject inside this block is of type DayOfWeek (actually SATURDAY) toEqual(DayOfWeek.SATURDAY) notToEqual(DayOfWeek.SUNDAY) - } + } // subject here is back to type LocalDateTime fails { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) @@ -96,7 +96,7 @@ class LocalDateTimeExpectationSamples { // subject inside this block is of type DayOfWeek (actually SATURDAY) toEqual(DayOfWeek.MONDAY) notToEqual(DayOfWeek.SATURDAY) - } + } // subject here is back to type LocalDateTime } } @@ -118,7 +118,7 @@ class LocalDateTimeExpectationSamples { // subject inside this block is of type Int (actually 9) toEqual(9) toBeGreaterThan(5) - } + } // subject here is back to type LocalDateTime fails { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) @@ -126,7 +126,7 @@ class LocalDateTimeExpectationSamples { // subject inside this block is of type Int (actually 9) toEqual(5) toBeLessThan(7) - } + } // subject here is back to type LocalDateTime } } } diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/LocalDateTimeExpectationSamples.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/LocalDateTimeExpectationSamples.kt index dbc177e3ef..0f6287b744 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/LocalDateTimeExpectationSamples.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/LocalDateTimeExpectationSamples.kt @@ -25,7 +25,7 @@ class LocalDateTimeExpectationSamples { // subject inside this block is of type Int (actually 2021) it toEqual 2021 it toBeGreaterThan 2020 - } + } // subject here is back to type LocalDateTime fails { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) year { @@ -33,7 +33,7 @@ class LocalDateTimeExpectationSamples { it notToEqual 2021 it toBeGreaterThan 2022 it toBeLessThan 2020 - } + } // subject here is back to type LocalDateTime } } @@ -54,14 +54,14 @@ class LocalDateTimeExpectationSamples { // subject inside this block is of type Int (actually Month.OCTOBER.value i.e. 10) it toEqual Month.OCTOBER.value it notToEqual Month.SEPTEMBER.value - } + } // subject here is back to type LocalDateTime fails { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) month { // subject inside this block is of type Int (actually Month.OCTOBER.value i.e. 10) it toEqual Month.SEPTEMBER.value it notToEqual Month.OCTOBER.value - } + } // subject here is back to type LocalDateTime } } @@ -82,14 +82,14 @@ class LocalDateTimeExpectationSamples { // subject inside this block is of type DayOfWeek (actually SATURDAY) it toEqual DayOfWeek.SATURDAY it notToEqual DayOfWeek.SUNDAY - } + } // subject here is back to type LocalDateTime fails { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) dayOfWeek { // subject inside this block is of type DayOfWeek (actually SATURDAY) it toEqual DayOfWeek.MONDAY it notToEqual DayOfWeek.SATURDAY - } + } // subject here is back to type LocalDateTime } } @@ -108,14 +108,14 @@ class LocalDateTimeExpectationSamples { // subject inside this block is of type Int (actually 9) it toEqual 9 it toBeGreaterThan 5 - } + } // subject here is back to type LocalDateTime fails { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) day { // subject inside this block is of type Int (actually 9) it toEqual 5 it toBeLessThan 7 - } + } // subject here is back to type LocalDateTime } } } From 95830d227f6820e3b380d6adaa2f6e9e5aa04615 Mon Sep 17 00:00:00 2001 From: Rhushikesh Apte Date: Tue, 12 Oct 2021 22:13:27 +0530 Subject: [PATCH 6/6] Add comment to exmplain type and value of subject (#997) --- .../en_GB/samples/LocalDateTimeExpectationSamples.kt | 8 ++++++++ .../en_GB/samples/LocalDateTimeExpectationSamples.kt | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/LocalDateTimeExpectationSamples.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/LocalDateTimeExpectationSamples.kt index 9c598f24d1..bec80390de 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/LocalDateTimeExpectationSamples.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/LocalDateTimeExpectationSamples.kt @@ -13,10 +13,12 @@ class LocalDateTimeExpectationSamples { fun yearFeature() { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) .year.toEqual(2021) + // | subject is now of type Int fails { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) .year.notToEqual(2021) + // | subject is now of type Int } } @@ -44,10 +46,12 @@ class LocalDateTimeExpectationSamples { fun monthFeature() { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) .month.toEqual(Month.OCTOBER.value) + // | subject is now of type Int fails { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) .month.toEqual(Month.SEPTEMBER.value) + // | subject is now of type Int } } @@ -74,10 +78,12 @@ class LocalDateTimeExpectationSamples { fun dayOfWeekFeature() { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) .dayOfWeek.toEqual(DayOfWeek.SATURDAY) + // | subject is now of type DayOfWeek fails { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) .dayOfWeek.toEqual(DayOfWeek.MONDAY) + // | subject is now of type DayOfWeek } } @@ -104,10 +110,12 @@ class LocalDateTimeExpectationSamples { fun dayFeature() { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) .day.toEqual(9) + // | subject is now of type Int fails { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) .day.toEqual(5) + // | subject is now of type Int } } diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/LocalDateTimeExpectationSamples.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/LocalDateTimeExpectationSamples.kt index 0f6287b744..e6c803a8a2 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/LocalDateTimeExpectationSamples.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/samples/LocalDateTimeExpectationSamples.kt @@ -13,9 +13,11 @@ class LocalDateTimeExpectationSamples { @Test fun yearFeature() { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)).year toEqual 2021 + // | subject is now of type Int fails { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)).year toEqual 2022 + // | subject is now of type Int } } @@ -41,10 +43,12 @@ class LocalDateTimeExpectationSamples { fun monthFeature() { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) .month toEqual Month.OCTOBER.value + // | subject is now of type Int fails { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) .month toEqual Month.SEPTEMBER.value + // | subject is now of type Int } } @@ -69,10 +73,12 @@ class LocalDateTimeExpectationSamples { fun dayOfWeekFeature() { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) .dayOfWeek toEqual DayOfWeek.SATURDAY + // | subject is now of type DayOfWeek fails { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)) .dayOfWeek toEqual DayOfWeek.MONDAY + // | subject is now of type DayOfWeek } } @@ -96,9 +102,11 @@ class LocalDateTimeExpectationSamples { @Test fun dayFeature() { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)).day toEqual 9 + // | subject is now of type DayOfWeek fails { expect(LocalDateTime.of(2021, Month.OCTOBER, 9, 11, 56)).day toEqual 5 + // | subject is now of type DayOfWeek } }