From 4dd9b2148242760d77a9e89a474ac1dee65c481b Mon Sep 17 00:00:00 2001 From: Joshua Gleitze Date: Wed, 23 Dec 2020 23:37:50 +0100 Subject: [PATCH] refactor: adapt specs to *Expectations* naming --- .github/ISSUE_TEMPLATE/good_first_issue.md | 4 +- .../fluent/en_GB/charSequenceExpectations.kt | 40 +++++++++---------- .../api/fluent/en_GB/AnyExpectationsSpec.kt | 2 +- .../en_GB/ArrayAsListExpectationsSpec.kt | 2 +- ...SequenceContainsAtLeastExpectationsSpec.kt | 10 ++--- ...rSequenceContainsAtMostExpectationsSpec.kt | 4 +- ...enceContainsContainsNotExpectationsSpec.kt | 6 +-- ...SequenceContainsExactlyExpectationsSpec.kt | 4 +- ...CharSequenceContainsNotExpectationsSpec.kt | 2 +- ...enceContainsNotOrAtMostExpectationsSpec.kt | 4 +- ...arSequenceContainsRegexExpectationsSpec.kt | 6 +-- .../en_GB/CharSequenceExpectationsSpec.kt | 2 +- .../en_GB/CollectionExpectationsSpec.kt | 2 +- .../en_GB/ComparableExpectationsSpec.kt | 2 +- ...PointWithErrorToleranceExpectationsSpec.kt | 4 +- .../api/fluent/en_GB/Fun0ExpectationsSpec.kt | 2 +- .../en_GB/IterableAllExpectationsSpec.kt | 2 +- .../en_GB/IterableAnyExpectationsSpec.kt | 13 +++--- ...OrderAtLeast1ElementsOfExpectationsSpec.kt | 8 ++-- ...AnyOrderAtLeast1EntriesExpectationsSpec.kt | 8 ++-- ...nAnyOrderAtLeast1ValuesExpectationsSpec.kt | 8 ++-- ...InAnyOrderAtLeastValuesExpectationsSpec.kt | 2 +- ...sInAnyOrderAtMostValuesExpectationsSpec.kt | 4 +- ...InAnyOrderExactlyValuesExpectationsSpec.kt | 4 +- ...yOrderNotOrAtMostValuesExpectationsSpec.kt | 4 +- ...nAnyOrderOnlyElementsOfExpectationsSpec.kt | 6 +-- ...nsInAnyOrderOnlyEntriesExpectationsSpec.kt | 4 +- ...insInAnyOrderOnlyValuesExpectationsSpec.kt | 4 +- ...nsInOrderOnlyElementsOfExpectationsSpec.kt | 8 ++-- ...tainsInOrderOnlyEntriesExpectationsSpec.kt | 8 ++-- ...OrderOnlyGroupedEntriesExpectationsSpec.kt | 4 +- ...nOrderOnlyGroupedValuesExpectationsSpec.kt | 4 +- ...ntainsInOrderOnlyValuesExpectationsSpec.kt | 8 ++-- ...rableContainsNotEntriesExpectationsSpec.kt | 4 +- ...erableContainsNotValuesExpectationsSpec.kt | 8 ++-- .../fluent/en_GB/IterableExpectationsSpec.kt | 2 +- .../en_GB/IterableNoneExpectationsSpec.kt | 8 ++-- .../fluent/en_GB/IteratorExpectationsSpec.kt | 2 +- .../api/fluent/en_GB/ListExpectationsSpec.kt | 4 +- .../en_GB/MapAsEntriesExpectationsSpec.kt | 2 +- ...ainsInAnyOrderEntriesOfExpectationsSpec.kt | 8 ++-- ...tainsInAnyOrderKeyValueExpectationsSpec.kt | 8 ++-- ...InAnyOrderKeyValuePairsExpectationsSpec.kt | 8 ++-- ...InAnyOrderOnlyEntriesOfExpectationsSpec.kt | 8 ++-- ...sInAnyOrderOnlyKeyValueExpectationsSpec.kt | 8 ++-- ...yOrderOnlyKeyValuePairsExpectationsSpec.kt | 8 ++-- ...insInOrderOnlyEntriesOfExpectationsSpec.kt | 6 +-- ...ainsInOrderOnlyKeyValueExpectationsSpec.kt | 6 +-- ...nOrderOnlyKeyValuePairsExpectationsSpec.kt | 6 +-- .../fluent/en_GB/MapEntryExpectationsSpec.kt | 2 +- .../api/fluent/en_GB/MapExpectationsSpec.kt | 3 +- .../api/fluent/en_GB/PairExpectationsSpec.kt | 2 +- .../fluent/en_GB/ThrowableExpectationsSpec.kt | 2 +- .../samples/CharSequenceExpectationsSpec.kt | 2 +- .../en_GB/BigDecimalExpectationsSpec.kt | 4 +- .../en_GB/ChronoLocalDateExpectationsSpec.kt | 6 +-- .../ChronoLocalDateTimeExpectationsSpec.kt | 6 +-- .../ChronoZonedDateTimeExpectationsSpec.kt | 8 ++-- .../en_GB/FileAsPathExpectationsSpec.kt | 2 +- ...ntWithErrorToleranceExpectationsJvmSpec.kt | 4 +- .../fluent/en_GB/Fun0ExpectationsJvmSpec.kt | 2 +- .../fluent/en_GB/LocalDateExpectationsSpec.kt | 2 +- .../en_GB/LocalDateTimeExpectationsSpec.kt | 2 +- .../fluent/en_GB/OptionalExpectationsSpec.kt | 4 +- .../api/fluent/en_GB/PathExpectationsSpec.kt | 2 +- .../en_GB/PathFeatureExpectationsSpec.kt | 2 +- .../en_GB/ZonedDateTimeExpectationsSpec.kt | 2 +- .../kotlin_1_3/ResultExpectationsSpec.kt | 2 +- .../api/infix/en_GB/AnyExpectationsSpec.kt | 2 +- .../en_GB/ArrayAsListExpectationsSpec.kt | 2 +- ...SequenceContainsAtLeastExpectationsSpec.kt | 10 ++--- ...rSequenceContainsAtMostExpectationsSpec.kt | 4 +- ...enceContainsContainsNotExpectationsSpec.kt | 6 +-- ...SequenceContainsExactlyExpectationsSpec.kt | 4 +- ...CharSequenceContainsNotExpectationsSpec.kt | 2 +- ...enceContainsNotOrAtMostExpectationsSpec.kt | 4 +- ...arSequenceContainsRegexExpectationsSpec.kt | 6 +-- .../en_GB/CharSequenceExpectationsSpec.kt | 2 +- .../infix/en_GB/CollectionExpectationsSpec.kt | 2 +- .../infix/en_GB/ComparableExpectationsSpec.kt | 2 +- .../api/infix/en_GB/Fun0ExpectationsSpec.kt | 2 +- .../en_GB/IterableAllExpectationsSpec.kt | 2 +- .../en_GB/IterableAnyExpectationsSpec.kt | 11 +++-- ...OrderAtLeast1ElementsOfExpectationsSpec.kt | 6 +-- ...AnyOrderAtLeast1EntriesExpectationsSpec.kt | 6 +-- ...nAnyOrderAtLeast1ValuesExpectationsSpec.kt | 6 +-- ...InAnyOrderExactlyValuesExpectationsSpec.kt | 4 +- ...yOrderNotOrAtMostValuesExpectationsSpec.kt | 4 +- ...nAnyOrderOnlyElementsOfExpectationsSpec.kt | 4 +- ...nsInAnyOrderOnlyEntriesExpectationsSpec.kt | 4 +- ...insInAnyOrderOnlyValuesExpectationsSpec.kt | 4 +- ...nsInOrderOnlyElementsOfExpectationsSpec.kt | 4 +- ...tainsInOrderOnlyEntriesExpectationsSpec.kt | 4 +- ...OrderOnlyGroupedEntriesExpectationsSpec.kt | 4 +- ...nOrderOnlyGroupedValuesExpectationsSpec.kt | 4 +- ...ntainsInOrderOnlyValuesExpectationsSpec.kt | 4 +- ...rableContainsNotEntriesExpectationsSpec.kt | 4 +- ...erableContainsNotValuesExpectationsSpec.kt | 4 +- .../infix/en_GB/IterableExpectationsSpec.kt | 2 +- .../en_GB/IterableNoneExpectationsSpec.kt | 6 +-- .../infix/en_GB/IteratorExpectationsSpec.kt | 2 +- .../api/infix/en_GB/ListExpectationsSpec.kt | 4 +- .../en_GB/MapAsEntriesExpectationsSpec.kt | 2 +- ...ainsInAnyOrderEntriesOfExpectationsSpec.kt | 8 ++-- ...tainsInAnyOrderKeyValueExpectationsSpec.kt | 8 ++-- ...InAnyOrderKeyValuePairsExpectationsSpec.kt | 8 ++-- ...InAnyOrderOnlyEntriesOfExpectationsSpec.kt | 8 ++-- ...sInAnyOrderOnlyKeyValueExpectationsSpec.kt | 8 ++-- ...yOrderOnlyKeyValuePairsExpectationsSpec.kt | 9 ++--- ...insInOrderOnlyEntriesOfExpectationsSpec.kt | 6 +-- ...ainsInOrderOnlyKeyValueExpectationsSpec.kt | 6 +-- ...nOrderOnlyKeyValuePairsExpectationsSpec.kt | 6 +-- .../infix/en_GB/MapEntryExpectationsSpec.kt | 2 +- .../api/infix/en_GB/MapExpectationsSpec.kt | 3 +- .../api/infix/en_GB/PairExpectationsSpec.kt | 2 +- .../infix/en_GB/ThrowableExpectationsSpec.kt | 2 +- .../infix/en_GB/BigDecimalExpectationsSpec.kt | 2 +- .../en_GB/ChronoLocalDateExpectationsSpec.kt | 6 +-- .../ChronoLocalDateTimeExpectationsSpec.kt | 4 +- .../ChronoZonedDateTimeExpectationsSpec.kt | 10 ++--- .../infix/en_GB/FileAsPathExpectationsSpec.kt | 2 +- .../infix/en_GB/Fun0ExpectationsJvmSpec.kt | 2 +- .../infix/en_GB/LocalDateExpectationsSpec.kt | 2 +- .../en_GB/LocalDateTimeExpectationsSpec.kt | 2 +- .../infix/en_GB/OptionalExpectationsSpec.kt | 6 +-- .../api/infix/en_GB/PathExpectationsSpec.kt | 2 +- .../en_GB/PathFeatureExpectationsSpec.kt | 2 +- .../en_GB/ZonedDateTimeExpectationsSpec.kt | 2 +- .../kotlin_1_3/ResultExpectationsSpec.kt | 4 +- .../fluent/en_GB/AnyExpectationsSpec.scala | 8 ++-- .../IterableLIkeElementComparableSpecs.scala | 10 ++--- .../jdk8/ChronoLocalDateAssertionsSpec.kt | 2 +- .../jdk8/ChronoLocalDateTimeAssertionSpec.kt | 2 +- .../jdk8/ChronoZonedDateTimeAssertionSpec.kt | 2 +- .../en_GB/jdk8/FileAsPathExpectationsSpec.kt | 2 +- .../en_GB/jdk8/LocalDateExpectationsSpec.kt | 2 +- .../jdk8/LocalDateTimeExpectationsSpec.kt | 2 +- .../en_GB/jdk8/OptionalExpectationsSpec.kt | 4 +- .../fluent/en_GB/jdk8/PathExpectationsSpec.kt | 2 +- .../en_GB/jdk8/PathFeatureExpectationsSpec.kt | 2 +- .../jdk8/ZonedDateTimeExpectationsSpec.kt | 2 +- .../specs/integration/AnyExpectationsSpec.kt | 2 +- .../ArrayAsListExpectationsSpec.kt | 2 +- ...SequenceContainsAtLeastExpectationsSpec.kt | 2 +- ...rSequenceContainsAtMostExpectationsSpec.kt | 2 +- ...enceContainsContainsNotExpectationsSpec.kt | 2 +- ...SequenceContainsExactlyExpectationsSpec.kt | 2 +- ...CharSequenceContainsNotExpectationsSpec.kt | 2 +- ...enceContainsNotOrAtMostExpectationsSpec.kt | 2 +- ...arSequenceContainsRegexExpectationsSpec.kt | 2 +- .../CharSequenceExpectationsSpec.kt | 2 +- .../integration/CollectionExpectationsSpec.kt | 2 +- .../integration/ComparableExpectationsSpec.kt | 2 +- .../integration/FeatureExpectationsSpec.kt | 2 +- ...PointWithErrorToleranceExpectationsSpec.kt | 4 +- .../specs/integration/Fun0ExpectationsSpec.kt | 6 +-- .../IterableAllExpectationsSpec.kt | 2 +- .../IterableAnyExpectationsSpec.kt | 2 +- ...AnyOrderAtLeast1EntriesExpectationsSpec.kt | 2 +- ...nAnyOrderAtLeast1ValuesExpectationsSpec.kt | 2 +- ...InAnyOrderAtLeastValuesExpectationsSpec.kt | 2 +- ...sInAnyOrderAtMostValuesExpectationsSpec.kt | 2 +- ...InAnyOrderExactlyValuesExpectationsSpec.kt | 2 +- ...yOrderNotOrAtMostValuesExpectationsSpec.kt | 2 +- ...nsInAnyOrderOnlyEntriesExpectationsSpec.kt | 2 +- ...insInAnyOrderOnlyValuesExpectationsSpec.kt | 2 +- ...tainsInOrderOnlyEntriesExpectationsSpec.kt | 2 +- ...OrderOnlyGroupedEntriesExpectationsSpec.kt | 2 +- ...nOrderOnlyGroupedValuesExpectationsSpec.kt | 2 +- ...ntainsInOrderOnlyValuesExpectationsSpec.kt | 2 +- ...rableContainsNotEntriesExpectationsSpec.kt | 2 +- ...erableContainsNotValuesExpectationsSpec.kt | 2 +- .../integration/IterableExpectationsSpec.kt | 2 +- .../IterableNoneExpectationsSpec.kt | 2 +- .../integration/IteratorExpectationsSpec.kt | 2 +- .../KeyValueLikeExpectationsSpec.kt | 2 +- .../specs/integration/ListExpectationsSpec.kt | 2 +- .../MapAsEntriesExpectationsSpec.kt | 2 +- ...tainsInAnyOrderKeyValueExpectationsSpec.kt | 2 +- ...InAnyOrderKeyValuePairsExpectationsSpec.kt | 2 +- ...sInAnyOrderOnlyKeyValueExpectationsSpec.kt | 2 +- ...yOrderOnlyKeyValuePairsExpectationsSpec.kt | 2 +- ...ainsInOrderOnlyKeyValueExpectationsSpec.kt | 2 +- ...nOrderOnlyKeyValuePairsExpectationsSpec.kt | 2 +- .../integration/MapEntryExpectationsSpec.kt | 4 +- .../specs/integration/MapExpectationsSpec.kt | 2 +- .../specs/integration/PairExpectationsSpec.kt | 4 +- .../integration/ResultExpectationsSpec.kt | 2 +- .../integration/ThrowableExpectationsSpec.kt | 2 +- .../integration/BigDecimalExpectationsSpec.kt | 2 +- ...ChronoLocalDateAsStringExpectationsSpec.kt | 2 +- ...noLocalDateTimeAsStringExpectationsSpec.kt | 4 +- .../ChronoLocalDateTimeExpectationsSpec.kt | 2 +- ...noZonedDateTimeAsStringExpectationsSpec.kt | 4 +- .../ChronoZonedDateTimeExpectationsSpec.kt | 2 +- .../integration/FileAsPathExpectationsSpec.kt | 2 +- ...ntWithErrorToleranceExpectationsJvmSpec.kt | 4 +- .../integration/Fun0ExpectationsJvmSpec.kt | 4 +- .../integration/LocalDateExpectationsSpec.kt | 2 +- .../LocalDateTimeExpectationsSpec.kt | 2 +- .../integration/OptionalExpectationsSpec.kt | 2 +- .../specs/integration/PathExpectationsSpec.kt | 2 +- .../PathFeatureExpectationsSpec.kt | 2 +- .../ZonedDateTimeExpectationsSpec.kt | 2 +- 204 files changed, 395 insertions(+), 404 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/good_first_issue.md b/.github/ISSUE_TEMPLATE/good_first_issue.md index 38d0ff7647..7b953073ce 100644 --- a/.github/ISSUE_TEMPLATE/good_first_issue.md +++ b/.github/ISSUE_TEMPLATE/good_first_issue.md @@ -26,13 +26,13 @@ Following the things you need to do: - [ ] provide a val which returns `Expect` (see yzAssertions.kt as a guideline) - [ ] provide a fun which expects an `assertionCreator`-lambda and returns `Expect` (see yzAssertions.kt as a guideline) - [ ] add `@since 0.16.0` (adapt to current [milestone](https://github.com/robstoll/atrium/milestones)) to KDOC -- [ ] extend or write a separate Spec named XyAssertionsSpec in specs-common (see for instance YzAssertionsSpec) and extend it in atrium-api-fluent-en_GB-common/src/test +- [ ] extend or write a separate Spec named XyExpectationsSpec in specs-common (see for instance YzExpectationsSpec) and extend it in atrium-api-fluent-en_GB-common/src/test *api-infix* - [ ] provide a val which returns `Expect` (see yzAssertions.kt as a guideline) - [ ] provide a fun which expects an `assertionCreator`-lambda and returns `Expect` (see yzAssertions.kt as a guideline) - [ ] add `@since 0.16.0` (adapt to current [milestone](https://github.com/robstoll/atrium/milestones)) to KDOC -- [ ] extend or write a separate Spec named XyAssertionsSpec in specs-common (see for instance YzAssertionsSpec) and extend it in atrium-api-infix-en_GB-common/src/test +- [ ] extend or write a separate Spec named XyExpectationsSpec in specs-common (see for instance YzExpectationsSpec) and extend it in atrium-api-infix-en_GB-common/src/test ## Non-Code related feature diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/charSequenceExpectations.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/charSequenceExpectations.kt index 74808052f4..3bf8a727e6 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/charSequenceExpectations.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/charSequenceExpectations.kt @@ -5,12 +5,12 @@ package ch.tutteli.atrium.api.fluent.en_GB import ch.tutteli.atrium.creating.Expect -import ch.tutteli.atrium.logic.creating.typeutils.CharSequenceOrNumberOrChar import ch.tutteli.atrium.logic.* import ch.tutteli.atrium.logic.creating.charsequence.contains.CharSequenceContains import ch.tutteli.atrium.logic.creating.charsequence.contains.searchbehaviours.NoOpSearchBehaviour import ch.tutteli.atrium.logic.creating.charsequence.contains.searchbehaviours.NotSearchBehaviour import ch.tutteli.atrium.logic.creating.charsequence.contains.steps.NotCheckerStep +import ch.tutteli.atrium.logic.creating.typeutils.CharSequenceOrNumberOrChar import kotlin.jvm.JvmMultifileClass import kotlin.jvm.JvmName @@ -19,7 +19,7 @@ import kotlin.jvm.JvmName * * @return The newly created builder. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceAssertionsSpec.containsBuilder + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSpec.containsBuilder */ val Expect.contains: CharSequenceContains.EntryPointStep get() = _logic.containsBuilder() @@ -30,7 +30,7 @@ val Expect.contains: CharSequenceContains.EntryPointStep Expect.containsNot: NotCheckerStep get() = _logic.containsNotBuilder() @@ -61,7 +61,7 @@ val Expect.containsNot: NotCheckerStep Expect.contains( expected: CharSequenceOrNumberOrChar, @@ -80,7 +80,7 @@ fun Expect.contains( * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceAssertionsSpec.containsNot + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSpec.containsNot */ fun Expect.containsNot( expected: CharSequenceOrNumberOrChar, @@ -109,7 +109,7 @@ fun Expect.containsNot( * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceAssertionsSpec.containsRegexString + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSpec.containsRegexString */ fun Expect.containsRegex(pattern: String, vararg otherPatterns: String): Expect = contains.atLeast(1).regex(pattern, *otherPatterns) @@ -138,7 +138,7 @@ fun Expect.containsRegex(pattern: String, vararg otherPatt * * @since 0.9.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceAssertionsSpec.containsRegex + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSpec.containsRegex */ fun Expect.containsRegex(pattern: Regex, vararg otherPatterns: Regex): Expect = contains.atLeast(1).regex(pattern, *otherPatterns) @@ -148,7 +148,7 @@ fun Expect.containsRegex(pattern: Regex, vararg otherPatte * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceAssertionsSpec.startsWith + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSpec.startsWith */ fun Expect.startsWith(expected: CharSequence): Expect = _logicAppend { startsWith(expected) } @@ -158,7 +158,7 @@ fun Expect.startsWith(expected: CharSequence): Expect = * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceAssertionsSpec.startsWithChar + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSpec.startsWithChar * * @since 0.9.0 */ @@ -170,7 +170,7 @@ fun Expect.startsWith(expected: Char): Expect = * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceAssertionsSpec.startsNotWith + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSpec.startsNotWith */ fun Expect.startsNotWith(expected: CharSequence): Expect = _logicAppend { startsNotWith(expected) } @@ -182,7 +182,7 @@ fun Expect.startsNotWith(expected: CharSequence): Expect Expect.startsNotWith(expected: Char): Expect = startsNotWith(expected.toString()) @@ -193,7 +193,7 @@ fun Expect.startsNotWith(expected: Char): Expect = * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceAssertionsSpec.endsWith + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSpec.endsWith */ fun Expect.endsWith(expected: CharSequence): Expect = _logicAppend { endsWith(expected) } @@ -205,7 +205,7 @@ fun Expect.endsWith(expected: CharSequence): Expect = * * @since 0.9.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceAssertionsSpec.endsWithChar + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSpec.endsWithChar */ fun Expect.endsWith(expected: Char): Expect = endsWith(expected.toString()) @@ -215,7 +215,7 @@ fun Expect.endsWith(expected: Char): Expect = * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceAssertionsSpec.endsNotWith + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSpec.endsNotWith */ fun Expect.endsNotWith(expected: CharSequence): Expect = _logicAppend { endsNotWith(expected) } @@ -226,7 +226,7 @@ fun Expect.endsNotWith(expected: CharSequence): Expect * @return An [Expect] for the current subject of the assertion. * * @since 0.9.0 - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceAssertionsSpec.endsNotWithChar + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSpec.endsNotWithChar */ fun Expect.endsNotWith(expected: Char): Expect = endsNotWith(expected.toString()) @@ -237,7 +237,7 @@ fun Expect.endsNotWith(expected: Char): Expect = * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceAssertionsSpec.isEmpty + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSpec.isEmpty */ fun Expect.isEmpty(): Expect = _logicAppend { isEmpty() } @@ -247,7 +247,7 @@ fun Expect.isEmpty(): Expect = * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceAssertionsSpec.isNotEmpty + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSpec.isNotEmpty */ fun Expect.isNotEmpty(): Expect = _logicAppend { isNotEmpty() } @@ -257,7 +257,7 @@ fun Expect.isNotEmpty(): Expect = * * @return An [Expect] for the current subject of the assertion. * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceAssertionsSpec.isNotBlank + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSpec.isNotBlank */ fun Expect.isNotBlank(): Expect = _logicAppend { isNotBlank() } @@ -271,7 +271,7 @@ fun Expect.isNotBlank(): Expect = * * @since 0.9.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceAssertionsSpec.matches + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSpec.matches */ fun Expect.matches(expected: Regex): Expect = _logicAppend { matches(expected) } @@ -285,7 +285,7 @@ fun Expect.matches(expected: Regex): Expect = * * @since 0.9.0 * - * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceAssertionsSpec.mismatches + * @sample ch.tutteli.atrium.api.fluent.en_GB.samples.CharSequenceExpectationsSpec.mismatches */ fun Expect.mismatches(expected: Regex): Expect = _logicAppend { mismatches(expected) } diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/AnyExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/AnyExpectationsSpec.kt index dde613fed5..003ef9772c 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/AnyExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/AnyExpectationsSpec.kt @@ -9,7 +9,7 @@ import ch.tutteli.atrium.specs.withNullableSuffix import kotlin.reflect.KFunction2 import kotlin.reflect.KProperty1 -class AnyAssertionsSpec : ch.tutteli.atrium.specs.integration.AnyAssertionsSpec( +class AnyExpectationsSpec : ch.tutteli.atrium.specs.integration.AnyExpectationsSpec( fun1(Expect::toBe), fun1(Expect::toBe), fun1(Expect::toBe).withNullableSuffix(), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ArrayAsListExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ArrayAsListExpectationsSpec.kt index 10036a491b..b443931197 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ArrayAsListExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ArrayAsListExpectationsSpec.kt @@ -3,7 +3,7 @@ package ch.tutteli.atrium.api.fluent.en_GB import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.notImplemented -object ArrayAsListAssertionsSpec : ch.tutteli.atrium.specs.integration.ArrayAsListAssertionsSpec( +object ArrayAsListExpectationsSpec : ch.tutteli.atrium.specs.integration.ArrayAsListExpectationsSpec( "asList", Expect>::asList, Expect::asList, diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsAtLeastExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsAtLeastExpectationsSpec.kt index 79e21badec..9a50896ba9 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsAtLeastExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsAtLeastExpectationsSpec.kt @@ -3,26 +3,26 @@ package ch.tutteli.atrium.api.fluent.en_GB import ch.tutteli.atrium.creating.Expect import org.spekframework.spek2.Spek -class CharSequenceContainsAtLeastAssertionsSpec : Spek({ - include(object : ch.tutteli.atrium.specs.integration.CharSequenceContainsAtLeastAssertionsSpec( +class CharSequenceContainsAtLeastExpectationsSpec : Spek({ + include(object : ch.tutteli.atrium.specs.integration.CharSequenceContainsAtLeastExpectationsSpec( getAtLeastValuesTriple(), getAtLeastIgnoringCaseValuesTriple(), getAtLeastButAtMostValuesTriple(), getAtLeastBustAtMostIgnoringCaseValuesTriple(), getContainsNotPair(), getExactlyPair(), - CharSequenceContainsAtLeastAssertionsSpec.Companion::getErrorMsgAtLeastButAtMost, + CharSequenceContainsAtLeastExpectationsSpec.Companion::getErrorMsgAtLeastButAtMost, "◆ ", "⚬ " ) {}) - include(object : ch.tutteli.atrium.specs.integration.CharSequenceContainsAtLeastAssertionsSpec( + include(object : ch.tutteli.atrium.specs.integration.CharSequenceContainsAtLeastExpectationsSpec( getAtLeastElementsOfTriple(), getAtLeastIgnoringCaseElementsOfTriple(), getAtLeastButAtMostElementsOfTriple(), getAtLeastButAtMostIgnoringCaseElementsOfTriple(), getContainsNotPair(), getExactlyPair(), - CharSequenceContainsAtLeastAssertionsSpec.Companion::getErrorMsgAtLeastButAtMost, + CharSequenceContainsAtLeastExpectationsSpec.Companion::getErrorMsgAtLeastButAtMost, "◆ ", "⚬ " ) {}) diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsAtMostExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsAtMostExpectationsSpec.kt index 4ccb52e272..209540752b 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsAtMostExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsAtMostExpectationsSpec.kt @@ -3,8 +3,8 @@ package ch.tutteli.atrium.api.fluent.en_GB import ch.tutteli.atrium.creating.Expect -class CharSequenceContainsAtMostAssertionsSpec : - ch.tutteli.atrium.specs.integration.CharSequenceContainsAtMostAssertionsSpec( +class CharSequenceContainsAtMostExpectationsSpec : + ch.tutteli.atrium.specs.integration.CharSequenceContainsAtMostExpectationsSpec( getAtMostTriple(), getAtMostIgnoringCaseTriple(), getContainsNotPair(), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsContainsNotExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsContainsNotExpectationsSpec.kt index cf40a69ebf..4d380b330d 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsContainsNotExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsContainsNotExpectationsSpec.kt @@ -5,16 +5,16 @@ import ch.tutteli.atrium.specs.fun2 import ch.tutteli.atrium.specs.notImplemented import org.spekframework.spek2.Spek -class CharSequenceContainsContainsNotAssertionsSpec : Spek({ +class CharSequenceContainsContainsNotExpectationsSpec : Spek({ - include(object : ch.tutteli.atrium.specs.integration.CharSequenceContainsContainsNotAssertionsSpec( + include(object : ch.tutteli.atrium.specs.integration.CharSequenceContainsContainsNotExpectationsSpec( getContainsPair(), getContainsNotPair(), "◆ ", "⚬ ", "▶ ", "[Atrium][Builder]" ) {}) - include(object : ch.tutteli.atrium.specs.integration.CharSequenceContainsContainsNotAssertionsSpec( + include(object : ch.tutteli.atrium.specs.integration.CharSequenceContainsContainsNotExpectationsSpec( getContainsShortcutPair(), getContainsNotShortcutPair(), "◆ ", "⚬ ", "▶ ", diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsExactlyExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsExactlyExpectationsSpec.kt index 3c5db90bdb..b5483690bc 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsExactlyExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsExactlyExpectationsSpec.kt @@ -2,8 +2,8 @@ package ch.tutteli.atrium.api.fluent.en_GB import ch.tutteli.atrium.creating.Expect -class CharSequenceContainsExactlyAssertionsSpec : - ch.tutteli.atrium.specs.integration.CharSequenceContainsExactlyAssertionsSpec( +class CharSequenceContainsExactlyExpectationsSpec : + ch.tutteli.atrium.specs.integration.CharSequenceContainsExactlyExpectationsSpec( getExactlyTriple(), getExactlyIgnoringCaseTriple(), getContainsNotPair(), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsNotExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsNotExpectationsSpec.kt index 2c13dd27e6..4ff91241c9 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsNotExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsNotExpectationsSpec.kt @@ -2,7 +2,7 @@ package ch.tutteli.atrium.api.fluent.en_GB import ch.tutteli.atrium.creating.Expect -class CharSequenceContainsNotAssertionsSpec : ch.tutteli.atrium.specs.integration.CharSequenceContainsNotAssertionsSpec( +class CharSequenceContainsNotExpectationsSpec : ch.tutteli.atrium.specs.integration.CharSequenceContainsNotExpectationsSpec( getContainsNotTriple(), getContainsNotIgnoringCaseTriple(), "◆ ", "⚬ " diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsNotOrAtMostExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsNotOrAtMostExpectationsSpec.kt index 405a83ba7c..e563a4ea07 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsNotOrAtMostExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsNotOrAtMostExpectationsSpec.kt @@ -2,8 +2,8 @@ package ch.tutteli.atrium.api.fluent.en_GB import ch.tutteli.atrium.creating.Expect -class CharSequenceContainsNotOrAtMostAssertionsSpec : - ch.tutteli.atrium.specs.integration.CharSequenceContainsNotOrAtMostAssertionsSpec( +class CharSequenceContainsNotOrAtMostExpectationsSpec : + ch.tutteli.atrium.specs.integration.CharSequenceContainsNotOrAtMostExpectationsSpec( getNotOrAtMostTriple(), getNotOrAtMostIgnoringCaseTriple(), getContainsNotPair(), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsRegexExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsRegexExpectationsSpec.kt index f941398897..f9cad828e4 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsRegexExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsRegexExpectationsSpec.kt @@ -3,11 +3,11 @@ package ch.tutteli.atrium.api.fluent.en_GB import ch.tutteli.atrium.creating.Expect import org.spekframework.spek2.Spek -class CharSequenceContainsRegexAssertionsSpec : Spek({ +class CharSequenceContainsRegexExpectationsSpec : Spek({ include(StringSpec) include(RegexSpec) }) { - object StringSpec : ch.tutteli.atrium.specs.integration.CharSequenceContainsRegexAssertionsSpec( + object StringSpec : ch.tutteli.atrium.specs.integration.CharSequenceContainsRegexExpectationsSpec( getNameContainsRegex(), getAtLeastTripleString(), getAtLeastIgnoringCaseTripleString(), @@ -18,7 +18,7 @@ class CharSequenceContainsRegexAssertionsSpec : Spek({ "[StringSpec] " ) - object RegexSpec : ch.tutteli.atrium.specs.integration.CharSequenceContainsRegexAssertionsSpec( + object RegexSpec : ch.tutteli.atrium.specs.integration.CharSequenceContainsRegexExpectationsSpec( getNameContainsRegex(), getAtLeastTripleRegex(), getAtLeastIgnoringCaseTripleString(), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceExpectationsSpec.kt index 9ae85d4afc..9cf87c1d7c 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceExpectationsSpec.kt @@ -5,7 +5,7 @@ import ch.tutteli.atrium.specs.fun0 import ch.tutteli.atrium.specs.fun1 import ch.tutteli.atrium.specs.notImplemented -class CharSequenceAssertionsSpec : ch.tutteli.atrium.specs.integration.CharSequenceAssertionsSpec( +class CharSequenceExpectationsSpec : ch.tutteli.atrium.specs.integration.CharSequenceExpectationsSpec( fun0(Expect::isEmpty), fun0(Expect::isNotEmpty), fun0(Expect::isNotBlank), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CollectionExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CollectionExpectationsSpec.kt index 98b29af79e..a84dc334d1 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CollectionExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CollectionExpectationsSpec.kt @@ -3,7 +3,7 @@ package ch.tutteli.atrium.api.fluent.en_GB import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* -object CollectionAssertionsSpec : ch.tutteli.atrium.specs.integration.CollectionAssertionsSpec( +object CollectionExpectationsSpec : ch.tutteli.atrium.specs.integration.CollectionExpectationsSpec( fun0(Expect>::isEmpty), fun0(Expect>::isNotEmpty), property, Int>(Expect>::size), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ComparableExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ComparableExpectationsSpec.kt index 4fb4bfaec7..115d2ddeab 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ComparableExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ComparableExpectationsSpec.kt @@ -4,7 +4,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.fun1 import ch.tutteli.atrium.specs.integration.DiffEqualsCompareTo -object ComparableAssertionsSpec : ch.tutteli.atrium.specs.integration.ComparableAssertionsSpec( +object ComparableExpectationsSpec : ch.tutteli.atrium.specs.integration.ComparableExpectationsSpec( fun1(Expect::isLessThan), fun1(Expect::isLessThanOrEqual), fun1(Expect::isGreaterThan), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FloatingPointWithErrorToleranceExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FloatingPointWithErrorToleranceExpectationsSpec.kt index 573590536f..70f180e29c 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FloatingPointWithErrorToleranceExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FloatingPointWithErrorToleranceExpectationsSpec.kt @@ -4,8 +4,8 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.adjustName import ch.tutteli.atrium.specs.fun2 -class FloatingPointWithErrorToleranceAssertionsSpec : - ch.tutteli.atrium.specs.integration.FloatingPointWithErrorToleranceAssertionsSpec( +class FloatingPointWithErrorToleranceExpectationsSpec : + ch.tutteli.atrium.specs.integration.FloatingPointWithErrorToleranceExpectationsSpec( fun2(Expect::toBeWithErrorTolerance).adjustName { "$it for Float" }, fun2(Expect::toBeWithErrorTolerance).adjustName { "$it for Double" } ) diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/Fun0ExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/Fun0ExpectationsSpec.kt index 7843e4d1fc..e1ac74ae51 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/Fun0ExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/Fun0ExpectationsSpec.kt @@ -6,7 +6,7 @@ import ch.tutteli.atrium.specs.feature1 import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.withFeatureSuffix -class Fun0AssertionsSpec : ch.tutteli.atrium.specs.integration.Fun0AssertionsSpec( +class Fun0ExpectationsSpec : ch.tutteli.atrium.specs.integration.Fun0ExpectationsSpec( ("toThrow" to Companion::toThrowFeature).withFeatureSuffix(), "toThrow" to Companion::toThrow, feature0<() -> Int, Int>(Expect<() -> Int>::notToThrow), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableAllExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableAllExpectationsSpec.kt index 644ba29d00..53e57ab009 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableAllExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableAllExpectationsSpec.kt @@ -5,7 +5,7 @@ import ch.tutteli.atrium.specs.fun1 import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.withNullableSuffix -object IterableAllAssertionsSpec : ch.tutteli.atrium.specs.integration.IterableAllAssertionsSpec( +object IterableAllExpectationsSpec : ch.tutteli.atrium.specs.integration.IterableAllExpectationsSpec( fun1(Expect>::all), fun1(Expect>::all).withNullableSuffix(), "◆ ", "❗❗ ", "⚬ ", "» ", "▶ ", "◾ " diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableAnyExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableAnyExpectationsSpec.kt index 098816f7c6..968b776684 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableAnyExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableAnyExpectationsSpec.kt @@ -7,23 +7,22 @@ import ch.tutteli.atrium.specs.fun1 import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.withNullableSuffix import org.spekframework.spek2.Spek -import kotlin.reflect.KFunction2 -import ch.tutteli.atrium.api.fluent.en_GB.IterableAnyAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.fluent.en_GB.IterableAnyExpectationsSpec.Companion as C -class IterableAnyAssertionsSpec : Spek({ +class IterableAnyExpectationsSpec : Spek({ include(PredicateSpec) include(BuilderSpec) include(ShortcutSpec) include(SequenceSpec) }) { - object PredicateSpec : ch.tutteli.atrium.specs.integration.IterableAnyAssertionsSpec( + object PredicateSpec : ch.tutteli.atrium.specs.integration.IterableAnyExpectationsSpec( fun1(Expect>::any), fun1(Expect>::any).withNullableSuffix(), "◆ ", "[Atrium][Predicate] " ) - object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableAnyAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableAnyExpectationsSpec( functionDescription to C::containsEntry, (functionDescription to C::containsNullableEntry).withNullableSuffix(), "◆ ", @@ -32,7 +31,7 @@ class IterableAnyAssertionsSpec : Spek({ // TODO 0.17.0 #722 this will differ once we don't implement the same behaviour for contains and none // that's fine and we can simply remove this test here - object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableAnyAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableAnyExpectationsSpec( shortcutDescription to C::containsEntryShortcut, (shortcutDescription to C::containsNullableEntryShortcut).withNullableSuffix(), "◆ ", @@ -40,7 +39,7 @@ class IterableAnyAssertionsSpec : Spek({ ) // TODO move to own SequenceSpec if we really need this (maybe we can also just delete it?) - object SequenceSpec : ch.tutteli.atrium.specs.integration.IterableAnyAssertionsSpec( + object SequenceSpec : ch.tutteli.atrium.specs.integration.IterableAnyExpectationsSpec( getContainsSequencePair(), getContainsNullableSequencePair().withNullableSuffix(), "◆ ", diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeast1ElementsOfExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeast1ElementsOfExpectationsSpec.kt index eeac6bb179..157a2561c7 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeast1ElementsOfExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeast1ElementsOfExpectationsSpec.kt @@ -4,22 +4,22 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.withNullableSuffix import org.spekframework.spek2.Spek -import ch.tutteli.atrium.api.fluent.en_GB.IterableContainsInAnyOrderAtLeast1ElementsOfAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.fluent.en_GB.IterableContainsInAnyOrderAtLeast1ElementsOfExpectationsSpec.Companion as C -class IterableContainsInAnyOrderAtLeast1ElementsOfAssertionsSpec : Spek({ +class IterableContainsInAnyOrderAtLeast1ElementsOfExpectationsSpec : Spek({ include(BuilderSpec) include(ShortcutSpec) include(BuilderIterableLikeToIterableSpec) include(ShortcutIterableLikeToIterableSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeast1ValuesAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec( functionDescription to C::containsValues, (functionDescription to C::containsNullableValues).withNullableSuffix(), "◆ ", "[Atrium][Builder] " ) - object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeast1ValuesAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec( shortcutDescription to C::containsInAnyOrderShortcut, (shortcutDescription to C::containsInAnyOrderNullableShortcut).withNullableSuffix(), "◆ ", diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec.kt index 24df7bb081..838fda4cf9 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec.kt @@ -5,20 +5,20 @@ import ch.tutteli.atrium.specs.fun2 import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.withNullableSuffix import org.spekframework.spek2.Spek -import ch.tutteli.atrium.api.fluent.en_GB.IterableContainsInAnyOrderAtLeast1EntriesAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.fluent.en_GB.IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec.Companion as C -class IterableContainsInAnyOrderAtLeast1EntriesAssertionsSpec : Spek({ +class IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec : Spek({ include(BuilderSpec) include(ShortcutSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeast1EntriesAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec( functionDescription to C::containsInAnyOrderEntries, (functionDescription to C::containsNullableEntries).withNullableSuffix(), "◆ ", "[Atrium][Builder] " ) - object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeast1EntriesAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec( fun2, Expect.() -> Unit, Array.() -> Unit>>(Expect>::contains), fun2, (Expect.() -> Unit)?, Array.() -> Unit)?>>(Expect>::contains).withNullableSuffix(), "◆ ", diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec.kt index 3999bfdbea..5cc3ee5e56 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec.kt @@ -5,20 +5,20 @@ import ch.tutteli.atrium.specs.fun2 import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.withNullableSuffix import org.spekframework.spek2.Spek -import ch.tutteli.atrium.api.fluent.en_GB.IterableContainsInAnyOrderAtLeast1ValuesAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.fluent.en_GB.IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec.Companion as C -class IterableContainsInAnyOrderAtLeast1ValuesAssertionsSpec : Spek({ +class IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec : Spek({ include(BuilderSpec) include(ShortcutSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeast1ValuesAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec( functionDescription to C::containsValues, (functionDescription to C::containsNullableValues).withNullableSuffix(), "◆ ", "[Atrium][Builder] " ) - object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeast1ValuesAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec( fun2, Double, Array>(Expect>::contains), fun2, Double?, Array>(Expect>::contains), "◆ ", diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeastValuesExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeastValuesExpectationsSpec.kt index 16a1cd5083..43fa246d4c 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeastValuesExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtLeastValuesExpectationsSpec.kt @@ -53,5 +53,5 @@ class IterableContainsInAnyOrderAtLeastValuesExpectationsSpec : "specifying $butAtMost($timesButAtMost) does not make sense if $atLeast($timesAtLeast) was used before" } - // ambiguityTests see IterableContainsInAnyOrderAtLeast1ValuesAssertionsSpec + // ambiguityTests see IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec } diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtMostValuesExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtMostValuesExpectationsSpec.kt index 193547d774..be29bf5358 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtMostValuesExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderAtMostValuesExpectationsSpec.kt @@ -3,8 +3,8 @@ package ch.tutteli.atrium.api.fluent.en_GB import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.notImplemented -class IterableContainsInAnyOrderAtMostValuesAssertionsSpec : - ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtMostValuesAssertionSpec( +class IterableContainsInAnyOrderAtMostValuesExpectationsSpec : + ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtMostValuesExpectationsSpec( getAtMostTriple(), getContainsNotPair(), getExactlyPair(), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderExactlyValuesExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderExactlyValuesExpectationsSpec.kt index 2111cb465a..b4f1f08fea 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderExactlyValuesExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderExactlyValuesExpectationsSpec.kt @@ -3,8 +3,8 @@ package ch.tutteli.atrium.api.fluent.en_GB import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.notImplemented -class IterableContainsInAnyOrderExactlyValuesAssertionsSpec : - ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderExactlyValuesAssertionsSpec( +class IterableContainsInAnyOrderExactlyValuesExpectationsSpec : + ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderExactlyValuesExpectationsSpec( getExactlyTriple(), getContainsNotPair(), "◆ " diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderNotOrAtMostValuesExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderNotOrAtMostValuesExpectationsSpec.kt index 957c63ef9f..82663b0971 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderNotOrAtMostValuesExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderNotOrAtMostValuesExpectationsSpec.kt @@ -3,8 +3,8 @@ package ch.tutteli.atrium.api.fluent.en_GB import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.notImplemented -class IterableContainsInAnyOrderNotOrAtMostValuesAssertionsSpec : - ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderNotOrAtMostValuesAssertionsSpec( +class IterableContainsInAnyOrderNotOrAtMostValuesExpectationsSpec : + ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderNotOrAtMostValuesExpectationsSpec( getNotOrAtMostTriple(), getContainsNotPair(), "◆ " diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderOnlyElementsOfExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderOnlyElementsOfExpectationsSpec.kt index 7def961331..d5be2dfe1d 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderOnlyElementsOfExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderOnlyElementsOfExpectationsSpec.kt @@ -4,13 +4,13 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.withNullableSuffix import org.spekframework.spek2.Spek -import ch.tutteli.atrium.api.fluent.en_GB.IterableContainsInAnyOrderOnlyElementsOfAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.fluent.en_GB.IterableContainsInAnyOrderOnlyElementsOfExpectationsSpec.Companion as C -class IterableContainsInAnyOrderOnlyElementsOfAssertionsSpec : Spek({ +class IterableContainsInAnyOrderOnlyElementsOfExpectationsSpec : Spek({ include(BuilderSpec) include(BuilderIterableLikeToIterableSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderOnlyValuesAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderOnlyValuesExpectationsSpec( functionDescription to C::containsElementsOf, (functionDescription to C::containsElementsOfNullable).withNullableSuffix(), "◆ ", "✔ ", "✘ ", "❗❗ ", "⚬ ", "» " diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderOnlyEntriesExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderOnlyEntriesExpectationsSpec.kt index c7593b223f..2be532e8f8 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderOnlyEntriesExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderOnlyEntriesExpectationsSpec.kt @@ -4,8 +4,8 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.withNullableSuffix -class IterableContainsInAnyOrderOnlyEntriesAssertionsSpec : - ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderOnlyEntriesAssertionsSpec( +class IterableContainsInAnyOrderOnlyEntriesExpectationsSpec : + ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderOnlyEntriesExpectationsSpec( functionDescription to Companion::containsInAnyOrderOnlyEntries, (functionDescription to Companion::containsInAnyOrderOnlyNullableEntries).withNullableSuffix(), "◆ ", "✔ ", "✘ ", "❗❗ ", "⚬ ", "» " diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderOnlyValuesExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderOnlyValuesExpectationsSpec.kt index b8cc03d826..7bc13f753d 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderOnlyValuesExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInAnyOrderOnlyValuesExpectationsSpec.kt @@ -4,8 +4,8 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.withNullableSuffix -class IterableContainsInAnyOrderOnlyValuesAssertionsSpec : - ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderOnlyValuesAssertionsSpec( +class IterableContainsInAnyOrderOnlyValuesExpectationsSpec : + ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderOnlyValuesExpectationsSpec( functionDescription to Companion::containsInAnyOrderOnlyValues, (functionDescription to Companion::containsInAnyOrderOnlyNullableValues).withNullableSuffix(), "◆ ", "✔ ", "✘ ", "❗❗ ", "⚬ " diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyElementsOfExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyElementsOfExpectationsSpec.kt index b0c44991d6..a4102c6948 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyElementsOfExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyElementsOfExpectationsSpec.kt @@ -4,22 +4,22 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.withNullableSuffix import org.spekframework.spek2.Spek -import ch.tutteli.atrium.api.fluent.en_GB.IterableContainsInOrderOnlyElementsOfAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.fluent.en_GB.IterableContainsInOrderOnlyElementsOfExpectationsSpec.Companion as C -class IterableContainsInOrderOnlyElementsOfAssertionsSpec : Spek({ +class IterableContainsInOrderOnlyElementsOfExpectationsSpec : Spek({ include(BuilderSpec) include(ShortcutSpec) include(BuilderIterableLikeToIterableSpec) include(ShortcutIterableLikeToIterableSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyValuesAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyValuesExpectationsSpec( functionDescription to C::containsInOrderOnlyValues, (functionDescription to C::containsInOrderOnlyNullableValues).withNullableSuffix(), "◆ ", "✔ ", "✘ ", "❗❗ ", "⚬ ", "» ", "▶ ", "◾ ", "[Atrium][Builder] " ) - object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyValuesAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyValuesExpectationsSpec( shortcutDescription to C::containsExactlyElementsOfShortcut, (shortcutDescription to C::containsExactlyElementsOfNullableShortcut).withNullableSuffix(), "◆ ", "✔ ", "✘ ", "❗❗ ", "⚬ ", "» ", "▶ ", "◾ ", diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyEntriesExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyEntriesExpectationsSpec.kt index 2da49cfb6d..5f7622f1fd 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyEntriesExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyEntriesExpectationsSpec.kt @@ -5,22 +5,22 @@ import ch.tutteli.atrium.specs.fun2 import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.withNullableSuffix import org.spekframework.spek2.Spek -import ch.tutteli.atrium.api.fluent.en_GB.IterableContainsInOrderOnlyEntriesAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.fluent.en_GB.IterableContainsInOrderOnlyEntriesExpectationsSpec.Companion as C -class IterableContainsInOrderOnlyEntriesAssertionsSpec : Spek({ +class IterableContainsInOrderOnlyEntriesExpectationsSpec : Spek({ include(BuilderSpec) include(ShortcutSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyEntriesAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyEntriesExpectationsSpec( functionDescription to C::containsInOrderOnly, (functionDescription to C::containsInOrderOnlyNullable).withNullableSuffix(), "◆ ", "✔ ", "✘ ", "❗❗ ", "⚬ ", "» ", "▶ ", "◾ ", "[Atrium][Builder] " ) - object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyEntriesAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyEntriesExpectationsSpec( fun2, Expect.() -> Unit, Array.() -> Unit>>(Expect>::containsExactly), fun2, (Expect.() -> Unit)?, Array.() -> Unit)?>>(Expect>::containsExactly).withNullableSuffix(), "◆ ", "✔ ", "✘ ", "❗❗ ", "⚬ ", "» ", "▶ ", "◾ ", diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyGroupedEntriesExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyGroupedEntriesExpectationsSpec.kt index aa0063afb0..e903f68b54 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyGroupedEntriesExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyGroupedEntriesExpectationsSpec.kt @@ -4,8 +4,8 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.domain.builders.utils.Group import ch.tutteli.atrium.specs.notImplemented -class IterableContainsInOrderOnlyGroupedEntriesAssertionsSpec : - ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyGroupedEntriesAssertionsSpec( +class IterableContainsInOrderOnlyGroupedEntriesExpectationsSpec : + ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyGroupedEntriesExpectationsSpec( functionDescription to Companion::containsInOrderOnlyGroupedInAnyOrderEntries, Companion::groupFactory, "◆ ", "✔ ", "✘ ", "❗❗ ", "⚬ ", "» ", "▶ ", "◾ ", diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyGroupedValuesExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyGroupedValuesExpectationsSpec.kt index 9ec300292f..6aee316c0a 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyGroupedValuesExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyGroupedValuesExpectationsSpec.kt @@ -5,8 +5,8 @@ import ch.tutteli.atrium.domain.builders.utils.Group import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.withNullableSuffix -class IterableContainsInOrderOnlyGroupedValuesAssertionsSpec : - ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyGroupedValuesAssertionsSpec( +class IterableContainsInOrderOnlyGroupedValuesExpectationsSpec : + ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyGroupedValuesExpectationsSpec( functionDescription to Companion::containsInOrderOnlyGroupedInAnyOrderValues, Companion::groupFactory, (functionDescription to Companion::containsInOrderOnlyGroupedInAnyOrderNullableValues).withNullableSuffix(), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyValuesExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyValuesExpectationsSpec.kt index 415ea7b8d6..80e5b19dfb 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyValuesExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsInOrderOnlyValuesExpectationsSpec.kt @@ -5,22 +5,22 @@ import ch.tutteli.atrium.specs.fun2 import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.withNullableSuffix import org.spekframework.spek2.Spek -import ch.tutteli.atrium.api.fluent.en_GB.IterableContainsInOrderOnlyValuesAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.fluent.en_GB.IterableContainsInOrderOnlyValuesExpectationsSpec.Companion as C -class IterableContainsInOrderOnlyValuesAssertionsSpec : Spek({ +class IterableContainsInOrderOnlyValuesExpectationsSpec : Spek({ include(BuilderSpec) include(ShortcutSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyValuesAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyValuesExpectationsSpec( functionDescription to C::containsInOrderOnlyValues, (functionDescription to C::containsInOrderOnlyNullableValues).withNullableSuffix(), "◆ ", "✔ ", "✘ ", "❗❗ ", "⚬ ", "» ", "▶ ", "◾ ", "[Atrium][Builder] " ) - object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyValuesAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyValuesExpectationsSpec( fun2, Double, Array>(Expect>::containsExactly), fun2, Double?, Array>(Expect>::containsExactly).withNullableSuffix(), "◆ ", "✔ ", "✘ ", "❗❗ ", "⚬ ", "» ", "▶ ", "◾ ", diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsNotEntriesExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsNotEntriesExpectationsSpec.kt index 01437c8405..d3810c258a 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsNotEntriesExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsNotEntriesExpectationsSpec.kt @@ -4,8 +4,8 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.withNullableSuffix -class IterableContainsNotEntriesAssertionsSpec : - ch.tutteli.atrium.specs.integration.IterableContainsNotEntriesAssertionsSpec( +class IterableContainsNotEntriesExpectationsSpec : + ch.tutteli.atrium.specs.integration.IterableContainsNotEntriesExpectationsSpec( functionDescription to Companion::containsNotFun, (functionDescription to Companion::containsNotNullableFun).withNullableSuffix(), "◆ ", "✔ ", "✘ ", "⚬ ", "» ", "▶ ", "◾ ", diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsNotValuesExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsNotValuesExpectationsSpec.kt index 30380eec13..1e3c09c1d8 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsNotValuesExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableContainsNotValuesExpectationsSpec.kt @@ -5,23 +5,23 @@ import ch.tutteli.atrium.specs.fun2 import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.withNullableSuffix import org.spekframework.spek2.Spek -import ch.tutteli.atrium.api.fluent.en_GB.IterableContainsNotValuesAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.fluent.en_GB.IterableContainsNotValuesExpectationsSpec.Companion as C -class IterableContainsNotValuesAssertionsSpec : Spek({ +class IterableContainsNotValuesExpectationsSpec : Spek({ include(BuilderSpec) include(ShortcutSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsNotValuesAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsNotValuesExpectationsSpec( functionDescription to C::containsNotFun, (functionDescription to C::containsNotNullableFun).withNullableSuffix(), "◆ ", "✔ ", "✘ ", "⚬ ", "▶ ", "◾ ", "[Atrium][Builder] " ) - object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsNotValuesAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsNotValuesExpectationsSpec( fun2,Double, Array>(Expect>::containsNot), fun2,Double?, Array>(Expect>::containsNot).withNullableSuffix(), "◆ ", "✔ ", "✘ ", "⚬ ", "▶ ", "◾ ", diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableExpectationsSpec.kt index 80ef9208c7..5a0dd68552 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableExpectationsSpec.kt @@ -3,7 +3,7 @@ package ch.tutteli.atrium.api.fluent.en_GB import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* -object IterableAssertionsSpec : ch.tutteli.atrium.specs.integration.IterableAssertionsSpec( +object IterableExpectationsSpec : ch.tutteli.atrium.specs.integration.IterableExpectationsSpec( fun0(Expect>::hasNext), fun0(Expect>::hasNotNext), feature0, Int>(Expect>::min), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableNoneExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableNoneExpectationsSpec.kt index e9fbce654d..b0c43ae031 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableNoneExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IterableNoneExpectationsSpec.kt @@ -5,13 +5,13 @@ import ch.tutteli.atrium.specs.fun1 import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.withNullableSuffix import org.spekframework.spek2.Spek -import ch.tutteli.atrium.api.fluent.en_GB.IterableNoneAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.fluent.en_GB.IterableNoneExpectationsSpec.Companion as C -class IterableNoneAssertionsSpec : Spek({ +class IterableNoneExpectationsSpec : Spek({ include(PredicateSpec) include(BuilderSpec) }) { - object PredicateSpec : ch.tutteli.atrium.specs.integration.IterableNoneAssertionsSpec( + object PredicateSpec : ch.tutteli.atrium.specs.integration.IterableNoneExpectationsSpec( fun1(Expect>::none), fun1(Expect>::none).withNullableSuffix(), "◆ ", "✔ ", "✘ ", "⚬ ", "» ", "▶ ", "◾ ", @@ -20,7 +20,7 @@ class IterableNoneAssertionsSpec : Spek({ // TODO 0.17.0 #722 this will differ once we don't implement the same behaviour for contains and none // that's fine and we can simply remove this test here - object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableNoneAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableNoneExpectationsSpec( functionDescription to C::containsNotFun, (functionDescription to C::containsNotNullableFun).withNullableSuffix(), "◆ ", "✔ ", "✘ ", "⚬ ", "» ", "▶ ", "◾ ", diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IteratorExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IteratorExpectationsSpec.kt index baf9d78d49..d61dac0557 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IteratorExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/IteratorExpectationsSpec.kt @@ -4,7 +4,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.fun0 import ch.tutteli.atrium.specs.notImplemented -class IteratorAssertionSpec : ch.tutteli.atrium.specs.integration.IteratorAssertionSpec( +class IteratorExpectationsSpec : ch.tutteli.atrium.specs.integration.IteratorExpectationsSpec( fun0(Expect>::hasNext), fun0(Expect>::hasNotNext) ) { diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ListExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ListExpectationsSpec.kt index ad45a36d98..6581d607d8 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ListExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ListExpectationsSpec.kt @@ -9,12 +9,12 @@ import ch.tutteli.atrium.specs.withNullableSuffix import org.spekframework.spek2.Spek import org.spekframework.spek2.style.specification.describe -object ListAssertionsSpec : Spek({ +object ListExpectationsSpec : Spek({ include(ListSpec) include(IterableSpec) include(SequenceSpec) }) { - object ListSpec : ch.tutteli.atrium.specs.integration.ListAssertionsSpec( + object ListSpec : ch.tutteli.atrium.specs.integration.ListExpectationsSpec( feature1, Int, Int>(Expect>::get), fun2, Int, Expect.() -> Unit>(Expect>::get), feature1, Int, Int?>(Expect>::get).withNullableSuffix(), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapAsEntriesExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapAsEntriesExpectationsSpec.kt index 7f2d9085e0..f28e445766 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapAsEntriesExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapAsEntriesExpectationsSpec.kt @@ -5,7 +5,7 @@ import ch.tutteli.atrium.specs.feature0 import ch.tutteli.atrium.specs.fun1 import ch.tutteli.atrium.specs.notImplemented -object MapAsEntriesAssertionsSpec : ch.tutteli.atrium.specs.integration.MapAsEntriesAssertionsSpec( +object MapAsEntriesExpectationsSpec : ch.tutteli.atrium.specs.integration.MapAsEntriesExpectationsSpec( feature0, Set>>(Expect>::asEntries), fun1, Expect>>.() -> Unit>(Expect>::asEntries) ) { diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderEntriesOfExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderEntriesOfExpectationsSpec.kt index 00c3fa39fa..a4281d87ce 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderEntriesOfExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderEntriesOfExpectationsSpec.kt @@ -7,22 +7,22 @@ import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.withNullableSuffix import org.spekframework.spek2.Spek import kotlin.jvm.JvmName -import ch.tutteli.atrium.api.fluent.en_GB.MapContainsInAnyOrderEntriesOfAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.fluent.en_GB.MapContainsInAnyOrderEntriesOfExpectationsSpec.Companion as C -class MapContainsInAnyOrderEntriesOfAssertionsSpec : Spek({ +class MapContainsInAnyOrderEntriesOfExpectationsSpec : Spek({ include(BuilderSpec) include(ShortcutSpec) include(BuilderMapLikeToIterablePairSpec) include(ShortcutMapLikeToIterablePairSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderKeyValuePairsAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderKeyValuePairsExpectationsSpec( functionDescription to C::containsKeyValuePairs, (functionDescription to C::containsKeyValuePairsNullable).withNullableSuffix(), "[Atrium][Builder] " ) - object ShortcutSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderKeyValuePairsAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderKeyValuePairsExpectationsSpec( mfun2(C::containsEntriesOf), mfun2(C::containsEntriesOf).withNullableSuffix(), "[Atrium][Shortcut] " diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderKeyValueExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderKeyValueExpectationsSpec.kt index ca44879070..bfa74eac7a 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderKeyValueExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderKeyValueExpectationsSpec.kt @@ -6,20 +6,20 @@ import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.specs.integration.mfun2 import org.spekframework.spek2.Spek import kotlin.jvm.JvmName -import ch.tutteli.atrium.api.fluent.en_GB.MapContainsInAnyOrderKeyValueAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.fluent.en_GB.MapContainsInAnyOrderKeyValueExpectationsSpec.Companion as C -class MapContainsInAnyOrderKeyValueAssertionsSpec : Spek({ +class MapContainsInAnyOrderKeyValueExpectationsSpec : Spek({ include(BuilderSpec) include(ShortcutSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderKeyValueAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderKeyValueExpectationsSpec( functionDescription to C::containsKeyValues, (functionDescription to C::containsKeyValuesNullable).withNullableSuffix(), "[Atrium][Builder] " ) - object ShortcutSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderKeyValueAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderKeyValueExpectationsSpec( mfun2.() -> Unit>(C::contains).adjustName { "$it ${KeyValue::class.simpleName}" }, mfun2.() -> Unit)?>(C::contains).adjustName { "$it ${KeyValue::class.simpleName}" } .withNullableSuffix(), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderKeyValuePairsExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderKeyValuePairsExpectationsSpec.kt index aa2e993b13..b0d7ea8ffd 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderKeyValuePairsExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderKeyValuePairsExpectationsSpec.kt @@ -4,20 +4,20 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.specs.integration.mfun2 import org.spekframework.spek2.Spek -import ch.tutteli.atrium.api.fluent.en_GB.MapContainsInAnyOrderKeyValuePairsAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.fluent.en_GB.MapContainsInAnyOrderKeyValuePairsExpectationsSpec.Companion as C -class MapContainsInAnyOrderKeyValuePairsAssertionsSpec : Spek({ +class MapContainsInAnyOrderKeyValuePairsExpectationsSpec : Spek({ include(BuilderSpec) include(ShortcutSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderKeyValuePairsAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderKeyValuePairsExpectationsSpec( functionDescription to C::containsKeyValuePairs, (functionDescription to C::containsKeyValuePairsNullable).withNullableSuffix(), "[Atrium][Builder] " ) - object ShortcutSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderKeyValuePairsAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderKeyValuePairsExpectationsSpec( mfun2(Expect>::contains), mfun2(Expect>::contains).withNullableSuffix(), "[Atrium][Shortcut] " diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderOnlyEntriesOfExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderOnlyEntriesOfExpectationsSpec.kt index 2ee4b3b6de..dfbe9d2ff7 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderOnlyEntriesOfExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderOnlyEntriesOfExpectationsSpec.kt @@ -6,23 +6,23 @@ import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.specs.integration.mfun2 import org.spekframework.spek2.Spek import kotlin.jvm.JvmName -import ch.tutteli.atrium.api.fluent.en_GB.MapContainsInAnyOrderOnlyEntriesOfAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.fluent.en_GB.MapContainsInAnyOrderOnlyEntriesOfExpectationsSpec.Companion as C -class MapContainsInAnyOrderOnlyEntriesOfAssertionsSpec : Spek({ +class MapContainsInAnyOrderOnlyEntriesOfExpectationsSpec : Spek({ include(BuilderSpec) include(ShortcutSpec) include(BuilderMapLikeToIterablePairSpec) include(ShortcutMapLikeToIterablePairSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderOnlyKeyValuePairsAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec( functionDescription to C::containsKeyValuePairs, (functionDescription to C::containsKeyValuePairsNullable).withNullableSuffix(), "◆ ", "✔ ", "✘ ", "❗❗ ", "⚬ ", "» ", "▶ ", "◾ ", "[Atrium][Builder] " ) - object ShortcutSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderOnlyKeyValuePairsAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec( mfun2(C::containsInAnyOrderOnlyEntriesOf), mfun2(C::containsInAnyOrderOnlyEntriesOf).withNullableSuffix(), "◆ ", "✔ ", "✘ ", "❗❗ ", "⚬ ", "» ", "▶ ", "◾ ", diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderOnlyKeyValueExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderOnlyKeyValueExpectationsSpec.kt index 80e140b941..2a2beea1eb 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderOnlyKeyValueExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderOnlyKeyValueExpectationsSpec.kt @@ -6,14 +6,14 @@ import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.specs.integration.mfun2 import org.spekframework.spek2.Spek import kotlin.jvm.JvmName -import ch.tutteli.atrium.api.fluent.en_GB.MapContainsInAnyOrderOnlyKeyValueAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.fluent.en_GB.MapContainsInAnyOrderOnlyKeyValueExpectationsSpec.Companion as C -class MapContainsInAnyOrderOnlyKeyValueAssertionsSpec : Spek({ +class MapContainsInAnyOrderOnlyKeyValueExpectationsSpec : Spek({ include(BuilderSpec) include(ShortcutSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderOnlyKeyValueAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderOnlyKeyValueExpectationsSpec( functionDescription to C::containsKeyValues, (functionDescription to C::containsKeyValuesNullable).withNullableSuffix(), "◆ ", "✔ ", "✘ ", "❗❗ ", "⚬ ", "» ", "▶ ", "◾ ", @@ -21,7 +21,7 @@ class MapContainsInAnyOrderOnlyKeyValueAssertionsSpec : Spek({ ) - object ShortcutSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderOnlyKeyValueAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderOnlyKeyValueExpectationsSpec( mfun2.() -> Unit>(C::containsOnly), mfun2.() -> Unit)?>(C::containsOnly).withNullableSuffix(), "◆ ", "✔ ", "✘ ", "❗❗ ", "⚬ ", "» ", "▶ ", "◾ ", diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec.kt index 800b266d19..5dd473cf92 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec.kt @@ -4,21 +4,21 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.specs.integration.mfun2 import org.spekframework.spek2.Spek -import ch.tutteli.atrium.api.fluent.en_GB.MapContainsInAnyOrderOnlyKeyValuePairsAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.fluent.en_GB.MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec.Companion as C -class MapContainsInAnyOrderOnlyKeyValuePairsAssertionsSpec : Spek({ +class MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec : Spek({ include(BuilderSpec) include(ShortcutSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderOnlyKeyValuePairsAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec( functionDescription to C::containsKeyValuePairs, (functionDescription to C::containsKeyValuePairsNullable).withNullableSuffix(), "◆ ", "✔ ", "✘ ", "❗❗ ", "⚬ ", "» ", "▶ ", "◾ ", "[Atrium][Builder] " ) - object ShortcutSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderOnlyKeyValuePairsAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec( mfun2(Expect>::containsOnly), mfun2(Expect>::containsOnly).withNullableSuffix(), "◆ ", "✔ ", "✘ ", "❗❗ ", "⚬ ", "» ", "▶ ", "◾ ", diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInOrderOnlyEntriesOfExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInOrderOnlyEntriesOfExpectationsSpec.kt index 0d138246da..4e6af887e8 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInOrderOnlyEntriesOfExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInOrderOnlyEntriesOfExpectationsSpec.kt @@ -5,13 +5,13 @@ import ch.tutteli.atrium.logic.creating.typeutils.MapLike import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.withNullableSuffix import org.spekframework.spek2.Spek -import ch.tutteli.atrium.api.fluent.en_GB.MapContainsInOrderOnlyEntriesOfAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.fluent.en_GB.MapContainsInOrderOnlyEntriesOfExpectationsSpec.Companion as C -class MapContainsInOrderOnlyEntriesOfAssertionsSpec : Spek({ +class MapContainsInOrderOnlyEntriesOfExpectationsSpec : Spek({ include(BuilderSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInOrderOnlyKeyValuePairsAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInOrderOnlyKeyValuePairsExpectationsSpec( functionDescription to C::containsKeyValuePairs, (functionDescription to C::containsKeyValuePairsNullable).withNullableSuffix(), "◆ ", "✔ ", "✘ ", "❗❗ ", "⚬ ", "» ", "▶ ", "◾ ", diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInOrderOnlyKeyValueExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInOrderOnlyKeyValueExpectationsSpec.kt index a9f464bfe9..684a575914 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInOrderOnlyKeyValueExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInOrderOnlyKeyValueExpectationsSpec.kt @@ -5,13 +5,13 @@ import ch.tutteli.atrium.logic.utils.mapArguments import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.withNullableSuffix import org.spekframework.spek2.Spek -import ch.tutteli.atrium.api.fluent.en_GB.MapContainsInOrderOnlyKeyValueAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.fluent.en_GB.MapContainsInOrderOnlyKeyValueExpectationsSpec.Companion as C -class MapContainsInOrderOnlyKeyValueAssertionsSpec : Spek({ +class MapContainsInOrderOnlyKeyValueExpectationsSpec : Spek({ include(BuilderSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInOrderOnlyKeyValueAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInOrderOnlyKeyValueExpectationsSpec( functionDescription to C::containsKeyValues, (functionDescription to C::containsKeyValuesNullable).withNullableSuffix(), "◆ ", "✔ ", "✘ ", "❗❗ ", "⚬ ", "» ", "▶ ", "◾ ", diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInOrderOnlyKeyValuePairsExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInOrderOnlyKeyValuePairsExpectationsSpec.kt index 39ec46068d..96191b5f24 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInOrderOnlyKeyValuePairsExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapContainsInOrderOnlyKeyValuePairsExpectationsSpec.kt @@ -4,13 +4,13 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.withNullableSuffix import org.spekframework.spek2.Spek -import ch.tutteli.atrium.api.fluent.en_GB.MapContainsInOrderOnlyKeyValuePairsAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.fluent.en_GB.MapContainsInOrderOnlyKeyValuePairsExpectationsSpec.Companion as C -class MapContainsInOrderOnlyKeyValuePairsAssertionsSpec : Spek({ +class MapContainsInOrderOnlyKeyValuePairsExpectationsSpec : Spek({ include(BuilderSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInOrderOnlyKeyValuePairsAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInOrderOnlyKeyValuePairsExpectationsSpec( functionDescription to C::containsKeyValuePairs, (functionDescription to C::containsKeyValuePairsNullable).withNullableSuffix(), "◆ ", "✔ ", "✘ ", "❗❗ ", "⚬ ", "» ", "▶ ", "◾ ", diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapEntryExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapEntryExpectationsSpec.kt index 8df14ed56e..71b0fa2a9b 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapEntryExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapEntryExpectationsSpec.kt @@ -3,7 +3,7 @@ package ch.tutteli.atrium.api.fluent.en_GB import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* -object MapEntryAssertionsSpec : ch.tutteli.atrium.specs.integration.MapEntryAssertionsSpec( +object MapEntryExpectationsSpec : ch.tutteli.atrium.specs.integration.MapEntryExpectationsSpec( fun2(Expect>::isKeyValue), fun2(Expect>::isKeyValue).withNullableSuffix(), property, String>(Expect>::key), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapExpectationsSpec.kt index 50f87bf555..d43903dd21 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/MapExpectationsSpec.kt @@ -3,10 +3,9 @@ package ch.tutteli.atrium.api.fluent.en_GB import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.logic.utils.mapArguments import ch.tutteli.atrium.specs.* -import ch.tutteli.atrium.specs.integration.mfun2 import kotlin.jvm.JvmName -class MapAssertionsSpec : ch.tutteli.atrium.specs.integration.MapAssertionsSpec( +class MapExpectationsSpec : ch.tutteli.atrium.specs.integration.MapExpectationsSpec( fun1(Expect>::containsKey), fun1(Expect>::containsKey).withNullableSuffix(), fun1(Expect>::containsNotKey), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/PairExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/PairExpectationsSpec.kt index 798ca55a5c..cb76c4567e 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/PairExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/PairExpectationsSpec.kt @@ -5,7 +5,7 @@ import ch.tutteli.atrium.specs.fun1 import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.property -class PairAssertionsSpec : ch.tutteli.atrium.specs.integration.PairAssertionsSpec( +class PairExpectationsSpec : ch.tutteli.atrium.specs.integration.PairExpectationsSpec( property, String>(Expect>::first), fun1, Expect.() -> Unit>(Expect>::first), property, Int>(Expect>::second), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ThrowableExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ThrowableExpectationsSpec.kt index d26cab9af6..80bb0e7cd5 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ThrowableExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ThrowableExpectationsSpec.kt @@ -3,7 +3,7 @@ package ch.tutteli.atrium.api.fluent.en_GB import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* -class ThrowableAssertionsSpec : ch.tutteli.atrium.specs.integration.ThrowableAssertionsSpec( +class ThrowableExpectationsSpec : ch.tutteli.atrium.specs.integration.ThrowableExpectationsSpec( property(Expect::message), fun1.() -> Unit>(Expect::message), fun2(Expect::messageContains), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/CharSequenceExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/CharSequenceExpectationsSpec.kt index ecb1a2e320..2dce5db0da 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/CharSequenceExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/samples/CharSequenceExpectationsSpec.kt @@ -4,7 +4,7 @@ import ch.tutteli.atrium.api.fluent.en_GB.* import ch.tutteli.atrium.api.verbs.internal.expect import kotlin.test.Test -class CharSequenceAssertionsSpec { +class CharSequenceExpectationsSpec { @Test fun containsBuilder() { diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/BigDecimalExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/BigDecimalExpectationsSpec.kt index 0bca264aca..b7d9eb29be 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/BigDecimalExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/BigDecimalExpectationsSpec.kt @@ -8,8 +8,8 @@ import org.spekframework.spek2.Spek import org.spekframework.spek2.style.specification.describe import java.math.BigDecimal -class BigDecimalAssertionsSpec : Spek({ - include(object : ch.tutteli.atrium.specs.integration.BigDecimalAssertionsSpec( +class BigDecimalExpectationsSpec : Spek({ + include(object : ch.tutteli.atrium.specs.integration.BigDecimalExpectationsSpec( @Suppress("DEPRECATION") fun1(Expect::toBe), @Suppress("DEPRECATION") fun1(Expect::toBe).withNullableSuffix(), fun1(Expect::toBe).withNullableSuffix(), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ChronoLocalDateExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ChronoLocalDateExpectationsSpec.kt index ca0c077b45..d10feef9ad 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ChronoLocalDateExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ChronoLocalDateExpectationsSpec.kt @@ -8,11 +8,11 @@ import java.time.LocalDate import java.time.chrono.ChronoLocalDate import java.time.chrono.JapaneseDate -class ChronoLocalDateAssertionsSpec : Spek({ +class ChronoLocalDateExpectationsSpec : Spek({ include(ChronoLocalDateSpec) include(ChronoLocalDateAsStringSpec) }) { - object ChronoLocalDateSpec : ch.tutteli.atrium.specs.integration.ChronoLocalDateAssertionSpec( + object ChronoLocalDateSpec : ch.tutteli.atrium.specs.integration.ChronoLocalDateExpectationsSpec( fun1(Expect::isBefore), fun1(Expect::isBeforeOrEqual), fun1(Expect::isAfter), @@ -20,7 +20,7 @@ class ChronoLocalDateAssertionsSpec : Spek({ fun1(Expect::isEqual) ) - object ChronoLocalDateAsStringSpec : ch.tutteli.atrium.specs.integration.ChronoLocalDateAsStringAssertionSpec( + object ChronoLocalDateAsStringSpec : ch.tutteli.atrium.specs.integration.ChronoLocalDateAsStringExpectationsSpec( fun1(Expect::isBefore), fun1(Expect::isBeforeOrEqual), fun1(Expect::isAfter), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ChronoLocalDateTimeExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ChronoLocalDateTimeExpectationsSpec.kt index c4e3318a69..418ffd9823 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ChronoLocalDateTimeExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ChronoLocalDateTimeExpectationsSpec.kt @@ -9,11 +9,11 @@ import java.time.LocalDateTime import java.time.chrono.ChronoLocalDate import java.time.chrono.ChronoLocalDateTime -class ChronoLocalDateTimeAssertionSpec : Spek({ +class ChronoLocalDateTimeExpectationsSpec : Spek({ include(ChronoLocalDateTimeSpec) include(ChronoLocalDateTimeAsStringSpec) }) { - object ChronoLocalDateTimeSpec : ch.tutteli.atrium.specs.integration.ChronoLocalDateTimeAssertionSpec( + object ChronoLocalDateTimeSpec : ch.tutteli.atrium.specs.integration.ChronoLocalDateTimeExpectationsSpec( fun1, ChronoLocalDateTime<*>>(Expect>::isBefore), fun1, ChronoLocalDateTime<*>>(Expect>::isBeforeOrEqual), fun1, ChronoLocalDateTime<*>>(Expect>::isAfter), @@ -22,7 +22,7 @@ class ChronoLocalDateTimeAssertionSpec : Spek({ ) object ChronoLocalDateTimeAsStringSpec : - ch.tutteli.atrium.specs.integration.ChronoLocalDateTimeAsStringAssertionSpec( + ch.tutteli.atrium.specs.integration.ChronoLocalDateTimeAsStringExpectationsSpec( fun1, String>(Expect>::isBefore), fun1, String>(Expect>::isBeforeOrEqual), fun1, String>(Expect>::isAfter), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ChronoZonedDateTimeExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ChronoZonedDateTimeExpectationsSpec.kt index 6966dc5f1f..bd8d5afdb7 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ChronoZonedDateTimeExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ChronoZonedDateTimeExpectationsSpec.kt @@ -9,10 +9,10 @@ import java.time.ZonedDateTime import java.time.chrono.ChronoLocalDate import java.time.chrono.ChronoZonedDateTime -class ChronoZonedDateTimeAssertionSpec : Spek({ - include(ChronoLocalDateTimeAssertionSpec.ChronoLocalDateTimeSpec) +class ChronoZonedDateTimeExpectationsSpec : Spek({ + include(ChronoLocalDateTimeExpectationsSpec.ChronoLocalDateTimeSpec) }) { - object ChronoZonedDateTimeSpec : ch.tutteli.atrium.specs.integration.ChronoZonedDateTimeAssertionSpec( + object ChronoZonedDateTimeSpec : ch.tutteli.atrium.specs.integration.ChronoZonedDateTimeExpectationsSpec( fun1, ChronoZonedDateTime<*>>(Expect>::isBefore), fun1, ChronoZonedDateTime<*>>(Expect>::isBeforeOrEqual), fun1, ChronoZonedDateTime<*>>(Expect>::isAfter), @@ -20,7 +20,7 @@ class ChronoZonedDateTimeAssertionSpec : Spek({ fun1, ChronoZonedDateTime<*>>(Expect>::isEqual) ) - object ChronoZonedDateTimeAsStringSpec : ch.tutteli.atrium.specs.integration.ChronoZonedDateTimeAsStringAssertionSpec( + object ChronoZonedDateTimeAsStringSpec : ch.tutteli.atrium.specs.integration.ChronoZonedDateTimeAsStringExpectationsSpec( fun1, String>(Expect>::isBefore), fun1, String>(Expect>::isBeforeOrEqual), fun1, String>(Expect>::isAfter), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FileAsPathExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FileAsPathExpectationsSpec.kt index 1ace381944..71250c3171 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FileAsPathExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FileAsPathExpectationsSpec.kt @@ -4,7 +4,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.notImplemented import java.io.File -class FileAsPathAssertionsSpec : ch.tutteli.atrium.specs.integration.FileAsPathAssertionsSpec( +class FileAsPathExpectationsSpec : ch.tutteli.atrium.specs.integration.FileAsPathExpectationsSpec( Expect::asPath ) { @Suppress("unused", "UNUSED_VALUE") diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FloatingPointWithErrorToleranceExpectationsJvmSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FloatingPointWithErrorToleranceExpectationsJvmSpec.kt index 47fff5ccda..793811ec0c 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FloatingPointWithErrorToleranceExpectationsJvmSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FloatingPointWithErrorToleranceExpectationsJvmSpec.kt @@ -4,8 +4,8 @@ import ch.tutteli.atrium.creating.Expect import java.math.BigDecimal import kotlin.reflect.KFunction3 -class FloatingPointWithErrorToleranceAssertionsJvmSpec : - ch.tutteli.atrium.specs.integration.FloatingPointWithErrorToleranceAssertionsJvmSpec( +class FloatingPointWithErrorToleranceExpectationsJvmSpec : + ch.tutteli.atrium.specs.integration.FloatingPointWithErrorToleranceExpectationsJvmSpec( toBeWithErrorToleranceBigDecimalPair() ) { companion object { diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/Fun0ExpectationsJvmSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/Fun0ExpectationsJvmSpec.kt index b3af86b30f..537da1b7f6 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/Fun0ExpectationsJvmSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/Fun0ExpectationsJvmSpec.kt @@ -5,7 +5,7 @@ import ch.tutteli.atrium.specs.feature0 import ch.tutteli.atrium.specs.feature1 import ch.tutteli.atrium.specs.withFeatureSuffix -class Fun0AssertionsJvmSpec : ch.tutteli.atrium.specs.integration.Fun0AssertionsJvmSpec( +class Fun0ExpectationsJvmSpec : ch.tutteli.atrium.specs.integration.Fun0ExpectationsJvmSpec( ("toThrow" to Companion::toThrowFeature).withFeatureSuffix(), "toThrow" to Companion::toThrow, feature0<() -> Int, Int>(Expect<() -> Int>::notToThrow), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/LocalDateExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/LocalDateExpectationsSpec.kt index b6038d1bcb..36c7387804 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/LocalDateExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/LocalDateExpectationsSpec.kt @@ -7,7 +7,7 @@ import ch.tutteli.atrium.specs.property import java.time.DayOfWeek import java.time.LocalDate -class LocalDateAssertionsSpec : ch.tutteli.atrium.specs.integration.LocalDateAssertionsSpec( +class LocalDateExpectationsSpec : ch.tutteli.atrium.specs.integration.LocalDateExpectationsSpec( property(Expect::year), fun1.() -> Unit>(Expect::year), property(Expect::month), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/LocalDateTimeExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/LocalDateTimeExpectationsSpec.kt index 12fdd41aa7..343515c2ba 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/LocalDateTimeExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/LocalDateTimeExpectationsSpec.kt @@ -7,7 +7,7 @@ import ch.tutteli.atrium.specs.property import java.time.DayOfWeek import java.time.LocalDateTime -class LocalDateTimeAssertionsSpec : ch.tutteli.atrium.specs.integration.LocalDateTimeAssertionsSpec( +class LocalDateTimeExpectationsSpec : ch.tutteli.atrium.specs.integration.LocalDateTimeExpectationsSpec( property(Expect::year), fun1.() -> Unit>(Expect::year), property(Expect::month), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/OptionalExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/OptionalExpectationsSpec.kt index 56432ce785..e754d85796 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/OptionalExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/OptionalExpectationsSpec.kt @@ -2,10 +2,10 @@ package ch.tutteli.atrium.api.fluent.en_GB import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* -import ch.tutteli.atrium.specs.integration.OptionalAssertionsSpec +import ch.tutteli.atrium.specs.integration.OptionalExpectationsSpec import java.util.* -class OptionalAssertionsSpec : OptionalAssertionsSpec( +class OptionalExpectationsSpec : OptionalExpectationsSpec( isEmpty = fun0(Expect>::isEmpty), isPresentFeature = feature0, Int>(Expect>::isPresent), isPresent = fun1, Expect.() -> Unit>(Expect>::isPresent) diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/PathExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/PathExpectationsSpec.kt index 5c2f111af7..ad8e6d101c 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/PathExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/PathExpectationsSpec.kt @@ -5,7 +5,7 @@ import ch.tutteli.atrium.specs.* import java.nio.file.Path import java.nio.file.Paths -class PathAssertionsSpec : ch.tutteli.atrium.specs.integration.PathAssertionsSpec( +class PathExpectationsSpec : ch.tutteli.atrium.specs.integration.PathExpectationsSpec( fun0(Expect::exists), fun0(Expect::existsNot), fun1(Expect::startsWith), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/PathFeatureExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/PathFeatureExpectationsSpec.kt index f331abc5d6..6ee9f573a5 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/PathFeatureExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/PathFeatureExpectationsSpec.kt @@ -4,7 +4,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* import java.nio.file.Path -class PathFeatureAssertionsSpec : ch.tutteli.atrium.specs.integration.PathFeatureAssertionsSpec( +class PathFeatureExpectationsSpec : ch.tutteli.atrium.specs.integration.PathFeatureExpectationsSpec( property(Expect::parent), fun1.() -> Unit>(Expect::parent), feature1(Expect::resolve), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ZonedDateTimeExpectationsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ZonedDateTimeExpectationsSpec.kt index 555ed9fec3..4552bfeced 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ZonedDateTimeExpectationsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/ZonedDateTimeExpectationsSpec.kt @@ -7,7 +7,7 @@ import ch.tutteli.atrium.specs.property import java.time.DayOfWeek import java.time.ZonedDateTime -class ZonedDateTimeAssertionsSpec : ch.tutteli.atrium.specs.integration.ZonedDateTimeAssertionsSpec( +class ZonedDateTimeExpectationsSpec : ch.tutteli.atrium.specs.integration.ZonedDateTimeExpectationsSpec( property(Expect::year), fun1.() -> Unit>(Expect::year), property(Expect::month), diff --git a/apis/fluent-en_GB/extensions/kotlin_1_3/atrium-api-fluent-en_GB-kotlin_1_3-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/kotlin_1_3/ResultExpectationsSpec.kt b/apis/fluent-en_GB/extensions/kotlin_1_3/atrium-api-fluent-en_GB-kotlin_1_3-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/kotlin_1_3/ResultExpectationsSpec.kt index df2f1f6d03..b730284f54 100644 --- a/apis/fluent-en_GB/extensions/kotlin_1_3/atrium-api-fluent-en_GB-kotlin_1_3-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/kotlin_1_3/ResultExpectationsSpec.kt +++ b/apis/fluent-en_GB/extensions/kotlin_1_3/atrium-api-fluent-en_GB-kotlin_1_3-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/kotlin_1_3/ResultExpectationsSpec.kt @@ -3,7 +3,7 @@ package ch.tutteli.atrium.api.fluent.en_GB.kotlin_1_3 import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* -class ResultAssertionsSpec : ch.tutteli.atrium.specs.integration.ResultAssertionsSpec( +class ResultExpectationsSpec : ch.tutteli.atrium.specs.integration.ResultExpectationsSpec( feature0, Int>(Expect>::isSuccess), fun1, Expect.() -> Unit>(Expect>::isSuccess), feature0, Int?>(Expect>::isSuccess).withNullableSuffix(), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/AnyExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/AnyExpectationsSpec.kt index 4d3862e930..6cad12fb60 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/AnyExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/AnyExpectationsSpec.kt @@ -9,7 +9,7 @@ import ch.tutteli.atrium.specs.withFeatureSuffix import ch.tutteli.atrium.specs.withNullableSuffix import kotlin.reflect.KFunction2 -class AnyAssertionsSpec : ch.tutteli.atrium.specs.integration.AnyAssertionsSpec( +class AnyExpectationsSpec : ch.tutteli.atrium.specs.integration.AnyExpectationsSpec( fun1(Expect::toBe), fun1(Expect::toBe), fun1(Expect::toBe).withNullableSuffix(), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ArrayAsListExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ArrayAsListExpectationsSpec.kt index b0cc9234bf..c1ecd082ae 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ArrayAsListExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ArrayAsListExpectationsSpec.kt @@ -4,7 +4,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.testutils.WithAsciiReporter -class ArrayAsListAssertionsSpec : ch.tutteli.atrium.specs.integration.ArrayAsListAssertionsSpec( +class ArrayAsListExpectationsSpec : ch.tutteli.atrium.specs.integration.ArrayAsListExpectationsSpec( "asList", Companion::arrayInt, Companion::byteArray, diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsAtLeastExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsAtLeastExpectationsSpec.kt index 8836a9070b..5420c506d6 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsAtLeastExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsAtLeastExpectationsSpec.kt @@ -3,26 +3,26 @@ package ch.tutteli.atrium.api.infix.en_GB import ch.tutteli.atrium.creating.Expect import org.spekframework.spek2.Spek -class CharSequenceContainsAtLeastAssertionsSpec : Spek({ - include(object : ch.tutteli.atrium.specs.integration.CharSequenceContainsAtLeastAssertionsSpec( +class CharSequenceContainsAtLeastExpectationsSpec : Spek({ + include(object : ch.tutteli.atrium.specs.integration.CharSequenceContainsAtLeastExpectationsSpec( getAtLeastValuesTriple(), getAtLeastIgnoringCaseValuesTriple(), getAtLeastButAtMostValuesTriple(), getAtLeastBustAtMostIgnoringCaseValuesTriple(), getContainsNotPair(), getExactlyPair(), - CharSequenceContainsAtLeastAssertionsSpec.Companion::getErrorMsgAtLeastButAtMost, + CharSequenceContainsAtLeastExpectationsSpec.Companion::getErrorMsgAtLeastButAtMost, "* ", "- " ) {}) - include(object : ch.tutteli.atrium.specs.integration.CharSequenceContainsAtLeastAssertionsSpec( + include(object : ch.tutteli.atrium.specs.integration.CharSequenceContainsAtLeastExpectationsSpec( getAtLeastElementsOfTriple(), getAtLeastIgnoringCaseElementsOfTriple(), getAtLeastButAtMostElementsOfTriple(), getAtLeastButAtMostIgnoringCaseElementsOfTriple(), getContainsNotPair(), getExactlyPair(), - CharSequenceContainsAtLeastAssertionsSpec.Companion::getErrorMsgAtLeastButAtMost, + CharSequenceContainsAtLeastExpectationsSpec.Companion::getErrorMsgAtLeastButAtMost, "* ", "- " ) {}) diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsAtMostExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsAtMostExpectationsSpec.kt index 19fa3802ec..5fddf477c1 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsAtMostExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsAtMostExpectationsSpec.kt @@ -3,8 +3,8 @@ package ch.tutteli.atrium.api.infix.en_GB import ch.tutteli.atrium.creating.Expect -class CharSequenceContainsAtMostAssertionsSpec : - ch.tutteli.atrium.specs.integration.CharSequenceContainsAtMostAssertionsSpec( +class CharSequenceContainsAtMostExpectationsSpec : + ch.tutteli.atrium.specs.integration.CharSequenceContainsAtMostExpectationsSpec( getAtMostTriple(), getAtMostIgnoringCaseTriple(), getContainsNotPair(), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsContainsNotExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsContainsNotExpectationsSpec.kt index 819c89ae70..3f9c603f09 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsContainsNotExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsContainsNotExpectationsSpec.kt @@ -5,16 +5,16 @@ import ch.tutteli.atrium.specs.fun2 import ch.tutteli.atrium.specs.notImplemented import org.spekframework.spek2.Spek -class CharSequenceContainsContainsNotAssertionsSpec : Spek({ +class CharSequenceContainsContainsNotExpectationsSpec : Spek({ - include(object : ch.tutteli.atrium.specs.integration.CharSequenceContainsContainsNotAssertionsSpec( + include(object : ch.tutteli.atrium.specs.integration.CharSequenceContainsContainsNotExpectationsSpec( getContainsPair(), getContainsNotPair(), "* ", "- ", ">> ", "[Atrium][Builder]" ) {}) - include(object : ch.tutteli.atrium.specs.integration.CharSequenceContainsContainsNotAssertionsSpec( + include(object : ch.tutteli.atrium.specs.integration.CharSequenceContainsContainsNotExpectationsSpec( getContainsShortcutPair(), getContainsNotShortcutPair(), "* ", "- ", ">> ", diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsExactlyExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsExactlyExpectationsSpec.kt index 94b0d56a15..b3776ddf2c 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsExactlyExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsExactlyExpectationsSpec.kt @@ -2,8 +2,8 @@ package ch.tutteli.atrium.api.infix.en_GB import ch.tutteli.atrium.creating.Expect -class CharSequenceContainsExactlyAssertionsSpec : - ch.tutteli.atrium.specs.integration.CharSequenceContainsExactlyAssertionsSpec( +class CharSequenceContainsExactlyExpectationsSpec : + ch.tutteli.atrium.specs.integration.CharSequenceContainsExactlyExpectationsSpec( getExactlyTriple(), getExactlyIgnoringCaseTriple(), getContainsNotPair(), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsNotExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsNotExpectationsSpec.kt index 3f02be2438..818e09bbca 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsNotExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsNotExpectationsSpec.kt @@ -2,7 +2,7 @@ package ch.tutteli.atrium.api.infix.en_GB import ch.tutteli.atrium.creating.Expect -class CharSequenceContainsNotAssertionsSpec : ch.tutteli.atrium.specs.integration.CharSequenceContainsNotAssertionsSpec( +class CharSequenceContainsNotExpectationsSpec : ch.tutteli.atrium.specs.integration.CharSequenceContainsNotExpectationsSpec( getContainsNotTriple(), getContainsNotIgnoringCaseTriple(), "* ", "- " diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsNotOrAtMostExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsNotOrAtMostExpectationsSpec.kt index d4220dd9ce..f15cd4a055 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsNotOrAtMostExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsNotOrAtMostExpectationsSpec.kt @@ -2,8 +2,8 @@ package ch.tutteli.atrium.api.infix.en_GB import ch.tutteli.atrium.creating.Expect -class CharSequenceContainsNotOrAtMostAssertionsSpec : - ch.tutteli.atrium.specs.integration.CharSequenceContainsNotOrAtMostAssertionsSpec( +class CharSequenceContainsNotOrAtMostExpectationsSpec : + ch.tutteli.atrium.specs.integration.CharSequenceContainsNotOrAtMostExpectationsSpec( getNotOrAtMostTriple(), getNotOrAtMostIgnoringCaseTriple(), getContainsNotPair(), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsRegexExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsRegexExpectationsSpec.kt index 2d2d17b97a..c4cddd8b49 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsRegexExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceContainsRegexExpectationsSpec.kt @@ -3,11 +3,11 @@ package ch.tutteli.atrium.api.infix.en_GB import ch.tutteli.atrium.creating.Expect import org.spekframework.spek2.Spek -class CharSequenceContainsRegexAssertionsSpec : Spek({ +class CharSequenceContainsRegexExpectationsSpec : Spek({ include(StringSpec) include(RegexSpec) }) { - object StringSpec : ch.tutteli.atrium.specs.integration.CharSequenceContainsRegexAssertionsSpec( + object StringSpec : ch.tutteli.atrium.specs.integration.CharSequenceContainsRegexExpectationsSpec( getNameContainsRegex(), getAtLeastTripleString(), getAtLeastIgnoringCaseTripleString(), @@ -18,7 +18,7 @@ class CharSequenceContainsRegexAssertionsSpec : Spek({ "[StringSpec] " ) - object RegexSpec : ch.tutteli.atrium.specs.integration.CharSequenceContainsRegexAssertionsSpec( + object RegexSpec : ch.tutteli.atrium.specs.integration.CharSequenceContainsRegexExpectationsSpec( getNameContainsRegex(), getAtLeastTripleRegex(), getAtLeastIgnoringCaseTripleString(), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceExpectationsSpec.kt index 0dacab299c..4a23b56b0b 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CharSequenceExpectationsSpec.kt @@ -5,7 +5,7 @@ import ch.tutteli.atrium.specs.fun1 import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.testutils.WithAsciiReporter -class CharSequenceAssertionsSpec : ch.tutteli.atrium.specs.integration.CharSequenceAssertionsSpec( +class CharSequenceExpectationsSpec : ch.tutteli.atrium.specs.integration.CharSequenceExpectationsSpec( "toBe ${empty::class.simpleName}" to Companion::toBeEmpty, "notToBe ${empty::class.simpleName}" to Companion::notToBeEmpty, "notToBe ${blank::class.simpleName}" to Companion::notToBeBlank, diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CollectionExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CollectionExpectationsSpec.kt index 70a54cac70..624d633709 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CollectionExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/CollectionExpectationsSpec.kt @@ -4,7 +4,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.specs.testutils.WithAsciiReporter -class CollectionAssertionsSpec : ch.tutteli.atrium.specs.integration.CollectionAssertionsSpec( +class CollectionExpectationsSpec : ch.tutteli.atrium.specs.integration.CollectionExpectationsSpec( "toBe ${empty::class.simpleName}" to Companion::isEmpty, "notToBe ${empty::class.simpleName}" to Companion::isNotEmpty, property, Int>(Expect>::size), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ComparableExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ComparableExpectationsSpec.kt index 0f8a3bce8b..be43b26cf9 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ComparableExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ComparableExpectationsSpec.kt @@ -6,7 +6,7 @@ import ch.tutteli.atrium.specs.integration.DiffEqualsCompareTo import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.testutils.WithAsciiReporter -class ComparableAssertionsSpec : ch.tutteli.atrium.specs.integration.ComparableAssertionsSpec( +class ComparableExpectationsSpec : ch.tutteli.atrium.specs.integration.ComparableExpectationsSpec( fun1(Expect::isLessThan), fun1(Expect::isLessThanOrEqual), fun1(Expect::isGreaterThan), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/Fun0ExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/Fun0ExpectationsSpec.kt index 6c53d3f42d..988cb7a9dc 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/Fun0ExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/Fun0ExpectationsSpec.kt @@ -7,7 +7,7 @@ import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.testutils.WithAsciiReporter import ch.tutteli.atrium.specs.withFeatureSuffix -class Fun0AssertionsSpec : ch.tutteli.atrium.specs.integration.Fun0AssertionsSpec( +class Fun0ExpectationsSpec : ch.tutteli.atrium.specs.integration.Fun0ExpectationsSpec( ("toThrow" to Companion::toThrowFeature).withFeatureSuffix(), "toThrow" to Companion::toThrow, feature0<() -> Int, Int>(Expect<() -> Int>::notToThrow), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableAllExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableAllExpectationsSpec.kt index 48caa24d3d..68cdde740e 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableAllExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableAllExpectationsSpec.kt @@ -6,7 +6,7 @@ import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.testutils.WithAsciiReporter import ch.tutteli.atrium.specs.withNullableSuffix -class IterableAllAssertionsSpec : ch.tutteli.atrium.specs.integration.IterableAllAssertionsSpec( +class IterableAllExpectationsSpec : ch.tutteli.atrium.specs.integration.IterableAllExpectationsSpec( fun1(Expect>::all), fun1(Expect>::all).withNullableSuffix(), "* ", "(!) ", "- ", "» ", ">> ", "=> " diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableAnyExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableAnyExpectationsSpec.kt index 649af354af..be535823e1 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableAnyExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableAnyExpectationsSpec.kt @@ -1,7 +1,6 @@ package ch.tutteli.atrium.api.infix.en_GB import ch.tutteli.atrium.creating.Expect -import ch.tutteli.atrium.domain.builders.ExpectImpl import ch.tutteli.atrium.logic._logic import ch.tutteli.atrium.logic.changeSubject import ch.tutteli.atrium.specs.fun1 @@ -10,34 +9,34 @@ import ch.tutteli.atrium.specs.withNullableSuffix import org.spekframework.spek2.Spek import kotlin.reflect.KFunction2 -class IterableAnyAssertionsSpec : Spek({ +class IterableAnyExpectationsSpec : Spek({ include(PredicateSpec) include(BuilderSpec) include(ShortcutSpec) include(SequenceSpec) }) { - object PredicateSpec : ch.tutteli.atrium.specs.integration.IterableAnyAssertionsSpec( + object PredicateSpec : ch.tutteli.atrium.specs.integration.IterableAnyExpectationsSpec( fun1(Expect>::any), fun1(Expect>::any).withNullableSuffix(), "* ", "[Atrium][Predicate] " ) - object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableAnyAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableAnyExpectationsSpec( getContainsPair(), getContainsNullablePair().withNullableSuffix(), "* ", "[Atrium][Builder] " ) - object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableAnyAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableAnyExpectationsSpec( getContainsShortcutPair(), getContainsNullableShortcutPair().withNullableSuffix(), "* ", "[Atrium][Shortcut] " ) - object SequenceSpec : ch.tutteli.atrium.specs.integration.IterableAnyAssertionsSpec( + object SequenceSpec : ch.tutteli.atrium.specs.integration.IterableAnyExpectationsSpec( getContainsSequencePair(), getContainsNullableSequencePair().withNullableSuffix(), "* ", diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeast1ElementsOfExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeast1ElementsOfExpectationsSpec.kt index 2e9f57bf07..1fb5db184d 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeast1ElementsOfExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeast1ElementsOfExpectationsSpec.kt @@ -4,20 +4,20 @@ import ch.tutteli.atrium.creating.Expect import org.spekframework.spek2.Spek import kotlin.reflect.KFunction2 -class IterableContainsInAnyOrderAtLeast1ElementsOfAssertionsSpec : Spek({ +class IterableContainsInAnyOrderAtLeast1ElementsOfExpectationsSpec : Spek({ include(BuilderSpec) include(ShortcutSpec) include(BuilderIterableLikeToIterableSpec) include(ShortcutIterableLikeToIterableSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeast1ValuesAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec( getContainsPair(), getContainsNullablePair(), "* ", "[Atrium][Builder] " ) - object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeast1ValuesAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec( getContainsShortcutPair(), getContainsNullableShortcutPair(), "* ", diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec.kt index 78849e7b70..2439c0f3b0 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec.kt @@ -4,18 +4,18 @@ import ch.tutteli.atrium.creating.Expect import org.spekframework.spek2.Spek import kotlin.reflect.KFunction2 -class IterableContainsInAnyOrderAtLeast1EntriesAssertionsSpec : Spek({ +class IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec : Spek({ include(BuilderSpec) include(ShortcutSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeast1EntriesAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec( getContainsPair(), getContainsNullablePair(), "* ", "[Atrium][Builder] " ) - object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeast1EntriesAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec( getContainsShortcutPair(), getContainsNullableShortcutPair(), "* ", diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec.kt index 76ec10a797..188afe3df3 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec.kt @@ -4,18 +4,18 @@ import ch.tutteli.atrium.creating.Expect import org.spekframework.spek2.Spek import kotlin.reflect.KFunction2 -class IterableContainsInAnyOrderAtLeast1ValuesAssertionsSpec : Spek({ +class IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec : Spek({ include(BuilderSpec) include(ShortcutSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeast1ValuesAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec( getContainsPair(), getContainsNullablePair(), "* ", "[Atrium][Builder] " ) - object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeast1ValuesAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec( getContainsShortcutPair(), getContainsNullableShortcutPair(), "* ", diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderExactlyValuesExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderExactlyValuesExpectationsSpec.kt index 0359da21ae..0fd2af1c39 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderExactlyValuesExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderExactlyValuesExpectationsSpec.kt @@ -2,8 +2,8 @@ package ch.tutteli.atrium.api.infix.en_GB import ch.tutteli.atrium.creating.Expect -class IterableContainsInAnyOrderExactlyValuesAssertionsSpec : - ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderExactlyValuesAssertionsSpec( +class IterableContainsInAnyOrderExactlyValuesExpectationsSpec : + ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderExactlyValuesExpectationsSpec( getExactlyTriple(), getContainsNotPair(), "* " diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderNotOrAtMostValuesExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderNotOrAtMostValuesExpectationsSpec.kt index b604411be5..10a80297f5 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderNotOrAtMostValuesExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderNotOrAtMostValuesExpectationsSpec.kt @@ -2,8 +2,8 @@ package ch.tutteli.atrium.api.infix.en_GB import ch.tutteli.atrium.creating.Expect -class IterableContainsInAnyOrderNotOrAtMostValuesAssertionsSpec : - ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderNotOrAtMostValuesAssertionsSpec( +class IterableContainsInAnyOrderNotOrAtMostValuesExpectationsSpec : + ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderNotOrAtMostValuesExpectationsSpec( getNotOrAtMostTriple(), getContainsNotPair(), "* " diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderOnlyElementsOfExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderOnlyElementsOfExpectationsSpec.kt index 69616d9ecd..d90ea2d8b1 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderOnlyElementsOfExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderOnlyElementsOfExpectationsSpec.kt @@ -3,11 +3,11 @@ package ch.tutteli.atrium.api.infix.en_GB import ch.tutteli.atrium.creating.Expect import org.spekframework.spek2.Spek -class IterableContainsInAnyOrderOnlyElementsOfAssertionsSpec : Spek({ +class IterableContainsInAnyOrderOnlyElementsOfExpectationsSpec : Spek({ include(BuilderSpec) include(BuilderIterableLikeToIterableSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderOnlyValuesAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderOnlyValuesExpectationsSpec( getContainsPair(), getContainsNullablePair(), "* ", "(/) ", "(x) ", "(!) ", "- ", "» " diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderOnlyEntriesExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderOnlyEntriesExpectationsSpec.kt index 4e38603d9e..0637d5ee07 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderOnlyEntriesExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderOnlyEntriesExpectationsSpec.kt @@ -2,8 +2,8 @@ package ch.tutteli.atrium.api.infix.en_GB import ch.tutteli.atrium.creating.Expect -class IterableContainsInAnyOrderOnlyEntriesAssertionsSpec : - ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderOnlyEntriesAssertionsSpec( +class IterableContainsInAnyOrderOnlyEntriesExpectationsSpec : + ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderOnlyEntriesExpectationsSpec( getContainsPair(), getContainsNullablePair(), "* ", "(/) ", "(x) ", "(!) ", "- ", "» " diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderOnlyValuesExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderOnlyValuesExpectationsSpec.kt index c3c3cefeff..38d532c498 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderOnlyValuesExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInAnyOrderOnlyValuesExpectationsSpec.kt @@ -2,8 +2,8 @@ package ch.tutteli.atrium.api.infix.en_GB import ch.tutteli.atrium.creating.Expect -class IterableContainsInAnyOrderOnlyValuesAssertionsSpec : - ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderOnlyValuesAssertionsSpec( +class IterableContainsInAnyOrderOnlyValuesExpectationsSpec : + ch.tutteli.atrium.specs.integration.IterableContainsInAnyOrderOnlyValuesExpectationsSpec( getContainsPair(), getContainsNullablePair(), "* ", "(/) ", "(x) ", "(!) ", "- " diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyElementsOfExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyElementsOfExpectationsSpec.kt index 5dc3fb8e80..e9210bb1a8 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyElementsOfExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyElementsOfExpectationsSpec.kt @@ -10,14 +10,14 @@ class IterableContainsInOrderOnlyElementsOfExpectationsSpec : Spek({ include(BuilderIterableLikeToIterableSpec) include(ShortcutIterableLikeToIterableSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyValuesAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyValuesExpectationsSpec( getContainsPair(), getContainsNullablePair(), "* ", "(/) ", "(x) ", "(!) ", "- ", "» ", ">> ", "=> ", "[Atrium][Builder] " ) - object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyValuesAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyValuesExpectationsSpec( getContainsShortcutPair(), getContainsNullableShortcutPair(), "* ", "(/) ", "(x) ", "(!) ", "- ", "» ", ">> ", "=> ", diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyEntriesExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyEntriesExpectationsSpec.kt index e28d2a6a3e..dad0616a5e 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyEntriesExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyEntriesExpectationsSpec.kt @@ -10,14 +10,14 @@ class IterableContainsInOrderOnlyEntriesExpectationsSpec : Spek({ include(ShortcutSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyEntriesAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyEntriesExpectationsSpec( getContainsPair(), getContainsNullablePair(), "* ", "(/) ", "(x) ", "(!) ", "- ", "» ", ">> ", "=> ", "[Atrium][Builder] " ) - object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyEntriesAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyEntriesExpectationsSpec( getContainsShortcutPair(), getContainsNullableShortcutPair(), "* ", "(/) ", "(x) ", "(!) ", "- ", "» ", ">> ", "=> ", diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyGroupedEntriesExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyGroupedEntriesExpectationsSpec.kt index 902631744c..eb9075ceb4 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyGroupedEntriesExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyGroupedEntriesExpectationsSpec.kt @@ -3,8 +3,8 @@ package ch.tutteli.atrium.api.infix.en_GB import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.domain.builders.utils.Group -class IterableContainsInOrderOnlyGroupedEntriesAssertionsSpec : - ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyGroupedEntriesAssertionsSpec( +class IterableContainsInOrderOnlyGroupedEntriesExpectationsSpec : + ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyGroupedEntriesExpectationsSpec( getContainsPair(), Companion::groupFactory, "* ", "(/) ", "(x) ", "(!) ", "- ", "» ", ">> ", "=> ", diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyGroupedValuesExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyGroupedValuesExpectationsSpec.kt index eff1172c0a..1fe5975f3e 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyGroupedValuesExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyGroupedValuesExpectationsSpec.kt @@ -3,8 +3,8 @@ package ch.tutteli.atrium.api.infix.en_GB import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.domain.builders.utils.Group -class IterableContainsInOrderOnlyGroupedValuesAssertionsSpec : - ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyGroupedValuesAssertionsSpec( +class IterableContainsInOrderOnlyGroupedValuesExpectationsSpec : + ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyGroupedValuesExpectationsSpec( getContainsPair(), Companion::groupFactory, getContainsNullablePair(), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyValuesExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyValuesExpectationsSpec.kt index 6837cd40a4..611e0693ca 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyValuesExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsInOrderOnlyValuesExpectationsSpec.kt @@ -10,14 +10,14 @@ class IterableContainsInOrderOnlyValuesExpectationsSpec : Spek({ include(ShortcutSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyValuesAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyValuesExpectationsSpec( getContainsPair(), getContainsNullablePair(), "* ", "(/) ", "(x) ", "(!) ", "- ", "» ", ">> ", "=> ", "[Atrium][Builder] " ) - object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyValuesAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsInOrderOnlyValuesExpectationsSpec( getContainsShortcutPair(), getContainsNullableShortcutPair(), "* ", "(/) ", "(x) ", "(!) ", "- ", "» ", ">> ", "=> ", diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsNotEntriesExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsNotEntriesExpectationsSpec.kt index c2c02a7574..1e7ae012d9 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsNotEntriesExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsNotEntriesExpectationsSpec.kt @@ -3,8 +3,8 @@ package ch.tutteli.atrium.api.infix.en_GB import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.withNullableSuffix -class IterableContainsNotEntriesAssertionsSpec : - ch.tutteli.atrium.specs.integration.IterableContainsNotEntriesAssertionsSpec( +class IterableContainsNotEntriesExpectationsSpec : + ch.tutteli.atrium.specs.integration.IterableContainsNotEntriesExpectationsSpec( getContainsNotPair(), getContainsNotNullablePair().withNullableSuffix(), "* ", "(/) ", "(x) ", "- ", "» ", ">> ", "=> ", diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsNotValuesExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsNotValuesExpectationsSpec.kt index 4dabd1650b..eb251b3d92 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsNotValuesExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableContainsNotValuesExpectationsSpec.kt @@ -11,14 +11,14 @@ class IterableContainsNotValuesExpectationsSpec : Spek({ }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsNotValuesAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableContainsNotValuesExpectationsSpec( getContainsNotPair(), getContainsNotNullablePair(), "* ", "(/) ", "(x) ", "- ", ">> ", "=> ", "[Atrium][Builder] " ) - object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsNotValuesAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.IterableContainsNotValuesExpectationsSpec( getContainsNotShortcutPair(), getContainsNotNullablePair(), "* ", "(/) ", "(x) ", "- ", ">> ", "=> ", diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableExpectationsSpec.kt index 16c50dbfbe..db9833e475 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableExpectationsSpec.kt @@ -5,7 +5,7 @@ import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.specs.testutils.WithAsciiReporter import kotlin.reflect.KFunction2 -class IterableAssertionsSpec : ch.tutteli.atrium.specs.integration.IterableAssertionsSpec( +class IterableExpectationsSpec : ch.tutteli.atrium.specs.integration.IterableExpectationsSpec( getHasNextPair(), getHasNotNextPair(), minFeaturePair(), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableNoneExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableNoneExpectationsSpec.kt index 887c35b600..c514b117a3 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableNoneExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IterableNoneExpectationsSpec.kt @@ -6,20 +6,20 @@ import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.withNullableSuffix import org.spekframework.spek2.Spek -class IterableNoneAssertionsSpec : Spek({ +class IterableNoneExpectationsSpec : Spek({ include(PredicateSpec) include(BuilderSpec) }) { - object PredicateSpec : ch.tutteli.atrium.specs.integration.IterableNoneAssertionsSpec( + object PredicateSpec : ch.tutteli.atrium.specs.integration.IterableNoneExpectationsSpec( fun1(Expect>::none), fun1(Expect>::none).withNullableSuffix(), "* ", "(/) ", "(x) ", "- ", "» ", ">> ", "=> ", "[Atrium][Predicate] " ) - object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableNoneAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.IterableNoneExpectationsSpec( getContainsNotPair(), getContainsNotNullablePair().withNullableSuffix(), "* ", "(/) ", "(x) ", "- ", "» ", ">> ", "=> ", diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IteratorExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IteratorExpectationsSpec.kt index d1ff81b090..05444c266f 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IteratorExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/IteratorExpectationsSpec.kt @@ -5,7 +5,7 @@ import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.testutils.WithAsciiReporter import kotlin.reflect.KFunction2 -class IteratorAssertionSpec : ch.tutteli.atrium.specs.integration.IteratorAssertionSpec( +class IteratorExpectationsSpec : ch.tutteli.atrium.specs.integration.IteratorExpectationsSpec( getHasNextPair(), getHasNotNextPair() ) { diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ListExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ListExpectationsSpec.kt index aaed70af43..f22f050151 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ListExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ListExpectationsSpec.kt @@ -11,12 +11,12 @@ import org.spekframework.spek2.Spek import org.spekframework.spek2.style.specification.describe import kotlin.jvm.JvmName -class ListAssertionsSpec : Spek({ +class ListExpectationsSpec : Spek({ include(ListSpec) include(IterableSpec) include(SequenceSpec) }) { - object ListSpec : ch.tutteli.atrium.specs.integration.ListAssertionsSpec( + object ListSpec : ch.tutteli.atrium.specs.integration.ListExpectationsSpec( feature1, Int, Int>(Expect>::get), fun2, Int, Expect.() -> Unit>(Companion::get), feature1, Int, Int?>(Expect>::get).withNullableSuffix(), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapAsEntriesExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapAsEntriesExpectationsSpec.kt index 55fe45a825..b74860140b 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapAsEntriesExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapAsEntriesExpectationsSpec.kt @@ -7,7 +7,7 @@ import ch.tutteli.atrium.specs.name import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.testutils.WithAsciiReporter -class MapAsEntriesAssertionsSpec : ch.tutteli.atrium.specs.integration.MapAsEntriesAssertionsSpec( +class MapAsEntriesExpectationsSpec : ch.tutteli.atrium.specs.integration.MapAsEntriesExpectationsSpec( asEntriesPair(), fun1, Expect>>.() -> Unit>(Expect>::asEntries) ) { diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderEntriesOfExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderEntriesOfExpectationsSpec.kt index 923fd615c9..40dc2e0074 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderEntriesOfExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderEntriesOfExpectationsSpec.kt @@ -6,21 +6,21 @@ import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.specs.integration.mfun2 import org.spekframework.spek2.Spek import kotlin.jvm.JvmName -import ch.tutteli.atrium.api.infix.en_GB.MapContainsInAnyOrderEntriesOfAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.infix.en_GB.MapContainsInAnyOrderEntriesOfExpectationsSpec.Companion as C -class MapContainsInAnyOrderEntriesOfAssertionsSpec : Spek({ +class MapContainsInAnyOrderEntriesOfExpectationsSpec : Spek({ include(BuilderSpec) include(ShortcutSpec) include(BuilderMapLikeToIterablePairSpec) include(ShortcutMapLikeToIterablePairSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderKeyValuePairsAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderKeyValuePairsExpectationsSpec( containsKeyValuePair_s to C::containsKeyValuePairs, (containsKeyValuePair_s to C::containsKeyValuePairsNullable).withNullableSuffix(), "[Atrium][Shortcut] " ) - object ShortcutSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderKeyValuePairsAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderKeyValuePairsExpectationsSpec( mfun2(C::containsEntriesOf), mfun2(C::containsEntriesOf).withNullableSuffix(), "[Atrium][Shortcut] " diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderKeyValueExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderKeyValueExpectationsSpec.kt index f974120b5b..41dcf0c078 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderKeyValueExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderKeyValueExpectationsSpec.kt @@ -7,19 +7,19 @@ import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.specs.integration.mfun2 import org.spekframework.spek2.Spek import kotlin.jvm.JvmName -import ch.tutteli.atrium.api.infix.en_GB.MapContainsInAnyOrderKeyValueAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.infix.en_GB.MapContainsInAnyOrderKeyValueExpectationsSpec.Companion as C -class MapContainsInAnyOrderKeyValueAssertionsSpec : Spek({ +class MapContainsInAnyOrderKeyValueExpectationsSpec : Spek({ include(BuilderSpec) include(ShortcutSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderKeyValueAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderKeyValueExpectationsSpec( containsKeyValue_s to C::containsKeyValues, (containsKeyValue_s to C::containsKeyValuesNullable).withNullableSuffix(), "[Atrium][Shortcut] " ) - object ShortcutSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderKeyValueAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderKeyValueExpectationsSpec( mfun2.() -> Unit>(C::contains), mfun2.() -> Unit)?>(C::contains).withNullableSuffix(), "[Atrium][Shortcut] " diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderKeyValuePairsExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderKeyValuePairsExpectationsSpec.kt index c825adaca0..e2a52c5983 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderKeyValuePairsExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderKeyValuePairsExpectationsSpec.kt @@ -5,19 +5,19 @@ import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.specs.integration.mfun2 import org.spekframework.spek2.Spek import kotlin.jvm.JvmName -import ch.tutteli.atrium.api.infix.en_GB.MapContainsInAnyOrderKeyValuePairsAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.infix.en_GB.MapContainsInAnyOrderKeyValuePairsExpectationsSpec.Companion as C -class MapContainsInAnyOrderKeyValuePairsAssertionsSpec : Spek({ +class MapContainsInAnyOrderKeyValuePairsExpectationsSpec : Spek({ include(BuilderSpec) include(ShortcutSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderKeyValuePairsAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderKeyValuePairsExpectationsSpec( containsKeyValuePair_s to C::containsKeyValuePairs, (containsKeyValuePair_s to C::containsKeyValuePairsNullable).withNullableSuffix(), "[Atrium][Shortcut] " ) - object ShortcutSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderKeyValuePairsAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderKeyValuePairsExpectationsSpec( mfun2(C::contains), mfun2(C::contains).withNullableSuffix(), "[Atrium][Shortcut] " diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderOnlyEntriesOfExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderOnlyEntriesOfExpectationsSpec.kt index ed43431667..1ee9f9cf4a 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderOnlyEntriesOfExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderOnlyEntriesOfExpectationsSpec.kt @@ -6,23 +6,23 @@ import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.specs.integration.mfun2 import org.spekframework.spek2.Spek import kotlin.jvm.JvmName -import ch.tutteli.atrium.api.infix.en_GB.MapContainsInAnyOrderOnlyEntriesOfAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.infix.en_GB.MapContainsInAnyOrderOnlyEntriesOfExpectationsSpec.Companion as C -class MapContainsInAnyOrderOnlyEntriesOfAssertionsSpec : Spek({ +class MapContainsInAnyOrderOnlyEntriesOfExpectationsSpec : Spek({ include(BuilderSpec) include(ShortcutSpec) include(BuilderMapLikeToIterablePairSpec) include(ShortcutMapLikeToIterablePairSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderOnlyKeyValuePairsAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec( containsKeyValuePair_s to C::containsKeyValuePairs, (containsKeyValuePair_s to C::containsKeyValuePairsNullable).withNullableSuffix(), "* ", "(/) ", "(x) ", "(!) ", "- ", "» ", ">> ", "=> ", "[Atrium][Builder] " ) - object ShortcutSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderOnlyKeyValuePairsAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec( mfun2(C::containsOnlyEntriesOf), mfun2(C::containsOnlyEntriesOf).withNullableSuffix(), "* ", "(/) ", "(x) ", "(!) ", "- ", ">> ", "=> ", diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderOnlyKeyValueExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderOnlyKeyValueExpectationsSpec.kt index bc446c7a05..5c284b94a1 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderOnlyKeyValueExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderOnlyKeyValueExpectationsSpec.kt @@ -6,21 +6,21 @@ import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.specs.integration.mfun2 import org.spekframework.spek2.Spek import kotlin.jvm.JvmName -import ch.tutteli.atrium.api.infix.en_GB.MapContainsInAnyOrderOnlyKeyValueAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.infix.en_GB.MapContainsInAnyOrderOnlyKeyValueExpectationsSpec.Companion as C -class MapContainsInAnyOrderOnlyKeyValueAssertionsSpec : Spek({ +class MapContainsInAnyOrderOnlyKeyValueExpectationsSpec : Spek({ include(BuilderSpec) include(ShortcutSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderOnlyKeyValueAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderOnlyKeyValueExpectationsSpec( containsKeyValue_s to C::containsKeyValues, (containsKeyValue_s to C::containsKeyValuesNullable).withNullableSuffix(), "* ", "(/) ", "(x) ", "(!) ", "- ", "» ", ">> ", "=> ", "[Atrium][Builder] " ) - object ShortcutSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderOnlyKeyValueAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderOnlyKeyValueExpectationsSpec( mfun2.() -> Unit>(C::containsOnly), mfun2.() -> Unit)?>(C::containsOnly).withNullableSuffix(), "* ", "(/) ", "(x) ", "(!) ", "- ", "» ", ">> ", "=> ", diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec.kt index 3fadd22297..8cedff5f43 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec.kt @@ -1,26 +1,25 @@ package ch.tutteli.atrium.api.infix.en_GB import ch.tutteli.atrium.creating.Expect -import ch.tutteli.atrium.logic.utils.mapArguments import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.specs.integration.mfun2 import org.spekframework.spek2.Spek import kotlin.jvm.JvmName -import ch.tutteli.atrium.api.infix.en_GB.MapContainsInAnyOrderOnlyKeyValuePairsAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.infix.en_GB.MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec.Companion as C -class MapContainsInAnyOrderOnlyKeyValuePairsAssertionsSpec : Spek({ +class MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec : Spek({ include(BuilderSpec) include(ShortcutSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderOnlyKeyValuePairsAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec( containsKeyValuePair_s to C::containsKeyValuePairs, (containsKeyValuePair_s to C::containsKeyValuePairsNullable).withNullableSuffix(), "* ", "(/) ", "(x) ", "(!) ", "- ", "» ", ">> ", "=> ", "[Atrium][Builder] " ) - object ShortcutSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderOnlyKeyValuePairsAssertionsSpec( + object ShortcutSpec : ch.tutteli.atrium.specs.integration.MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec( mfun2(C::containsInAnyOrderOnly), mfun2(C::containsInAnyOrderOnly).withNullableSuffix(), "* ", "(/) ", "(x) ", "(!) ", "- ", "» ", ">> ", "=> ", diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInOrderOnlyEntriesOfExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInOrderOnlyEntriesOfExpectationsSpec.kt index 7fd63c30bb..97d0d9ea26 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInOrderOnlyEntriesOfExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInOrderOnlyEntriesOfExpectationsSpec.kt @@ -5,13 +5,13 @@ import ch.tutteli.atrium.logic.creating.typeutils.MapLike import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.withNullableSuffix import org.spekframework.spek2.Spek -import ch.tutteli.atrium.api.infix.en_GB.MapContainsInOrderOnlyEntriesOfAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.infix.en_GB.MapContainsInOrderOnlyEntriesOfExpectationsSpec.Companion as C -class MapContainsInOrderOnlyEntriesOfAssertionsSpec : Spek({ +class MapContainsInOrderOnlyEntriesOfExpectationsSpec : Spek({ include(BuilderSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInOrderOnlyKeyValuePairsAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInOrderOnlyKeyValuePairsExpectationsSpec( containsKeyValuePair_s to C::containsKeyValuePairs, (containsKeyValuePair_s to C::containsKeyValuePairsNullable).withNullableSuffix(), "* ", "(/) ", "(x) ", "(!) ", "- ", "» ", ">> ", "=> ", diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInOrderOnlyKeyValueExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInOrderOnlyKeyValueExpectationsSpec.kt index 603dda8117..2c762790dd 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInOrderOnlyKeyValueExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInOrderOnlyKeyValueExpectationsSpec.kt @@ -4,13 +4,13 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.logic.utils.mapArguments import ch.tutteli.atrium.specs.* import org.spekframework.spek2.Spek -import ch.tutteli.atrium.api.infix.en_GB.MapContainsInOrderOnlyKeyValueAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.infix.en_GB.MapContainsInOrderOnlyKeyValueExpectationsSpec.Companion as C -class MapContainsInOrderOnlyKeyValueAssertionsSpec : Spek({ +class MapContainsInOrderOnlyKeyValueExpectationsSpec : Spek({ include(BuilderSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInOrderOnlyKeyValueAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInOrderOnlyKeyValueExpectationsSpec( containsKeyValue_s to C::containsKeyValues, (containsKeyValue_s to C::containsKeyValuesNullable).withNullableSuffix(), "* ", "(/) ", "(x) ", "(!) ", "- ", "» ", ">> ", "=> ", diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInOrderOnlyKeyValuePairsExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInOrderOnlyKeyValuePairsExpectationsSpec.kt index 94ddb600a1..ee29e1ab02 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInOrderOnlyKeyValuePairsExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapContainsInOrderOnlyKeyValuePairsExpectationsSpec.kt @@ -4,13 +4,13 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.withNullableSuffix import org.spekframework.spek2.Spek -import ch.tutteli.atrium.api.infix.en_GB.MapContainsInOrderOnlyKeyValuePairsAssertionsSpec.Companion as C +import ch.tutteli.atrium.api.infix.en_GB.MapContainsInOrderOnlyKeyValuePairsExpectationsSpec.Companion as C -class MapContainsInOrderOnlyKeyValuePairsAssertionsSpec : Spek({ +class MapContainsInOrderOnlyKeyValuePairsExpectationsSpec : Spek({ include(BuilderSpec) }) { - object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInOrderOnlyKeyValuePairsAssertionsSpec( + object BuilderSpec : ch.tutteli.atrium.specs.integration.MapContainsInOrderOnlyKeyValuePairsExpectationsSpec( containsKeyValuePair_s to C::containsKeyValuePairs, (containsKeyValuePair_s to C::containsKeyValuePairsNullable).withNullableSuffix(), "* ", "(/) ", "(x) ", "(!) ", "- ", "» ", ">> ", "=> ", diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapEntryExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapEntryExpectationsSpec.kt index b8e7c4d06d..3106b48ac5 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapEntryExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapEntryExpectationsSpec.kt @@ -4,7 +4,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.specs.testutils.WithAsciiReporter -class MapEntryAssertionsSpec : ch.tutteli.atrium.specs.integration.MapEntryAssertionsSpec( +class MapEntryExpectationsSpec : ch.tutteli.atrium.specs.integration.MapEntryExpectationsSpec( fun1(Expect>::isKeyValue).name to Companion::isKeyValue, (fun1(Expect>::isKeyValue).name to Companion::isKeyValueNullable).withNullableSuffix(), property, String>(Expect>::key), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapExpectationsSpec.kt index 60e592e882..368142983a 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/MapExpectationsSpec.kt @@ -1,12 +1,11 @@ package ch.tutteli.atrium.api.infix.en_GB import ch.tutteli.atrium.creating.Expect -import ch.tutteli.atrium.logic.utils.mapArguments import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.specs.testutils.WithAsciiReporter import kotlin.jvm.JvmName -class MapAssertionsSpec : ch.tutteli.atrium.specs.integration.MapAssertionsSpec( +class MapExpectationsSpec : ch.tutteli.atrium.specs.integration.MapExpectationsSpec( fun1, String>(Companion::containsKey), fun1, String?>(Companion::containsKey).withNullableSuffix(), fun1, String>(Companion::containsNotKey), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/PairExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/PairExpectationsSpec.kt index 875d7565e7..64bbcac133 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/PairExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/PairExpectationsSpec.kt @@ -6,7 +6,7 @@ import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.property import ch.tutteli.atrium.specs.testutils.WithAsciiReporter -class PairAssertionsSpec : ch.tutteli.atrium.specs.integration.PairAssertionsSpec( +class PairExpectationsSpec : ch.tutteli.atrium.specs.integration.PairExpectationsSpec( property, String>(Expect>::first), fun1, Expect.() -> Unit>(Expect>::first), property, Int>(Expect>::second), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ThrowableExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ThrowableExpectationsSpec.kt index 27ab3c86ab..6b17c24239 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ThrowableExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ThrowableExpectationsSpec.kt @@ -4,7 +4,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.specs.testutils.WithAsciiReporter -class ThrowableAssertionsSpec : ch.tutteli.atrium.specs.integration.ThrowableAssertionsSpec( +class ThrowableExpectationsSpec : ch.tutteli.atrium.specs.integration.ThrowableExpectationsSpec( property(Expect::message), fun1.() -> Unit>(Expect::message), fun2(Companion::messageContains), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/BigDecimalExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/BigDecimalExpectationsSpec.kt index c47e3117d3..53af008f63 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/BigDecimalExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/BigDecimalExpectationsSpec.kt @@ -10,7 +10,7 @@ import org.spekframework.spek2.Spek import org.spekframework.spek2.style.specification.describe import java.math.BigDecimal -class BigDecimalExpectationsSpec : Spek({ +class BigDecimalAssertionsSpec : Spek({ include(object : BigDecimalExpectationsSpec( fun1(Companion::toBeBigDecimal), fun1(Companion::toBeNullable).withNullableSuffix(), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ChronoLocalDateExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ChronoLocalDateExpectationsSpec.kt index c1bb1fdae5..87a6cffda5 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ChronoLocalDateExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ChronoLocalDateExpectationsSpec.kt @@ -9,11 +9,11 @@ import java.time.LocalDate import java.time.chrono.ChronoLocalDate import java.time.chrono.JapaneseDate -class ChronoLocalDateAssertionsSpec : Spek({ +class ChronoLocalDateExpectationsSpec : Spek({ include(ChronoLocalDateSpec) include(ChronoLocalDateAsStringSpec) }) { - object ChronoLocalDateSpec : ch.tutteli.atrium.specs.integration.ChronoLocalDateAssertionSpec( + object ChronoLocalDateSpec : ch.tutteli.atrium.specs.integration.ChronoLocalDateExpectationsSpec( fun1(Expect::isBefore), fun1(Expect::isBeforeOrEqual), fun1(Expect::isAfter), @@ -21,7 +21,7 @@ class ChronoLocalDateAssertionsSpec : Spek({ fun1(Expect::isEqual) ) - object ChronoLocalDateAsStringSpec : ch.tutteli.atrium.specs.integration.ChronoLocalDateAsStringAssertionSpec( + object ChronoLocalDateAsStringSpec : ch.tutteli.atrium.specs.integration.ChronoLocalDateAsStringExpectationsSpec( fun1(Expect::isBefore), fun1(Expect::isBeforeOrEqual), fun1(Expect::isAfter), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ChronoLocalDateTimeExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ChronoLocalDateTimeExpectationsSpec.kt index a374141896..e134cc6a90 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ChronoLocalDateTimeExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ChronoLocalDateTimeExpectationsSpec.kt @@ -14,7 +14,7 @@ class ChronoLocalDateTimeExpectationsSpec : Spek({ include(ChronoLocalDateTimeSpec) include(ChronoLocalDateTimeAsStringSpec) }) { - object ChronoLocalDateTimeSpec : ch.tutteli.atrium.specs.integration.ChronoLocalDateTimeAssertionSpec( + object ChronoLocalDateTimeSpec : ch.tutteli.atrium.specs.integration.ChronoLocalDateTimeExpectationsSpec( fun1, ChronoLocalDateTime<*>>(Expect>::isBefore), fun1, ChronoLocalDateTime<*>>(Expect>::isBeforeOrEqual), fun1, ChronoLocalDateTime<*>>(Expect>::isAfter), @@ -23,7 +23,7 @@ class ChronoLocalDateTimeExpectationsSpec : Spek({ ) object ChronoLocalDateTimeAsStringSpec : - ch.tutteli.atrium.specs.integration.ChronoLocalDateTimeAsStringAssertionSpec( + ch.tutteli.atrium.specs.integration.ChronoLocalDateTimeAsStringExpectationsSpec( fun1, String>(Expect>::isBefore), fun1, String>(Expect>::isBeforeOrEqual), fun1, String>(Expect>::isAfter), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ChronoZonedDateTimeExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ChronoZonedDateTimeExpectationsSpec.kt index 4c467d6d81..57e75039ac 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ChronoZonedDateTimeExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ChronoZonedDateTimeExpectationsSpec.kt @@ -10,11 +10,11 @@ import java.time.ZonedDateTime import java.time.chrono.ChronoLocalDate import java.time.chrono.ChronoZonedDateTime -class ChronoZonedDateTimeAssertionSpec : Spek({ - include(ChronoZonedDateTimeAssertionSpec) - include(ChronoZonedDateTimeAsStringAssertionSpec) +class ChronoZonedDateTimeExpectationsSpec : Spek({ + include(ChronoZonedDateTimeExpectationsSpec) + include(ChronoZonedDateTimeAsStringExpectationsSpec) }) { - object ChronoZonedDateTimeAssertionSpec : ch.tutteli.atrium.specs.integration.ChronoZonedDateTimeAssertionSpec( + object ChronoZonedDateTimeExpectationsSpec : ch.tutteli.atrium.specs.integration.ChronoZonedDateTimeExpectationsSpec( fun1, ChronoZonedDateTime<*>>(Expect>::isBefore), fun1, ChronoZonedDateTime<*>>(Expect>::isBeforeOrEqual), fun1, ChronoZonedDateTime<*>>(Expect>::isAfter), @@ -22,7 +22,7 @@ class ChronoZonedDateTimeAssertionSpec : Spek({ fun1, ChronoZonedDateTime<*>>(Expect>::isEqual) ) - object ChronoZonedDateTimeAsStringAssertionSpec : ch.tutteli.atrium.specs.integration.ChronoZonedDateTimeAsStringAssertionSpec( + object ChronoZonedDateTimeAsStringExpectationsSpec : ch.tutteli.atrium.specs.integration.ChronoZonedDateTimeAsStringExpectationsSpec( fun1, String>(Expect>::isBefore), fun1, String>(Expect>::isBeforeOrEqual), fun1, String>(Expect>::isAfter), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FileAsPathExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FileAsPathExpectationsSpec.kt index 18c3fe82ca..4035199772 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FileAsPathExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/FileAsPathExpectationsSpec.kt @@ -5,7 +5,7 @@ import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.testutils.WithAsciiReporter import java.io.File -class FileAsPathAssertionsSpec : ch.tutteli.atrium.specs.integration.FileAsPathAssertionsSpec( +class FileAsPathExpectationsSpec : ch.tutteli.atrium.specs.integration.FileAsPathExpectationsSpec( Expect::asPath ) { companion object : WithAsciiReporter() diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/Fun0ExpectationsJvmSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/Fun0ExpectationsJvmSpec.kt index 57347f2641..5aa10a6bc8 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/Fun0ExpectationsJvmSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/Fun0ExpectationsJvmSpec.kt @@ -6,7 +6,7 @@ import ch.tutteli.atrium.specs.feature1 import ch.tutteli.atrium.specs.testutils.WithAsciiReporter import ch.tutteli.atrium.specs.withFeatureSuffix -class Fun0AssertionsJvmSpec : ch.tutteli.atrium.specs.integration.Fun0AssertionsJvmSpec( +class Fun0ExpectationsJvmSpec : ch.tutteli.atrium.specs.integration.Fun0ExpectationsJvmSpec( ("toThrow" to Companion::toThrowFeature).withFeatureSuffix(), "toThrow" to Companion::toThrow, feature0<() -> Int, Int>(Expect<() -> Int>::notToThrow), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/LocalDateExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/LocalDateExpectationsSpec.kt index 599e71d1b7..d7a755b130 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/LocalDateExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/LocalDateExpectationsSpec.kt @@ -8,7 +8,7 @@ import ch.tutteli.atrium.specs.testutils.WithAsciiReporter import java.time.DayOfWeek import java.time.LocalDate -class LocalDateAssertionsSpec : ch.tutteli.atrium.specs.integration.LocalDateAssertionsSpec( +class LocalDateExpectationsSpec : ch.tutteli.atrium.specs.integration.LocalDateExpectationsSpec( property(Expect::year), fun1.() -> Unit>(Expect::year), property(Expect::month), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/LocalDateTimeExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/LocalDateTimeExpectationsSpec.kt index 9e768a4655..fe33dffdc4 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/LocalDateTimeExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/LocalDateTimeExpectationsSpec.kt @@ -8,7 +8,7 @@ import ch.tutteli.atrium.specs.testutils.WithAsciiReporter import java.time.DayOfWeek import java.time.LocalDateTime -class LocalDateTimeAssertionsSpec : ch.tutteli.atrium.specs.integration.LocalDateTimeAssertionsSpec( +class LocalDateTimeExpectationsSpec : ch.tutteli.atrium.specs.integration.LocalDateTimeExpectationsSpec( property(Expect::year), fun1.() -> Unit>(Expect::year), property(Expect::month), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/OptionalExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/OptionalExpectationsSpec.kt index 9b4a9565d4..e9d21842c6 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/OptionalExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/OptionalExpectationsSpec.kt @@ -1,17 +1,15 @@ package ch.tutteli.atrium.api.infix.en_GB -import ch.tutteli.atrium.api.infix.en_GB.empty -import ch.tutteli.atrium.api.infix.en_GB.present import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.feature0 import ch.tutteli.atrium.specs.fun0 import ch.tutteli.atrium.specs.fun1 -import ch.tutteli.atrium.specs.integration.OptionalAssertionsSpec +import ch.tutteli.atrium.specs.integration.OptionalExpectationsSpec import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.testutils.WithAsciiReporter import java.util.* -class OptionalAssertionsSpec : OptionalAssertionsSpec( +class OptionalExpectationsSpec : OptionalExpectationsSpec( fun0(Companion::toBeEmpty), feature0(Companion::toBePresentFeature), fun1(Companion::toBePresent) diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/PathExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/PathExpectationsSpec.kt index 5877fc7703..92de3d0713 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/PathExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/PathExpectationsSpec.kt @@ -9,7 +9,7 @@ import java.nio.charset.Charset import java.nio.file.Path import java.nio.file.Paths -class PathAssertionsSpec : ch.tutteli.atrium.specs.integration.PathAssertionsSpec( +class PathExpectationsSpec : ch.tutteli.atrium.specs.integration.PathExpectationsSpec( "toBe ${existing::class.simpleName}" to Companion::exists, "notToBe ${existing::class.simpleName}" to Companion::existsNot, fun1(Expect::startsWith), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/PathFeatureExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/PathFeatureExpectationsSpec.kt index 33cd8d7b3c..3cf0a88542 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/PathFeatureExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/PathFeatureExpectationsSpec.kt @@ -5,7 +5,7 @@ import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.specs.testutils.WithAsciiReporter import java.nio.file.Path -class PathFeatureAssertionsSpec : ch.tutteli.atrium.specs.integration.PathFeatureAssertionsSpec( +class PathFeatureExpectationsSpec : ch.tutteli.atrium.specs.integration.PathFeatureExpectationsSpec( property(Expect::parent), fun1.() -> Unit>(Expect::parent), feature1(Expect::resolve), diff --git a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ZonedDateTimeExpectationsSpec.kt b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ZonedDateTimeExpectationsSpec.kt index 2aef3a0fe0..69e905130a 100644 --- a/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ZonedDateTimeExpectationsSpec.kt +++ b/apis/infix-en_GB/atrium-api-infix-en_GB-jvm/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/ZonedDateTimeExpectationsSpec.kt @@ -8,7 +8,7 @@ import ch.tutteli.atrium.specs.testutils.WithAsciiReporter import java.time.DayOfWeek import java.time.ZonedDateTime -class ZonedDateTimeAssertionsSpec : ch.tutteli.atrium.specs.integration.ZonedDateTimeAssertionsSpec( +class ZonedDateTimeExpectationsSpec : ch.tutteli.atrium.specs.integration.ZonedDateTimeExpectationsSpec( property(Expect::year), fun1.() -> Unit>(Expect::year), property(Expect::month), diff --git a/apis/infix-en_GB/extensions/kotlin_1_3/atrium-api-infix-en_GB-kotlin_1_3-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/kotlin_1_3/ResultExpectationsSpec.kt b/apis/infix-en_GB/extensions/kotlin_1_3/atrium-api-infix-en_GB-kotlin_1_3-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/kotlin_1_3/ResultExpectationsSpec.kt index d20b25ed01..95cdac8c94 100644 --- a/apis/infix-en_GB/extensions/kotlin_1_3/atrium-api-infix-en_GB-kotlin_1_3-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/kotlin_1_3/ResultExpectationsSpec.kt +++ b/apis/infix-en_GB/extensions/kotlin_1_3/atrium-api-infix-en_GB-kotlin_1_3-common/src/test/kotlin/ch/tutteli/atrium/api/infix/en_GB/kotlin_1_3/ResultExpectationsSpec.kt @@ -2,12 +2,12 @@ package ch.tutteli.atrium.api.infix.en_GB.kotlin_1_3 import ch.tutteli.atrium.api.infix.en_GB.success import ch.tutteli.atrium.creating.Expect -import ch.tutteli.atrium.specs.integration.ResultAssertionsSpec +import ch.tutteli.atrium.specs.integration.ResultExpectationsSpec import ch.tutteli.atrium.specs.notImplemented import ch.tutteli.atrium.specs.withFeatureSuffix import ch.tutteli.atrium.specs.withNullableSuffix -class ResultAssertionsSpec : ResultAssertionsSpec( +class ResultExpectationsSpec : ResultExpectationsSpec( ("toBe ${success::class::simpleName}" to (Companion::toBeSuccessFeature)).withFeatureSuffix(), "toBe ${success::class::simpleName}" to Companion::toBeSuccess, ("toBe ${success::class::simpleName}" to (Companion::toBeSuccessFeatureNullable)).withFeatureSuffix() diff --git a/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/AnyExpectationsSpec.scala b/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/AnyExpectationsSpec.scala index 4a7abbbccd..354d7e5b01 100644 --- a/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/AnyExpectationsSpec.scala +++ b/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/AnyExpectationsSpec.scala @@ -1,11 +1,11 @@ package ch.tutteli.atrium.scala2.api.fluent.en_GB import TestUtils._ -import AnyAssertionsSpec._ +import AnyExpectationsSpec._ import ch.tutteli.atrium.creating.Expect -class AnyAssertionsSpec - extends ch.tutteli.atrium.specs.integration.AnyAssertionsSpec( +class AnyExpectationsSpec + extends ch.tutteli.atrium.specs.integration.AnyExpectationsSpec( toBe, toBe, toBe.withNullableSuffix(), @@ -50,7 +50,7 @@ class AnyAssertionsSpec ) //noinspection TypeAnnotation -object AnyAssertionsSpec { +object AnyExpectationsSpec { import scala.jdk.CollectionConverters._ def toBe[T]: Fun1[T, T] = fun1("toBe", _.toBe(_)) diff --git a/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/IterableLIkeElementComparableSpecs.scala b/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/IterableLIkeElementComparableSpecs.scala index 7493e85630..9883650c2d 100644 --- a/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/IterableLIkeElementComparableSpecs.scala +++ b/atrium-scala2/apis/atrium-scala2-api-fluent-en_GB/src/test/scala/ch/tutteli/atrium/scala2/api/fluent/en_GB/IterableLIkeElementComparableSpecs.scala @@ -5,10 +5,10 @@ import ch.tutteli.atrium.creating.Expect import java.lang.{Iterable => JIterable} import scala.reflect.ClassTag -import IterableFeatureAssertionsSpec._ +import IterableFeatureExpectationsSpec._ import IsIterableHelpers._ -// FIXME rewrite after fusing IterableFutureAssertionsSpec with IterableAssertionsSpecr +// FIXME rewrite after fusing IterableFutureExpectationsSpec with IterableExpectationsSpec //class IterableFeatureAssertionsSpec // extends ch.tutteli.atrium.specs.integration.IterableFeatureAssertionsSpec( // feature0("min", changeToScalaIterable(_).min()), @@ -18,8 +18,8 @@ import IsIterableHelpers._ // "[Atrium] " // ) // -//class ArrayFeatureAssertionsSpec -// extends ch.tutteli.atrium.specs.integration.IterableFeatureAssertionsSpec( +//class ArrayFeatureExpectationsSpec +// extends ch.tutteli.atrium.specs.integration.IterableFeatureExpectationsSpec( // feature0("min", changeToScalaArray(_).min()), // fun1("min", changeToScalaArray(_).min(_).asExpectJIterable), // feature0("max", changeToScalaArray(_).max()), @@ -28,7 +28,7 @@ import IsIterableHelpers._ // ) //noinspection TypeAnnotation -object IterableFeatureAssertionsSpec { +object IterableFeatureExpectationsSpec { def changeToScalaIterable[E](expect: Expect[JIterable[E]]) = { import scala.jdk.CollectionConverters._ diff --git a/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/ChronoLocalDateAssertionsSpec.kt b/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/ChronoLocalDateAssertionsSpec.kt index 1f2d065e38..8b084663f2 100644 --- a/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/ChronoLocalDateAssertionsSpec.kt +++ b/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/ChronoLocalDateAssertionsSpec.kt @@ -14,7 +14,7 @@ import java.time.chrono.JapaneseDate class ChronoLocalDateAssertionsSpec : Spek({ include(ChronoLocalDateSpec) }) { - object ChronoLocalDateSpec : ch.tutteli.atrium.specs.integration.ChronoLocalDateAssertionSpec( + object ChronoLocalDateSpec : ch.tutteli.atrium.specs.integration.ChronoLocalDateExpectationsSpec( fun1(Expect::isBefore), fun1(Expect::isBeforeOrEqual), fun1(Expect::isAfter), diff --git a/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/ChronoLocalDateTimeAssertionSpec.kt b/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/ChronoLocalDateTimeAssertionSpec.kt index 20bb7ce7ab..88be71d9b3 100644 --- a/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/ChronoLocalDateTimeAssertionSpec.kt +++ b/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/ChronoLocalDateTimeAssertionSpec.kt @@ -15,7 +15,7 @@ import java.time.chrono.ChronoLocalDateTime class ChronoLocalDateTimeAssertionSpec : Spek({ include(ChronoLocalDateTimeSpec) }) { - object ChronoLocalDateTimeSpec : ch.tutteli.atrium.specs.integration.ChronoLocalDateTimeAssertionSpec( + object ChronoLocalDateTimeSpec : ch.tutteli.atrium.specs.integration.ChronoLocalDateTimeExpectationsSpec( fun1(Expect>::isBefore), fun1(Expect>::isBeforeOrEqual), fun1(Expect>::isAfter), diff --git a/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/ChronoZonedDateTimeAssertionSpec.kt b/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/ChronoZonedDateTimeAssertionSpec.kt index 19fc2216ae..e0b0688f6b 100644 --- a/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/ChronoZonedDateTimeAssertionSpec.kt +++ b/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/ChronoZonedDateTimeAssertionSpec.kt @@ -15,7 +15,7 @@ import java.time.chrono.ChronoZonedDateTime class ChronoZonedDateTimeAssertionSpec : Spek({ include(ChronoLocalDateTimeAssertionSpec.ChronoLocalDateTimeSpec) }) { - object ChronoZonedDateTimeSpec : ch.tutteli.atrium.specs.integration.ChronoZonedDateTimeAssertionSpec( + object ChronoZonedDateTimeSpec : ch.tutteli.atrium.specs.integration.ChronoZonedDateTimeExpectationsSpec( fun1(Expect>::isBefore), fun1(Expect>::isBeforeOrEqual), fun1(Expect>::isAfter), diff --git a/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/FileAsPathExpectationsSpec.kt b/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/FileAsPathExpectationsSpec.kt index 1970a3c655..f4df0401c8 100644 --- a/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/FileAsPathExpectationsSpec.kt +++ b/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/FileAsPathExpectationsSpec.kt @@ -7,7 +7,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.notImplemented import java.io.File -class FileAsPathAssertionsSpec : ch.tutteli.atrium.specs.integration.FileAsPathAssertionsSpec( +class FileAsPathExpectationsSpec : ch.tutteli.atrium.specs.integration.FileAsPathExpectationsSpec( Expect::asPath ) { @Suppress("unused", "UNUSED_VALUE") diff --git a/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/LocalDateExpectationsSpec.kt b/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/LocalDateExpectationsSpec.kt index 291365d210..04c16f289d 100644 --- a/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/LocalDateExpectationsSpec.kt +++ b/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/LocalDateExpectationsSpec.kt @@ -10,7 +10,7 @@ import ch.tutteli.atrium.specs.property import java.time.DayOfWeek import java.time.LocalDate -class LocalDateAssertionsSpec : ch.tutteli.atrium.specs.integration.LocalDateAssertionsSpec( +class LocalDateExpectationsSpec : ch.tutteli.atrium.specs.integration.LocalDateExpectationsSpec( property(Expect::year), fun1.() -> Unit>(Expect::year), property(Expect::month), diff --git a/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/LocalDateTimeExpectationsSpec.kt b/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/LocalDateTimeExpectationsSpec.kt index e783c98246..99c86f75e5 100644 --- a/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/LocalDateTimeExpectationsSpec.kt +++ b/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/LocalDateTimeExpectationsSpec.kt @@ -10,7 +10,7 @@ import ch.tutteli.atrium.specs.property import java.time.DayOfWeek import java.time.LocalDateTime -class LocalDateTimeAssertionsSpec : ch.tutteli.atrium.specs.integration.LocalDateTimeAssertionsSpec( +class LocalDateTimeExpectationsSpec : ch.tutteli.atrium.specs.integration.LocalDateTimeExpectationsSpec( property(Expect::year), fun1.() -> Unit>(Expect::year), property(Expect::month), diff --git a/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/OptionalExpectationsSpec.kt b/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/OptionalExpectationsSpec.kt index 4f36fdd2ba..b85a77d7f3 100644 --- a/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/OptionalExpectationsSpec.kt +++ b/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/OptionalExpectationsSpec.kt @@ -5,10 +5,10 @@ package ch.tutteli.atrium.api.fluent.en_GB.jdk8 import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* -import ch.tutteli.atrium.specs.integration.OptionalAssertionsSpec +import ch.tutteli.atrium.specs.integration.OptionalExpectationsSpec import java.util.* -class OptionalAssertionsSpec : OptionalAssertionsSpec( +class OptionalExpectationsSpec : OptionalExpectationsSpec( isEmpty = fun0(Expect>::isEmpty), isPresentFeature = feature0, Int>(Expect>::isPresent), isPresent = fun1, Expect.() -> Unit>(Expect>::isPresent) diff --git a/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/PathExpectationsSpec.kt b/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/PathExpectationsSpec.kt index 89d4354f10..5597347329 100644 --- a/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/PathExpectationsSpec.kt +++ b/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/PathExpectationsSpec.kt @@ -12,7 +12,7 @@ import ch.tutteli.atrium.specs.* import java.nio.file.Path import java.nio.file.Paths -class PathAssertionsSpec : ch.tutteli.atrium.specs.integration.PathAssertionsSpec( +class PathExpectationsSpec : ch.tutteli.atrium.specs.integration.PathExpectationsSpec( fun0(Expect::exists), fun0(Expect::existsNot), fun1(Expect::startsWith), diff --git a/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/PathFeatureExpectationsSpec.kt b/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/PathFeatureExpectationsSpec.kt index b35fbd07f6..bbcf58d754 100644 --- a/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/PathFeatureExpectationsSpec.kt +++ b/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/PathFeatureExpectationsSpec.kt @@ -7,7 +7,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* import java.nio.file.Path -class PathFeatureAssertionsSpec : ch.tutteli.atrium.specs.integration.PathFeatureAssertionsSpec( +class PathFeatureExpectationsSpec : ch.tutteli.atrium.specs.integration.PathFeatureExpectationsSpec( property(Expect::parent), fun1.() -> Unit>(Expect::parent), feature1(Expect::resolve), diff --git a/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/ZonedDateTimeExpectationsSpec.kt b/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/ZonedDateTimeExpectationsSpec.kt index ce4258d315..d2679fdd74 100644 --- a/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/ZonedDateTimeExpectationsSpec.kt +++ b/misc/deprecated/apis/fluent-en_GB-jdk8/atrium-api-fluent-en_GB-jdk8-jvm/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/jdk8/ZonedDateTimeExpectationsSpec.kt @@ -10,7 +10,7 @@ import ch.tutteli.atrium.specs.property import java.time.DayOfWeek import java.time.ZonedDateTime -class ZonedDateTimeAssertionsSpec : ch.tutteli.atrium.specs.integration.ZonedDateTimeAssertionsSpec( +class ZonedDateTimeExpectationsSpec : ch.tutteli.atrium.specs.integration.ZonedDateTimeExpectationsSpec( property(Expect::year), fun1.() -> Unit>(Expect::year), property(Expect::month), diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/AnyExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/AnyExpectationsSpec.kt index 89382a9e6c..8905caaec9 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/AnyExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/AnyExpectationsSpec.kt @@ -17,7 +17,7 @@ import ch.tutteli.atrium.translations.DescriptionComparableAssertion.IS_LESS_THA import org.spekframework.spek2.Spek import org.spekframework.spek2.style.specification.Suite -abstract class AnyAssertionsSpec( +abstract class AnyExpectationsSpec( toBeInt: Fun1, toBeDataClass: Fun1, toBeNullableInt: Fun1, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ArrayAsListExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ArrayAsListExpectationsSpec.kt index 33d3ebd55e..4de52bd0b1 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ArrayAsListExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ArrayAsListExpectationsSpec.kt @@ -10,7 +10,7 @@ import ch.tutteli.atrium.translations.DescriptionIterableAssertion import org.spekframework.spek2.Spek import org.spekframework.spek2.style.specification.describe -abstract class ArrayAsListAssertionsSpec( +abstract class ArrayAsListExpectationsSpec( asListFunName: String, arr: Expect>.() -> Expect>, arrByte: Expect.() -> Expect>, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsAtLeastExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsAtLeastExpectationsSpec.kt index 118755770c..38d280a36a 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsAtLeastExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsAtLeastExpectationsSpec.kt @@ -6,7 +6,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* import org.spekframework.spek2.style.specification.Suite -abstract class CharSequenceContainsAtLeastAssertionsSpec( +abstract class CharSequenceContainsAtLeastExpectationsSpec( containsAtLeastPair: Pair<(String, String) -> String, Fun3>>, containsAtLeastIgnoringCasePair: Pair<(String, String) -> String, Fun3>>, containsAtLeastButAtMostPair: Pair<(String, String, String) -> String, Fun4>>, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsAtMostExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsAtMostExpectationsSpec.kt index f3985efd6c..18b2646c61 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsAtMostExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsAtMostExpectationsSpec.kt @@ -6,7 +6,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* import org.spekframework.spek2.style.specification.Suite -abstract class CharSequenceContainsAtMostAssertionsSpec( +abstract class CharSequenceContainsAtMostExpectationsSpec( containsAtMostPair: Pair<(String, String) -> String, Fun3>>, containsAtMostIgnoringCasePair: Pair<(String, String) -> String, Fun3>>, containsNotPair: Pair String>, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsContainsNotExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsContainsNotExpectationsSpec.kt index 59f3ff532a..275301ecfa 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsContainsNotExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsContainsNotExpectationsSpec.kt @@ -7,7 +7,7 @@ import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.translations.DescriptionCharSequenceAssertion.CONTAINS_NOT import org.spekframework.spek2.style.specification.Suite -abstract class CharSequenceContainsContainsNotAssertionsSpec( +abstract class CharSequenceContainsContainsNotExpectationsSpec( contains: Fun2>, containsNot: Fun2>, rootBulletPoint: String, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsExactlyExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsExactlyExpectationsSpec.kt index 8c3771f5c8..3ec20eb368 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsExactlyExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsExactlyExpectationsSpec.kt @@ -7,7 +7,7 @@ import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.translations.DescriptionCharSequenceAssertion.EXACTLY import org.spekframework.spek2.style.specification.Suite -abstract class CharSequenceContainsExactlyAssertionsSpec( +abstract class CharSequenceContainsExactlyExpectationsSpec( containsExactlyPair: Pair<(String, String) -> String, Fun3>>, containsExactlyIgnoringCasePair: Pair<(String, String) -> String, Fun3>>, containsNotPair: Pair String>, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsNotExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsNotExpectationsSpec.kt index 66d856413b..9372f2579b 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsNotExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsNotExpectationsSpec.kt @@ -9,7 +9,7 @@ import ch.tutteli.atrium.translations.DescriptionBasic import ch.tutteli.atrium.translations.DescriptionCharSequenceAssertion import org.spekframework.spek2.style.specification.Suite -abstract class CharSequenceContainsNotAssertionsSpec( +abstract class CharSequenceContainsNotExpectationsSpec( containsNotPair: Pair<(String) -> String, Fun2>>, containsNotIgnoringCasePair: Pair<(String) -> String, Fun2>>, rootBulletPoint: String, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsNotOrAtMostExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsNotOrAtMostExpectationsSpec.kt index 0d565d0642..ae61a510bf 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsNotOrAtMostExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsNotOrAtMostExpectationsSpec.kt @@ -7,7 +7,7 @@ import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.translations.DescriptionCharSequenceAssertion.AT_MOST import org.spekframework.spek2.style.specification.Suite -abstract class CharSequenceContainsNotOrAtMostAssertionsSpec( +abstract class CharSequenceContainsNotOrAtMostExpectationsSpec( containsNotOrAtMostPair: Pair<(String, String) -> String, Fun3>>, containsNotOrAtMostIgnoringCasePair: Pair<(String, String) -> String, Fun3>>, containsNotPair: Pair String>, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsRegexExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsRegexExpectationsSpec.kt index 26db3a7d43..f9fdca3e72 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsRegexExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceContainsRegexExpectationsSpec.kt @@ -8,7 +8,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* import org.spekframework.spek2.style.specification.Suite -abstract class CharSequenceContainsRegexAssertionsSpec( +abstract class CharSequenceContainsRegexExpectationsSpec( containsRegex: String, containsAtLeastPair: Pair<(String, String) -> String, Fun3>>, containsAtLeastIgnoringCasePair: Pair<(String, String) -> String, Fun3>>, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceExpectationsSpec.kt index 717cca573a..4b92a1c5be 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CharSequenceExpectationsSpec.kt @@ -10,7 +10,7 @@ import ch.tutteli.atrium.translations.DescriptionBasic import ch.tutteli.atrium.translations.DescriptionCharSequenceAssertion.* import org.spekframework.spek2.style.specification.Suite -abstract class CharSequenceAssertionsSpec( +abstract class CharSequenceExpectationsSpec( isEmpty: Fun0, isNotEmpty: Fun0, isNotBlank: Fun0, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CollectionExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CollectionExpectationsSpec.kt index 3acfa44675..ce8b0d643e 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CollectionExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/CollectionExpectationsSpec.kt @@ -9,7 +9,7 @@ import ch.tutteli.atrium.translations.DescriptionCollectionAssertion import org.spekframework.spek2.Spek import org.spekframework.spek2.style.specification.Suite -abstract class CollectionAssertionsSpec( +abstract class CollectionExpectationsSpec( isEmpty: Fun0>, isNotEmpty: Fun0>, sizeFeature: Feature0, Int>, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ComparableExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ComparableExpectationsSpec.kt index b967e11db7..b411f7cee0 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ComparableExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ComparableExpectationsSpec.kt @@ -9,7 +9,7 @@ import ch.tutteli.atrium.translations.DescriptionComparableAssertion.* import org.spekframework.spek2.Spek import org.spekframework.spek2.style.specification.describe -abstract class ComparableAssertionsSpec( +abstract class ComparableExpectationsSpec( isLessThan: Fun1, isLessOrEquals: Fun1, isGreaterThan: Fun1, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/FeatureExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/FeatureExpectationsSpec.kt index 8628cde93e..fa4a9e15c5 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/FeatureExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/FeatureExpectationsSpec.kt @@ -28,7 +28,7 @@ data class TestData(val nonNullValue: String, val nullableValue: Int?) { } typealias F = Expect.() -> Unit -abstract class FeatureAssertionsSpec( +abstract class FeatureExpectationsSpec( propertyImmediate: F, propertyLazy: F, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/FloatingPointWithErrorToleranceExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/FloatingPointWithErrorToleranceExpectationsSpec.kt index f21438efa0..4366ffdc5f 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/FloatingPointWithErrorToleranceExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/FloatingPointWithErrorToleranceExpectationsSpec.kt @@ -14,7 +14,7 @@ import org.spekframework.spek2.dsl.Root import org.spekframework.spek2.style.specification.describe import kotlin.math.absoluteValue -abstract class FloatingPointWithErrorToleranceAssertionsSpec( +abstract class FloatingPointWithErrorToleranceExpectationsSpec( toBeWithErrorToleranceFloat: Fun2, toBeWithErrorToleranceDouble: Fun2, describePrefix: String = "[Atrium] " @@ -61,7 +61,7 @@ fun Root.checkFloatingPoint( pair: Fun2, withFailureNotice: Boolean, absDiff: (T, T) -> T, - testData: List> + testData: List> ) { val (name, toBeWithErrorTolerance) = pair diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/Fun0ExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/Fun0ExpectationsSpec.kt index 3c8117f215..1f89bcf1f5 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/Fun0ExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/Fun0ExpectationsSpec.kt @@ -6,14 +6,12 @@ import ch.tutteli.atrium.core.polyfills.format import ch.tutteli.atrium.core.polyfills.fullName import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* -import ch.tutteli.atrium.translations.DescriptionAnyAssertion -import ch.tutteli.atrium.translations.DescriptionBasic import ch.tutteli.atrium.translations.DescriptionFunLikeAssertion import ch.tutteli.atrium.translations.DescriptionThrowableAssertion import org.spekframework.spek2.Spek import org.spekframework.spek2.style.specification.Suite -abstract class Fun0AssertionsSpec( +abstract class Fun0ExpectationsSpec( toThrowFeature: Feature0 Any?, IllegalArgumentException>, toThrow: Feature1 Any?, Expect.() -> Unit, IllegalArgumentException>, notToThrowFeature: Feature0<() -> Int, Int>, @@ -72,7 +70,7 @@ abstract class Fun0AssertionsSpec( fun messageAndStackTrace(message: String) = "\\s+\\Q$explanationBulletPoint\\E$messageDescr: \"$message\".*$separator" + "\\s+\\Q$explanationBulletPoint\\E$stackTraceDescr: $separator" + - "\\s+\\Q$listBulletPoint\\E${Fun0AssertionsSpec::class.fullName}" + "\\s+\\Q$listBulletPoint\\E${Fun0ExpectationsSpec::class.fullName}" describeFun(toThrowFeature, toThrow, notToThrowFeature, notToThrow) { val toThrowFunctions = unifySignatures(toThrowFeature, toThrow) diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableAllExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableAllExpectationsSpec.kt index 232d8296d3..ec75f2ff03 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableAllExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableAllExpectationsSpec.kt @@ -7,7 +7,7 @@ import ch.tutteli.atrium.logic.utils.expectLambda import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.translations.DescriptionIterableAssertion -abstract class IterableAllAssertionsSpec( +abstract class IterableAllExpectationsSpec( all: Fun1, Expect.() -> Unit>, allNullable: Fun1, (Expect.() -> Unit)?>, rootBulletPoint: String, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableAnyExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableAnyExpectationsSpec.kt index 353daab0c1..25984612dd 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableAnyExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableAnyExpectationsSpec.kt @@ -10,7 +10,7 @@ import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.translations.DescriptionComparableAssertion import ch.tutteli.atrium.creating.ErrorMessages -abstract class IterableAnyAssertionsSpec( +abstract class IterableAnyExpectationsSpec( any: Fun1, Expect.() -> Unit>, anyNullable: Fun1, (Expect.() -> Unit)?>, rootBulletPoint: String, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec.kt index 7da0f08fe3..9a8260cf6a 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec.kt @@ -10,7 +10,7 @@ import ch.tutteli.atrium.logic.utils.expectLambda import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.creating.ErrorMessages -abstract class IterableContainsInAnyOrderAtLeast1EntriesAssertionsSpec( +abstract class IterableContainsInAnyOrderAtLeast1EntriesExpectationsSpec( containsInAnyOrderEntries: Fun2, Expect.() -> Unit, Array.() -> Unit>>, containsInAnyOrderNullableEntries: Fun2, (Expect.() -> Unit)?, Array.() -> Unit)?>>, rootBulletPoint: String, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec.kt index e135966b03..a997902c62 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec.kt @@ -6,7 +6,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.translations.DescriptionIterableAssertion -abstract class IterableContainsInAnyOrderAtLeast1ValuesAssertionsSpec( +abstract class IterableContainsInAnyOrderAtLeast1ValuesExpectationsSpec( containsInAnyOrderValues: Fun2, Double, Array>, containsInAnyOrderNullableValues: Fun2, Double?, Array>, rootBulletPoint: String, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtLeastValuesExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtLeastValuesExpectationsSpec.kt index 9876a760b0..314a0b3ef7 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtLeastValuesExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtLeastValuesExpectationsSpec.kt @@ -6,7 +6,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* import org.spekframework.spek2.style.specification.Suite -abstract class IterableContainsInAnyOrderAtLeastValuesAssertionSpec( +abstract class IterableContainsInAnyOrderAtLeastValuesExpectationsSpec( containsAtLeastPair: Pair<(String, String) -> String, Fun3, Int, Double, Array>>, containsAtLeastButAtMostPair: Pair<(String, String, String) -> String, Fun4, Int, Int, Double, Array>>, containsNotPair: Pair String>, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtMostValuesExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtMostValuesExpectationsSpec.kt index cd0857c2e8..e9b546834b 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtMostValuesExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderAtMostValuesExpectationsSpec.kt @@ -6,7 +6,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* import org.spekframework.spek2.style.specification.Suite -abstract class IterableContainsInAnyOrderAtMostValuesAssertionSpec( +abstract class IterableContainsInAnyOrderAtMostValuesExpectationsSpec( containsAtMostPair: Pair<(String, String) -> String, Fun3, Int, Double, Array>>, containsNotPair: Pair String>, exactlyPair: Pair String>, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderExactlyValuesExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderExactlyValuesExpectationsSpec.kt index 4d4499cc0f..c6562b3fdd 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderExactlyValuesExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderExactlyValuesExpectationsSpec.kt @@ -7,7 +7,7 @@ import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.translations.DescriptionIterableAssertion.EXACTLY import org.spekframework.spek2.style.specification.Suite -abstract class IterableContainsInAnyOrderExactlyValuesAssertionsSpec( +abstract class IterableContainsInAnyOrderExactlyValuesExpectationsSpec( containsExactlyPair: Pair<(String, String) -> String, Fun3, Int, Double, Array>>, containsNotPair: Pair String>, rootBulletPoint: String, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderNotOrAtMostValuesExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderNotOrAtMostValuesExpectationsSpec.kt index 197eb56721..d68fbdfeeb 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderNotOrAtMostValuesExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderNotOrAtMostValuesExpectationsSpec.kt @@ -6,7 +6,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* import org.spekframework.spek2.style.specification.Suite -abstract class IterableContainsInAnyOrderNotOrAtMostValuesAssertionsSpec( +abstract class IterableContainsInAnyOrderNotOrAtMostValuesExpectationsSpec( containsNotOrAtMostPair: Pair<(String, String) -> String, Fun3, Int, Double, Array>>, containsNotPair: Pair String>, rootBulletPoint: String, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderOnlyEntriesExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderOnlyEntriesExpectationsSpec.kt index 2065e5dd59..15519f99c9 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderOnlyEntriesExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderOnlyEntriesExpectationsSpec.kt @@ -10,7 +10,7 @@ import ch.tutteli.atrium.logic.utils.expectLambda import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.creating.ErrorMessages -abstract class IterableContainsInAnyOrderOnlyEntriesAssertionsSpec( +abstract class IterableContainsInAnyOrderOnlyEntriesExpectationsSpec( containsInAnyOrderOnlyEntries: Fun2, Expect.() -> Unit, Array.() -> Unit>>, containsInAnyOrderOnlyNullableEntries: Fun2, (Expect.() -> Unit)?, Array.() -> Unit)?>>, rootBulletPoint: String, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderOnlyValuesExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderOnlyValuesExpectationsSpec.kt index 6882d30a2c..5ba5203970 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderOnlyValuesExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInAnyOrderOnlyValuesExpectationsSpec.kt @@ -8,7 +8,7 @@ import ch.tutteli.atrium.specs.SubjectLessSpec import ch.tutteli.atrium.specs.forSubjectLess import ch.tutteli.atrium.specs.invoke -abstract class IterableContainsInAnyOrderOnlyValuesAssertionsSpec( +abstract class IterableContainsInAnyOrderOnlyValuesExpectationsSpec( containsInAnyOrderOnlyValues: Fun2, Double, Array>, containsInAnyOrderOnlyNullableValues: Fun2, Double?, Array>, rootBulletPoint: String, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyEntriesExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyEntriesExpectationsSpec.kt index 5d7b728bdb..7e8c18b40b 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyEntriesExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyEntriesExpectationsSpec.kt @@ -10,7 +10,7 @@ import ch.tutteli.atrium.logic.utils.expectLambda import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.creating.ErrorMessages -abstract class IterableContainsInOrderOnlyEntriesAssertionsSpec( +abstract class IterableContainsInOrderOnlyEntriesExpectationsSpec( containsInOrderOnlyEntries: Fun2, Expect.() -> Unit, Array.() -> Unit>>, containsInOrderOnlyNullableEntries: Fun2, (Expect.() -> Unit)?, Array.() -> Unit)?>>, rootBulletPoint: String, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyGroupedEntriesExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyGroupedEntriesExpectationsSpec.kt index f110b3f5cd..b5303146ce 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyGroupedEntriesExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyGroupedEntriesExpectationsSpec.kt @@ -10,7 +10,7 @@ import ch.tutteli.atrium.translations.DescriptionCollectionAssertion import ch.tutteli.atrium.translations.DescriptionIterableAssertion import org.spekframework.spek2.style.specification.Suite -abstract class IterableContainsInOrderOnlyGroupedEntriesAssertionsSpec( +abstract class IterableContainsInOrderOnlyGroupedEntriesExpectationsSpec( containsInOrderOnlyGroupedEntries: Fun3, Group<(Expect.() -> Unit)?>, Group<(Expect.() -> Unit)?>, Array.() -> Unit)?>>>, groupFactory: (Array.() -> Unit)?>) -> Group<(Expect.() -> Unit)?>, rootBulletPoint: String, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyGroupedValuesExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyGroupedValuesExpectationsSpec.kt index 01c0b71d69..ea9d14e90f 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyGroupedValuesExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyGroupedValuesExpectationsSpec.kt @@ -7,7 +7,7 @@ import ch.tutteli.atrium.domain.builders.utils.Group import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.translations.DescriptionCollectionAssertion -abstract class IterableContainsInOrderOnlyGroupedValuesAssertionsSpec( +abstract class IterableContainsInOrderOnlyGroupedValuesExpectationsSpec( containsInOrderOnlyGroupedValues: Fun3, Group, Group, Array>>, groupFactory: (Array) -> Group, containsInOrderOnlyGroupedNullableValues: Fun3, Group, Group, Array>>, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyValuesExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyValuesExpectationsSpec.kt index 45d4c58b1d..57c8a691fe 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyValuesExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsInOrderOnlyValuesExpectationsSpec.kt @@ -6,7 +6,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.reporting.Text import ch.tutteli.atrium.specs.* -abstract class IterableContainsInOrderOnlyValuesAssertionsSpec( +abstract class IterableContainsInOrderOnlyValuesExpectationsSpec( containsInOrderOnlyValues: Fun2, Double, Array>, containsInOrderOnlyNullableValues: Fun2, Double?, Array>, rootBulletPoint: String, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsNotEntriesExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsNotEntriesExpectationsSpec.kt index 7e1fd67e11..8d9280702e 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsNotEntriesExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsNotEntriesExpectationsSpec.kt @@ -7,7 +7,7 @@ import ch.tutteli.atrium.logic.utils.expectLambda import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.translations.DescriptionIterableAssertion -abstract class IterableContainsNotEntriesAssertionsSpec( +abstract class IterableContainsNotEntriesExpectationsSpec( containsNotEntries: Fun2, Expect.() -> Unit, Array.() -> Unit>>, containsNotNullableEntries: Fun2, (Expect.() -> Unit)?, Array.() -> Unit)?>>, rootBulletPoint: String, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsNotValuesExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsNotValuesExpectationsSpec.kt index 255daa36dc..0fb758c22c 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsNotValuesExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsNotValuesExpectationsSpec.kt @@ -9,7 +9,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.translations.DescriptionIterableAssertion -abstract class IterableContainsNotValuesAssertionsSpec( +abstract class IterableContainsNotValuesExpectationsSpec( containsNotValues: Fun2, Double, Array>, containsNotNullableValues: Fun2, Double?, Array>, rootBulletPoint: String, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableExpectationsSpec.kt index d0a782777e..aa94d2e2f0 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableExpectationsSpec.kt @@ -10,7 +10,7 @@ import ch.tutteli.atrium.translations.DescriptionIterableAssertion import org.spekframework.spek2.Spek import org.spekframework.spek2.style.specification.Suite -abstract class IterableAssertionsSpec( +abstract class IterableExpectationsSpec( hasNext: Fun0>, hasNotNext: Fun0>, minFeature: Feature0, Int>, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableNoneExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableNoneExpectationsSpec.kt index ef4d436494..2926389b1e 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableNoneExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableNoneExpectationsSpec.kt @@ -6,7 +6,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* import ch.tutteli.atrium.translations.DescriptionIterableAssertion -abstract class IterableNoneAssertionsSpec( +abstract class IterableNoneExpectationsSpec( none: Fun1, Expect.() -> Unit>, noneNullable: Fun1, (Expect.() -> Unit)?>, rootBulletPoint: String, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IteratorExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IteratorExpectationsSpec.kt index 0e70b7ae89..3f5cf0a698 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IteratorExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IteratorExpectationsSpec.kt @@ -9,7 +9,7 @@ import ch.tutteli.atrium.translations.DescriptionIterableAssertion import org.spekframework.spek2.Spek import org.spekframework.spek2.style.specification.Suite -abstract class IteratorAssertionSpec( +abstract class IteratorExpectationsSpec( hasNext: Fun0>, hasNotNext: Fun0>, describePrefix: String = "[Atrium] " diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/KeyValueLikeExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/KeyValueLikeExpectationsSpec.kt index 22989d6570..824a8ae443 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/KeyValueLikeExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/KeyValueLikeExpectationsSpec.kt @@ -9,7 +9,7 @@ import ch.tutteli.atrium.translations.DescriptionComparableAssertion import org.spekframework.spek2.Spek import org.spekframework.spek2.style.specification.Suite -abstract class KeyValueLikeAssertionsSpec( +abstract class KeyValueLikeExpectationsSpec( creator: (String, Int) -> T, creatorNullable: (String?, Int?) -> TNullable, keyName: String, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ListExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ListExpectationsSpec.kt index 451503ef49..5279736b95 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ListExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ListExpectationsSpec.kt @@ -10,7 +10,7 @@ import ch.tutteli.atrium.translations.DescriptionListAssertion import org.spekframework.spek2.Spek import org.spekframework.spek2.style.specification.Suite -abstract class ListAssertionsSpec( +abstract class ListExpectationsSpec( getFeature: Feature1, Int, Int>, get: Fun2, Int, Expect.() -> Unit>, getFeatureNullable: Feature1, Int, Int?>, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapAsEntriesExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapAsEntriesExpectationsSpec.kt index 4d22ea6a6d..365469ad28 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapAsEntriesExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapAsEntriesExpectationsSpec.kt @@ -7,7 +7,7 @@ import ch.tutteli.atrium.specs.* import org.spekframework.spek2.Spek import org.spekframework.spek2.style.specification.Suite -abstract class MapAsEntriesAssertionsSpec( +abstract class MapAsEntriesExpectationsSpec( asEntriesFeature: Feature0, Set>>, asEntries: Fun1, Expect>>.() -> Unit>, describePrefix: String = "[Atrium] " diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderKeyValueExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderKeyValueExpectationsSpec.kt index 84cb4ad3ac..3e306216cb 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderKeyValueExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderKeyValueExpectationsSpec.kt @@ -14,7 +14,7 @@ fun keyNullableValue( assertionCreator: (Expect.() -> Unit)? ): Pair.() -> Unit)?> = key to assertionCreator -abstract class MapContainsInAnyOrderKeyValueAssertionsSpec( +abstract class MapContainsInAnyOrderKeyValueExpectationsSpec( keyWithValueAssertions: MFun2.() -> Unit>, keyWithNullableValueAssertions: MFun2.() -> Unit)?>, describePrefix: String = "[Atrium] " diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderKeyValuePairsExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderKeyValuePairsExpectationsSpec.kt index 7852ac8911..8c953c00c0 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderKeyValuePairsExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderKeyValuePairsExpectationsSpec.kt @@ -8,7 +8,7 @@ import org.spekframework.spek2.style.specification.Suite import kotlin.reflect.KFunction3 -abstract class MapContainsInAnyOrderKeyValuePairsAssertionsSpec( +abstract class MapContainsInAnyOrderKeyValuePairsExpectationsSpec( keyValuePairs: MFun2, keyValuePairsNullable: MFun2, describePrefix: String = "[Atrium] " diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderOnlyKeyValueExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderOnlyKeyValueExpectationsSpec.kt index f41427468e..0fc1a3a934 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderOnlyKeyValueExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderOnlyKeyValueExpectationsSpec.kt @@ -6,7 +6,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* import org.spekframework.spek2.style.specification.Suite -abstract class MapContainsInAnyOrderOnlyKeyValueAssertionsSpec( +abstract class MapContainsInAnyOrderOnlyKeyValueExpectationsSpec( keyWithValueAssertions: MFun2.() -> Unit>, keyWithNullableValueAssertions: MFun2.() -> Unit)?>, rootBulletPoint: String, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec.kt index fb6bca3e26..453908e04d 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec.kt @@ -5,7 +5,7 @@ import ch.tutteli.atrium.api.verbs.internal.expect import ch.tutteli.atrium.specs.* import org.spekframework.spek2.style.specification.Suite -abstract class MapContainsInAnyOrderOnlyKeyValuePairsAssertionsSpec( +abstract class MapContainsInAnyOrderOnlyKeyValuePairsExpectationsSpec( keyValuePairs: MFun2, keyValuePairsNullable: MFun2, rootBulletPoint: String, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInOrderOnlyKeyValueExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInOrderOnlyKeyValueExpectationsSpec.kt index be67974a61..d4e20a7249 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInOrderOnlyKeyValueExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInOrderOnlyKeyValueExpectationsSpec.kt @@ -6,7 +6,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* import org.spekframework.spek2.style.specification.Suite -abstract class MapContainsInOrderOnlyKeyValueAssertionsSpec( +abstract class MapContainsInOrderOnlyKeyValueExpectationsSpec( keyWithValueAssertions: MFun2.() -> Unit>, keyWithNullableValueAssertions: MFun2.() -> Unit)?>, rootBulletPoint: String, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInOrderOnlyKeyValuePairsExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInOrderOnlyKeyValuePairsExpectationsSpec.kt index 0f7a01144e..d4c9f1122c 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInOrderOnlyKeyValuePairsExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapContainsInOrderOnlyKeyValuePairsExpectationsSpec.kt @@ -7,7 +7,7 @@ import ch.tutteli.atrium.specs.* import org.spekframework.spek2.style.specification.Suite import kotlin.reflect.KFunction3 -abstract class MapContainsInOrderOnlyKeyValuePairsAssertionsSpec( +abstract class MapContainsInOrderOnlyKeyValuePairsExpectationsSpec( keyValuePairs: MFun2, keyValuePairsNullable: MFun2, rootBulletPoint: String, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapEntryExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapEntryExpectationsSpec.kt index f712463af0..05daa3f989 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapEntryExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapEntryExpectationsSpec.kt @@ -7,7 +7,7 @@ import ch.tutteli.atrium.specs.* import org.spekframework.spek2.Spek import org.spekframework.spek2.style.specification.Suite -abstract class MapEntryAssertionsSpec( +abstract class MapEntryExpectationsSpec( isKeyValue: Fun2, String, Int>, isKeyValueNullable: Fun2, String?, Int?>, keyFeature: Feature0, String>, @@ -31,7 +31,7 @@ abstract class MapEntryAssertionsSpec( isKeyValueNullable.forSubjectLess("key", 1) ) {}) - include(object : KeyValueLikeAssertionsSpec, Map.Entry>( + include(object : KeyValueLikeExpectationsSpec, Map.Entry>( ::mapEntry, ::mapEntry, "key", diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapExpectationsSpec.kt index 93b819cfd0..eb05eadb30 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/MapExpectationsSpec.kt @@ -9,7 +9,7 @@ import ch.tutteli.atrium.translations.DescriptionMapLikeAssertion import org.spekframework.spek2.Spek import org.spekframework.spek2.style.specification.Suite -abstract class MapAssertionsSpec( +abstract class MapExpectationsSpec( containsKey: Fun1, String>, containsKeyNullable: Fun1, String?>, containsNotKey: Fun1, String>, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/PairExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/PairExpectationsSpec.kt index 6d524a3094..9e5e2cbdea 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/PairExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/PairExpectationsSpec.kt @@ -4,7 +4,7 @@ import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.Feature0 import ch.tutteli.atrium.specs.Fun1 -abstract class PairAssertionsSpec( +abstract class PairExpectationsSpec( firstFeature: Feature0, String>, first: Fun1, Expect.() -> Unit>, secondFeature: Feature0, Int>, @@ -14,7 +14,7 @@ abstract class PairAssertionsSpec( nullableSecondFeature: Feature0, Int?>, nullableSecond: Fun1, Expect.() -> Unit>, describePrefix: String = "[Atrium] " -) : KeyValueLikeAssertionsSpec, Pair>( +) : KeyValueLikeExpectationsSpec, Pair>( ::Pair, ::Pair, "first", diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ResultExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ResultExpectationsSpec.kt index 2d82c272e6..eb928cf4d0 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ResultExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ResultExpectationsSpec.kt @@ -13,7 +13,7 @@ import ch.tutteli.atrium.translations.DescriptionResultAssertion import org.spekframework.spek2.Spek import org.spekframework.spek2.style.specification.Suite -abstract class ResultAssertionsSpec( +abstract class ResultExpectationsSpec( isSuccessFeature: Feature0, Int>, isSuccess: Fun1, Expect.() -> Unit>, isSuccessFeatureNullable: Feature0, Int?>, diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ThrowableExpectationsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ThrowableExpectationsSpec.kt index 49d73e156f..263949a7db 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ThrowableExpectationsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/ThrowableExpectationsSpec.kt @@ -14,7 +14,7 @@ import ch.tutteli.atrium.translations.DescriptionThrowableAssertion import org.spekframework.spek2.Spek import org.spekframework.spek2.style.specification.Suite -abstract class ThrowableAssertionsSpec( +abstract class ThrowableExpectationsSpec( messageFeature: Feature0, message: Fun1.() -> Unit>, messageContains: Fun2>, diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/BigDecimalExpectationsSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/BigDecimalExpectationsSpec.kt index c94e0b8fc3..85f26a7a99 100644 --- a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/BigDecimalExpectationsSpec.kt +++ b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/BigDecimalExpectationsSpec.kt @@ -11,7 +11,7 @@ import org.spekframework.spek2.Spek import org.spekframework.spek2.style.specification.Suite import java.math.BigDecimal -abstract class BigDecimalAssertionsSpec( +abstract class BigDecimalExpectationsSpec( toBeDontUse: Fun1, toBeNullableDontUse: Fun1, toBeNull: Fun1, diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateAsStringExpectationsSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateAsStringExpectationsSpec.kt index e1156ef91c..15d8acc3bb 100644 --- a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateAsStringExpectationsSpec.kt +++ b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateAsStringExpectationsSpec.kt @@ -15,7 +15,7 @@ import java.time.chrono.ChronoLocalDate import java.time.format.DateTimeFormatter import java.time.format.DateTimeParseException -abstract class ChronoLocalDateAsStringAssertionSpec( +abstract class ChronoLocalDateAsStringExpectationsSpec( isBefore: Fun1, isBeforeOrEqual: Fun1, isAfter: Fun1, diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateTimeAsStringExpectationsSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateTimeAsStringExpectationsSpec.kt index f272b5b0e0..3f2f7bd9fa 100644 --- a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateTimeAsStringExpectationsSpec.kt +++ b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateTimeAsStringExpectationsSpec.kt @@ -17,7 +17,7 @@ import java.time.chrono.ChronoLocalDateTime import java.time.format.DateTimeFormatter import java.time.format.DateTimeParseException -abstract class ChronoLocalDateTimeAsStringAssertionSpec( +abstract class ChronoLocalDateTimeAsStringExpectationsSpec( isBefore: Fun1, String>, isBeforeOrEqual: Fun1, String>, isAfter: Fun1, String>, @@ -56,7 +56,7 @@ abstract class ChronoLocalDateTimeAsStringAssertionSpec( ): Expect> = expect.(isEqual.lambda)(expected.format(DateTimeFormatter.ISO_DATE_TIME)) - include(object : ChronoLocalDateTimeAssertionSpec( + include(object : ChronoLocalDateTimeExpectationsSpec( fun1(::isBefore), fun1(::isBeforeOrEqual), fun1(::isAfter), diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateTimeExpectationsSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateTimeExpectationsSpec.kt index dbc8241372..5943c9fa93 100644 --- a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateTimeExpectationsSpec.kt +++ b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoLocalDateTimeExpectationsSpec.kt @@ -12,7 +12,7 @@ import java.time.LocalTime import java.time.chrono.ChronoLocalDateTime import java.time.chrono.JapaneseDate -abstract class ChronoLocalDateTimeAssertionSpec( +abstract class ChronoLocalDateTimeExpectationsSpec( isBefore: Fun1, ChronoLocalDateTime<*>>, isBeforeOrEqual: Fun1, ChronoLocalDateTime<*>>, isAfter: Fun1, ChronoLocalDateTime<*>>, diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoZonedDateTimeAsStringExpectationsSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoZonedDateTimeAsStringExpectationsSpec.kt index 48fa676ecb..d56f056485 100644 --- a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoZonedDateTimeAsStringExpectationsSpec.kt +++ b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoZonedDateTimeAsStringExpectationsSpec.kt @@ -16,7 +16,7 @@ import java.time.chrono.ChronoZonedDateTime import java.time.format.DateTimeFormatter import java.time.format.DateTimeParseException -abstract class ChronoZonedDateTimeAsStringAssertionSpec( +abstract class ChronoZonedDateTimeAsStringExpectationsSpec( isBefore: Fun1, String>, isBeforeOrEqual: Fun1, String>, isAfter: Fun1, String>, @@ -55,7 +55,7 @@ abstract class ChronoZonedDateTimeAsStringAssertionSpec( ): Expect> = expect.(isEqual.lambda)(expected.format(DateTimeFormatter.ISO_ZONED_DATE_TIME)) - include(object : ChronoZonedDateTimeAssertionSpec( + include(object : ChronoZonedDateTimeExpectationsSpec( fun1(::isBefore), fun1(::isBeforeOrEqual), fun1(::isAfter), diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoZonedDateTimeExpectationsSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoZonedDateTimeExpectationsSpec.kt index 959b6a9127..8c5879b0d9 100644 --- a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoZonedDateTimeExpectationsSpec.kt +++ b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ChronoZonedDateTimeExpectationsSpec.kt @@ -12,7 +12,7 @@ import java.time.ZoneOffset import java.time.ZonedDateTime import java.time.chrono.ChronoZonedDateTime -abstract class ChronoZonedDateTimeAssertionSpec( +abstract class ChronoZonedDateTimeExpectationsSpec( isBefore: Fun1, ChronoZonedDateTime<*>>, isBeforeOrEqual: Fun1, ChronoZonedDateTime<*>>, isAfter: Fun1, ChronoZonedDateTime<*>>, diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/FileAsPathExpectationsSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/FileAsPathExpectationsSpec.kt index 0873017b7c..c275843ecc 100644 --- a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/FileAsPathExpectationsSpec.kt +++ b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/FileAsPathExpectationsSpec.kt @@ -9,7 +9,7 @@ import java.io.File import java.nio.file.Path import java.nio.file.Paths -abstract class FileAsPathAssertionsSpec( +abstract class FileAsPathExpectationsSpec( asPath: Expect.(Expect.() -> Unit) -> Expect ) : Spek({ diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/FloatingPointWithErrorToleranceExpectationsJvmSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/FloatingPointWithErrorToleranceExpectationsJvmSpec.kt index 9d629671f7..7277c6c800 100644 --- a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/FloatingPointWithErrorToleranceExpectationsJvmSpec.kt +++ b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/FloatingPointWithErrorToleranceExpectationsJvmSpec.kt @@ -3,12 +3,12 @@ package ch.tutteli.atrium.specs.integration import ch.tutteli.atrium.specs.Fun2 import ch.tutteli.atrium.specs.SubjectLessSpec import ch.tutteli.atrium.specs.forSubjectLess -import ch.tutteli.atrium.specs.integration.FloatingPointWithErrorToleranceAssertionsSpec.TestData +import ch.tutteli.atrium.specs.integration.FloatingPointWithErrorToleranceExpectationsSpec.TestData import org.spekframework.spek2.Spek import org.spekframework.spek2.dsl.Root import java.math.BigDecimal -abstract class FloatingPointWithErrorToleranceAssertionsJvmSpec( +abstract class FloatingPointWithErrorToleranceExpectationsJvmSpec( toBeWithErrorToleranceBigDecimalPair: Fun2, describePrefix: String = "[Atrium] " ) : Spek({ diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/Fun0ExpectationsJvmSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/Fun0ExpectationsJvmSpec.kt index be7fcd1682..d866365956 100644 --- a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/Fun0ExpectationsJvmSpec.kt +++ b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/Fun0ExpectationsJvmSpec.kt @@ -12,7 +12,7 @@ import org.spekframework.spek2.Spek import org.spekframework.spek2.style.specification.Suite import java.io.IOException -abstract class Fun0AssertionsJvmSpec( +abstract class Fun0ExpectationsJvmSpec( toThrowFeature: Feature0 Any?, IllegalArgumentException>, toThrow: Feature1 Any?, Expect.() -> Unit, IllegalArgumentException>, notToThrowFeature: Feature0<() -> Int, Int>, @@ -42,7 +42,7 @@ abstract class Fun0AssertionsJvmSpec( fun messageAndStackTrace(message: String) = "\\s+\\Q$explanationBulletPoint\\E$messageDescr: \"$message\".*$separator" + "\\s+\\Q$explanationBulletPoint\\E$stackTraceDescr: $separator" + - "\\s+\\Q$listBulletPoint\\E${Fun0AssertionsJvmSpec::class.fullName}" + "\\s+\\Q$listBulletPoint\\E${Fun0ExpectationsJvmSpec::class.fullName}" describeFun(toThrowFeature, toThrow, notToThrowFeature, notToThrow) { val toThrowFunctions = unifySignatures(toThrowFeature, toThrow) diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/LocalDateExpectationsSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/LocalDateExpectationsSpec.kt index 22e4f4c9ae..a29a49f538 100644 --- a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/LocalDateExpectationsSpec.kt +++ b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/LocalDateExpectationsSpec.kt @@ -16,7 +16,7 @@ import java.time.DayOfWeek import java.time.LocalDate import java.time.Month -abstract class LocalDateAssertionsSpec( +abstract class LocalDateExpectationsSpec( yearFeature: Feature0, year: Fun1.() -> Unit>, monthFeature: Feature0, diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/LocalDateTimeExpectationsSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/LocalDateTimeExpectationsSpec.kt index a097fa440f..b349df3a48 100644 --- a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/LocalDateTimeExpectationsSpec.kt +++ b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/LocalDateTimeExpectationsSpec.kt @@ -15,7 +15,7 @@ import org.spekframework.spek2.style.specification.Suite import java.time.DayOfWeek import java.time.LocalDateTime -abstract class LocalDateTimeAssertionsSpec( +abstract class LocalDateTimeExpectationsSpec( yearFeature: Feature0, year: Fun1.() -> Unit>, monthFeature: Feature0, diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/OptionalExpectationsSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/OptionalExpectationsSpec.kt index c294fe888f..ad7f533380 100644 --- a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/OptionalExpectationsSpec.kt +++ b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/OptionalExpectationsSpec.kt @@ -11,7 +11,7 @@ import org.spekframework.spek2.Spek import org.spekframework.spek2.style.specification.Suite import java.util.* -abstract class OptionalAssertionsSpec( +abstract class OptionalExpectationsSpec( isEmpty: Fun0>, isPresentFeature: Feature0, Int>, isPresent: Fun1, Expect.() -> Unit>, diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/PathExpectationsSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/PathExpectationsSpec.kt index 486085078f..ae98d90618 100644 --- a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/PathExpectationsSpec.kt +++ b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/PathExpectationsSpec.kt @@ -32,7 +32,7 @@ import java.nio.file.attribute.PosixFilePermission.* import java.nio.file.spi.FileSystemProvider import java.util.regex.Pattern.quote -abstract class PathAssertionsSpec( +abstract class PathExpectationsSpec( exists: Fun0, existsNot: Fun0, startsWith: Fun1, diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/PathFeatureExpectationsSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/PathFeatureExpectationsSpec.kt index adadcd89a2..622c493f56 100644 --- a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/PathFeatureExpectationsSpec.kt +++ b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/PathFeatureExpectationsSpec.kt @@ -11,7 +11,7 @@ import org.spekframework.spek2.style.specification.Suite import java.nio.file.Path import java.nio.file.Paths -abstract class PathFeatureAssertionsSpec( +abstract class PathFeatureExpectationsSpec( parentFeature: Feature0, parent: Fun1.() -> Unit>, resolveFeature: Feature1, diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ZonedDateTimeExpectationsSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ZonedDateTimeExpectationsSpec.kt index 2c50cd327d..9a9f293dc8 100644 --- a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ZonedDateTimeExpectationsSpec.kt +++ b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/integration/ZonedDateTimeExpectationsSpec.kt @@ -15,7 +15,7 @@ import org.spekframework.spek2.style.specification.Suite import java.time.DayOfWeek import java.time.ZonedDateTime -abstract class ZonedDateTimeAssertionsSpec( +abstract class ZonedDateTimeExpectationsSpec( yearFeature: Feature0, year: Fun1.() -> Unit>, monthFeature: Feature0,